Skip to content
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.

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

Rollup of 8 pull requests #129443

Merged
merged 17 commits into from
Aug 23, 2024
Merged

Rollup of 8 pull requests #129443

merged 17 commits into from
Aug 23, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

ColinFinck and others added 17 commits August 13, 2024 18:15
…s-gnu` targets

`rust-lld.exe` built for `x86_64-pc-windows-gnu` depends on `libgcc_s_seh-1.dll` and `libwinpthread-1.dll` from MinGW-w64.
Until now, they were not shipped alongside `rust-lld.exe`, and you could not run `rust-lld.exe` on most systems.

This problem didn't surface until now because:
* Most targets don't use `rust-lld` by default.
* Some people had these DLLs in their `PATH` from some other MinGW binary.
* `rustup` used to add `bin` to the `PATH`, which contains these DLLs for `rustc.exe`. But it no longer does that: rust-lang/rustup@ce3c09a

Fixes rust-lang#125809
Signed-off-by: Amjad Alsharafi <26300843+Amjad50@users.noreply.github.com>
fixes rust-lang#127576

windows implementation still needs some work
…=Amanieu

fix: fs::remove_dir_all: treat internal ENOENT as success

fixes rust-lang#127576

try-job: test-various
…lls, r=Kobzol,petrochenkov,jieyouxu

Ship MinGW-w64 runtime DLLs along with `rust-lld.exe` for `-pc-windows-gnu` targets

`rust-lld.exe` built for `x86_64-pc-windows-gnu` depends on `libgcc_s_seh-1.dll` and `libwinpthread-1.dll` from MinGW-w64. Until now, they were not shipped alongside `rust-lld.exe`, and you could not run `rust-lld.exe` on most systems.

This problem didn't surface until now because:
* Most targets don't use `rust-lld` by default.
* Some people had these DLLs in their `PATH` from some other MinGW binary.
* `rustup` used to add `bin` to the `PATH`, which contains these DLLs for `rustc.exe`. But it no longer does that: rust-lang/rustup@ce3c09a

Fixes rust-lang#125809

try-job: dist-x86_64-mingw
…r=jieyouxu

Migrate `x86_64-fortanix-unknown-sgx-lvi` `run-make` test to rmake

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).

The final Makefile! Every Makefile test is now claimed.

This is difficult to test due to the uncommon architecture it is specific to. I don't think it is in the CI (I didn't find it in `jobs.yml`, but if there is a way to test it, please do.

Locally, on Linux, it compiles and panics at the `llvm_filecheck` part (if I replace the `x86_64-fortanix-unknown-sgx` with `x86_64-unknown-linux-gnu`, of course), which is expected.

For this reason, the Makefile and associated script have been kept, but with a leading underscore.
…piler-errors

Use a LocalDefId in ResolvedArg.
…r=tgross35

Update `compiler_builtins` to `0.1.120`

Includes rust-lang/compiler-builtins#672 which fixes regression issue with Apple and Windows compilers.

try-job: aarch64-apple
try-job: x86_64-apple-1
try-job: x86_64-msvc
…es, r=notriddle

Fix extern crates not being hidden with `doc(hidden)`

Fixes rust-lang#126796.

Only the current crate should never be stripped, any other crate should be strippable.

r? ``@notriddle``
Don't trigger refinement lint if predicates reference errors

Fixes rust-lang#129404
…-rustdoc, r=jieyouxu

Fix a missing import in a doc in run-make-support
@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc O-solid Operating System: SOLID O-unix Operating system: Unix-like O-wasi Operating system: Wasi, Webassembly System Interface O-windows Operating system: Windows S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Aug 23, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=8

@bors
Copy link
Contributor

bors commented Aug 23, 2024

📌 Commit 6c2ee6f has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 23, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 23, 2024
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#127623 (fix: fs::remove_dir_all: treat internal ENOENT as success)
 - rust-lang#128876 (Ship MinGW-w64 runtime DLLs along with `rust-lld.exe` for `-pc-windows-gnu` targets)
 - rust-lang#129055 (Migrate `x86_64-fortanix-unknown-sgx-lvi` `run-make` test to rmake)
 - rust-lang#129386 (Use a LocalDefId in ResolvedArg.)
 - rust-lang#129400 (Update `compiler_builtins` to `0.1.120`)
 - rust-lang#129414 (Fix extern crates not being hidden with `doc(hidden)`)
 - rust-lang#129417 (Don't trigger refinement lint if predicates reference errors)
 - rust-lang#129433 (Fix a missing import in a doc in run-make-support)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Contributor

bors commented Aug 23, 2024

⌛ Testing commit 6c2ee6f with merge 087fc49...

@rust-log-analyzer
Copy link
Collaborator

The job x86_64-msvc-ext failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
test result: ok. 25 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.02s

     Running tests\ui.rs (build\x86_64-pc-windows-msvc\stage1-tools\x86_64-pc-windows-msvc\release\deps\ui-9700297a935a1cdc.exe)
## Running ui tests in tests/pass for x86_64-pc-windows-msvc
   Compiler: "MIRI_ENV_VAR_TEST"="0" "MIRI_TEMP"="C:\\a\\_temp\\msys64\\tmp\\miri-uitest-jTVESj" "RUST_BACKTRACE"="1" C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1\bin\miri.exe "--error-format=json" "--sysroot=C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\miri-sysroot" "-Dwarnings" "-Dunused" "-Ainternal_features" "-Zmiri-provenance-gc=1" "-Zui-testing" "--target" "x86_64-pc-windows-msvc" "--out-dir" OUT_DIR
tests/pass\align_repeat_into_well_aligned_array.rs ... ok
tests/pass\alloc-access-tracking.rs ... ignored (in-test comment)
tests/pass\align_repeat_into_packed_field.rs ... ok
tests/pass\align.rs ... ok
---

test result: ok. 350 passed; 9 ignored;

## Running ui tests in tests/pass-dep for x86_64-pc-windows-msvc
   Compiler: "MIRI_ENV_VAR_TEST"="0" "MIRI_TEMP"="C:\\a\\_temp\\msys64\\tmp\\miri-uitest-jTVESj" "RUST_BACKTRACE"="1" C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1\bin\miri.exe "--error-format=json" "--sysroot=C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\miri-sysroot" "-Dwarnings" "-Dunused" "-Ainternal_features" "-Zmiri-provenance-gc=1" "-Zui-testing" "--target" "x86_64-pc-windows-msvc" "--out-dir" OUT_DIR
tests/pass-dep\tempfile.rs ... ignored (in-test comment)
tests/pass-dep\concurrency\apple-os-unfair-lock.rs ... ignored (in-test comment)
tests/pass-dep\concurrency\env-cleanup-data-race.rs ... ignored (in-test comment)
tests/pass-dep\concurrency\libc_pthread_cond_timedwait.rs ... ignored (in-test comment)
---

test result: ok. 12 passed; 28 ignored;

## Running ui tests in tests/panic for x86_64-pc-windows-msvc
   Compiler: "MIRI_ENV_VAR_TEST"="0" "MIRI_TEMP"="C:\\a\\_temp\\msys64\\tmp\\miri-uitest-jTVESj" "RUST_BACKTRACE"="1" C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1\bin\miri.exe "--error-format=json" "--sysroot=C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\miri-sysroot" "-Dwarnings" "-Dunused" "-Ainternal_features" "-Zmiri-provenance-gc=1" "-Zui-testing" "--target" "x86_64-pc-windows-msvc" "--out-dir" OUT_DIR
Building dependencies ... ok
tests/panic\div-by-zero-2.rs ... ok
tests/panic\overflowing-lsh-neg.rs ... ok
tests/panic\overflowing-rsh-2.rs ... ok
---

test result: ok. 14 passed; 2 ignored;

## Running ui tests in tests/fail for x86_64-pc-windows-msvc
   Compiler: "MIRI_ENV_VAR_TEST"="0" "MIRI_TEMP"="C:\\a\\_temp\\msys64\\tmp\\miri-uitest-jTVESj" "RUST_BACKTRACE"="1" C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1\bin\miri.exe "--error-format=json" "--sysroot=C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\miri-sysroot" "-Dwarnings" "-Dunused" "-Ainternal_features" "-Zmiri-provenance-gc=1" "-Zui-testing" "--target" "x86_64-pc-windows-msvc" "--out-dir" OUT_DIR
tests/fail\deny_lint.rs ... ok
tests/fail\const-ub-checks.rs ... ok
tests/fail\dyn-call-trait-mismatch.rs ... ok
tests/fail\environ-gets-deallocated.rs ... ignored (in-test comment)
---

test result: ok. 451 passed; 4 ignored;

## Running ui tests in tests/fail-dep for x86_64-pc-windows-msvc
   Compiler: "MIRI_ENV_VAR_TEST"="0" "MIRI_TEMP"="C:\\a\\_temp\\msys64\\tmp\\miri-uitest-jTVESj" "RUST_BACKTRACE"="1" C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1\bin\miri.exe "--error-format=json" "--sysroot=C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\miri-sysroot" "-Dwarnings" "-Dunused" "-Ainternal_features" "-Zmiri-provenance-gc=1" "-Zui-testing" "--target" "x86_64-pc-windows-msvc" "--out-dir" OUT_DIR
tests/fail-dep\concurrency\apple_os_unfair_lock_assert_owner.rs ... ignored (in-test comment)
tests/fail-dep\concurrency\apple_os_unfair_lock_reentrant.rs ... ignored (in-test comment)
tests/fail-dep\concurrency\apple_os_unfair_lock_unowned.rs ... ignored (in-test comment)
tests/fail-dep\concurrency\libc_pthread_cond_double_destroy.rs ... ignored (in-test comment)
---
[RUSTC-TIMING] miri test:false 4.483
error: failed to remove file `C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-tools\x86_64-pc-windows-msvc\release\miri.exe`

Caused by:
  Access is denied. (os error 5)
Command has failed. Rerun with -v to see more details.
  local time: Fri, Aug 23, 2024  6:50:51 AM
  network time: Fri, 23 Aug 2024 06:50:52 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

@bors
Copy link
Contributor

bors commented Aug 23, 2024

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 23, 2024
@matthiaskrgr
Copy link
Member Author

@bors retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 23, 2024
@bors
Copy link
Contributor

bors commented Aug 23, 2024

⌛ Testing commit 6c2ee6f with merge c8b14ba...

@bors
Copy link
Contributor

bors commented Aug 23, 2024

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing c8b14ba to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 23, 2024
@bors bors merged commit c8b14ba into rust-lang:master Aug 23, 2024
7 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Aug 23, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#127623 fix: fs::remove_dir_all: treat internal ENOENT as success c007f01fe93bb679f8ac909542841975be23ae26 (link)
#128876 Ship MinGW-w64 runtime DLLs along with rust-lld.exe for `… d0b41d89aa13543872d4dd0dfaa813994007fe3b (link)
#129055 Migrate x86_64-fortanix-unknown-sgx-lvi run-make test t… 223dac170e36a7d624cd58dc42090b5ca3c38835 (link)
#129386 Use a LocalDefId in ResolvedArg. e02ab694d8b384efe47bedba52c6880877b72bf8 (link)
#129400 Update compiler_builtins to 0.1.120 ecb296bca49b740d48740aa6b7c4b5d11b005a59 (link)
#129414 Fix extern crates not being hidden with doc(hidden) 3257fba0bd8bfbc4b233839440d5e0ff8ef99d90 (link)
#129417 Don't trigger refinement lint if predicates reference errors 90580da5673dc4ade1b1e2741f63fe1b7c5318d1 (link)
#129433 Fix a missing import in a doc in run-make-support 1a2e5180522c1344c0fe9751e1d7ea25cf2e2b3f (link)

previous master: b5723af345

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (c8b14ba): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-1.4% [-1.4%, -1.4%] 1
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary -1.3%, secondary 3.3%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
0.6% [0.6%, 0.6%] 1
Regressions ❌
(secondary)
3.3% [3.3%, 3.3%] 1
Improvements ✅
(primary)
-2.2% [-3.0%, -1.3%] 2
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -1.3% [-3.0%, 0.6%] 3

Cycles

Results (secondary 2.4%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
2.4% [2.4%, 2.4%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 749.494s -> 751.695s (0.29%)
Artifact size: 338.87 MiB -> 339.03 MiB (0.05%)

@matthiaskrgr matthiaskrgr deleted the rollup-tbgdj0p branch September 1, 2024 17:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. O-solid Operating System: SOLID O-unix Operating system: Unix-like O-wasi Operating system: Wasi, Webassembly System Interface O-windows Operating system: Windows rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.