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 6 pull requests #139363

Closed
wants to merge 24 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

GuillaumeGomez and others added 24 commits March 16, 2025 14:45
this also makes `changeSetting` more robust in case it somehow
gets called before `main.js` has finished loading.
changes:
* Add type signature
* Add null checks
* getHelpButton and getSettingsButton are only called once,
  which should marginally improve performance due to less queries.

unfortunatly 2 @ts-expect-error was needed,
as typescript is unaware the EventTarget is likely an Element.
With this, almost the entire file is fully typechecked,
the only exception being the Element.contains(EventTarget) pattern
that is used several times, those are annotated with
@ts-expect-error
"true" looks like a string value, `true` makes it more clear
that we are talking about the actual boolean value.
this allows us to eliminate the last 3 @ts-expect-error
in this file.
Put them all on the same line with just their GitHub handles to make it
very easy to copy and paste (with ctrl-shift-v!!!) the names.

We have no use for email, so I removed all the emails, we don't care
about people's full names either.

Co-authored-by: Thalia Archibald <[email protected]>
…ests, r=Amanieu

Add integer to string formatting tests

As discussed in rust-lang#136264, there doesn't seem to have tests to ensure that int to string conversion is performed correctly, only sporadic tests here and there. Now we have some basic tests. :)

r? ```@Mark-Simulacrum```
replace extra_filename with strict version hash in metrics file names

Should resolve the potential issue of overwriting metrics from the same crate when compiled with different features or flags.

r? ```@estebank```

try-job: test-various
Make target maintainers more easily pingable

Put them all on the same line with just their GitHub handles to make it very easy to copy and paste (with ctrl-shift-v!!!) the names.

We have no use for email, so I removed all the emails, we don't care about people's full names either.

This is a pretty big PR with lots of changes. I may have gotten one or two wrong, who knows. I went over it fairly aggressively, removing all information I deemed unnecessary.

> [!Caution]
> When copying these usernames, use **ctrl-shift-v** to avoid pasting them as links

r? RalfJung you indirectly asked for this :) (anyone is welcome to review)
…t-error-part5, r=notriddle

Rustdoc: typecheck settings.js

This makes the file fully typechecked with no instances of ````@ts-expect-error```` and no type casts.

r? ```@notriddle```
Update the minimum external LLVM to 19

With this change, we'll have stable support for LLVM 19 and 20.
For reference, the previous increase to LLVM 18 was rust-lang#130487.

cc `@rust-lang/wg-llvm`
r? nikic
…7970, r=fmease

Fix 2024 edition doctest panic output

Fixes rust-lang#137970.

The problem was that the output was actually displayed by rustc itself because we're exiting with `Result<(), String>`, and the display is really not great. So instead, we get the output, we print it and then we return an `ExitCode`.

r? ``@aDotInTheVoid``
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc 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-infra Relevant to the infrastructure 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. labels Apr 4, 2025
@rustbot rustbot added T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. rollup A PR which is a rollup labels Apr 4, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Apr 4, 2025

📌 Commit 7bed27f 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 Apr 4, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 4, 2025
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#138546 (Add integer to string formatting tests)
 - rust-lang#138950 (replace extra_filename with strict version hash in metrics file names)
 - rust-lang#139028 (Make target maintainers more easily pingable)
 - rust-lang#139274 (Rustdoc: typecheck settings.js)
 - rust-lang#139275 (Update the minimum external LLVM to 19)
 - rust-lang#139328 (Fix 2024 edition doctest panic output)

Failed merges:

 - rust-lang#138947 (Refactor Apple version handling in the compiler)

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

bors commented Apr 4, 2025

⌛ Testing commit 7bed27f with merge f5fa4d8...

@rust-log-analyzer
Copy link
Collaborator

The job aarch64-apple failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
61 error: unrecognized instruction mnemonic
-   --> $DIR/srcloc.rs:42:14
+   --> $DIR/srcloc.rs:39:14
63    |
64 LL |         asm!(concat!("invalid", "_", "instruction"));
65    |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

71    |     ^
72 
73 error: unrecognized instruction mnemonic
---
109 error: unrecognized instruction mnemonic
-   --> $DIR/srcloc.rs:66:13
+   --> $DIR/srcloc.rs:63:13
111    |
112 LL |             concat!("invalid", "_", "instruction"),
113    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

119    | ^
120 
121 error: unrecognized instruction mnemonic
-   --> $DIR/srcloc.rs:73:13
+   --> $DIR/srcloc.rs:70:13
123    |
124 LL |             concat!("invalid", "_", "instruction"),
125    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

131    | ^
132 
133 error: unrecognized instruction mnemonic
---
157 error: unrecognized instruction mnemonic
-   --> $DIR/srcloc.rs:87:13
+   --> $DIR/srcloc.rs:84:13
159    |
160 LL | /             concat!(
161 LL | |                 "invalid", "_", "instruction1", "\n",

170    |     ^
171 
172 error: unrecognized instruction mnemonic
-   --> $DIR/srcloc.rs:87:13
+   --> $DIR/srcloc.rs:84:13
174    |
175 LL | /             concat!(
176 LL | |                 "invalid", "_", "instruction1", "\n",

185    | ^
186 
187 error: unrecognized instruction mnemonic
-   --> $DIR/srcloc.rs:96:13
+   --> $DIR/srcloc.rs:93:13
189    |
190 LL | /             concat!(
191 LL | |                 "invalid", "_", "instruction1", "\n",

200    |     ^
201 
202 error: unrecognized instruction mnemonic
-   --> $DIR/srcloc.rs:96:13
+   --> $DIR/srcloc.rs:93:13
204    |
205 LL | /             concat!(
206 LL | |                 "invalid", "_", "instruction1", "\n",

215    | ^
216 
217 error: unrecognized instruction mnemonic
-   --> $DIR/srcloc.rs:100:13
+   --> $DIR/srcloc.rs:97:13
219    |
220 LL | /             concat!(
221 LL | |                 "invalid", "_", "instruction3", "\n",

230    | ^
231 
232 error: unrecognized instruction mnemonic
-   --> $DIR/srcloc.rs:100:13
+   --> $DIR/srcloc.rs:97:13
234    |
235 LL | /             concat!(
236 LL | |                 "invalid", "_", "instruction3", "\n",

245    | ^
246 
247 error: unrecognized instruction mnemonic
-   --> $DIR/srcloc.rs:111:13
+   --> $DIR/srcloc.rs:108:13
249    |
250 LL | /             concat!(
251 LL | |                 "invalid", "_", "instruction1", "\n",

260    |     ^
261 
262 error: unrecognized instruction mnemonic
-   --> $DIR/srcloc.rs:111:13
+   --> $DIR/srcloc.rs:108:13
264    |
265 LL | /             concat!(
266 LL | |                 "invalid", "_", "instruction1", "\n",

275    | ^
276 
277 error: unrecognized instruction mnemonic
-   --> $DIR/srcloc.rs:115:13
+   --> $DIR/srcloc.rs:112:13
279    |
280 LL | /             concat!(
281 LL | |                 "invalid", "_", "instruction3", "\n",

290    | ^
291 
292 error: unrecognized instruction mnemonic
-   --> $DIR/srcloc.rs:115:13
+   --> $DIR/srcloc.rs:112:13
294    |
295 LL | /             concat!(
296 LL | |                 "invalid", "_", "instruction3", "\n",

305    | ^
306 
307 error: unrecognized instruction mnemonic
-   --> $DIR/srcloc.rs:128:14
---
To only update this specific test, also pass `--test-args asm/aarch64/srcloc.rs`

error: 1 errors occurred comparing output.
status: exit status: 1
command: env -u RUSTC_LOG_COLOR RUSTC_ICE="0" RUST_BACKTRACE="short" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2/bin/rustc" "/Users/runner/work/rust/rust/tests/ui/asm/aarch64/srcloc.rs" "-Zthreads=1" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Z" "ignore-directory-in-diagnostics-source-blocks=/Users/runner/.cargo" "-Z" "ignore-directory-in-diagnostics-source-blocks=/Users/runner/work/rust/rust/vendor" "--sysroot" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/stage2" "--target=aarch64-apple-darwin" "--check-cfg" "cfg(test,FALSE)" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zwrite-long-types-to-disk=no" "-Cstrip=debuginfo" "-C" "prefer-dynamic" "--out-dir" "/Users/runner/work/rust/rust/build/aarch64-apple-darwin/test/ui/asm/aarch64/srcloc" "-A" "unused" "-A" "internal_features" "-Crpath" "-Cdebuginfo=0" "-Lnative=/Users/runner/work/rust/rust/build/aarch64-apple-darwin/native/rust-test-helpers" "-Ccodegen-units=1"
stdout: none
--- stderr -------------------------------
error: unrecognized instruction mnemonic
##[error]  --> /Users/runner/work/rust/rust/tests/ui/asm/aarch64/srcloc.rs:12:15
   |
LL |         asm!("invalid_instruction");
   |               ^^^^^^^^^^^^^^^^^^^
   |
note: instantiated into assembly here
  --> <inline asm>:1:2
   |
LL |     invalid_instruction
   |     ^

error: unrecognized instruction mnemonic
##[error]  --> /Users/runner/work/rust/rust/tests/ui/asm/aarch64/srcloc.rs:16:13
   |
LL |             invalid_instruction
   |             ^^^^^^^^^^^^^^^^^^^
   |
note: instantiated into assembly here
  --> <inline asm>:2:13
   |
LL |             invalid_instruction
   |             ^

error: unrecognized instruction mnemonic
##[error]  --> /Users/runner/work/rust/rust/tests/ui/asm/aarch64/srcloc.rs:21:13
   |
LL |             invalid_instruction
   |             ^^^^^^^^^^^^^^^^^^^
   |
note: instantiated into assembly here
  --> <inline asm>:2:13
   |
LL |             invalid_instruction
   |             ^

error: unrecognized instruction mnemonic
##[error]  --> /Users/runner/work/rust/rust/tests/ui/asm/aarch64/srcloc.rs:27:13
   |
LL |             invalid_instruction
   |             ^^^^^^^^^^^^^^^^^^^
   |
note: instantiated into assembly here
  --> <inline asm>:3:13
   |
LL |             invalid_instruction
   |             ^

error: unrecognized instruction mnemonic
##[error]  --> /Users/runner/work/rust/rust/tests/ui/asm/aarch64/srcloc.rs:34:13
   |
LL |             invalid_instruction
   |             ^^^^^^^^^^^^^^^^^^^
   |
note: instantiated into assembly here
  --> <inline asm>:3:13
   |
LL |             invalid_instruction
   |             ^

error: unrecognized instruction mnemonic
##[error]  --> /Users/runner/work/rust/rust/tests/ui/asm/aarch64/srcloc.rs:39:14
   |
LL |         asm!(concat!("invalid", "_", "instruction"));
   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
note: instantiated into assembly here
  --> <inline asm>:1:2
   |
LL |     invalid_instruction
   |     ^

error: unrecognized instruction mnemonic
##[error]  --> /Users/runner/work/rust/rust/tests/ui/asm/aarch64/srcloc.rs:43:14
   |
LL |             "invalid_instruction",
   |              ^^^^^^^^^^^^^^^^^^^
   |
note: instantiated into assembly here
  --> <inline asm>:1:2
   |
LL |     invalid_instruction
   |     ^

error: unrecognized instruction mnemonic
##[error]  --> /Users/runner/work/rust/rust/tests/ui/asm/aarch64/srcloc.rs:49:14
   |
LL |             "invalid_instruction",
   |              ^^^^^^^^^^^^^^^^^^^
   |
note: instantiated into assembly here
  --> <inline asm>:2:1
   |
LL | invalid_instruction
   | ^

error: unrecognized instruction mnemonic
##[error]  --> /Users/runner/work/rust/rust/tests/ui/asm/aarch64/srcloc.rs:56:14
   |
LL |             "invalid_instruction",
   |              ^^^^^^^^^^^^^^^^^^^
   |
note: instantiated into assembly here
  --> <inline asm>:3:1
   |
LL | invalid_instruction
   | ^

error: unrecognized instruction mnemonic
##[error]  --> /Users/runner/work/rust/rust/tests/ui/asm/aarch64/srcloc.rs:63:13
   |
LL |             concat!("invalid", "_", "instruction"),
   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
note: instantiated into assembly here
  --> <inline asm>:2:1
   |
LL | invalid_instruction
   | ^

error: unrecognized instruction mnemonic
##[error]  --> /Users/runner/work/rust/rust/tests/ui/asm/aarch64/srcloc.rs:70:13
   |
LL |             concat!("invalid", "_", "instruction"),
   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
note: instantiated into assembly here
  --> <inline asm>:2:1
   |
LL | invalid_instruction
   | ^

error: unrecognized instruction mnemonic
##[error]  --> /Users/runner/work/rust/rust/tests/ui/asm/aarch64/srcloc.rs:77:14
   |
LL |             "invalid_instruction1",
   |              ^^^^^^^^^^^^^^^^^^^^
   |
note: instantiated into assembly here
  --> <inline asm>:1:2
   |
LL |     invalid_instruction1
   |     ^

error: unrecognized instruction mnemonic
##[error]  --> /Users/runner/work/rust/rust/tests/ui/asm/aarch64/srcloc.rs:78:14
   |
LL |             "invalid_instruction2",
   |              ^^^^^^^^^^^^^^^^^^^^
   |
note: instantiated into assembly here
  --> <inline asm>:2:1
   |
LL | invalid_instruction2
   | ^

error: unrecognized instruction mnemonic
##[error]  --> /Users/runner/work/rust/rust/tests/ui/asm/aarch64/srcloc.rs:84:13
   |
LL | /             concat!(
LL | |                 "invalid", "_", "instruction1", "\n",
LL | |                 "invalid", "_", "instruction2",
LL | |             ),
   | |_____________^
   |
note: instantiated into assembly here
  --> <inline asm>:1:2
   |
LL |     invalid_instruction1
   |     ^

error: unrecognized instruction mnemonic
##[error]  --> /Users/runner/work/rust/rust/tests/ui/asm/aarch64/srcloc.rs:84:13
   |
LL | /             concat!(
LL | |                 "invalid", "_", "instruction1", "\n",
LL | |                 "invalid", "_", "instruction2",
LL | |             ),
   | |_____________^
   |
note: instantiated into assembly here
  --> <inline asm>:2:1
   |
LL | invalid_instruction2
   | ^

error: unrecognized instruction mnemonic
##[error]  --> /Users/runner/work/rust/rust/tests/ui/asm/aarch64/srcloc.rs:93:13
   |
LL | /             concat!(
LL | |                 "invalid", "_", "instruction1", "\n",
LL | |                 "invalid", "_", "instruction2",
LL | |             ),
   | |_____________^
   |
note: instantiated into assembly here
  --> <inline asm>:1:2
   |
LL |     invalid_instruction1
   |     ^

error: unrecognized instruction mnemonic
##[error]  --> /Users/runner/work/rust/rust/tests/ui/asm/aarch64/srcloc.rs:93:13
   |
LL | /             concat!(
LL | |                 "invalid", "_", "instruction1", "\n",
LL | |                 "invalid", "_", "instruction2",
LL | |             ),
   | |_____________^
   |
note: instantiated into assembly here
  --> <inline asm>:2:1
   |
LL | invalid_instruction2
   | ^

error: unrecognized instruction mnemonic
##[error]  --> /Users/runner/work/rust/rust/tests/ui/asm/aarch64/srcloc.rs:97:13
   |
LL | /             concat!(
LL | |                 "invalid", "_", "instruction3", "\n",
LL | |                 "invalid", "_", "instruction4",
LL | |             ),
   | |_____________^
   |
note: instantiated into assembly here
  --> <inline asm>:3:1
   |
LL | invalid_instruction3
   | ^

error: unrecognized instruction mnemonic
##[error]  --> /Users/runner/work/rust/rust/tests/ui/asm/aarch64/srcloc.rs:97:13
   |
LL | /             concat!(
LL | |                 "invalid", "_", "instruction3", "\n",
LL | |                 "invalid", "_", "instruction4",
LL | |             ),
   | |_____________^
   |
note: instantiated into assembly here
  --> <inline asm>:4:1
   |
LL | invalid_instruction4
   | ^

error: unrecognized instruction mnemonic
##[error]  --> /Users/runner/work/rust/rust/tests/ui/asm/aarch64/srcloc.rs:108:13
   |
LL | /             concat!(
LL | |                 "invalid", "_", "instruction1", "\n",
LL | |                 "invalid", "_", "instruction2", "\n",
LL | |             ),
   | |_____________^
   |
note: instantiated into assembly here
  --> <inline asm>:1:2
   |
LL |     invalid_instruction1
   |     ^

error: unrecognized instruction mnemonic
##[error]  --> /Users/runner/work/rust/rust/tests/ui/asm/aarch64/srcloc.rs:108:13
   |
LL | /             concat!(
LL | |                 "invalid", "_", "instruction1", "\n",
LL | |                 "invalid", "_", "instruction2", "\n",
LL | |             ),
   | |_____________^
   |
note: instantiated into assembly here
  --> <inline asm>:2:1
   |
LL | invalid_instruction2
   | ^

error: unrecognized instruction mnemonic
##[error]  --> /Users/runner/work/rust/rust/tests/ui/asm/aarch64/srcloc.rs:112:13
   |
LL | /             concat!(
LL | |                 "invalid", "_", "instruction3", "\n",
LL | |                 "invalid", "_", "instruction4", "\n",
LL | |             ),
   | |_____________^
   |
note: instantiated into assembly here
  --> <inline asm>:4:1
   |
LL | invalid_instruction3
   | ^

error: unrecognized instruction mnemonic
##[error]  --> /Users/runner/work/rust/rust/tests/ui/asm/aarch64/srcloc.rs:112:13
   |
LL | /             concat!(
LL | |                 "invalid", "_", "instruction3", "\n",
LL | |                 "invalid", "_", "instruction4", "\n",
LL | |             ),
   | |_____________^
   |
note: instantiated into assembly here
  --> <inline asm>:5:1
   |
LL | invalid_instruction4
   | ^

error: unrecognized instruction mnemonic
##[error]  --> /Users/runner/work/rust/rust/tests/ui/asm/aarch64/srcloc.rs:125:14
   |
LL |             "invalid_instruction"
   |              ^^^^^^^^^^^^^^^^^^^
   |
note: instantiated into assembly here
  --> <inline asm>:4:1
   |
LL | invalid_instruction
   | ^

error: aborting due to 24 previous errors

@bors
Copy link
Collaborator

bors commented Apr 4, 2025

💔 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 Apr 4, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc rollup A PR which is a rollup 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-infra Relevant to the infrastructure 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. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants