Skip to content

Commit 219380d

Browse files
committed
Auto merge of #72901 - ehuss:update-cargo, r=Mark-Simulacrum
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)
2 parents 47c3158 + e658200 commit 219380d

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

Diff for: .github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ jobs:
442442
- name: x86_64-msvc-cargo
443443
env:
444444
SCRIPT: python x.py test src/tools/cargotest src/tools/cargo
445-
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc"
445+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-lld"
446446
VCVARS_BAT: vcvars64.bat
447447
NO_DEBUG_ASSERTIONS: 1
448448
NO_LLVM_ASSERTIONS: 1

Diff for: src/ci/azure-pipelines/auto.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ jobs:
148148
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
149149
x86_64-msvc-cargo:
150150
SCRIPT: python x.py test src/tools/cargotest src/tools/cargo
151-
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
151+
INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld
152152
VCVARS_BAT: vcvars64.bat
153153
# FIXME(#59637)
154154
NO_DEBUG_ASSERTIONS: 1

Diff for: src/ci/github-actions/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ jobs:
505505
- name: x86_64-msvc-cargo
506506
env:
507507
SCRIPT: python x.py test src/tools/cargotest src/tools/cargo
508-
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
508+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld
509509
VCVARS_BAT: vcvars64.bat
510510
# FIXME(#59637)
511511
NO_DEBUG_ASSERTIONS: 1

0 commit comments

Comments
 (0)