Skip to content

Commit fad5cc6

Browse files
committed
revert note wording change
1 parent 233b82c commit fad5cc6

File tree

589 files changed

+1058
-1058
lines changed

Some content is hidden

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

589 files changed

+1058
-1058
lines changed

compiler/rustc_const_eval/messages.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +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 = called from {$where_ ->
106+
const_eval_frame_note_inner = inside {$where_ ->
107107
[closure] closure
108108
[instance] `{$instance}`
109109
*[other] {""}

compiler/rustc_const_eval/src/interpret/stack.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,12 +216,12 @@ impl<'tcx> fmt::Display for FrameInfo<'tcx> {
216216
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
217217
ty::tls::with(|tcx| {
218218
if tcx.def_key(self.instance.def_id()).disambiguated_data.data == DefPathData::Closure {
219-
write!(f, "called from closure")
219+
write!(f, "inside closure")
220220
} else {
221221
// Note: this triggers a `must_produce_diag` state, which means that if we ever
222222
// get here we must emit a diagnostic. We should never display a `FrameInfo` unless
223223
// we actually want to emit a warning or error to the user.
224-
write!(f, "called from `{}`", self.instance)
224+
write!(f, "inside `{}`", self.instance)
225225
}
226226
})
227227
}

src/tools/miri/tests/fail-dep/concurrency/libc_pthread_cond_double_destroy.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | libc::pthread_cond_destroy(cond.as_mut_ptr());
77
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
88
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
99
= note: BACKTRACE:
10-
= note: called from `main` at tests/fail-dep/concurrency/libc_pthread_cond_double_destroy.rs:LL:CC
10+
= note: inside `main` at tests/fail-dep/concurrency/libc_pthread_cond_double_destroy.rs:LL:CC
1111

1212
note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
1313

src/tools/miri/tests/fail-dep/concurrency/libc_pthread_cond_move.init.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | libc::pthread_cond_destroy(cond2.as_mut_ptr());
77
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
88
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
99
= note: BACKTRACE:
10-
= note: called from `check` at tests/fail-dep/concurrency/libc_pthread_cond_move.rs:LL:CC
10+
= note: inside `check` at tests/fail-dep/concurrency/libc_pthread_cond_move.rs:LL:CC
1111
note: inside `main`
1212
--> tests/fail-dep/concurrency/libc_pthread_cond_move.rs:LL:CC
1313
|

src/tools/miri/tests/fail-dep/concurrency/libc_pthread_cond_move.static_initializer.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | libc::pthread_cond_destroy(&mut cond2 as *mut _);
77
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
88
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
99
= note: BACKTRACE:
10-
= note: called from `check` at tests/fail-dep/concurrency/libc_pthread_cond_move.rs:LL:CC
10+
= note: inside `check` at tests/fail-dep/concurrency/libc_pthread_cond_move.rs:LL:CC
1111
note: inside `main`
1212
--> tests/fail-dep/concurrency/libc_pthread_cond_move.rs:LL:CC
1313
|

src/tools/miri/tests/fail-dep/concurrency/libc_pthread_condattr_double_destroy.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | libc::pthread_condattr_destroy(attr.as_mut_ptr());
77
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
88
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
99
= note: BACKTRACE:
10-
= note: called from `main` at tests/fail-dep/concurrency/libc_pthread_condattr_double_destroy.rs:LL:CC
10+
= note: inside `main` at tests/fail-dep/concurrency/libc_pthread_condattr_double_destroy.rs:LL:CC
1111

1212
note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
1313

src/tools/miri/tests/fail-dep/concurrency/libc_pthread_join_detached.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | assert_eq!(libc::pthread_join(native, ptr::null_mut()), 0);
77
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
88
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
99
= note: BACKTRACE:
10-
= note: called from `main` at tests/fail-dep/concurrency/libc_pthread_join_detached.rs:LL:CC
10+
= note: inside `main` at tests/fail-dep/concurrency/libc_pthread_join_detached.rs:LL:CC
1111

1212
note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
1313

src/tools/miri/tests/fail-dep/concurrency/libc_pthread_join_joined.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | assert_eq!(libc::pthread_join(native, ptr::null_mut()), 0);
77
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
88
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
99
= note: BACKTRACE:
10-
= note: called from `main` at tests/fail-dep/concurrency/libc_pthread_join_joined.rs:LL:CC
10+
= note: inside `main` at tests/fail-dep/concurrency/libc_pthread_join_joined.rs:LL:CC
1111

1212
note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
1313

src/tools/miri/tests/fail-dep/concurrency/libc_pthread_join_main.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | assert_eq!(libc::pthread_join(thread_id, ptr::null_mut()), 0);
77
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
88
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
99
= note: BACKTRACE on thread `unnamed-ID`:
10-
= note: called from closure at tests/fail-dep/concurrency/libc_pthread_join_main.rs:LL:CC
10+
= note: inside closure at tests/fail-dep/concurrency/libc_pthread_join_main.rs:LL:CC
1111

1212
note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
1313

src/tools/miri/tests/fail-dep/concurrency/libc_pthread_join_multiple.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | ... assert_eq!(libc::pthread_join(native_copy, ptr::null_mut()), 0);
77
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
88
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
99
= note: BACKTRACE on thread `unnamed-ID`:
10-
= note: called from closure at tests/fail-dep/concurrency/libc_pthread_join_multiple.rs:LL:CC
10+
= note: inside closure at tests/fail-dep/concurrency/libc_pthread_join_multiple.rs:LL:CC
1111

1212
note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
1313

0 commit comments

Comments
 (0)