Skip to content

Update cargo #72901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 5, 2020
Merged

Update cargo #72901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
860b381
Update cargo
ehuss Jun 2, 2020
e658200
Enable lld for Cargo tests on Windows.
ehuss Jun 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ jobs:
- name: x86_64-msvc-cargo
env:
SCRIPT: python x.py test src/tools/cargotest src/tools/cargo
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc"
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-lld"
VCVARS_BAT: vcvars64.bat
NO_DEBUG_ASSERTIONS: 1
NO_LLVM_ASSERTIONS: 1
Expand Down
2 changes: 1 addition & 1 deletion src/ci/azure-pipelines/auto.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ jobs:
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
x86_64-msvc-cargo:
SCRIPT: python x.py test src/tools/cargotest src/tools/cargo
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld
VCVARS_BAT: vcvars64.bat
# FIXME(#59637)
NO_DEBUG_ASSERTIONS: 1
Expand Down
2 changes: 1 addition & 1 deletion src/ci/github-actions/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ jobs:
- name: x86_64-msvc-cargo
env:
SCRIPT: python x.py test src/tools/cargotest src/tools/cargo
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld
VCVARS_BAT: vcvars64.bat
# FIXME(#59637)
NO_DEBUG_ASSERTIONS: 1
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Open in desktop
Submodule cargo updated 24 files
+1 −1 ci/azure-install-rust.yml
+3 −7 crates/cargo-test-support/src/lib.rs
+8 −0 crates/cargo-test-support/src/registry.rs
+25 −0 crates/resolver-tests/tests/resolve.rs
+22 −2 src/cargo/core/compiler/fingerprint.rs
+2 −0 src/cargo/core/compiler/mod.rs
+172 −0 src/cargo/core/compiler/rustdoc.rs
+2 −0 src/cargo/core/features.rs
+1 −1 src/cargo/core/profiles.rs
+18 −20 src/cargo/core/registry.rs
+1 −0 src/cargo/ops/resolve.rs
+24 −8 src/cargo/util/config/mod.rs
+1 −1 src/cargo/util/dependency_queue.rs
+11 −0 src/cargo/util/toml/mod.rs
+41 −0 src/doc/src/reference/unstable.md
+11 −1 tests/testsuite/alt_registry.rs
+30 −0 tests/testsuite/bad_config.rs
+57 −6 tests/testsuite/build.rs
+3 −3 tests/testsuite/config_include.rs
+36 −0 tests/testsuite/freshness.rs
+2 −2 tests/testsuite/install.rs
+1 −0 tests/testsuite/main.rs
+2 −0 tests/testsuite/profiles.rs
+375 −0 tests/testsuite/rustdoc_extern_html.rs