Skip to content

Commit 4ed8345

Browse files
NoratriebNoratrieb
committed
Clean up query descriptions
Use the same tense everywhere and prefer display over debug, as these descriptions are user facing.
1 parent a9d1caf commit 4ed8345

File tree

7 files changed

+104
-101
lines changed

7 files changed

+104
-101
lines changed

Diff for: ‎compiler/rustc_middle/src/query/mod.rs

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

Diff for: ‎src/test/ui/async-await/no-const-async.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ note: ...which requires borrow-checking `x`...
1818
|
1919
LL | pub const async fn x() {}
2020
| ^^^^^^^^^^^^^^^^^^^^^^
21-
note: ...which requires processing `x`...
21+
note: ...which requires processing MIR for `x`...
2222
--> $DIR/no-const-async.rs:4:1
2323
|
2424
LL | pub const async fn x() {}

Diff for: ‎src/test/ui/const-generics/generic_const_exprs/closures.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0391]: cycle detected when building an abstract representation for test::{constant#0}
1+
error[E0391]: cycle detected when building an abstract representation for `test::{constant#0}`
22
--> $DIR/closures.rs:3:35
33
|
44
LL | fn test<const N: usize>() -> [u8; N + (|| 42)()] {}
@@ -14,7 +14,7 @@ note: ...which requires type-checking `test::{constant#0}`...
1414
|
1515
LL | fn test<const N: usize>() -> [u8; N + (|| 42)()] {}
1616
| ^^^^^^^^^^^^^
17-
= note: ...which again requires building an abstract representation for test::{constant#0}, completing the cycle
17+
= note: ...which again requires building an abstract representation for `test::{constant#0}`, completing the cycle
1818
note: cycle used when checking that `test` is well-formed
1919
--> $DIR/closures.rs:3:1
2020
|

Diff for: ‎src/test/ui/impl-trait/auto-trait-leak.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ note: ...which requires borrow-checking `cycle1`...
99
|
1010
LL | fn cycle1() -> impl Clone {
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^^
12-
note: ...which requires processing `cycle1`...
12+
note: ...which requires processing MIR for `cycle1`...
1313
--> $DIR/auto-trait-leak.rs:12:1
1414
|
1515
LL | fn cycle1() -> impl Clone {
1616
| ^^^^^^^^^^^^^^^^^^^^^^^^^
17-
note: ...which requires processing MIR for `cycle1`...
17+
note: ...which requires preparing `cycle1` for borrow checking...
1818
--> $DIR/auto-trait-leak.rs:12:1
1919
|
2020
LL | fn cycle1() -> impl Clone {
@@ -50,12 +50,12 @@ note: ...which requires borrow-checking `cycle2`...
5050
|
5151
LL | fn cycle2() -> impl Clone {
5252
| ^^^^^^^^^^^^^^^^^^^^^^^^^
53-
note: ...which requires processing `cycle2`...
53+
note: ...which requires processing MIR for `cycle2`...
5454
--> $DIR/auto-trait-leak.rs:19:1
5555
|
5656
LL | fn cycle2() -> impl Clone {
5757
| ^^^^^^^^^^^^^^^^^^^^^^^^^
58-
note: ...which requires processing MIR for `cycle2`...
58+
note: ...which requires preparing `cycle2` for borrow checking...
5959
--> $DIR/auto-trait-leak.rs:19:1
6060
|
6161
LL | fn cycle2() -> impl Clone {

Diff for: ‎src/test/ui/parser/fn-header-semantic-fail.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ note: ...which requires borrow-checking `main::ff5`...
199199
|
200200
LL | const async unsafe extern "C" fn ff5() {}
201201
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
202-
note: ...which requires processing `main::ff5`...
202+
note: ...which requires processing MIR for `main::ff5`...
203203
--> $DIR/fn-header-semantic-fail.rs:12:5
204204
|
205205
LL | const async unsafe extern "C" fn ff5() {}
@@ -235,7 +235,7 @@ note: ...which requires borrow-checking `main::<impl at $DIR/fn-header-semantic-
235235
|
236236
LL | const async unsafe extern "C" fn ft5() {}
237237
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
238-
note: ...which requires processing `main::<impl at $DIR/fn-header-semantic-fail.rs:28:5: 28:17>::ft5`...
238+
note: ...which requires processing MIR for `main::<impl at $DIR/fn-header-semantic-fail.rs:28:5: 28:17>::ft5`...
239239
--> $DIR/fn-header-semantic-fail.rs:33:9
240240
|
241241
LL | const async unsafe extern "C" fn ft5() {}
@@ -271,7 +271,7 @@ note: ...which requires borrow-checking `main::<impl at $DIR/fn-header-semantic-
271271
|
272272
LL | const async unsafe extern "C" fn fi5() {}
273273
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
274-
note: ...which requires processing `main::<impl at $DIR/fn-header-semantic-fail.rs:40:5: 40:11>::fi5`...
274+
note: ...which requires processing MIR for `main::<impl at $DIR/fn-header-semantic-fail.rs:40:5: 40:11>::fi5`...
275275
--> $DIR/fn-header-semantic-fail.rs:45:9
276276
|
277277
LL | const async unsafe extern "C" fn fi5() {}

Diff for: ‎src/test/ui/treat-err-as-bug/delay_span_bug.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// compile-flags: -Ztreat-err-as-bug
22
// failure-status: 101
33
// error-pattern: aborting due to `-Z treat-err-as-bug=1`
4-
// error-pattern: [trigger_delay_span_bug] trigger a delay span bug
4+
// error-pattern: [trigger_delay_span_bug] triggering a delay span bug
55
// normalize-stderr-test "note: .*\n\n" -> ""
66
// normalize-stderr-test "thread 'rustc' panicked.*\n" -> ""
77
// rustc-env:RUST_BACKTRACE=0

Diff for: ‎src/test/ui/treat-err-as-bug/delay_span_bug.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ LL | fn main() {}
77
error: internal compiler error: unexpected panic
88

99
query stack during panic:
10-
#0 [trigger_delay_span_bug] trigger a delay span bug
10+
#0 [trigger_delay_span_bug] triggering a delay span bug
1111
end of query stack

0 commit comments

Comments
 (0)