Skip to content

Commit c79f0ec

Browse files
estebankestebank
committed
revert note message wording
1 parent 8064604 commit c79f0ec

Some content is hidden

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

41 files changed

+64
-68
lines changed

‎compiler/rustc_const_eval/messages.ftl

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,7 @@ const_eval_frame_note = {$times ->
103103
*[other] [... {$times} additional calls {const_eval_frame_note_inner} ...]
104104
}
105105
106-
const_eval_frame_note_inner = {$is_last ->
107-
[true] {"the failure occurred "}
108-
*[false] {""}
109-
}inside {$where_ ->
106+
const_eval_frame_note_inner = inside {$where_ ->
110107
[closure] closure
111108
[instance] `{$instance}`
112109
*[other] {""}

‎compiler/rustc_const_eval/src/errors.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,6 @@ impl Subdiagnostic for FrameNote {
298298
diag.arg("times", self.times);
299299
diag.arg("where_", self.where_);
300300
diag.arg("instance", self.instance);
301-
diag.arg("is_last", self.is_last);
302301
let mut span: MultiSpan = self.span.into();
303302
if self.is_last && !self.span.is_dummy() {
304303
span.push_span_label(self.span, fluent::const_eval_frame_note_last);

‎tests/ui/borrowck/issue-81899.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0080]: evaluation of constant value failed
44
LL | const _CONST: &[u8] = &f(&[], |_| {});
55
| ^^^^^^^^^^^^^^ panic: explicit panic
66
|
7-
note: the failure occurred inside `f::<{closure@$DIR/issue-81899.rs:4:31: 4:34}>`
7+
note: inside `f::<{closure@$DIR/issue-81899.rs:4:31: 4:34}>`
88
--> $DIR/issue-81899.rs:11:5
99
|
1010
LL | panic!()

‎tests/ui/borrowck/issue-88434-minimal-example.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0080]: evaluation of constant value failed
44
LL | const _CONST: &() = &f(&|_| {});
55
| ^^^^^^^^^^ panic: explicit panic
66
|
7-
note: the failure occurred inside `f::<{closure@$DIR/issue-88434-minimal-example.rs:3:25: 3:28}>`
7+
note: inside `f::<{closure@$DIR/issue-88434-minimal-example.rs:3:25: 3:28}>`
88
--> $DIR/issue-88434-minimal-example.rs:10:5
99
|
1010
LL | panic!()

‎tests/ui/borrowck/issue-88434-removal-index-should-be-less.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0080]: evaluation of constant value failed
44
LL | const _CONST: &[u8] = &f(&[], |_| {});
55
| ^^^^^^^^^^^^^^ panic: explicit panic
66
|
7-
note: the failure occurred inside `f::<{closure@$DIR/issue-88434-removal-index-should-be-less.rs:3:31: 3:34}>`
7+
note: inside `f::<{closure@$DIR/issue-88434-removal-index-should-be-less.rs:3:31: 3:34}>`
88
--> $DIR/issue-88434-removal-index-should-be-less.rs:10:5
99
|
1010
LL | panic!()

‎tests/ui/coherence/const-errs-dont-conflict-103369.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0080]: evaluation of constant value failed
44
LL | impl ConstGenericTrait<{my_fn(1)}> for () {}
55
| ^^^^^^^^ panic: Some error occurred
66
|
7-
note: the failure occurred inside `my_fn`
7+
note: inside `my_fn`
88
--> $DIR/const-errs-dont-conflict-103369.rs:10:5
99
|
1010
LL | panic!("Some error occurred");
@@ -17,7 +17,7 @@ error[E0080]: evaluation of constant value failed
1717
LL | impl ConstGenericTrait<{my_fn(2)}> for () {}
1818
| ^^^^^^^^ panic: Some error occurred
1919
|
20-
note: the failure occurred inside `my_fn`
20+
note: inside `my_fn`
2121
--> $DIR/const-errs-dont-conflict-103369.rs:10:5
2222
|
2323
LL | panic!("Some error occurred");

‎tests/ui/const-generics/issues/issue-100313.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0080]: evaluation of constant value failed
44
LL | x.set_false();
55
| ^^^^^^^^^^^^^ writing to ALLOC0 which is read-only
66
|
7-
note: the failure occurred inside `T::<&true>::set_false`
7+
note: inside `T::<&true>::set_false`
88
--> $DIR/issue-100313.rs:9:13
99
|
1010
LL | *(B as *const bool as *mut bool) = false;

‎tests/ui/const-ptr/forbidden_slices.stderr

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ LL | pub static R1: &[()] = unsafe { from_ptr_range(ptr::null()..ptr::null()) };
107107
|
108108
note: inside `from_ptr_range::<'_, ()>`
109109
--> $SRC_DIR/core/src/slice/raw.rs:LL:COL
110-
note: the failure occurred inside `std::ptr::const_ptr::<impl *const ()>::sub_ptr`
110+
note: inside `std::ptr::const_ptr::<impl *const ()>::sub_ptr`
111111
--> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
112112
|
113113
= note: the failure occurred here
@@ -119,7 +119,7 @@ error[E0080]: could not evaluate static initializer
119119
LL | from_ptr_range(ptr..ptr.add(2)) // errors inside libcore
120120
| ^^^^^^^^^^ out-of-bounds pointer arithmetic: expected a pointer to 8 bytes of memory, but got ALLOC10 which is only 4 bytes from the end of the allocation
121121
|
122-
note: the failure occurred inside `std::ptr::const_ptr::<impl *const u32>::add`
122+
note: inside `std::ptr::const_ptr::<impl *const u32>::add`
123123
--> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
124124
|
125125
= note: the failure occurred here
@@ -176,7 +176,7 @@ error[E0080]: could not evaluate static initializer
176176
LL | from_ptr_range(ptr..ptr.add(1))
177177
| ^^^^^^^^^^ out-of-bounds pointer arithmetic: expected a pointer to 8 bytes of memory, but got ALLOC11+0x1 which is only 7 bytes from the end of the allocation
178178
|
179-
note: the failure occurred inside `std::ptr::const_ptr::<impl *const u64>::add`
179+
note: inside `std::ptr::const_ptr::<impl *const u64>::add`
180180
--> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
181181
|
182182
= note: the failure occurred here
@@ -189,7 +189,7 @@ LL | pub static R9: &[u32] = unsafe { from_ptr_range(&D0..(&D0 as *const u32).ad
189189
|
190190
note: inside `from_ptr_range::<'_, u32>`
191191
--> $SRC_DIR/core/src/slice/raw.rs:LL:COL
192-
note: the failure occurred inside `std::ptr::const_ptr::<impl *const u32>::sub_ptr`
192+
note: inside `std::ptr::const_ptr::<impl *const u32>::sub_ptr`
193193
--> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
194194
|
195195
= note: the failure occurred here
@@ -202,7 +202,7 @@ LL | pub static R10: &[u32] = unsafe { from_ptr_range(&D0..&D0) };
202202
|
203203
note: inside `from_ptr_range::<'_, u32>`
204204
--> $SRC_DIR/core/src/slice/raw.rs:LL:COL
205-
note: the failure occurred inside `std::ptr::const_ptr::<impl *const u32>::sub_ptr`
205+
note: inside `std::ptr::const_ptr::<impl *const u32>::sub_ptr`
206206
--> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
207207
|
208208
= note: the failure occurred here

‎tests/ui/const-ptr/out_of_bounds_read.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0080]: evaluation of constant value failed
44
LL | const _READ: u32 = unsafe { ptr::read(PAST_END_PTR) };
55
| ^^^^^^^^^^^^^^^^^^^^^^^ memory access failed: expected a pointer to 4 bytes of memory, but got ALLOC0+0x4 which is at or beyond the end of the allocation of size 4 bytes
66
|
7-
note: the failure occurred inside `std::ptr::read::<u32>`
7+
note: inside `std::ptr::read::<u32>`
88
--> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
99
|
1010
= note: the failure occurred here
@@ -17,7 +17,7 @@ LL | const _CONST_READ: u32 = unsafe { PAST_END_PTR.read() };
1717
|
1818
note: inside `std::ptr::const_ptr::<impl *const u32>::read`
1919
--> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
20-
note: the failure occurred inside `std::ptr::read::<u32>`
20+
note: inside `std::ptr::read::<u32>`
2121
--> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
2222
|
2323
= note: the failure occurred here
@@ -30,7 +30,7 @@ LL | const _MUT_READ: u32 = unsafe { (PAST_END_PTR as *mut u32).read() };
3030
|
3131
note: inside `std::ptr::mut_ptr::<impl *mut u32>::read`
3232
--> $SRC_DIR/core/src/ptr/mut_ptr.rs:LL:COL
33-
note: the failure occurred inside `std::ptr::read::<u32>`
33+
note: inside `std::ptr::read::<u32>`
3434
--> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
3535
|
3636
= note: the failure occurred here

‎tests/ui/consts/const-eval/const_fn_ptr_fail2.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ const X: fn(usize) -> usize = double;
77

88
const fn bar(x: fn(usize) -> usize, y: usize) -> usize {
99
x(y)
10-
//~^ NOTE the failure occurred inside `bar`
10+
//~^ NOTE inside `bar`
1111
//~| NOTE the failure occurred here
12-
//~| NOTE the failure occurred inside `bar`
12+
//~| NOTE inside `bar`
1313
//~| NOTE the failure occurred here
1414
}
1515

‎tests/ui/consts/const-eval/const_fn_ptr_fail2.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0080]: evaluation of constant value failed
44
LL | const Y: usize = bar(X, 2); // FIXME: should fail to typeck someday
55
| ^^^^^^^^^ calling non-const function `double`
66
|
7-
note: the failure occurred inside `bar`
7+
note: inside `bar`
88
--> $DIR/const_fn_ptr_fail2.rs:9:5
99
|
1010
LL | x(y)
@@ -16,7 +16,7 @@ error[E0080]: evaluation of constant value failed
1616
LL | const Z: usize = bar(double, 2); // FIXME: should fail to typeck someday
1717
| ^^^^^^^^^^^^^^ calling non-const function `double`
1818
|
19-
note: the failure occurred inside `bar`
19+
note: inside `bar`
2020
--> $DIR/const_fn_ptr_fail2.rs:9:5
2121
|
2222
LL | x(y)

‎tests/ui/consts/const-eval/const_panic_track_caller.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0080]: evaluation of constant value failed
44
LL | const X: u32 = c();
55
| ^^^ panic: hey
66
|
7-
note: the failure occurred inside `c`
7+
note: inside `c`
88
--> $DIR/const_panic_track_caller.rs:15:5
99
|
1010
LL | b()

‎tests/ui/consts/const-eval/heap/alloc_intrinsic_errors.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0080]: evaluation of constant value failed
44
LL | const FOO: i32 = foo();
55
| ^^^^^ invalid align passed to `const_allocate`: 3 is not a power of 2
66
|
7-
note: the failure occurred inside `foo`
7+
note: inside `foo`
88
--> $DIR/alloc_intrinsic_errors.rs:8:17
99
|
1010
LL | let _ = intrinsics::const_allocate(4, 3) as *mut i32;

‎tests/ui/consts/const-eval/parse_ints.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LL | const _TOO_LOW: () = { u64::from_str_radix("12345ABCD", 1); };
66
|
77
note: inside `core::num::<impl u64>::from_str_radix`
88
--> $SRC_DIR/core/src/num/mod.rs:LL:COL
9-
note: the failure occurred inside `core::num::<impl u64>::from_ascii_radix`
9+
note: inside `core::num::<impl u64>::from_ascii_radix`
1010
--> $SRC_DIR/core/src/num/mod.rs:LL:COL
1111
|
1212
= note: the failure occurred here
@@ -20,7 +20,7 @@ LL | const _TOO_HIGH: () = { u64::from_str_radix("12345ABCD", 37); };
2020
|
2121
note: inside `core::num::<impl u64>::from_str_radix`
2222
--> $SRC_DIR/core/src/num/mod.rs:LL:COL
23-
note: the failure occurred inside `core::num::<impl u64>::from_ascii_radix`
23+
note: inside `core::num::<impl u64>::from_ascii_radix`
2424
--> $SRC_DIR/core/src/num/mod.rs:LL:COL
2525
|
2626
= note: the failure occurred here

‎tests/ui/consts/const-eval/raw-pointer-ub.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ LL | y.copy_to_nonoverlapping(&mut z, 1);
1818
|
1919
note: inside `std::ptr::const_ptr::<impl *const u32>::copy_to_nonoverlapping`
2020
--> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
21-
note: the failure occurred inside `copy_nonoverlapping::<u32>`
21+
note: inside `copy_nonoverlapping::<u32>`
2222
--> $SRC_DIR/core/src/intrinsics/mod.rs:LL:COL
2323
|
2424
= note: the failure occurred here

‎tests/ui/consts/const-eval/transmute-size-mismatch.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0080]: evaluation of constant value failed
44
LL | const FROM_BIGGER: u16 = unsafe { mir_transmute(123_i32) };
55
| ^^^^^^^^^^^^^^^^^^^^^^ transmuting from 4-byte type to 2-byte type: `i32` -> `u16`
66
|
7-
note: the failure occurred inside `mir_transmute::<i32, u16>`
7+
note: inside `mir_transmute::<i32, u16>`
88
--> $DIR/transmute-size-mismatch.rs:12:13
99
|
1010
LL | RET = CastTransmute(x);
@@ -16,7 +16,7 @@ error[E0080]: evaluation of constant value failed
1616
LL | const FROM_SMALLER: u32 = unsafe { mir_transmute(123_i16) };
1717
| ^^^^^^^^^^^^^^^^^^^^^^ transmuting from 2-byte type to 4-byte type: `i16` -> `u32`
1818
|
19-
note: the failure occurred inside `mir_transmute::<i16, u32>`
19+
note: inside `mir_transmute::<i16, u32>`
2020
--> $DIR/transmute-size-mismatch.rs:12:13
2121
|
2222
LL | RET = CastTransmute(x);

‎tests/ui/consts/const-eval/ub-enum.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ error[E0080]: evaluation of constant value failed
122122
LL | unsafe { std::mem::discriminant(&*(&() as *const () as *const Never)); };
123123
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ read discriminant of an uninhabited enum variant
124124
|
125-
note: the failure occurred inside `discriminant::<Never>`
125+
note: inside `discriminant::<Never>`
126126
--> $SRC_DIR/core/src/mem/mod.rs:LL:COL
127127
|
128128
= note: the failure occurred here

‎tests/ui/consts/const-eval/ub-invalid-values.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0080]: evaluation of constant value failed
44
LL | bool_cast(&v as *const u8 as *const bool);
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ interpreting an invalid 8-bit value as a bool: 0x03
66
|
7-
note: the failure occurred inside `bool_cast`
7+
note: inside `bool_cast`
88
--> $DIR/ub-invalid-values.rs:2:16
99
|
1010
LL | let _val = *ptr as u32;

‎tests/ui/consts/const-eval/ub-ref-ptr.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ LL | ptr.read();
156156
|
157157
note: inside `std::ptr::const_ptr::<impl *const u32>::read`
158158
--> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
159-
note: the failure occurred inside `std::ptr::read::<u32>`
159+
note: inside `std::ptr::read::<u32>`
160160
--> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
161161
|
162162
= note: the failure occurred here

‎tests/ui/consts/const-eval/unwind-abort.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0080]: evaluation of constant value failed
44
LL | const _: () = foo();
55
| ^^^^^ panic: explicit panic
66
|
7-
note: the failure occurred inside `foo`
7+
note: inside `foo`
88
--> $DIR/unwind-abort.rs:2:5
99
|
1010
LL | panic!()

‎tests/ui/consts/const-eval/validate_uninhabited_zsts.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0080]: evaluation of constant value failed
44
LL | const FOO: [empty::Empty; 3] = [foo(); 3];
55
| ^^^^^ constructing invalid value: encountered a value of the never type `!`
66
|
7-
note: the failure occurred inside `foo`
7+
note: inside `foo`
88
--> $DIR/validate_uninhabited_zsts.rs:2:14
99
|
1010
LL | unsafe { std::mem::transmute(()) }

‎tests/ui/consts/const-ptr-is-null.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LL | assert!(!ptr.wrapping_sub(512).is_null());
66
|
77
note: inside `std::ptr::const_ptr::<impl *const i32>::is_null`
88
--> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
9-
note: the failure occurred inside `std::ptr::const_ptr::<impl *const T>::is_null::compiletime`
9+
note: inside `std::ptr::const_ptr::<impl *const T>::is_null::compiletime`
1010
--> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
1111
|
1212
= note: the failure occurred here

‎tests/ui/consts/const_unsafe_unreachable_ub.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ note: inside `foo`
99
|
1010
LL | false => std::hint::unreachable_unchecked(),
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
12-
note: the failure occurred inside `unreachable_unchecked`
12+
note: inside `unreachable_unchecked`
1313
--> $SRC_DIR/core/src/hint.rs:LL:COL
1414
|
1515
= note: the failure occurred here

‎tests/ui/consts/issue-miri-1910.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LL | (&foo as *const _ as *const u8).add(one_and_a_half_pointers).read();
66
|
77
note: inside `std::ptr::const_ptr::<impl *const u8>::read`
88
--> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
9-
note: the failure occurred inside `std::ptr::read::<u8>`
9+
note: inside `std::ptr::read::<u8>`
1010
--> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
1111
|
1212
= note: the failure occurred here

‎tests/ui/consts/miri_unleashed/abi-mismatch.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0080]: could not evaluate static initializer
44
LL | static VAL: () = call_rust_fn(unsafe { std::mem::transmute(c_fn as extern "C" fn()) });
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ calling a function with calling convention C using calling convention Rust
66
|
7-
note: the failure occurred inside `call_rust_fn`
7+
note: inside `call_rust_fn`
88
--> $DIR/abi-mismatch.rs:7:5
99
|
1010
LL | my_fn();

‎tests/ui/consts/miri_unleashed/assoc_const.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LL | const F: u32 = (U::X, 42).1;
66
|
77
note: inside `std::ptr::drop_in_place::<(Vec<u32>, u32)> - shim(Some((Vec<u32>, u32)))`
88
--> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
9-
note: the failure occurred inside `std::ptr::drop_in_place::<Vec<u32>> - shim(Some(Vec<u32>))`
9+
note: inside `std::ptr::drop_in_place::<Vec<u32>> - shim(Some(Vec<u32>))`
1010
--> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
1111
|
1212
= note: the failure occurred here

‎tests/ui/consts/miri_unleashed/drop.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0080]: could not evaluate static initializer
44
LL | };
55
| ^ calling non-const function `<Vec<i32> as Drop>::drop`
66
|
7-
note: the failure occurred inside `std::ptr::drop_in_place::<Vec<i32>> - shim(Some(Vec<i32>))`
7+
note: inside `std::ptr::drop_in_place::<Vec<i32>> - shim(Some(Vec<i32>))`
88
--> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
99
|
1010
= note: the failure occurred here

‎tests/ui/consts/missing_span_in_backtrace.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ note: inside `swap_nonoverlapping::compiletime::<MaybeUninit<u8>>`
1414
--> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
1515
note: inside `std::ptr::swap_nonoverlapping_simple_untyped::<MaybeUninit<u8>>`
1616
--> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
17-
note: the failure occurred inside `std::ptr::read::<MaybeUninit<MaybeUninit<u8>>>`
17+
note: inside `std::ptr::read::<MaybeUninit<MaybeUninit<u8>>>`
1818
--> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
1919
|
2020
= note: the failure occurred here

‎tests/ui/consts/offset_from_ub.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ error[E0080]: evaluation of constant value failed
1010
LL | unsafe { (42 as *const u8).offset_from(&5u8) as usize }
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `ptr_offset_from` called on two different pointers that are not both derived from the same allocation
1212
|
13-
note: the failure occurred inside `std::ptr::const_ptr::<impl *const u8>::offset_from`
13+
note: inside `std::ptr::const_ptr::<impl *const u8>::offset_from`
1414
--> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
1515
|
1616
= note: the failure occurred here
@@ -81,7 +81,7 @@ error[E0080]: evaluation of constant value failed
8181
LL | unsafe { ptr2.offset_from(ptr1) }
8282
| ^^^^^^^^^^^^^^^^^^^^^^ `ptr_offset_from` called on two different pointers that are not both derived from the same allocation
8383
|
84-
note: the failure occurred inside `std::ptr::const_ptr::<impl *const u8>::offset_from`
84+
note: inside `std::ptr::const_ptr::<impl *const u8>::offset_from`
8585
--> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
8686
|
8787
= note: the failure occurred here
@@ -92,7 +92,7 @@ error[E0080]: evaluation of constant value failed
9292
LL | unsafe { ptr1.offset_from(ptr2.wrapping_offset(1)) }
9393
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `ptr_offset_from` called when first pointer is too far before second
9494
|
95-
note: the failure occurred inside `std::ptr::const_ptr::<impl *const u8>::offset_from`
95+
note: inside `std::ptr::const_ptr::<impl *const u8>::offset_from`
9696
--> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
9797
|
9898
= note: the failure occurred here

0 commit comments

Comments
 (0)