Skip to content

Commit

Permalink
Auto merge of #72901 - ehuss:update-cargo, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history 
Update cargo

9 commits in 9fcb8c1d20c17f51054f7aa4e08ff28d381fe096..40ebd52206e25c7a576ee42c137cc06a745a167a
2020-05-25 16:25:36 +0000 to 2020-06-01 22:35:00 +0000
- Warn if using hash in git URL, Fixes rust-lang/cargo#8241 (rust-lang/cargo#8297)
- reset lockfile information between resolutions (rust-lang/cargo#8274)
- Disable strip_works test on macos. (rust-lang/cargo#8301)
- Fix typo in impl Display for Strip (rust-lang/cargo#8299)
- Add support for rustdoc root URL mappings. (rust-lang/cargo#8287)
- Fix tests with enoent error message on non-english systems. (rust-lang/cargo#8295)
- Fix fingerprinting for lld on Windows with dylib. (rust-lang/cargo#8290)
- Fix a typo (rust-lang/cargo#8289)
- Fix several issues with close_output test. (rust-lang/cargo#8286)
  • Loading branch information
@bors
bors committed Jun 4, 2020
2 parents 47c3158 + e658200 commit 219380d
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
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
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
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
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

0 comments on commit 219380d

Please sign in to comment.