dependabot-cargo 0.216.0 → 0.216.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a703a41b5c7903d51de877727762fc65183f03093205a185dff2fbcedb958076
-  data.tar.gz: 397d241631ce98380aa93fc4275da005130eb9698b29c30bbd610c6285840d59
+  metadata.gz: 6798a7c2314ff0c4bf5e4e875511cc1d1779eeaaf21dfcc35e9dabc79b7b90d9
+  data.tar.gz: a81064eaadfc1e519500ecd7b2f6fbfbe444c6a31c7d5745d23de13d915d5274
 SHA512:
-  metadata.gz: 414c85341229431f5743788b1280a86a7d9075c98d323db7ee4248cafccd074b8b5fef8bffdfd0badfeb5be02901aaa36df8273dcca00b1a46ab17c8e6362b9a
-  data.tar.gz: 6f7f6ff7921444cae0cfc8a8f0839520997d228f9534f2512342bd2a3d2d7e67f0107122cbd7930c6767b010c14aa55b1f542655ef3f98e24e324cd5db5eb829
+  metadata.gz: f4afefbd0e342378d74a661d0463134f2c7cebca3a02ca1272b6baf3407af5c8fd83af5d4426fc66a1335d1ad0f60587de9b4d870144c51bacf88e88860ca369
+  data.tar.gz: 39dc999fc8bf9eb051644f0fcce8164fca0d1b21e3c1d46b9652cf3dd69abf367cd27f5f9288cfc2b574346a8f1732db582d4651d837eca7cad19e24996e87e6

data/lib/dependabot/cargo/file_fetcher.rb

@@ -20,6 +20,26 @@ module Dependabot
         "Repo must contain a Cargo.toml."
       end
 
+      def package_manager_version
+        channel = if rust_toolchain
+                    TomlRB.parse(rust_toolchain.content).fetch("toolchain", nil)&.fetch("channel", nil)
+                  else
+                    "default"
+                  end
+
+        {
+          ecosystem: "cargo",
+          package_managers: {
+            "channel" => channel
+          }
+        }
+      rescue TomlRB::ParseError
+        raise Dependabot::DependencyFileNotParseable.new(
+          rust_toolchain.path,
+          "only rust-toolchain files formatted as TOML are supported, the non-TOML format was deprecated by Rust"
+        )
+      end
+
       private
 
       def fetch_files
@@ -285,8 +305,17 @@ module Dependabot
       end
 
       def rust_toolchain
-        @rust_toolchain ||= fetch_file_if_present("rust-toolchain")&.
+        return @rust_toolchain if defined?(@rust_toolchain)
+
+        @rust_toolchain = fetch_file_if_present("rust-toolchain")&.
                             tap { |f| f.support_file = true }
+
+        # Per https://rust-lang.github.io/rustup/overrides.html the file can
+        # have a `.toml` extension, but the non-extension version is preferred.
+        # Renaming here to simplify finding it later in the code.
+        @rust_toolchain ||= fetch_file_if_present("rust-toolchain.toml")&.
+                            tap { |f| f.support_file = true }&.
+                            tap { |f| f.name = "rust-toolchain" }
       end
     end
   end

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

@@ -145,6 +145,10 @@ module Dependabot
           # returns a non-zero status
           return if process.success?
 
+          if stdout.include?("usage of sparse registries requires `-Z sparse-registry`")
+            raise Dependabot::DependencyFileNotEvaluatable, "Dependabot only supports toolchain 1.68 and up."
+          end
+
           raise SharedHelpers::HelperSubprocessFailed.new(
             message: stdout,
             error_context: {

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

@@ -102,13 +102,11 @@ module Dependabot
         end
 
         def version_class
-          Utils.version_class_for_package_manager(dependency.package_manager)
+          dependency.version_class
         end
 
         def requirement_class
-          Utils.requirement_class_for_package_manager(
-            dependency.package_manager
-          )
+          dependency.requirement_class
         end
       end
     end

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

@@ -422,7 +422,7 @@ module Dependabot
         end
 
         def version_class
-          Cargo::Version
+          dependency.version_class
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-cargo
 version: !ruby/object:Gem::Version
-  version: 0.216.0
+  version: 0.216.2
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-12 00:00:00.000000000 Z
+date: 2023-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.216.0
+        version: 0.216.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.216.0
+        version: 0.216.2
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.48.0
+        version: 1.50.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.48.0
+        version: 1.50.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement