dependabot-cargo 0.87.11 → 0.87.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5f2a002b4c408178e04d09c6ea0adda0a402aa5265c66448ea1d7a37c120ab4
-  data.tar.gz: 4167a8d2db7f522f82d6e391902c0142f82aa43ae8f481dc71ab76170d660715
+  metadata.gz: b1cea58c29ba4b87e36c6f518c9a792b7412ca68ff0250adfb3e9c35816dcac4
+  data.tar.gz: a8acdca43d8971141e16c4ff7036f13fb62dcc4a2a292e6b85955f920443cba3
 SHA512:
-  metadata.gz: 60b95620931b1c5a84b7b4af8007ba9f9f754bcb5170584eb756b955bbb7763ecf5981bcae3eac4a5bdbaca3c7daf82f9e30f5f3f916de5c93397ecd97145de8
-  data.tar.gz: 0fc8cb5034a8a30fb0fcd964629dbc24714e5c11e0a1012948703c2faea67a73f8bc41e7aed42f893c37dd31a16effed0fba910f76bff90f9d8d8e75c894365f
+  metadata.gz: 984fbf1f7474f261cadbb2731b195315e2440c9958c9f3c916a964f1c443c190c6761341cdd239c865270ed0d32c47db0fbbb49a0c47160bd02971264e34eb50
+  data.tar.gz: 5fc854d29970ad99e774923bb7411440d24125293d57062b6a71b8a6c9789f26026bbf0027d29dc1ede2c2a22f08e7fc3cd06637024a9220b5804d22df0cb017

data/lib/dependabot/cargo/update_checker/file_preparer.rb

@@ -68,14 +68,16 @@ module Dependabot
           parsed_manifest = TomlRB.parse(content)
 
           Cargo::FileParser::DEPENDENCY_TYPES.each do |type|
-            next unless (req = parsed_manifest.dig(type, dependency.name))
+            dependency_names_for_type(parsed_manifest, type).each do |name|
+              req = parsed_manifest.dig(type, name)
 
-            updated_req = temporary_requirement_for_resolution(filename)
+              updated_req = temporary_requirement_for_resolution(filename)
 
-            if req.is_a?(Hash)
-              parsed_manifest[type][dependency.name]["version"] = updated_req
-            else
-              parsed_manifest[type][dependency.name] = updated_req
+              if req.is_a?(Hash)
+                parsed_manifest[type][name]["version"] = updated_req
+              else
+                parsed_manifest[type][name] = updated_req
+              end
             end
           end
 
@@ -86,18 +88,18 @@ module Dependabot
           parsed_manifest = TomlRB.parse(content)
 
           Cargo::FileParser::DEPENDENCY_TYPES.each do |type|
-            next unless (req = parsed_manifest.dig(type, dependency.name))
-            next unless req.is_a?(Hash)
-            next unless [req["tag"], req["rev"]].compact.uniq.count == 1
-
-            if req["tag"]
-              parsed_manifest[type][dependency.name]["tag"] =
-                replacement_git_pin
-            end
-
-            if req["rev"]
-              parsed_manifest[type][dependency.name]["rev"] =
-                replacement_git_pin
+            dependency_names_for_type(parsed_manifest, type).each do |name|
+              req = parsed_manifest.dig(type, name)
+              next unless req.is_a?(Hash)
+              next unless [req["tag"], req["rev"]].compact.uniq.count == 1
+
+              if req["tag"]
+                parsed_manifest[type][name]["tag"] = replacement_git_pin
+              end
+
+              if req["rev"]
+                parsed_manifest[type][name]["rev"] = replacement_git_pin
+              end
             end
           end
 
@@ -172,6 +174,24 @@ module Dependabot
             fetch("version")
         end
 
+        def dependency_names_for_type(parsed_manifest, type)
+          names = []
+          parsed_manifest.fetch(type, {}).each do |nm, req|
+            next unless dependency.name == name_from_declaration(nm, req)
+            names << nm
+          end
+          names
+        end
+
+        def name_from_declaration(name, declaration)
+          return name if declaration.is_a?(String)
+          unless declaration.is_a?(Hash)
+            raise "Unexpected dependency declaration: #{declaration}"
+          end
+
+          declaration.fetch("package", name)
+        end
+
         def manifest_files
           @manifest_files ||=
             dependency_files.select { |f| f.name.end_with?("Cargo.toml") }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-cargo
 version: !ruby/object:Gem::Version
-  version: 0.87.11
+  version: 0.87.12
 platform: ruby
 authors:
 - Dependabot
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.87.11
+        version: 0.87.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.87.11
+        version: 0.87.12
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement