Skip to content

Commit

Permalink
Merge pull request #3362 from CryZe/update-cargo
Browse files Browse the repository at this point in the history
Update Rust to 1.51.0
  • Loading branch information
jurre authored Mar 26, 2021
2 parents c36e14b + d0f4855 commit 47bd1e9
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions cargo/spec/dependabot/cargo/file_parser_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cargo/spec/fixtures/manifests/disabled_feature
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions cargo/spec/fixtures/manifests/requires_nightly
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
5 changes: 5 additions & 0 deletions cargo/spec/fixtures/manifests/resolver2
Original file line number Diff line number Diff line change
@@ -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"

0 comments on commit 47bd1e9

Please sign in to comment.