Rollup of 11 pull requests #140096

jhpratt · 2025-04-21T01:24:26Z

Successful merges:

Clarify why SGX code specifies linkage/symbol names for certain statics #139795 (Clarify why SGX code specifies linkage/symbol names for certain statics)
fix missing word in comment #139946 (fix missing word in comment)
SystemTime doc tweaks #139982 (SystemTime doc tweaks)
docs(LocalKey<T>): clarify that T's Drop shouldn't panic #140009 (docs(LocalKey): clarify that T's Drop shouldn't panic)
Don't ICE on pending obligations from deep normalization in a loop #140021 (Don't ICE on pending obligations from deep normalization in a loop)
Advent of tests/ui (misc cleanups and improvements) [4/N] #140036 (Advent of tests/ui (misc cleanups and improvements) [4/N])
remove a couple clones #140047 (remove a couple clones)
Fix error when an intra doc link is trying to resolve an empty associated item #140052 (Fix error when an intra doc link is trying to resolve an empty associated item)
rustdoc-json: Improve test for auto-trait impls #140074 (rustdoc-json: Improve test for auto-trait impls)
jsondocck: Require command is at start of line #140076 (jsondocck: Require command is at start of line)
Update libc to 0.2.172 #140081 (Update libc to 0.2.172)

r? @ghost
@rustbot modify labels: rollup

Also update the symbol names as items have moved around a bit. The actual name isn't that important, it just needs to be unique. But for debugging it can be useful for it to point to the right place.

- Reworked the test as a *centralized* version of checking that certain targets correctly require `-C target-cpu` being specified. - Document test intention. - Move `amdgpu-require-explicit-cpu.rs` under new dir `tests/ui/target-cpu/` - No other ui subdir really fits this "requires `-Ctarget-cpu`" check.

- `tests/ui/augmented-assignment-feature-gate-cross.rs`: - This was *originally* to feature-gate overloaded OpAssign cross-crate, but now let's keep it as a smoke test. - Renamed as `augmented-assignment-cross-crate.rs`. - Relocated under `tests/ui/binop/`. - `tests/ui/augmented-assignments.rs`: - Documented test intent. - Moved under `tests/ui/borrowck/`. - `tests/ui/augmented-assignment-rpass.rs`: - Renamed to drop the `-rpass` suffix, since this was leftover from when `run-pass` test suite was a thing. - Moved under `tests/ui/binop/`.

- Reformat the test. - Document test intention. - Move test under `tests/ui/inference/`.

…ated item

…r=joboet Clarify why SGX code specifies linkage/symbol names for certain statics Specifying linkage/symbol name is solely to ensure a single instance between the `std` crate and its unit tests. Also update the symbol names as items have moved around a bit. The actual name isn't that important, it just needs to be unique. But for debugging it can be useful for it to point to the right place.

… r=jhpratt fix missing word in comment a very simple fix, rectifying a situation in which a word was accidentally .

…ratt SystemTime doc tweaks * Change the `UNIX_EPOCH` link in the `SystemTime` docs to point to the associated constant, not the module level constant. The former seems to be the recommended way to access it, since aiui the only reason the module constant exists in the first place is that associated constants weren't stable yet at the time. * Reword the comment in the `SystemTime` example - "an error occurred!" is a tad misleading; I feel like it implies a system error out of our control while `SystemTimeError` is more of a logic error. I was originally just gonna do the first thing but I noticed the second and figured I may as well. I'm also somewhat surprised that there aren't more in-depth module level docs for `std::time`; they don't even mention `SystemTime` at all. I might make another PR for that but mainly just wanted to flag it.

docs(LocalKey<T>): clarify that T's Drop shouldn't panic Clarify that should a TLS destructor panics, the process will abort. Also, an abort may be obfuscated as the process can be terminated with `SIGSEGV` or [`STATUS_STACK_BUFFER_OVERRUN`](https://devblogs.microsoft.com/oldnewthing/20190108-00/?p=100655) (i.e., `SIGABRT` is not guaranteed), so explicitly prints that the process was aborted. Context: https://users.rust-lang.org/t/status-stack-buffer-overrun-on-windows-without-any-usage-of-unsafe/128417 `@rustbot` label -T-compiler

…r=lcnr Don't ICE on pending obligations from deep normalization in a loop See the comment I left inline in `compiler/rustc_trait_selection/src/traits/normalize.rs`. Fixes rust-lang#133868 r? lcnr

…errors Advent of `tests/ui` (misc cleanups and improvements) [4/N] Some `tests/ui/` housekeeping, to trim down number of tests directly under `tests/ui/`. Part of rust-lang#133895. ### Review advice - Best reviewed commit-by-commit. - I can squash commits before merge, commits are separate to make it easier to review.

remove a couple clones

…ercote Fix error when an intra doc link is trying to resolve an empty associated item Fixes rust-lang#140026. Assigning `@nnethercote` since they're the one who wrote the initial change. I updated rustdoc code instead of compiler's because I think it makes more sense that the caller ensures on their side that the name they're looking for isn't empty. r? `@nnethercote`

…meGomez rustdoc-json: Improve test for auto-trait impls The TODO is fixable now due-to rust-lang#138763. While I was here I realized there's probably a a few more things we should also test. r? `@GuillaumeGomez`

…aumeGomez jsondocck: Require command is at start of line In one place we use `///`@`` instead of `//`@`.` The test-runner allowed it, but it probably shouldn't. Ran into by `@lolbinarycat` in rust-lang#132748 (comment): ``` error: unknown disambiguator `?(` ##[error] --> /checkout/tests/rustdoc-json/fns/return_type_alias.rs:3:25 | 3 | ///@ set foo = "$.index[?(`@.name=='Foo')].id"` | ^^ | ``` Maybe it's also worth erroring on this like we added in rust-lang#137103 r? `@GuillaumeGomez`

Update `libc` to 0.2.172 r? `@joboet`

bors · 2025-04-21T05:41:07Z

⌛ Testing commit 4c5a95f with merge 257d645...

Rollup of 11 pull requests Successful merges: - rust-lang#139795 (Clarify why SGX code specifies linkage/symbol names for certain statics) - rust-lang#139946 (fix missing word in comment) - rust-lang#139982 (SystemTime doc tweaks) - rust-lang#140009 (docs(LocalKey<T>): clarify that T's Drop shouldn't panic) - rust-lang#140021 (Don't ICE on pending obligations from deep normalization in a loop) - rust-lang#140036 (Advent of `tests/ui` (misc cleanups and improvements) [4/N]) - rust-lang#140047 (remove a couple clones) - rust-lang#140052 (Fix error when an intra doc link is trying to resolve an empty associated item) - rust-lang#140074 (rustdoc-json: Improve test for auto-trait impls) - rust-lang#140076 (jsondocck: Require command is at start of line) - rust-lang#140081 (Update `libc` to 0.2.172) r? `@ghost` `@rustbot` modify labels: rollup

rust-log-analyzer · 2025-04-21T07:57:18Z

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

Click to see the possible cause of the failure (guessed by this bot)

[2025-04-21T06:36:46Z DEBUG collector::compile::benchmark] Benchmark iteration 1/1
[2025-04-21T06:36:47Z INFO  collector::compile::execute] run_rustc with incremental=false, profile=Opt, scenario=Some(Full), patch=None, backend=Llvm, target=X86_64UnknownLinuxGnu, phase=benchmark
[2025-04-21T06:36:47Z DEBUG collector::compile::execute] "\\\\?\\C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage0\\bin\\cargo.exe" "rustc" "--manifest-path" "Cargo.toml" "-p" "path+file:///C:/Users/RUNNER~1/AppData/Local/Temp/.tmpQVBVCW#[email protected]" "--release" "--" "--wrap-rustc-with" "Eprintln"
[2025-04-21T06:36:47Z INFO  collector::compile::execute] run_rustc with incremental=true, profile=Opt, scenario=Some(IncrFull), patch=None, backend=Llvm, target=X86_64UnknownLinuxGnu, phase=benchmark
[2025-04-21T06:36:47Z DEBUG collector::compile::execute] "\\\\?\\C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage0\\bin\\cargo.exe" "rustc" "--manifest-path" "Cargo.toml" "-p" "path+file:///C:/Users/RUNNER~1/AppData/Local/Temp/.tmpQVBVCW#[email protected]" "--release" "--" "--wrap-rustc-with" "Eprintln" "-C" "incremental=C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\.tmpQVBVCW\\incremental-state"
[2025-04-21T06:36:48Z INFO  collector::compile::execute] run_rustc with incremental=true, profile=Opt, scenario=Some(IncrUnchanged), patch=None, backend=Llvm, target=X86_64UnknownLinuxGnu, phase=benchmark
[2025-04-21T06:36:48Z DEBUG collector::compile::execute] "\\\\?\\C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage0\\bin\\cargo.exe" "rustc" "--manifest-path" "Cargo.toml" "-p" "path+file:///C:/Users/RUNNER~1/AppData/Local/Temp/.tmpQVBVCW#[email protected]" "--release" "--" "--wrap-rustc-with" "Eprintln" "-C" "incremental=C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\.tmpQVBVCW\\incremental-state"
Finished benchmark externs (5/8)
Executing benchmark match-stress (6/8)
Preparing match-stress
[2025-04-21T06:36:48Z INFO  collector::compile::execute] run_rustc with incremental=false, profile=Check, scenario=None, patch=None, backend=Llvm, target=X86_64UnknownLinuxGnu, phase=dependencies
[2025-04-21T06:36:48Z INFO  collector::compile::execute] run_rustc with incremental=false, profile=Opt, scenario=None, patch=None, backend=Llvm, target=X86_64UnknownLinuxGnu, phase=dependencies
---
[2025-04-21T06:36:49Z DEBUG collector::compile::benchmark] Benchmark iteration 1/1
[2025-04-21T06:36:49Z INFO  collector::compile::execute] run_rustc with incremental=false, profile=Check, scenario=Some(Full), patch=None, backend=Llvm, target=X86_64UnknownLinuxGnu, phase=benchmark
[2025-04-21T06:36:49Z DEBUG collector::compile::execute] "\\\\?\\C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage0\\bin\\cargo.exe" "rustc" "--manifest-path" "Cargo.toml" "-p" "path+file:///C:/Users/RUNNER~1/AppData/Local/Temp/.tmpClqhmo#[email protected]" "--profile" "check" "--" "--wrap-rustc-with" "Eprintln"
[2025-04-21T06:36:50Z INFO  collector::compile::execute] run_rustc with incremental=true, profile=Check, scenario=Some(IncrFull), patch=None, backend=Llvm, target=X86_64UnknownLinuxGnu, phase=benchmark
[2025-04-21T06:36:50Z DEBUG collector::compile::execute] "\\\\?\\C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage0\\bin\\cargo.exe" "rustc" "--manifest-path" "Cargo.toml" "-p" "path+file:///C:/Users/RUNNER~1/AppData/Local/Temp/.tmpClqhmo#[email protected]" "--profile" "check" "--" "--wrap-rustc-with" "Eprintln" "-C" "incremental=C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\.tmpClqhmo\\incremental-state"
[2025-04-21T06:36:52Z INFO  collector::compile::execute] run_rustc with incremental=true, profile=Check, scenario=Some(IncrUnchanged), patch=None, backend=Llvm, target=X86_64UnknownLinuxGnu, phase=benchmark
[2025-04-21T06:36:52Z DEBUG collector::compile::execute] "\\\\?\\C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage0\\bin\\cargo.exe" "rustc" "--manifest-path" "Cargo.toml" "-p" "path+file:///C:/Users/RUNNER~1/AppData/Local/Temp/.tmpClqhmo#[email protected]" "--profile" "check" "--" "--wrap-rustc-with" "Eprintln" "-C" "incremental=C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\.tmpClqhmo\\incremental-state"
Running match-stress: Debug + [Full, IncrFull, IncrUnchanged, IncrPatched] + Llvm + X86_64UnknownLinuxGnu
[2025-04-21T06:36:53Z DEBUG collector::compile::benchmark] Benchmark iteration 1/1
[2025-04-21T06:36:53Z INFO  collector::compile::execute] run_rustc with incremental=false, profile=Debug, scenario=Some(Full), patch=None, backend=Llvm, target=X86_64UnknownLinuxGnu, phase=benchmark
[2025-04-21T06:36:53Z DEBUG collector::compile::execute] "\\\\?\\C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage0\\bin\\cargo.exe" "rustc" "--manifest-path" "Cargo.toml" "-p" "path+file:///C:/Users/RUNNER~1/AppData/Local/Temp/.tmpAvsvty#[email protected]" "--" "--wrap-rustc-with" "Eprintln"
[2025-04-21T06:36:54Z INFO  collector::compile::execute] run_rustc with incremental=true, profile=Debug, scenario=Some(IncrFull), patch=None, backend=Llvm, target=X86_64UnknownLinuxGnu, phase=benchmark
---
failures:

---- [mir-opt] tests\mir-opt\strip_debuginfo.rs#TINY stdout ----

thread '[mir-opt] tests\mir-opt\strip_debuginfo.rs#TINY' panicked at src\tools\compiletest\src\runtest.rs:1516:17:
failed to remove and recreate output directory `C:\a\rust\rust\build\x86_64-pc-windows-msvc\test\mir-opt\strip_debuginfo`: Access is denied. (os error 5)
stack backtrace:
note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.


failures:

bors · 2025-04-21T07:57:51Z

💔 Test failed - checks-actions

jieyouxu · 2025-04-21T08:09:17Z

@bors retry

jieyouxu · 2025-04-21T08:09:51Z

If this fails 3 times in a row on msvc, you might want to buy a lottery ticket 😆

bors · 2025-04-21T09:54:55Z

⌛ Testing commit 4c5a95f with merge 3bd7db2...

Rollup of 11 pull requests Successful merges: - rust-lang#139795 (Clarify why SGX code specifies linkage/symbol names for certain statics) - rust-lang#139946 (fix missing word in comment) - rust-lang#139982 (SystemTime doc tweaks) - rust-lang#140009 (docs(LocalKey<T>): clarify that T's Drop shouldn't panic) - rust-lang#140021 (Don't ICE on pending obligations from deep normalization in a loop) - rust-lang#140036 (Advent of `tests/ui` (misc cleanups and improvements) [4/N]) - rust-lang#140047 (remove a couple clones) - rust-lang#140052 (Fix error when an intra doc link is trying to resolve an empty associated item) - rust-lang#140074 (rustdoc-json: Improve test for auto-trait impls) - rust-lang#140076 (jsondocck: Require command is at start of line) - rust-lang#140081 (Update `libc` to 0.2.172) r? `@ghost` `@rustbot` modify labels: rollup

ChrisDenton · 2025-04-21T10:43:23Z

Or try to add my workaround to the rollup (#140091). I'm not totally confident it'll help but it can't hurt (IMHO).

rust-log-analyzer · 2025-04-21T12:05:16Z

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

Click to see the possible cause of the failure (guessed by this bot)

failures:

---- [mir-opt] tests\mir-opt\strip_debuginfo.rs#TINY stdout ----

thread '[mir-opt] tests\mir-opt\strip_debuginfo.rs#TINY' panicked at src\tools\compiletest\src\runtest.rs:1516:17:
failed to remove and recreate output directory `C:\a\rust\rust\build\x86_64-pc-windows-msvc\test\mir-opt\strip_debuginfo`: Access is denied. (os error 5)
stack backtrace:
note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.


failures:

bors · 2025-04-21T12:05:55Z

💔 Test failed - checks-actions

jieyouxu · 2025-04-21T12:20:45Z

I'm going to make a rollup w/ #140091

jieyouxu · 2025-04-21T12:20:51Z

@bors r-

jieyouxu · 2025-04-21T12:31:32Z

That's interesting though -- all 3 failures are on the mir-opt strip_debuginfo.rs test. I wonder if there's a timing where maybe the strip process or sth doesn't exist before we try to remove_and_recreate_dir_all

ChrisDenton · 2025-04-21T12:37:39Z

That's odd because I'm pretty sure stripping is a no-op on Windows msvc:

rust/compiler/rustc_codegen_ssa/src/back/linker.rs

Line 1045 in b8005bf

    
           fn debuginfo(&mut self, _strip: Strip, natvis_debugger_visualizers: &[PathBuf]) {

jieyouxu · 2025-04-21T12:43:23Z

🤔 yeah idk why it's failing on that specific test...

jieyouxu · 2025-04-21T13:40:03Z

This test is somehow special, in that it also fails on apple (not msvc) #139727 (comment)

… r=<try> [EXPERIMENTAL] `tests/mir-opt/strip_debuginfo.rs` failure investigation cc rust-lang#140096 (comment), rust-lang#139727 (comment). r? ghost try-job: x86_64-apple-1 try-job: x86_64-msvc-1 try-job: dist-x86_64-msvc

jieyouxu · 2025-04-21T14:25:14Z

Backlink: #134351

… r=<try> [EXPERIMENTAL] `tests/mir-opt/strip_debuginfo.rs` failure investigation cc rust-lang#140096 (comment), rust-lang#139727 (comment). cf. rust-lang#134351. (Yes this isn't robust, but just in case) r? ghost try-job: x86_64-apple-1 try-job: x86_64-msvc-1 try-job: dist-x86_64-msvc

Jethro Beekman and others added 28 commits April 14, 2025 13:36

Clarify why SGX code specifies linkage/symbol names for certain statics

8dc7732

Also update the symbol names as items have moved around a bit. The actual name isn't that important, it just needs to be unique. But for debugging it can be useful for it to point to the right place.

fix missing word in comment

abf401d

Point UNIX_EPOCH to associated constant in SystemTime docs

88bd191

Be more specific about the error in the SystemTime example

34573d6

LocalKey<T>: document that the dtor should not panic

0d56e3e

rtprintpanic: clarify that the error is aborting the process

17b7d63

tests: adjust tests/ui/auto-instantiate.rs

b47fe51

- Reformat the test. - Document test intention. - Move test under `tests/ui/inference/`.

Don't ICE on pending obligations from deep normalization in a loop

47911eb

Update docs for AssocItems::filter_by_name_unhygienic

ae4b6d6

Fix error when an intra doc link is trying to resolve an empty associ…

e0437ec

…ated item

Add regression test for rust-lang#140026

88a5e1e

rustdoc-json: Improve test for auto-trait impls

c7e976e

jsondocck: Require command is at start of line

fd4a093

Update libc to 0.2.172 for std

6ea0fe5

remove a couple clones

de93239

Rollup merge of rust-lang#139946 - mumbleskates:any-fix-missing-word,…

1d6e298

… r=jhpratt fix missing word in comment a very simple fix, rectifying a situation in which a word was accidentally .

Rollup merge of rust-lang#140021 - compiler-errors:no-deep-norm-ice, …

1499121

…r=lcnr Don't ICE on pending obligations from deep normalization in a loop See the comment I left inline in `compiler/rustc_trait_selection/src/traits/normalize.rs`. Fixes rust-lang#133868 r? lcnr

Rollup merge of rust-lang#140047 - matthiaskrgr:clo, r=compiler-errors

8f27141

remove a couple clones

Rollup merge of rust-lang#140081 - Berrysoft:update-libc-172, r=tgross35

4c5a95f

Update `libc` to 0.2.172 r? `@joboet`

rustbot added A-rustdoc-json Area: Rustdoc JSON backend O-SGX Target: SGX labels Apr 21, 2025

jhpratt added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. CI-spurious-fail-msvc CI spurious failure: target env msvc labels Apr 21, 2025

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 Apr 21, 2025

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 Apr 21, 2025

jieyouxu closed this Apr 21, 2025

jieyouxu mentioned this pull request Apr 21, 2025

Rollup of 12 pull requests #140112

Closed

jhpratt deleted the rollup-0dqrcxa branch April 21, 2025 13:06

jieyouxu mentioned this pull request Apr 21, 2025

[EXPERIMENTAL] tests/mir-opt/strip_debuginfo.rs failure investigation #140116

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 11 pull requests #140096

Rollup of 11 pull requests #140096

jhpratt commented Apr 21, 2025

bors commented Apr 21, 2025

rust-log-analyzer commented Apr 21, 2025

bors commented Apr 21, 2025

jieyouxu commented Apr 21, 2025

jieyouxu commented Apr 21, 2025

bors commented Apr 21, 2025

ChrisDenton commented Apr 21, 2025

rust-log-analyzer commented Apr 21, 2025

bors commented Apr 21, 2025

jieyouxu commented Apr 21, 2025

jieyouxu commented Apr 21, 2025

jieyouxu commented Apr 21, 2025

ChrisDenton commented Apr 21, 2025 •

edited

Loading

jieyouxu commented Apr 21, 2025

jieyouxu commented Apr 21, 2025

jieyouxu commented Apr 21, 2025

Rollup of 11 pull requests #140096

Rollup of 11 pull requests #140096

Conversation

jhpratt commented Apr 21, 2025

bors commented Apr 21, 2025

rust-log-analyzer commented Apr 21, 2025

bors commented Apr 21, 2025

jieyouxu commented Apr 21, 2025

jieyouxu commented Apr 21, 2025

bors commented Apr 21, 2025

ChrisDenton commented Apr 21, 2025

rust-log-analyzer commented Apr 21, 2025

bors commented Apr 21, 2025

jieyouxu commented Apr 21, 2025

jieyouxu commented Apr 21, 2025

jieyouxu commented Apr 21, 2025

ChrisDenton commented Apr 21, 2025 • edited Loading

jieyouxu commented Apr 21, 2025

jieyouxu commented Apr 21, 2025

jieyouxu commented Apr 21, 2025

ChrisDenton commented Apr 21, 2025 •

edited

Loading