Skip to content

Commit 90f4521

Browse files
committed
Bless tests
1 parent f005e9f commit 90f4521

File tree

218 files changed

+575
-554
lines changed

Some content is hidden

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

218 files changed

+575
-554
lines changed

src/test/mir-opt/unreachable_asm.main.UnreachablePropagation.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
StorageDead(_6); // scope 2 at $DIR/unreachable_asm.rs:18:9: 18:10
6060
StorageDead(_5); // scope 2 at $DIR/unreachable_asm.rs:18:9: 18:10
6161
StorageLive(_7); // scope 2 at $DIR/unreachable_asm.rs:21:9: 21:37
62-
llvm_asm!(LlvmInlineAsmInner { asm: "NOP", asm_str_style: Cooked, outputs: [], inputs: [], clobbers: [], volatile: true, alignstack: false, dialect: Att } : [] : []); // scope 3 at $DIR/unreachable_asm.rs:21:18: 21:35
62+
llvm_asm!(LlvmInlineAsmInner { asm: "NOP", asm_str_style: Cooked, outputs: [], inputs: [], clobbers: [], volatile: true, alignstack: false, dialect: Att } : [] : []); // scope 3 at $DIR/unreachable_asm.rs:21:18: 21:34
6363
_7 = const (); // scope 3 at $DIR/unreachable_asm.rs:21:9: 21:37
6464
StorageDead(_7); // scope 2 at $DIR/unreachable_asm.rs:21:36: 21:37
6565
StorageLive(_8); // scope 2 at $DIR/unreachable_asm.rs:22:9: 22:21

src/test/mir-opt/unreachable_asm_2.main.UnreachablePropagation.diff

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949

5050
bb3: {
5151
StorageLive(_7); // scope 2 at $DIR/unreachable_asm_2.rs:16:13: 16:41
52-
llvm_asm!(LlvmInlineAsmInner { asm: "NOP", asm_str_style: Cooked, outputs: [], inputs: [], clobbers: [], volatile: true, alignstack: false, dialect: Att } : [] : []); // scope 3 at $DIR/unreachable_asm_2.rs:16:22: 16:39
52+
llvm_asm!(LlvmInlineAsmInner { asm: "NOP", asm_str_style: Cooked, outputs: [], inputs: [], clobbers: [], volatile: true, alignstack: false, dialect: Att } : [] : []); // scope 3 at $DIR/unreachable_asm_2.rs:16:22: 16:38
5353
_7 = const (); // scope 3 at $DIR/unreachable_asm_2.rs:16:13: 16:41
5454
StorageDead(_7); // scope 2 at $DIR/unreachable_asm_2.rs:16:40: 16:41
5555
_4 = const 21_i32; // scope 2 at $DIR/unreachable_asm_2.rs:17:13: 17:20
@@ -60,7 +60,7 @@
6060

6161
bb4: {
6262
StorageLive(_8); // scope 2 at $DIR/unreachable_asm_2.rs:20:13: 20:41
63-
llvm_asm!(LlvmInlineAsmInner { asm: "NOP", asm_str_style: Cooked, outputs: [], inputs: [], clobbers: [], volatile: true, alignstack: false, dialect: Att } : [] : []); // scope 4 at $DIR/unreachable_asm_2.rs:20:22: 20:39
63+
llvm_asm!(LlvmInlineAsmInner { asm: "NOP", asm_str_style: Cooked, outputs: [], inputs: [], clobbers: [], volatile: true, alignstack: false, dialect: Att } : [] : []); // scope 4 at $DIR/unreachable_asm_2.rs:20:22: 20:38
6464
_8 = const (); // scope 4 at $DIR/unreachable_asm_2.rs:20:13: 20:41
6565
StorageDead(_8); // scope 2 at $DIR/unreachable_asm_2.rs:20:40: 20:41
6666
_4 = const 42_i32; // scope 2 at $DIR/unreachable_asm_2.rs:21:13: 21:20

src/test/rustdoc-ui/intra-doc/warning.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ LL | #[doc = $f]
8888
| ^^^^^^^^^^^
8989
...
9090
LL | f!("Foo\nbar [BarF] bar\nbaz");
91-
| ------------------------------- in this macro invocation
91+
| ------------------------------ in this macro invocation
9292
|
9393
= note: the link appears in this line:
9494

src/test/ui-fulldeps/internal-lints/lint_pass_impl_without_macro.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ LL | impl LintPass for Custom {
1818
| ^^^^^^^^
1919
...
2020
LL | custom_lint_pass_macro!();
21-
| -------------------------- in this macro invocation
21+
| ------------------------- in this macro invocation
2222
|
2323
= help: try using `declare_lint_pass!` or `impl_lint_pass!` instead
2424
= note: this error originates in the macro `custom_lint_pass_macro` (in Nightly builds, run with -Z macro-backtrace for more info)

src/test/ui-fulldeps/issue-76270-panic-in-libproc-macro.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: proc macro panicked
22
--> $DIR/issue-76270-panic-in-libproc-macro.rs:15:1
33
|
44
LL | proc_macro_panic::panic_in_libproc_macro!();
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
66
|
77
= help: message: `""` is not a valid identifier
88

src/test/ui/annotate-snippet/multispan.stderr

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,41 +2,41 @@ error: hello to you, too!
22
--> $DIR/multispan.rs:15:5
33
|
44
LL | hello!(hi);
5-
| ^^^^^^^^^^^
5+
| ^^^^^^^^^^
66
|
77
error: hello to you, too!
88
--> $DIR/multispan.rs:18:5
99
|
1010
LL | hello!(hi hi);
11-
| ^^^^^^^^^^^^^^
11+
| ^^^^^^^^^^^^^
1212
|
1313
error: hello to you, too!
1414
--> $DIR/multispan.rs:21:5
1515
|
1616
LL | hello!(hi hi hi);
17-
| ^^^^^^^^^^^^^^^^^
17+
| ^^^^^^^^^^^^^^^^
1818
|
1919
error: hello to you, too!
2020
--> $DIR/multispan.rs:24:5
2121
|
2222
LL | hello!(hi hey hi yo hi beep beep hi hi);
23-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
23+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2424
|
2525
error: hello to you, too!
2626
--> $DIR/multispan.rs:25:5
2727
|
2828
LL | hello!(hi there, hi how are you? hi... hi.);
29-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
29+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
3030
|
3131
error: hello to you, too!
3232
--> $DIR/multispan.rs:26:5
3333
|
3434
LL | hello!(whoah. hi di hi di ho);
35-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
35+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
3636
|
3737
error: hello to you, too!
3838
--> $DIR/multispan.rs:27:5
3939
|
4040
LL | hello!(hi good hi and good bye);
41-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
41+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4242
|

src/test/ui/asm/aarch64/interpolated-idents.stderr

+8-8
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | $options($pure, $nomem, $readonly, $preserves_flags, $noretur
77
LL | / m!(in out lateout inout inlateout const sym
88
LL | | pure nomem readonly preserves_flags
99
LL | | noreturn nostack options);
10-
| |_________________________________- in this macro invocation
10+
| |________________________________- in this macro invocation
1111
|
1212
= note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
1313

@@ -20,7 +20,7 @@ LL | $options($pure, $nomem, $readonly, $preserves_flags, $noretur
2020
LL | / m!(in out lateout inout inlateout const sym
2121
LL | | pure nomem readonly preserves_flags
2222
LL | | noreturn nostack options);
23-
| |_________________________________- in this macro invocation
23+
| |________________________________- in this macro invocation
2424
|
2525
= note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
2626

@@ -38,12 +38,12 @@ LL | m!(in out lateout inout inlateout const sym
3838
| |
3939
LL | | pure nomem readonly preserves_flags
4040
LL | | noreturn nostack options);
41-
| | -
42-
| |_________________________________|
43-
| |_________________________________in this macro invocation
44-
| |_________________________________in this macro invocation
45-
| |_________________________________in this macro invocation
46-
| in this macro invocation
41+
| | -
42+
| |________________________________|
43+
| |________________________________in this macro invocation
44+
| |________________________________in this macro invocation
45+
| |________________________________in this macro invocation
46+
| in this macro invocation
4747
|
4848
= note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
4949

src/test/ui/asm/aarch64/parse-error.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: requires at least a template string argument
22
--> $DIR/parse-error.rs:9:9
33
|
44
LL | asm!();
5-
| ^^^^^^^
5+
| ^^^^^^
66

77
error: asm template must be a string literal
88
--> $DIR/parse-error.rs:11:14
@@ -236,7 +236,7 @@ error: requires at least a template string argument
236236
--> $DIR/parse-error.rs:90:1
237237
|
238238
LL | global_asm!();
239-
| ^^^^^^^^^^^^^^
239+
| ^^^^^^^^^^^^^
240240

241241
error: asm template must be a string literal
242242
--> $DIR/parse-error.rs:92:13

src/test/ui/asm/aarch64/type-check-2.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ error[E0381]: use of possibly-uninitialized variable: `y`
7777
--> $DIR/type-check-2.rs:20:9
7878
|
7979
LL | asm!("{}", inout(reg) y);
80-
| ^^^^^^^^^^^^^^^^^^^^^^^^^ use of possibly-uninitialized `y`
80+
| ^^^^^^^^^^^^^^^^^^^^^^^^ use of possibly-uninitialized `y`
8181

8282
error[E0596]: cannot borrow `v` as mutable, as it is not declared as mutable
8383
--> $DIR/type-check-2.rs:28:29

src/test/ui/asm/bad-arch.mirunsafeck.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ error[E0472]: inline assembly is unsupported on this target
22
--> $DIR/bad-arch.rs:22:9
33
|
44
LL | asm!("");
5-
| ^^^^^^^^^
5+
| ^^^^^^^^
66

77
error[E0472]: inline assembly is unsupported on this target
88
--> $DIR/bad-arch.rs:27:1
99
|
1010
LL | global_asm!("");
11-
| ^^^^^^^^^^^^^^^^
11+
| ^^^^^^^^^^^^^^^
1212
|
1313
= note: this error originates in the macro `global_asm` (in Nightly builds, run with -Z macro-backtrace for more info)
1414

src/test/ui/asm/bad-arch.thirunsafeck.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ error[E0472]: inline assembly is unsupported on this target
22
--> $DIR/bad-arch.rs:22:9
33
|
44
LL | asm!("");
5-
| ^^^^^^^^^
5+
| ^^^^^^^^
66

77
error[E0472]: inline assembly is unsupported on this target
88
--> $DIR/bad-arch.rs:27:1
99
|
1010
LL | global_asm!("");
11-
| ^^^^^^^^^^^^^^^^
11+
| ^^^^^^^^^^^^^^^
1212
|
1313
= note: this error originates in the macro `global_asm` (in Nightly builds, run with -Z macro-backtrace for more info)
1414

src/test/ui/asm/naked-functions.stderr

+11-11
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ LL | | in(reg) a,
111111
... |
112112
LL | | sym G,
113113
LL | | );
114-
| |______^
114+
| |_____^
115115
|
116116
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
117117
= note: for more information, see issue #32408 <https://github.com/rust-lang/rust/issues/32408>
@@ -156,7 +156,7 @@ warning: asm in naked functions must use `noreturn` option
156156
--> $DIR/naked-functions.rs:89:5
157157
|
158158
LL | asm!("");
159-
| ^^^^^^^^^
159+
| ^^^^^^^^
160160
|
161161
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
162162
= note: for more information, see issue #32408 <https://github.com/rust-lang/rust/issues/32408>
@@ -165,7 +165,7 @@ warning: asm in naked functions must use `noreturn` option
165165
--> $DIR/naked-functions.rs:92:5
166166
|
167167
LL | asm!("");
168-
| ^^^^^^^^^
168+
| ^^^^^^^^
169169
|
170170
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
171171
= note: for more information, see issue #32408 <https://github.com/rust-lang/rust/issues/32408>
@@ -174,7 +174,7 @@ warning: asm in naked functions must use `noreturn` option
174174
--> $DIR/naked-functions.rs:95:5
175175
|
176176
LL | asm!("");
177-
| ^^^^^^^^^
177+
| ^^^^^^^^
178178
|
179179
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
180180
= note: for more information, see issue #32408 <https://github.com/rust-lang/rust/issues/32408>
@@ -188,13 +188,13 @@ LL | |
188188
LL | | asm!("");
189189
... |
190190
LL | | asm!("");
191-
| | --------- multiple asm blocks are unsupported in naked functions
191+
| | -------- multiple asm blocks are unsupported in naked functions
192192
... |
193193
LL | | asm!("");
194-
| | --------- multiple asm blocks are unsupported in naked functions
194+
| | -------- multiple asm blocks are unsupported in naked functions
195195
... |
196196
LL | | asm!("", options(noreturn));
197-
| | ---------------------------- multiple asm blocks are unsupported in naked functions
197+
| | --------------------------- multiple asm blocks are unsupported in naked functions
198198
LL | | }
199199
| |_^
200200
|
@@ -228,7 +228,7 @@ warning: the LLVM-style inline assembly is unsupported in naked functions
228228
--> $DIR/naked-functions.rs:116:5
229229
|
230230
LL | llvm_asm!("");
231-
| ^^^^^^^^^^^^^^
231+
| ^^^^^^^^^^^^^
232232
|
233233
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
234234
= note: for more information, see issue #32408 <https://github.com/rust-lang/rust/issues/32408>
@@ -255,7 +255,7 @@ warning: asm options unsupported in naked functions: `nomem`, `preserves_flags`
255255
--> $DIR/naked-functions.rs:124:5
256256
|
257257
LL | asm!("", options(nomem, preserves_flags, noreturn));
258-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
258+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
259259
|
260260
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
261261
= note: for more information, see issue #32408 <https://github.com/rust-lang/rust/issues/32408>
@@ -264,7 +264,7 @@ warning: asm options unsupported in naked functions: `nostack`, `pure`, `readonl
264264
--> $DIR/naked-functions.rs:131:5
265265
|
266266
LL | asm!("", options(readonly, nostack), options(pure));
267-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
267+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
268268
|
269269
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
270270
= note: for more information, see issue #32408 <https://github.com/rust-lang/rust/issues/32408>
@@ -273,7 +273,7 @@ warning: asm in naked functions must use `noreturn` option
273273
--> $DIR/naked-functions.rs:131:5
274274
|
275275
LL | asm!("", options(readonly, nostack), options(pure));
276-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
276+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
277277
|
278278
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
279279
= note: for more information, see issue #32408 <https://github.com/rust-lang/rust/issues/32408>

src/test/ui/asm/rustfix-asm.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: the legacy LLVM-style asm! syntax is no longer supported
22
--> $DIR/rustfix-asm.rs:11:9
33
|
44
LL | asm!("" :: "r" (x));
5-
| ----^^^^^^^^^^^^^^^^
5+
| ----^^^^^^^^^^^^^^^
66
| |
77
| help: replace with: `llvm_asm!`
88
|
@@ -13,7 +13,7 @@ error: the legacy LLVM-style asm! syntax is no longer supported
1313
--> $DIR/rustfix-asm.rs:13:9
1414
|
1515
LL | asm!("" : "=r" (y));
16-
| ----^^^^^^^^^^^^^^^^
16+
| ----^^^^^^^^^^^^^^^
1717
| |
1818
| help: replace with: `llvm_asm!`
1919
|

src/test/ui/asm/type-check-4.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0506]: cannot assign to `a` because it is borrowed
44
LL | let p = &a;
55
| -- borrow of `a` occurs here
66
LL | asm!("{}", out(reg) a);
7-
| ^^^^^^^^^^^^^^^^^^^^^^^ assignment to borrowed `a` occurs here
7+
| ^^^^^^^^^^^^^^^^^^^^^^ assignment to borrowed `a` occurs here
88
LL |
99
LL | println!("{}", p);
1010
| - borrow later used here

src/test/ui/asm/x86_64/interpolated-idents.stderr

+8-8
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | $options($pure, $nomem, $readonly, $preserves_flags, $noretur
77
LL | / m!(in out lateout inout inlateout const sym
88
LL | | pure nomem readonly preserves_flags
99
LL | | noreturn nostack att_syntax options);
10-
| |____________________________________________- in this macro invocation
10+
| |___________________________________________- in this macro invocation
1111
|
1212
= note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
1313

@@ -20,7 +20,7 @@ LL | $options($pure, $nomem, $readonly, $preserves_flags, $noretur
2020
LL | / m!(in out lateout inout inlateout const sym
2121
LL | | pure nomem readonly preserves_flags
2222
LL | | noreturn nostack att_syntax options);
23-
| |____________________________________________- in this macro invocation
23+
| |___________________________________________- in this macro invocation
2424
|
2525
= note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
2626

@@ -38,12 +38,12 @@ LL | m!(in out lateout inout inlateout const sym
3838
| |
3939
LL | | pure nomem readonly preserves_flags
4040
LL | | noreturn nostack att_syntax options);
41-
| | -
42-
| |____________________________________________|
43-
| |____________________________________________in this macro invocation
44-
| |____________________________________________in this macro invocation
45-
| |____________________________________________in this macro invocation
46-
| in this macro invocation
41+
| | -
42+
| |___________________________________________|
43+
| |___________________________________________in this macro invocation
44+
| |___________________________________________in this macro invocation
45+
| |___________________________________________in this macro invocation
46+
| in this macro invocation
4747
|
4848
= note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
4949

src/test/ui/asm/x86_64/parse-error.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: requires at least a template string argument
22
--> $DIR/parse-error.rs:9:9
33
|
44
LL | asm!();
5-
| ^^^^^^^
5+
| ^^^^^^
66

77
error: asm template must be a string literal
88
--> $DIR/parse-error.rs:11:14
@@ -236,7 +236,7 @@ error: requires at least a template string argument
236236
--> $DIR/parse-error.rs:90:1
237237
|
238238
LL | global_asm!();
239-
| ^^^^^^^^^^^^^^
239+
| ^^^^^^^^^^^^^
240240

241241
error: asm template must be a string literal
242242
--> $DIR/parse-error.rs:92:13

src/test/ui/asm/x86_64/type-check-2.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ error[E0381]: use of possibly-uninitialized variable: `y`
7777
--> $DIR/type-check-2.rs:16:9
7878
|
7979
LL | asm!("{}", inout(reg) y);
80-
| ^^^^^^^^^^^^^^^^^^^^^^^^^ use of possibly-uninitialized `y`
80+
| ^^^^^^^^^^^^^^^^^^^^^^^^ use of possibly-uninitialized `y`
8181

8282
error[E0596]: cannot borrow `v` as mutable, as it is not declared as mutable
8383
--> $DIR/type-check-2.rs:24:29

src/test/ui/associated-consts/defaults-not-assumed-fail.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ error: erroneous constant used
2020
--> $DIR/defaults-not-assumed-fail.rs:34:5
2121
|
2222
LL | assert_eq!(<() as Tr>::B, 0); // causes the error above
23-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ referenced constant has errors
23+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ referenced constant has errors
2424
|
2525
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
2626
= note: for more information, see issue #71800 <https://github.com/rust-lang/rust/issues/71800>

src/test/ui/async-await/issue-73541-2.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | continue 'a
88
| ^^ unreachable label `'a`
99
...
1010
LL | b!();
11-
| ----- in this macro invocation
11+
| ---- in this macro invocation
1212
|
1313
= note: labels are unreachable through functions, closures, async blocks and modules
1414
= note: this error originates in the macro `b` (in Nightly builds, run with -Z macro-backtrace for more info)

0 commit comments

Comments
 (0)