diff --git a/Dockerfile b/Dockerfile index ed8958b59ac..4b0d99fac39 100644 --- a/Dockerfile +++ b/Dockerfile @@ -170,11 +170,11 @@ RUN wget https://packages.erlang-solutions.com/erlang-solutions_1.0_all.deb \ ### RUST -# Install Rust 1.47.0 +# Install Rust 1.51.0 ENV RUSTUP_HOME=/opt/rust \ PATH="${PATH}:/opt/rust/bin" RUN export CARGO_HOME=/opt/rust ; curl https://sh.rustup.rs -sSf | sh -s -- -y -RUN export CARGO_HOME=/opt/rust ; rustup toolchain install 1.47.0 && rustup default 1.47.0 +RUN export CARGO_HOME=/opt/rust ; rustup toolchain install 1.51.0 && rustup default 1.51.0 ### NEW NATIVE HELPERS diff --git a/cargo/spec/dependabot/cargo/file_parser_spec.rb b/cargo/spec/dependabot/cargo/file_parser_spec.rb index a957820230e..ad176930e44 100644 --- a/cargo/spec/dependabot/cargo/file_parser_spec.rb +++ b/cargo/spec/dependabot/cargo/file_parser_spec.rb @@ -773,6 +773,12 @@ end end + context "with resolver version 2" do + let(:manifest_fixture_name) { "resolver2" } + let(:lockfile_fixture_name) { "no_dependencies" } + it { is_expected.to eq([]) } + end + context "with no dependencies" do let(:manifest_fixture_name) { "no_dependencies" } let(:lockfile_fixture_name) { "no_dependencies" } diff --git a/cargo/spec/dependabot/cargo/update_checker/version_resolver_spec.rb b/cargo/spec/dependabot/cargo/update_checker/version_resolver_spec.rb index 4553efc68c2..6bf5dfb52af 100644 --- a/cargo/spec/dependabot/cargo/update_checker/version_resolver_spec.rb +++ b/cargo/spec/dependabot/cargo/update_checker/version_resolver_spec.rb @@ -173,7 +173,7 @@ # Test that the temporary path isn't included in the error message expect(error.message).to_not include("dependabot_20") expect(error.message). - to include("feature `namespaced-features` is required") + to include("feature `metabuild` is required") end end end diff --git a/cargo/spec/fixtures/manifests/disabled_feature b/cargo/spec/fixtures/manifests/disabled_feature index 4d04d26fd43..d9754284340 100644 --- a/cargo/spec/fixtures/manifests/disabled_feature +++ b/cargo/spec/fixtures/manifests/disabled_feature @@ -2,7 +2,7 @@ name = "dependabot" # the name of the package version = "0.1.0" # the current version, obeying semver authors = ["support@dependabot.com"] -namespaced-features = true +metabuild = ["foo", "bar"] [dependencies] time = "0.1.12" diff --git a/cargo/spec/fixtures/manifests/requires_nightly b/cargo/spec/fixtures/manifests/requires_nightly index 0cfaecc7ef4..014aba62dfe 100644 --- a/cargo/spec/fixtures/manifests/requires_nightly +++ b/cargo/spec/fixtures/manifests/requires_nightly @@ -1,10 +1,10 @@ -cargo-features = ["namespaced-features"] +cargo-features = ["metabuild"] [package] name = "dependabot" # the name of the package version = "0.1.0" # the current version, obeying semver authors = ["support@dependabot.com"] -namespaced-features = true +metabuild = ["foo", "bar"] [dependencies] time = "0.1.12" diff --git a/cargo/spec/fixtures/manifests/resolver2 b/cargo/spec/fixtures/manifests/resolver2 new file mode 100644 index 00000000000..0bb6ac85d65 --- /dev/null +++ b/cargo/spec/fixtures/manifests/resolver2 @@ -0,0 +1,5 @@ +[package] +name = "dependabot" # the name of the package +version = "0.1.0" # the current version, obeying semver +authors = ["support@dependabot.com"] +resolver = "2"