dependabot-cargo 0.106.6 → 0.106.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: befcaf217dcea992d1200db26037a941b40afc1062950af4eee53cdd9e86cd16
-  data.tar.gz: 515359f42529ea83e5b19e94b1f6368e63658776beb3660c401ef0317627932e
+  metadata.gz: e3560cc9d36a11e9a976850f845caf257d53edbd79896fafdcbf5d9cdf8a30db
+  data.tar.gz: 1194d58cbcfc8cca7386d036b5cc1977c4f07669833d0d65ddaae2ef4af40ea0
 SHA512:
-  metadata.gz: 052bab8ca21032a107acf3ab6b03bb50a925161cd9c379d1799a627e21bba2140979e9aaa0f291ea7e8cb0deb48c6545dba5e36797ab3a802f21bd8cde447938
-  data.tar.gz: 0ea433708ed6fa7a23be1021c8941a987344838204507ec239f37416e79fa29d1a36c6970e573ebeb87e73fc09c1d84a43cea5ee8e389d42f638d53d5c90adae
+  metadata.gz: f1a229c329992e84ad3e7b9f64495364822db5aa3298bd7a1ddd5fb73d21dad105afa91f9ab11d89fbbc30ff2762a243a83df7eed6b465eabd37dcbbdbce735e
+  data.tar.gz: b835eec1ea56c1ff6f6c1ebf22c374dcf6676be0fce0988f6f0b9cea2abf596e39aba14bfd30d025e01370c3400d8b1d87b370f1afe266d4e7605629487e25af

data/lib/dependabot/cargo/file_parser.rb

@@ -59,23 +59,23 @@ module Dependabot
       def manifest_dependencies
         dependency_set = DependencySet.new
 
-        DEPENDENCY_TYPES.each do |type|
-          manifest_files.each do |file|
+        manifest_files.each do |file|
+          DEPENDENCY_TYPES.each do |type|
             parsed_file(file).fetch(type, {}).each do |name, requirement|
               next unless name == name_from_declaration(name, requirement)
               next if lockfile && !version_from_lockfile(name, requirement)
 
-              dependency_set << Dependency.new(
-                name: name,
-                version: version_from_lockfile(name, requirement),
-                package_manager: "cargo",
-                requirements: [{
-                  requirement: requirement_from_declaration(requirement),
-                  file: file.name,
-                  groups: [type],
-                  source: source_from_declaration(requirement)
-                }]
-              )
+              dependency_set << build_dependency(name, requirement, type, file)
+            end
+
+            parsed_file(file).fetch("target", {}).each do |_, t_details|
+              t_details.fetch(type, {}).each do |name, requirement|
+                next unless name == name_from_declaration(name, requirement)
+                next if lockfile && !version_from_lockfile(name, requirement)
+
+                dependency_set <<
+                  build_dependency(name, requirement, type, file)
+              end
             end
           end
         end
@@ -83,6 +83,20 @@ module Dependabot
         dependency_set
       end
 
+      def build_dependency(name, requirement, type, file)
+        Dependency.new(
+          name: name,
+          version: version_from_lockfile(name, requirement),
+          package_manager: "cargo",
+          requirements: [{
+            requirement: requirement_from_declaration(requirement),
+            file: file.name,
+            groups: [type],
+            source: source_from_declaration(requirement)
+          }]
+        )
+      end
+
       def lockfile_dependencies
         dependency_set = DependencySet.new
         return dependency_set unless lockfile

data/lib/dependabot/cargo/file_updater/lockfile_updater.rb

@@ -8,6 +8,7 @@ require "dependabot/cargo/file_updater/manifest_updater"
 require "dependabot/cargo/file_parser"
 require "dependabot/shared_helpers"
 
+# rubocop:disable Metrics/ClassLength
 module Dependabot
   module Cargo
     class FileUpdater
@@ -227,9 +228,30 @@ module Dependabot
             end
           end
 
+          pin_target_specific_dependencies!(parsed_manifest)
+
           TomlRB.dump(parsed_manifest)
         end
 
+        def pin_target_specific_dependencies!(parsed_manifest)
+          parsed_manifest.fetch("target", {}).each do |target, t_details|
+            Cargo::FileParser::DEPENDENCY_TYPES.each do |type|
+              t_details.fetch(type, {}).each do |name, requirement|
+                next unless name == dependency.name
+
+                updated_req = "=#{dependency.version}"
+
+                if requirement.is_a?(Hash)
+                  parsed_manifest["target"][target][type][name]["version"] =
+                    updated_req
+                else
+                  parsed_manifest["target"][target][type][name] = updated_req
+                end
+              end
+            end
+          end
+        end
+
         def replace_ssh_urls(content)
           git_ssh_requirements_to_swap.each do |ssh_url, https_url|
             content = content.gsub(ssh_url, https_url)
@@ -341,3 +363,4 @@ module Dependabot
     end
   end
 end
+# rubocop:enable Metrics/ClassLength

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

@@ -81,9 +81,36 @@ module Dependabot
             end
           end
 
+          replace_req_on_target_specific_deps!(parsed_manifest, filename)
+
           TomlRB.dump(parsed_manifest)
         end
 
+        def replace_req_on_target_specific_deps!(parsed_manifest, filename)
+          parsed_manifest.fetch("target", {}).each do |target, _|
+            Cargo::FileParser::DEPENDENCY_TYPES.each do |type|
+              dependency_names = dependency_names_for_type_and_target(
+                parsed_manifest,
+                type,
+                target
+              )
+
+              dependency_names.each do |name|
+                req = parsed_manifest.dig("target", target, type, name)
+
+                updated_req = temporary_requirement_for_resolution(filename)
+
+                if req.is_a?(Hash)
+                  parsed_manifest["target"][target][type][name]["version"] =
+                    updated_req
+                else
+                  parsed_manifest["target"][target][type][name] = updated_req
+                end
+              end
+            end
+          end
+        end
+
         def replace_git_pin(content)
           parsed_manifest = TomlRB.parse(content)
 
@@ -103,9 +130,39 @@ module Dependabot
             end
           end
 
+          replace_git_pin_on_target_specific_deps!(parsed_manifest)
+
           TomlRB.dump(parsed_manifest)
         end
 
+        def replace_git_pin_on_target_specific_deps!(parsed_manifest)
+          parsed_manifest.fetch("target", {}).each do |target, _|
+            Cargo::FileParser::DEPENDENCY_TYPES.each do |type|
+              dependency_names = dependency_names_for_type_and_target(
+                parsed_manifest,
+                type,
+                target
+              )
+
+              dependency_names.each do |name|
+                req = parsed_manifest.dig("target", target, type, name)
+                next unless req.is_a?(Hash)
+                next unless [req["tag"], req["rev"]].compact.uniq.count == 1
+
+                if req["tag"]
+                  parsed_manifest["target"][target][type][name]["tag"] =
+                    replacement_git_pin
+                end
+
+                if req["rev"]
+                  parsed_manifest["target"][target][type][name]["rev"] =
+                    replacement_git_pin
+                end
+              end
+            end
+          end
+        end
+
         def replace_ssh_urls(content)
           parsed_manifest = TomlRB.parse(content)
 
@@ -184,6 +241,16 @@ module Dependabot
           names
         end
 
+        def dependency_names_for_type_and_target(parsed_manifest, type, target)
+          names = []
+          (parsed_manifest.dig("target", target, 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)

metadata

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