Skip to content

Commit d7f6eba

Browse files
borsbors
committed
Auto merge of rust-lang#126563 - jieyouxu:rollup-7dbtmzk, r=jieyouxu
Rollup of 8 pull requests Successful merges: - rust-lang#126178 (Weekly `cargo update`) - rust-lang#126192 (Various Redox OS fixes and add i686 Redox OS target) - rust-lang#126365 (Honor collapse_debuginfo for statics.) - rust-lang#126524 (bump few deps) - rust-lang#126536 (Remove unused `llvm_readobj.rs` in `run-make-support`) - rust-lang#126546 (std: move `sys_common::backtrace` to `sys`) - rust-lang#126560 (more ice tests) - rust-lang#126561 (`boxed_slice_into_iter`: tiny doc correction) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 55cac26 + 975c702 commit d7f6eba

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+526
-190
lines changed

‎Cargo.lock

+113-89
Large diffs are not rendered by default.

‎compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ use rustc_middle::ty::{
3636
};
3737
use rustc_session::config::{self, DebugInfo, Lto};
3838
use rustc_span::symbol::Symbol;
39-
use rustc_span::FileName;
39+
use rustc_span::{hygiene, FileName, DUMMY_SP};
4040
use rustc_span::{FileNameDisplayPreference, SourceFile};
4141
use rustc_symbol_mangling::typeid_for_trait_ref;
4242
use rustc_target::abi::{Align, Size};
@@ -1306,7 +1306,7 @@ pub fn build_global_var_di_node<'ll>(cx: &CodegenCx<'ll, '_>, def_id: DefId, glo
13061306
// We may want to remove the namespace scope if we're in an extern block (see
13071307
// https://github.com/rust-lang/rust/pull/46457#issuecomment-351750952).
13081308
let var_scope = get_namespace_for_item(cx, def_id);
1309-
let span = tcx.def_span(def_id);
1309+
let span = hygiene::walk_chain_collapsed(tcx.def_span(def_id), DUMMY_SP);
13101310

13111311
let (file_metadata, line_number) = if !span.is_dummy() {
13121312
let loc = cx.lookup_debug_loc(span.lo());

‎compiler/rustc_data_structures/src/flock.rs

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ cfg_match! {
99
mod linux;
1010
use linux as imp;
1111
}
12+
cfg(target_os = "redox") => {
13+
mod linux;
14+
use linux as imp;
15+
}
1216
cfg(unix) => {
1317
mod unix;
1418
use unix as imp;

‎compiler/rustc_lint/src/shadowed_into_iter.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ declare_lint! {
5252
/// Since Rust 1.80.0, boxed slices implement `IntoIterator`. However, to avoid
5353
/// breakage, `boxed_slice.into_iter()` in Rust 2015, 2018, and 2021 code will still
5454
/// behave as `(&boxed_slice).into_iter()`, returning an iterator over
55-
/// references, just like in Rust 1.80.0 and earlier.
55+
/// references, just like in Rust 1.79.0 and earlier.
5656
/// This only applies to the method call syntax `boxed_slice.into_iter()`, not to
5757
/// any other syntax such as `for _ in boxed_slice` or `IntoIterator::into_iter(boxed_slice)`.
5858
pub BOXED_SLICE_INTO_ITER,

‎compiler/rustc_target/src/spec/base/redox.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::spec::{cvs, RelroLevel, TargetOptions};
1+
use crate::spec::{cvs, Cc, LinkerFlavor, Lld, RelroLevel, TargetOptions};
22

33
pub fn opts() -> TargetOptions {
44
TargetOptions {
@@ -12,6 +12,8 @@ pub fn opts() -> TargetOptions {
1212
has_thread_local: true,
1313
crt_static_default: true,
1414
crt_static_respected: true,
15+
crt_static_allows_dylibs: true,
16+
late_link_args: TargetOptions::link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-lgcc"]),
1517
..Default::default()
1618
}
1719
}

‎compiler/rustc_target/src/spec/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1647,6 +1647,7 @@ supported_targets! {
16471647
("x86_64-unknown-l4re-uclibc", x86_64_unknown_l4re_uclibc),
16481648

16491649
("aarch64-unknown-redox", aarch64_unknown_redox),
1650+
("i686-unknown-redox", i686_unknown_redox),
16501651
("x86_64-unknown-redox", x86_64_unknown_redox),
16511652

16521653
("i386-apple-ios", i386_apple_ios),

‎compiler/rustc_target/src/spec/targets/i686_unknown_redox.rs

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
use crate::spec::{base, Cc, LinkerFlavor, Lld, StackProbeType, Target};
2+
3+
pub fn target() -> Target {
4+
let mut base = base::redox::opts();
5+
base.cpu = "pentiumpro".into();
6+
base.plt_by_default = false;
7+
base.max_atomic_width = Some(64);
8+
base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m32"]);
9+
// don't use probe-stack=inline-asm until rust#83139 and rust#84667 are resolved
10+
base.stack_probes = StackProbeType::Call;
11+
12+
Target {
13+
llvm_target: "i686-unknown-redox".into(),
14+
metadata: crate::spec::TargetMetadata {
15+
description: None,
16+
tier: None,
17+
host_tools: None,
18+
std: None,
19+
},
20+
pointer_width: 32,
21+
data_layout:
22+
"e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-i128:128-f64:32:64-f80:32-n8:16:32-S128"
23+
.into(),
24+
arch: "x86".into(),
25+
options: base,
26+
}
27+
}

‎library/std/src/backtrace.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ use crate::fmt;
9595
use crate::panic::UnwindSafe;
9696
use crate::sync::atomic::{AtomicU8, Ordering::Relaxed};
9797
use crate::sync::LazyLock;
98-
use crate::sys_common::backtrace::{lock, output_filename, set_image_base};
98+
use crate::sys::backtrace::{lock, output_filename, set_image_base};
9999

100100
/// A captured OS thread stack backtrace.
101101
///

‎library/std/src/error.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ impl<E> Report<E> {
429429
/// 1: rust_out::main::_doctest_main_src_error_rs_1158_0
430430
/// 2: rust_out::main
431431
/// 3: core::ops::function::FnOnce::call_once
432-
/// 4: std::sys_common::backtrace::__rust_begin_short_backtrace
432+
/// 4: std::sys::backtrace::__rust_begin_short_backtrace
433433
/// 5: std::rt::lang_start::{{closure}}
434434
/// 6: std::panicking::try
435435
/// 7: std::rt::lang_start_internal

‎library/std/src/panicking.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ use crate::mem::{self, ManuallyDrop};
1919
use crate::process;
2020
use crate::sync::atomic::{AtomicBool, Ordering};
2121
use crate::sync::{PoisonError, RwLock};
22+
use crate::sys::backtrace;
2223
use crate::sys::stdio::panic_output;
23-
use crate::sys_common::backtrace;
2424
use crate::thread;
2525

2626
#[cfg(not(test))]
@@ -655,7 +655,7 @@ pub fn begin_panic_handler(info: &core::panic::PanicInfo<'_>) -> ! {
655655

656656
let loc = info.location().unwrap(); // The current implementation always returns Some
657657
let msg = info.message();
658-
crate::sys_common::backtrace::__rust_end_short_backtrace(move || {
658+
crate::sys::backtrace::__rust_end_short_backtrace(move || {
659659
if let Some(s) = msg.as_str() {
660660
rust_panic_with_hook(
661661
&mut StaticStrPayload(s),
@@ -727,7 +727,7 @@ pub const fn begin_panic<M: Any + Send>(msg: M) -> ! {
727727
}
728728

729729
let loc = Location::caller();
730-
crate::sys_common::backtrace::__rust_end_short_backtrace(move || {
730+
crate::sys::backtrace::__rust_end_short_backtrace(move || {
731731
rust_panic_with_hook(
732732
&mut Payload { inner: Some(msg) },
733733
loc,

‎library/std/src/rt.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ fn lang_start<T: crate::process::Termination + 'static>(
156156
sigpipe: u8,
157157
) -> isize {
158158
let Ok(v) = lang_start_internal(
159-
&move || crate::sys_common::backtrace::__rust_begin_short_backtrace(main).report().to_i32(),
159+
&move || crate::sys::backtrace::__rust_begin_short_backtrace(main).report().to_i32(),
160160
argc,
161161
argv,
162162
sigpipe,

‎library/std/src/sys_common/backtrace.rs ‎library/std/src/sys/backtrace.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
//! Common code for printing backtraces.
2+
13
use crate::backtrace_rs::{self, BacktraceFmt, BytesOrWideString, PrintFmt};
24
use crate::borrow::Cow;
3-
/// Common code for printing the backtrace in the same way across the different
4-
/// supported platforms.
55
use crate::env;
66
use crate::fmt;
77
use crate::io;

‎library/std/src/sys/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ mod pal;
55

66
mod personality;
77

8+
pub mod backtrace;
89
pub mod cmath;
910
pub mod os_str;
1011
pub mod path;

‎library/std/src/sys_common/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#[cfg(test)]
2121
mod tests;
2222

23-
pub mod backtrace;
2423
pub mod fs;
2524
pub mod io;
2625
pub mod lazy_box;

‎library/std/src/thread/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ impl Builder {
539539
let f = f.into_inner();
540540
set_current(their_thread);
541541
let try_result = panic::catch_unwind(panic::AssertUnwindSafe(|| {
542-
crate::sys_common::backtrace::__rust_begin_short_backtrace(f)
542+
crate::sys::backtrace::__rust_begin_short_backtrace(f)
543543
}));
544544
// SAFETY: `their_packet` as been built just above and moved by the
545545
// closure (it is an Arc<...>) and `my_packet` will be stored in the

‎src/bootstrap/Cargo.lock

+9-21
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,6 @@ version = "1.0.4"
1717
source = "registry+https://github.com/rust-lang/crates.io-index"
1818
checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
1919

20-
[[package]]
21-
name = "autocfg"
22-
version = "1.1.0"
23-
source = "registry+https://github.com/rust-lang/crates.io-index"
24-
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
25-
2620
[[package]]
2721
name = "bitflags"
2822
version = "1.3.2"
@@ -181,34 +175,28 @@ dependencies = [
181175

182176
[[package]]
183177
name = "crossbeam-deque"
184-
version = "0.8.4"
178+
version = "0.8.5"
185179
source = "registry+https://github.com/rust-lang/crates.io-index"
186-
checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751"
180+
checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
187181
dependencies = [
188-
"cfg-if",
189182
"crossbeam-epoch",
190183
"crossbeam-utils",
191184
]
192185

193186
[[package]]
194187
name = "crossbeam-epoch"
195-
version = "0.9.17"
188+
version = "0.9.18"
196189
source = "registry+https://github.com/rust-lang/crates.io-index"
197-
checksum = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d"
190+
checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
198191
dependencies = [
199-
"autocfg",
200-
"cfg-if",
201192
"crossbeam-utils",
202193
]
203194

204195
[[package]]
205196
name = "crossbeam-utils"
206-
version = "0.8.18"
197+
version = "0.8.20"
207198
source = "registry+https://github.com/rust-lang/crates.io-index"
208-
checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c"
209-
dependencies = [
210-
"cfg-if",
211-
]
199+
checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
212200

213201
[[package]]
214202
name = "crypto-common"
@@ -331,12 +319,12 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
331319

332320
[[package]]
333321
name = "junction"
334-
version = "1.0.0"
322+
version = "1.1.0"
335323
source = "registry+https://github.com/rust-lang/crates.io-index"
336-
checksum = "ca39ef0d69b18e6a2fd14c2f0a1d593200f4a4ed949b240b5917ab51fac754cb"
324+
checksum = "1c9c415a9b7b1e86cd5738f39d34c9e78c765da7fb1756dbd7d31b3b0d2e7afa"
337325
dependencies = [
338326
"scopeguard",
339-
"winapi",
327+
"windows-sys",
340328
]
341329

342330
[[package]]

‎src/doc/rustc/src/SUMMARY.md

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
- [*-unknown-hermit](platform-support/hermit.md)
7272
- [\*-unknown-netbsd\*](platform-support/netbsd.md)
7373
- [*-unknown-openbsd](platform-support/openbsd.md)
74+
- [*-unknown-redox](platform-support/redox.md)
7475
- [\*-unknown-uefi](platform-support/unknown-uefi.md)
7576
- [wasm32-wasip1](platform-support/wasm32-wasip1.md)
7677
- [wasm32-wasip1-threads](platform-support/wasm32-wasip1-threads.md)

‎src/doc/rustc/src/platform-support.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ target | std | notes
203203
`x86_64-unknown-linux-gnux32` | ✓ | 64-bit Linux (x32 ABI) (kernel 4.15, glibc 2.27)
204204
[`x86_64-unknown-linux-ohos`](platform-support/openharmony.md) | ✓ | x86_64 OpenHarmony
205205
[`x86_64-unknown-none`](platform-support/x86_64-unknown-none.md) | * | Freestanding/bare-metal x86_64, softfloat
206-
`x86_64-unknown-redox` | ✓ | Redox OS
206+
[`x86_64-unknown-redox`](platform-support/redox.md) | ✓ | Redox OS
207207
[`x86_64-unknown-uefi`](platform-support/unknown-uefi.md) | ? | 64-bit UEFI
208208

209209
[^x86_32-floats-x87]: Floating-point support on `i586` targets is non-compliant: the `x87` registers and instructions used for these targets do not provide IEEE-754-compliant behavior, in particular when it comes to rounding and NaN payload bits. See [issue #114479][x86-32-float-issue].
@@ -258,7 +258,7 @@ target | std | host | notes
258258
`aarch64-unknown-linux-gnu_ilp32` | ✓ | ✓ | ARM64 Linux (ILP32 ABI)
259259
[`aarch64-unknown-netbsd`](platform-support/netbsd.md) | ✓ | ✓ | ARM64 NetBSD
260260
[`aarch64-unknown-openbsd`](platform-support/openbsd.md) | ✓ | ✓ | ARM64 OpenBSD
261-
`aarch64-unknown-redox` | ? | | ARM64 Redox OS
261+
[`aarch64-unknown-redox`](platform-support/redox.md) | ✓ | | ARM64 Redox OS
262262
`aarch64-uwp-windows-msvc` | ✓ | |
263263
`aarch64-wrs-vxworks` | ? | |
264264
`aarch64_be-unknown-linux-gnu_ilp32` | ✓ | ✓ | ARM64 Linux (big-endian, ILP32 ABI)
@@ -300,6 +300,7 @@ target | std | host | notes
300300
[`i686-unknown-hurd-gnu`](platform-support/hurd.md) | ✓ | ✓ | 32-bit GNU/Hurd [^x86_32-floats-return-ABI]
301301
[`i686-unknown-netbsd`](platform-support/netbsd.md) | ✓ | ✓ | NetBSD/i386 with SSE2 [^x86_32-floats-return-ABI]
302302
[`i686-unknown-openbsd`](platform-support/openbsd.md) | ✓ | ✓ | 32-bit OpenBSD [^x86_32-floats-return-ABI]
303+
[`i686-unknown-redox`](platform-support/redox.md) | ✓ | | i686 Redox OS
303304
`i686-uwp-windows-gnu` | ✓ | | [^x86_32-floats-return-ABI]
304305
`i686-uwp-windows-msvc` | ✓ | | [^x86_32-floats-return-ABI]
305306
[`i686-win7-windows-msvc`](platform-support/win7-windows-msvc.md) | ✓ | | 32-bit Windows 7 support [^x86_32-floats-return-ABI]

‎src/doc/rustc/src/platform-support/redox.md

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# `*-unknown-redox`
2+
3+
**Tier: 2/3**
4+
5+
Targets for the [Redox OS](https://redox-os.org/) operating
6+
system.
7+
8+
Target triplets available so far:
9+
10+
- `x86_64-unknown-redox` (tier 2)
11+
- `aarch64-unknown-redox` (tier 3)
12+
- `i686-unknown-redox` (tier 3)
13+
14+
## Target maintainers
15+
16+
- Jeremy Soller ([@jackpot51](https://github.com/jackpot51))
17+
18+
## Requirements
19+
20+
These targets are natively compiled and can be cross-compiled. Std is fully supported.
21+
22+
The targets are only expected to work with the latest version of Redox OS as the ABI is not yet stable.
23+
24+
`extern "C"` uses the official calling convention of the respective architectures.
25+
26+
Redox OS binaries use ELF as file format.
27+
28+
## Building the target
29+
30+
You can build Rust with support for the targets by adding it to the `target` list in `config.toml`. In addition a copy of [relibc] needs to be present in the linker search path.
31+
32+
```toml
33+
[build]
34+
build-stage = 1
35+
target = [
36+
"<HOST_TARGET>",
37+
"x86_64-unknown-redox",
38+
"aarch64-unknown-redox",
39+
"i686-unknown-redox",
40+
]
41+
```
42+
43+
[relibc]: https://gitlab.redox-os.org/redox-os/relibc
44+
45+
## Building Rust programs and testing
46+
47+
Rust does not yet ship pre-compiled artifacts for Redox OS except for x86_64-unknown-redox.
48+
49+
The easiest way to build and test programs for Redox OS is using [redoxer](https://gitlab.redox-os.org/redox-os/redoxer) which sets up the required compiler toolchain for building as well as runs programs inside a Redox OS VM using QEMU.
50+
51+
## Cross-compilation toolchains and C code
52+
53+
The target supports C code. Pre-compiled C toolchains can be found at <https://static.redox-os.org/toolchain/>.

‎src/tools/build-manifest/src/main.rs

+1
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ static TARGETS: &[&str] = &[
103103
"i686-unknown-freebsd",
104104
"i686-unknown-linux-gnu",
105105
"i686-unknown-linux-musl",
106+
"i686-unknown-redox",
106107
"i686-unknown-uefi",
107108
"loongarch64-unknown-linux-gnu",
108109
"loongarch64-unknown-none",

‎src/tools/linkchecker/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ path = "main.rs"
99

1010
[dependencies]
1111
regex = "1"
12-
html5ever = "0.26.0"
12+
html5ever = "0.27.0"

‎src/tools/linkchecker/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ fn maybe_redirect(source: &str) -> Option<String> {
503503

504504
fn parse_html<Sink: TokenSink>(source: &str, sink: Sink) -> Sink {
505505
let tendril: ByteTendril = source.as_bytes().into();
506-
let mut input = BufferQueue::new();
506+
let mut input = BufferQueue::default();
507507
input.push_back(tendril.try_reinterpret().unwrap());
508508

509509
let mut tok = Tokenizer::new(sink, TokenizerOpts::default());

‎src/tools/miri/tests/fail/function_calls/exported_symbol_bad_unwind2.both.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ LL | ABORT();
1616
= note: inside `std::sys::pal::PLATFORM::abort_internal` at RUSTLIB/std/src/sys/pal/PLATFORM/mod.rs:LL:CC
1717
= note: inside `std::panicking::rust_panic_with_hook` at RUSTLIB/std/src/panicking.rs:LL:CC
1818
= note: inside closure at RUSTLIB/std/src/panicking.rs:LL:CC
19-
= note: inside `std::sys_common::backtrace::__rust_end_short_backtrace::<{closure@std::panicking::begin_panic_handler::{closure#0}}, !>` at RUSTLIB/std/src/sys_common/backtrace.rs:LL:CC
19+
= note: inside `std::sys::backtrace::__rust_end_short_backtrace::<{closure@std::panicking::begin_panic_handler::{closure#0}}, !>` at RUSTLIB/std/src/sys/backtrace.rs:LL:CC
2020
= note: inside `std::panicking::begin_panic_handler` at RUSTLIB/std/src/panicking.rs:LL:CC
2121
= note: inside `core::panicking::panic_nounwind` at RUSTLIB/core/src/panicking.rs:LL:CC
2222
= note: inside `core::panicking::panic_cannot_unwind` at RUSTLIB/core/src/panicking.rs:LL:CC

‎src/tools/miri/tests/fail/function_calls/exported_symbol_bad_unwind2.definition.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ LL | ABORT();
1616
= note: inside `std::sys::pal::PLATFORM::abort_internal` at RUSTLIB/std/src/sys/pal/PLATFORM/mod.rs:LL:CC
1717
= note: inside `std::panicking::rust_panic_with_hook` at RUSTLIB/std/src/panicking.rs:LL:CC
1818
= note: inside closure at RUSTLIB/std/src/panicking.rs:LL:CC
19-
= note: inside `std::sys_common::backtrace::__rust_end_short_backtrace::<{closure@std::panicking::begin_panic_handler::{closure#0}}, !>` at RUSTLIB/std/src/sys_common/backtrace.rs:LL:CC
19+
= note: inside `std::sys::backtrace::__rust_end_short_backtrace::<{closure@std::panicking::begin_panic_handler::{closure#0}}, !>` at RUSTLIB/std/src/sys/backtrace.rs:LL:CC
2020
= note: inside `std::panicking::begin_panic_handler` at RUSTLIB/std/src/panicking.rs:LL:CC
2121
= note: inside `core::panicking::panic_nounwind` at RUSTLIB/core/src/panicking.rs:LL:CC
2222
= note: inside `core::panicking::panic_cannot_unwind` at RUSTLIB/core/src/panicking.rs:LL:CC

‎src/tools/miri/tests/fail/intrinsics/uninit_uninhabited_type.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ LL | ABORT();
1313
= note: inside `std::sys::pal::PLATFORM::abort_internal` at RUSTLIB/std/src/sys/pal/PLATFORM/mod.rs:LL:CC
1414
= note: inside `std::panicking::rust_panic_with_hook` at RUSTLIB/std/src/panicking.rs:LL:CC
1515
= note: inside closure at RUSTLIB/std/src/panicking.rs:LL:CC
16-
= note: inside `std::sys_common::backtrace::__rust_end_short_backtrace::<{closure@std::panicking::begin_panic_handler::{closure#0}}, !>` at RUSTLIB/std/src/sys_common/backtrace.rs:LL:CC
16+
= note: inside `std::sys::backtrace::__rust_end_short_backtrace::<{closure@std::panicking::begin_panic_handler::{closure#0}}, !>` at RUSTLIB/std/src/sys/backtrace.rs:LL:CC
1717
= note: inside `std::panicking::begin_panic_handler` at RUSTLIB/std/src/panicking.rs:LL:CC
1818
= note: inside `core::panicking::panic_nounwind` at RUSTLIB/core/src/panicking.rs:LL:CC
1919
note: inside `main`

‎src/tools/miri/tests/fail/intrinsics/zero_fn_ptr.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ LL | ABORT();
1313
= note: inside `std::sys::pal::PLATFORM::abort_internal` at RUSTLIB/std/src/sys/pal/PLATFORM/mod.rs:LL:CC
1414
= note: inside `std::panicking::rust_panic_with_hook` at RUSTLIB/std/src/panicking.rs:LL:CC
1515
= note: inside closure at RUSTLIB/std/src/panicking.rs:LL:CC
16-
= note: inside `std::sys_common::backtrace::__rust_end_short_backtrace::<{closure@std::panicking::begin_panic_handler::{closure#0}}, !>` at RUSTLIB/std/src/sys_common/backtrace.rs:LL:CC
16+
= note: inside `std::sys::backtrace::__rust_end_short_backtrace::<{closure@std::panicking::begin_panic_handler::{closure#0}}, !>` at RUSTLIB/std/src/sys/backtrace.rs:LL:CC
1717
= note: inside `std::panicking::begin_panic_handler` at RUSTLIB/std/src/panicking.rs:LL:CC
1818
= note: inside `core::panicking::panic_nounwind` at RUSTLIB/core/src/panicking.rs:LL:CC
1919
note: inside `main`

0 commit comments

Comments
 (0)