dependabot-rust_toolchain 0.334.0 → 0.335.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdb44f4b0f8a8afc4195f353e99901bf2aad638ddebb469abf628eaeff62d0ab
-  data.tar.gz: ae37edfe55112ce4f4061d0df645add7d1752246f6c4970cab9611b3f4ac1649
+  metadata.gz: 3434912dd874d817f710ba288a846c1de2946c343621fe93e2983af87ea9e5f3
+  data.tar.gz: 811bab1f287e5929d6998072b61cba77a8f46a747befe4da5c82b2c6aceaf7c7
 SHA512:
-  metadata.gz: 3080bb7f229320c931b16d88bee8c8db1c084e365a4bc0f054b8e9158068b5078e3269a86875e34bfdd6f00410a2ce64cacf42226fe83d30236e7ef51f8ecbec
-  data.tar.gz: d4486c39c789796af635ae0385ee67c8086600034c719c9e3d48a5128772a1f26fb15266638ee1d7c4b0a92707423dabe38a18cfeb00779ac71a22c284f06b6a
+  metadata.gz: 1325790a506f9105732c949191c2211489449769d8dc1c0437b3c41af4744e5646b7366dcc9d761ee36ec2dc3736da56dbd8ae119bdf8913f72dbaa041183fdb
+  data.tar.gz: 708ff561efe1b67ed1984cd26d59634fbf4f4ddd0fae4090ec1b95e83072ed4ea43689537ab4b70c067c350d2a929366e805a527811bd448b69cc7556b0ae1cb

data/lib/dependabot/rust_toolchain/file_parser.rb

@@ -1,4 +1,4 @@
-# typed: strict
+# typed: strong
 # frozen_string_literal: true
 
 require "sorbet-runtime"
@@ -10,6 +10,7 @@ require "dependabot/file_parsers"
 require "dependabot/file_parsers/base"
 require "dependabot/file_parsers/base/dependency_set"
 
+require "dependabot/rust_toolchain/models/rust_toolchain_toml"
 require "dependabot/rust_toolchain/package_manager"
 
 module Dependabot
@@ -80,16 +81,8 @@ module Dependabot
 
       sig { params(content: String).returns(String) }
       def parse_toml_toolchain(content)
-        parsed = TomlRB.parse(content)
-
-        channel = parsed.dig("toolchain", "channel")
-        return channel if channel
-
-        Dependabot.logger.warn("No toolchain section found in rust-toolchain.toml file.")
-        raise Dependabot::DependencyFileNotParseable, "rust-toolchain.toml"
-      rescue TomlRB::ParseError => e
-        Dependabot.logger.warn("Failed to parse rust-toolchain.toml file: #{e.message}")
-        raise Dependabot::DependencyFileNotParseable, "rust-toolchain.toml"
+        toolchain_toml = Models::RustToolchainToml.from_toml(content)
+        toolchain_toml.channel
       end
 
       sig { params(content: String).returns(String) }

data/lib/dependabot/rust_toolchain/models/rust_toolchain_config.rb

@@ -0,0 +1,31 @@
+# typed: strong
+# frozen_string_literal: true
+
+require "sorbet-runtime"
+
+module Dependabot
+  module RustToolchain
+    module Models
+      # Typed struct for the [toolchain] section of rust-toolchain.toml files
+      # https://rust-lang.github.io/rustup/overrides.html#the-toolchain-file
+      class RustToolchainConfig < T::ImmutableStruct
+        extend T::Sig
+
+        # The channel specifies which toolchain to use
+        # Format: "(<channel>[-<date>])|<custom toolchain name>"
+        # Examples: "stable", "beta", "nightly", "nightly-2020-07-10", "1.70.0"
+        const :channel, String
+
+        # Creates a RustToolchainConfig from a hash representation
+        sig { params(data: T::Hash[String, T.untyped]).returns(RustToolchainConfig) }
+        def self.from_hash(data)
+          new(
+            channel: T.cast(data["channel"], String)
+          )
+        rescue TypeError => e
+          raise Dependabot::DependencyFileNotParseable, "Invalid toolchain config: #{e.message}"
+        end
+      end
+    end
+  end
+end

data/lib/dependabot/rust_toolchain/models/rust_toolchain_toml.rb

@@ -0,0 +1,43 @@
+# typed: strong
+# frozen_string_literal: true
+
+require "sorbet-runtime"
+require "toml-rb"
+
+require "dependabot/errors"
+require "dependabot/rust_toolchain/models/rust_toolchain_config"
+
+module Dependabot
+  module RustToolchain
+    module Models
+      # Typed struct for rust-toolchain.toml file structure
+      # https://rust-lang.github.io/rustup/overrides.html#the-toolchain-file
+      class RustToolchainToml < T::ImmutableStruct
+        extend T::Sig
+
+        # The [toolchain] section containing the toolchain configuration
+        # This is the only top-level section currently supported
+        const :toolchain, RustToolchainConfig
+
+        sig { params(toml_string: String).returns(RustToolchainToml) }
+        def self.from_toml(toml_string)
+          parsed_data = TomlRB.parse(toml_string)
+          data = T.cast(parsed_data, T::Hash[String, T.untyped])
+
+          toolchain_data = T.cast(data["toolchain"], T::Hash[String, T.untyped])
+          new(
+            toolchain: RustToolchainConfig.from_hash(toolchain_data)
+          )
+        rescue TomlRB::ParseError, TypeError => e
+          raise Dependabot::DependencyFileNotParseable, "Invalid TOML syntax: #{e.message}"
+        end
+
+        # Extracts the channel from the toolchain configuration
+        sig { returns(String) }
+        def channel
+          toolchain.channel
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-rust_toolchain
 version: !ruby/object:Gem::Version
-  version: 0.334.0
+  version: 0.335.0
 platform: ruby
 authors:
 - Dependabot
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.334.0
+        version: 0.335.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.334.0
+        version: 0.335.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -113,56 +113,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.67'
+        version: '1.80'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.67'
+        version: '1.80'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: '1.26'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: '1.26'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.29'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.29'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: rubocop-sorbet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +248,8 @@ files:
 - lib/dependabot/rust_toolchain/file_parser.rb
 - lib/dependabot/rust_toolchain/file_updater.rb
 - lib/dependabot/rust_toolchain/metadata_finder.rb
+- lib/dependabot/rust_toolchain/models/rust_toolchain_config.rb
+- lib/dependabot/rust_toolchain/models/rust_toolchain_toml.rb
 - lib/dependabot/rust_toolchain/package/package_details_fetcher.rb
 - lib/dependabot/rust_toolchain/package_manager.rb
 - lib/dependabot/rust_toolchain/requirement.rb
@@ -259,7 +261,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.334.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.335.0
 rdoc_options: []
 require_paths:
 - lib