diff options
| author | bors <bors@rust-lang.org> | 2021-12-28 16:59:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-12-28 16:59:56 +0000 |
| commit | 83b15bfe1c15f325bc186ebfe3691b729ed59f2b (patch) | |
| tree | 7cf204daa88c54395af84a97f3fc902934e91aa5 /src/ci/github-actions | |
| parent | 442248d6bcc00693922941eb5a9f241e0e9da2c0 (diff) | |
| parent | 11c71d24aae79cad195b8b7e3f22fc8fd5a80926 (diff) | |
| download | rust-83b15bfe1c15f325bc186ebfe3691b729ed59f2b.tar.gz rust-83b15bfe1c15f325bc186ebfe3691b729ed59f2b.zip | |
Auto merge of #92352 - matthiaskrgr:rollup-19fbq7u, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #92076 (Ignore other `PredicateKind`s in rustdoc auto trait finder) - #92219 (Remove VCVARS_BAT) - #92238 (Add a test suite for stringify macro) - #92330 (Add myself to .mailmap) - #92333 (Tighten span when suggesting lifetime on path) - #92335 (Document units for `std::column`) - #92344 (:arrow_up: rust-analyzer) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/ci/github-actions')
| -rw-r--r-- | src/ci/github-actions/ci.yml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 96af401369e..ac5d5822bfb 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -548,7 +548,6 @@ jobs: env: SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld - VCVARS_BAT: vcvars64.bat <<: *job-windows-xl - name: x86_64-msvc-tools |