dependabot-rust_toolchain 0.328.0 → 0.331.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23a023f76f1af824c52ce5e524d315143232bb4366a159ac0c91e5acf05dbaff
-  data.tar.gz: 4f84cb53af1f32bc8c7b02fe919d259eba26f398645e68ecdfe8fe57463b3aea
+  metadata.gz: 2148ce002bc0aa6ca37b608b45ad445511f2873ced7746dedc2573d70d72c426
+  data.tar.gz: 14c98e7fbcaf63aaef5e0714c7c5536418ea865ed8d40d3981f40ed796326b93
 SHA512:
-  metadata.gz: 58895d0554d951e087e2a888e6add7ec67dc3b0665987175ac42bb9cbbe89cdcd5edc4373872694dfda66cbbfaade8041373febd3eec95362abbc9a097db5d77
-  data.tar.gz: 8e506993d4308aab1eefc6ffb9eb16f20e85506e44d45c2fe27175a2e6d815d1699e6f0f8e788f42577fa2a4fbc4271a9dbe5c2ce17be7305a6aaaa889193f44
+  metadata.gz: d0ea3f704001f6a27d8c298728f6258d6b0a8b608202fd4de0afedb90f8704b0b4a966f0562232b154dad0b7fec42f877f0a88d303d529d8d55e1e87f02f71a3
+  data.tar.gz: 486fbf3aecb8bfa033e186808368318662b95beeaf4d77e14b577ef93614b49a38f60df552e0a466840d64b31559f36cf2b60fb9c98a6ce05eb34bf629de5219

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

@@ -59,32 +59,12 @@ module Dependabot
           current_channel = current_version.channel
           return [] unless current_channel
 
-          current_type = current_channel.channel_type
-
-          # There are no updates for channels
-          # i.e. "stable", "beta", "nightly"
-          return [] if current_type == ChannelType::Stability
+          return [] if stability_channel_without_updates?(current_channel)
 
           is_current_major_minor = major_minor_format?(current_version.to_s)
 
-          channel_matched_releases = releases.filter_map do |release|
-            release_rust_version = T.cast(release.version, Dependabot::RustToolchain::Version)
-            release_channel = release_rust_version.channel
-            next unless release_channel
-
-            # Check that the release version is in the same channel type
-            next unless release_channel.channel_type == current_type
-
-            next release unless release_channel.channel_type == ChannelType::Version
-
-            # For version channels, we need to ensure that the version format matches
-            is_release_major_minor = major_minor_format?(release_rust_version.to_s)
-            case [is_current_major_minor, is_release_major_minor]
-            in [true, true] | [false, false]
-              release
-            else
-              nil
-            end
+          channel_matched_releases = releases.select do |release|
+            compatible_release?(release, current_channel, is_current_major_minor)
           end
 
           channel_matched_releases.uniq do |release|
@@ -92,6 +72,60 @@ module Dependabot
           end
         end
 
+        sig { params(channel: T.untyped).returns(T::Boolean) }
+        def stability_channel_without_updates?(channel)
+          channel.channel_type == ChannelType::Stability
+        end
+
+        sig do
+          params(
+            release: Dependabot::Package::PackageRelease,
+            current_channel: T.untyped,
+            is_current_major_minor: T::Boolean
+          )
+            .returns(T::Boolean)
+        end
+        def compatible_release?(release, current_channel, is_current_major_minor)
+          release_rust_version = T.cast(release.version, Dependabot::RustToolchain::Version)
+          release_channel = release_rust_version.channel
+          return false unless release_channel
+
+          return false unless matching_channel_type?(release_channel, current_channel)
+          return false unless matching_dated_stability?(release_channel, current_channel)
+          return true unless version_channel?(release_channel)
+
+          matching_version_format?(release_rust_version, is_current_major_minor)
+        end
+
+        sig { params(release_channel: T.untyped, current_channel: T.untyped).returns(T::Boolean) }
+        def matching_channel_type?(release_channel, current_channel)
+          release_channel.channel_type == current_channel.channel_type
+        end
+
+        sig { params(release_channel: T.untyped, current_channel: T.untyped).returns(T::Boolean) }
+        def matching_dated_stability?(release_channel, current_channel)
+          return true unless current_channel.channel_type == ChannelType::DatedStability
+
+          release_channel.stability == current_channel.stability
+        end
+
+        sig { params(channel: T.untyped).returns(T::Boolean) }
+        def version_channel?(channel)
+          channel.channel_type == ChannelType::Version
+        end
+
+        sig do
+          params(
+            release_version: Dependabot::RustToolchain::Version,
+            is_current_major_minor: T::Boolean
+          )
+            .returns(T::Boolean)
+        end
+        def matching_version_format?(release_version, is_current_major_minor)
+          is_release_major_minor = major_minor_format?(release_version.to_s)
+          is_current_major_minor == is_release_major_minor
+        end
+
         # Check if a version string is in major.minor format (e.g., "1.72" vs "1.72.0")
         sig { params(version_string: String).returns(T::Boolean) }
         def major_minor_format?(version_string)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-rust_toolchain
 version: !ruby/object:Gem::Version
-  version: 0.328.0
+  version: 0.331.0
 platform: ruby
 authors:
 - Dependabot
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.328.0
+        version: 0.331.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.328.0
+        version: 0.331.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -259,7 +259,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
-  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.328.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.331.0
 rdoc_options: []
 require_paths:
 - lib