diff options
| author | bors <bors@rust-lang.org> | 2025-05-09 08:31:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-05-09 08:31:19 +0000 |
| commit | da1e442ebde8d527f3872c0cac5b371ff6ea0cc7 (patch) | |
| tree | e06d5cdc456c3b7516612a33db08d1f6bb889273 /src | |
| parent | a7b1b24587dcbebf12455c41ed828d9b486487be (diff) | |
| parent | d91e86e963128ebd9e0baee42d1504670dab1565 (diff) | |
Auto merge of #140838 - Zalathar:rollup-13hybry, r=Zalathar
Rollup of 5 pull requests Successful merges: - #140801 (Use span before macro expansion in lint for-loops-over-falibles) - #140804 (add signed ints to unn- transmutes to ensure feature parity) - #140812 (Fix `tests/rustdoc-json` triagebot message path) - #140817 (bootstrap: more consistent use of `...` when citing configuration snippets) - #140828 (Enable non-leaf Frame Pointers for Arm64 Windows) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/src/bin/main.rs | 4 | ||||
| -rw-r--r-- | src/tools/miri/tests/pass/shims/x86/intrinsics-x86-sse2.rs | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/bootstrap/src/bin/main.rs b/src/bootstrap/src/bin/main.rs index cbfe00a757c..833f8027951 100644 --- a/src/bootstrap/src/bin/main.rs +++ b/src/bootstrap/src/bin/main.rs @@ -163,7 +163,7 @@ fn check_version(config: &Config) -> Option<String> { msg.push_str("WARNING: The `change-id` is missing in the `bootstrap.toml`. This means that you will not be able to track the major changes made to the bootstrap configurations.\n"); msg.push_str("NOTE: to silence this warning, "); msg.push_str(&format!( - "add `change-id = {latest_change_id}` or change-id = \"ignore\" at the top of `bootstrap.toml`" + "add `change-id = {latest_change_id}` or `change-id = \"ignore\"` at the top of `bootstrap.toml`" )); return Some(msg); } @@ -195,7 +195,7 @@ fn check_version(config: &Config) -> Option<String> { msg.push_str("NOTE: to silence this warning, "); msg.push_str(&format!( - "update `bootstrap.toml` to use `change-id = {latest_change_id}` or change-id = \"ignore\" instead" + "update `bootstrap.toml` to use `change-id = {latest_change_id}` or `change-id = \"ignore\"` instead" )); if io::stdout().is_terminal() { diff --git a/src/tools/miri/tests/pass/shims/x86/intrinsics-x86-sse2.rs b/src/tools/miri/tests/pass/shims/x86/intrinsics-x86-sse2.rs index 7aaf9c2624f..731d8b57763 100644 --- a/src/tools/miri/tests/pass/shims/x86/intrinsics-x86-sse2.rs +++ b/src/tools/miri/tests/pass/shims/x86/intrinsics-x86-sse2.rs @@ -1,5 +1,6 @@ // We're testing x86 target specific features //@only-target: x86_64 i686 +#![allow(unnecessary_transmutes)] #[cfg(target_arch = "x86")] use std::arch::x86::*; |