Skip to content

Commit 729f12b

Browse files
estebankestebank
committed
Fix tests after rebase
1 parent 7002dce commit 729f12b

File tree

79 files changed

+532
-347
lines changed

Some content is hidden

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

79 files changed

+532
-347
lines changed

Diff for: ‎tests/rustdoc-ui/ice-unresolved-import-100241.stderr

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
error[E0432]: unresolved import `inner`
2+
--> $DIR/ice-unresolved-import-100241.rs:9:13
3+
|
4+
LL | pub use inner::S;
5+
| ^^^^^ maybe a missing crate `inner`?
6+
|
7+
= help: consider adding `extern crate inner` to use the `inner` crate
8+
9+
error: aborting due to 1 previous error
10+
11+
For more information about this error, try `rustc --explain E0432`.

Diff for: ‎tests/ui/asm/parse-error.stderr

+15-10
Original file line numberDiff line numberDiff line change
@@ -376,8 +376,9 @@ LL | asm!("{}", options(), const foo);
376376
|
377377
help: consider using `const` instead of `let`
378378
|
379-
LL | const foo: /* Type */ = 0;
380-
| ~~~~~ ++++++++++++
379+
LL - let mut foo = 0;
380+
LL + const foo: /* Type */ = 0;
381+
|
381382

382383
error[E0435]: attempt to use a non-constant value in a constant
383384
--> $DIR/parse-error.rs:71:44
@@ -387,8 +388,9 @@ LL | asm!("{}", clobber_abi("C"), const foo);
387388
|
388389
help: consider using `const` instead of `let`
389390
|
390-
LL | const foo: /* Type */ = 0;
391-
| ~~~~~ ++++++++++++
391+
LL - let mut foo = 0;
392+
LL + const foo: /* Type */ = 0;
393+
|
392394

393395
error[E0435]: attempt to use a non-constant value in a constant
394396
--> $DIR/parse-error.rs:74:55
@@ -398,8 +400,9 @@ LL | asm!("{}", options(), clobber_abi("C"), const foo);
398400
|
399401
help: consider using `const` instead of `let`
400402
|
401-
LL | const foo: /* Type */ = 0;
402-
| ~~~~~ ++++++++++++
403+
LL - let mut foo = 0;
404+
LL + const foo: /* Type */ = 0;
405+
|
403406

404407
error[E0435]: attempt to use a non-constant value in a constant
405408
--> $DIR/parse-error.rs:76:31
@@ -409,8 +412,9 @@ LL | asm!("{a}", a = const foo, a = const bar);
409412
|
410413
help: consider using `const` instead of `let`
411414
|
412-
LL | const foo: /* Type */ = 0;
413-
| ~~~~~ ++++++++++++
415+
LL - let mut foo = 0;
416+
LL + const foo: /* Type */ = 0;
417+
|
414418

415419
error[E0435]: attempt to use a non-constant value in a constant
416420
--> $DIR/parse-error.rs:76:46
@@ -420,8 +424,9 @@ LL | asm!("{a}", a = const foo, a = const bar);
420424
|
421425
help: consider using `const` instead of `let`
422426
|
423-
LL | const bar: /* Type */ = 0;
424-
| ~~~~~ ++++++++++++
427+
LL - let mut bar = 0;
428+
LL + const bar: /* Type */ = 0;
429+
|
425430

426431
error: aborting due to 64 previous errors
427432

Diff for: ‎tests/ui/asm/type-check-1.stderr

+9-6
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ LL | asm!("{}", const x);
66
|
77
help: consider using `const` instead of `let`
88
|
9-
LL | const x: /* Type */ = 0;
10-
| ~~~~~ ++++++++++++
9+
LL - let x = 0;
10+
LL + const x: /* Type */ = 0;
11+
|
1112

1213
error[E0435]: attempt to use a non-constant value in a constant
1314
--> $DIR/type-check-1.rs:44:36
@@ -17,8 +18,9 @@ LL | asm!("{}", const const_foo(x));
1718
|
1819
help: consider using `const` instead of `let`
1920
|
20-
LL | const x: /* Type */ = 0;
21-
| ~~~~~ ++++++++++++
21+
LL - let x = 0;
22+
LL + const x: /* Type */ = 0;
23+
|
2224

2325
error[E0435]: attempt to use a non-constant value in a constant
2426
--> $DIR/type-check-1.rs:47:36
@@ -28,8 +30,9 @@ LL | asm!("{}", const const_bar(x));
2830
|
2931
help: consider using `const` instead of `let`
3032
|
31-
LL | const x: /* Type */ = 0;
32-
| ~~~~~ ++++++++++++
33+
LL - let x = 0;
34+
LL + const x: /* Type */ = 0;
35+
|
3336

3437
error: invalid `sym` operand
3538
--> $DIR/type-check-1.rs:49:24

Diff for: ‎tests/ui/asm/x86_64/x86_64_parse_error.stderr

+9-6
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ LL | asm!("{a}", in("eax") foo, a = const bar);
2020
|
2121
help: consider using `const` instead of `let`
2222
|
23-
LL | const bar: /* Type */ = 0;
24-
| ~~~~~ ++++++++++++
23+
LL - let mut bar = 0;
24+
LL + const bar: /* Type */ = 0;
25+
|
2526

2627
error[E0435]: attempt to use a non-constant value in a constant
2728
--> $DIR/x86_64_parse_error.rs:15:46
@@ -31,8 +32,9 @@ LL | asm!("{a}", in("eax") foo, a = const bar);
3132
|
3233
help: consider using `const` instead of `let`
3334
|
34-
LL | const bar: /* Type */ = 0;
35-
| ~~~~~ ++++++++++++
35+
LL - let mut bar = 0;
36+
LL + const bar: /* Type */ = 0;
37+
|
3638

3739
error[E0435]: attempt to use a non-constant value in a constant
3840
--> $DIR/x86_64_parse_error.rs:17:42
@@ -42,8 +44,9 @@ LL | asm!("{1}", in("eax") foo, const bar);
4244
|
4345
help: consider using `const` instead of `let`
4446
|
45-
LL | const bar: /* Type */ = 0;
46-
| ~~~~~ ++++++++++++
47+
LL - let mut bar = 0;
48+
LL + const bar: /* Type */ = 0;
49+
|
4750

4851
error: aborting due to 5 previous errors
4952

Diff for: ‎tests/ui/conditional-compilation/cfg-attr-parse.stderr

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ LL | #[cfg_attr()]
77
= note: for more information, visit <https://doc.rust-lang.org/reference/conditional-compilation.html#the-cfg_attr-attribute>
88
help: missing condition and attribute
99
|
10-
LL | #[cfg_attr(condition, attribute, other_attribute, ...)]
11-
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
10+
LL - #[cfg_attr()]
11+
LL + #[cfg_attr(condition, attribute, other_attribute, ...)]
12+
|
1213

1314
error: expected `,`, found end of `cfg_attr` input
1415
--> $DIR/cfg-attr-parse.rs:8:17

Diff for: ‎tests/ui/const-generics/legacy-const-generics-bad.stderr

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ LL | legacy_const_generics::foo(0, a, 2);
66
|
77
help: consider using `const` instead of `let`
88
|
9-
LL | const a: /* Type */ = 1;
10-
| ~~~~~ ++++++++++++
9+
LL - let a = 1;
10+
LL + const a: /* Type */ = 1;
11+
|
1112

1213
error: generic parameters may not be used in const operations
1314
--> $DIR/legacy-const-generics-bad.rs:12:35

Diff for: ‎tests/ui/consts/issue-3521.stderr

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ LL | Bar = foo
66
|
77
help: consider using `const` instead of `let`
88
|
9-
LL | const foo: isize = 100;
10-
| ~~~~~
9+
LL - let foo: isize = 100;
10+
LL + const foo: isize = 100;
11+
|
1112

1213
error: aborting due to 1 previous error
1314

Diff for: ‎tests/ui/consts/issue-91560.stderr

+6-4
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ LL | let arr = [0; length];
66
|
77
help: consider using `const` instead of `let`
88
|
9-
LL | const length: usize = 2;
10-
| ~~~~~
9+
LL - let mut length: usize = 2;
10+
LL + const length: usize = 2;
11+
|
1112

1213
error[E0435]: attempt to use a non-constant value in a constant
1314
--> $DIR/issue-91560.rs:17:19
@@ -17,8 +18,9 @@ LL | let arr = [0; length];
1718
|
1819
help: consider using `const` instead of `let`
1920
|
20-
LL | const length: usize = 2;
21-
| ~~~~~
21+
LL - let length: usize = 2;
22+
LL + const length: usize = 2;
23+
|
2224

2325
error: aborting due to 2 previous errors
2426

Diff for: ‎tests/ui/consts/non-const-value-in-const.stderr

+6-4
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ LL | const Y: i32 = x;
66
|
77
help: consider using `let` instead of `const`
88
|
9-
LL | let Y: i32 = x;
10-
| ~~~
9+
LL - const Y: i32 = x;
10+
LL + let Y: i32 = x;
11+
|
1112

1213
error[E0435]: attempt to use a non-constant value in a constant
1314
--> $DIR/non-const-value-in-const.rs:6:17
@@ -17,8 +18,9 @@ LL | let _ = [0; x];
1718
|
1819
help: consider using `const` instead of `let`
1920
|
20-
LL | const x: /* Type */ = 5;
21-
| ~~~~~ ++++++++++++
21+
LL - let x = 5;
22+
LL + const x: /* Type */ = 5;
23+
|
2224

2325
error: aborting due to 2 previous errors
2426

Diff for: ‎tests/ui/did_you_mean/issue-41679-tilde-bitwise-negation-attempt.stderr

+15-10
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ LL | let _x = ~1;
66
|
77
help: use `!` to perform bitwise not
88
|
9-
LL | let _x = !1;
10-
| ~
9+
LL - let _x = ~1;
10+
LL + let _x = !1;
11+
|
1112

1213
error: unexpected `1` after identifier
1314
--> $DIR/issue-41679-tilde-bitwise-negation-attempt.rs:5:18
@@ -17,8 +18,9 @@ LL | let _y = not 1;
1718
|
1819
help: use `!` to perform bitwise not
1920
|
20-
LL | let _y = !1;
21-
| ~
21+
LL - let _y = not 1;
22+
LL + let _y = !1;
23+
|
2224

2325
error: unexpected keyword `false` after identifier
2426
--> $DIR/issue-41679-tilde-bitwise-negation-attempt.rs:6:18
@@ -28,8 +30,9 @@ LL | let _z = not false;
2830
|
2931
help: use `!` to perform logical negation
3032
|
31-
LL | let _z = !false;
32-
| ~
33+
LL - let _z = not false;
34+
LL + let _z = !false;
35+
|
3336

3437
error: unexpected keyword `true` after identifier
3538
--> $DIR/issue-41679-tilde-bitwise-negation-attempt.rs:7:18
@@ -39,8 +42,9 @@ LL | let _a = not true;
3942
|
4043
help: use `!` to perform logical negation
4144
|
42-
LL | let _a = !true;
43-
| ~
45+
LL - let _a = not true;
46+
LL + let _a = !true;
47+
|
4448

4549
error: unexpected `v` after identifier
4650
--> $DIR/issue-41679-tilde-bitwise-negation-attempt.rs:9:18
@@ -50,8 +54,9 @@ LL | let _v = not v;
5054
|
5155
help: use `!` to perform logical negation or bitwise not
5256
|
53-
LL | let _v = !v;
54-
| ~
57+
LL - let _v = not v;
58+
LL + let _v = !v;
59+
|
5560

5661
error: aborting due to 5 previous errors
5762

Diff for: ‎tests/ui/did_you_mean/issue-46836-identifier-not-instead-of-negation.stderr

+15-10
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ LL | if not for_you {
66
|
77
help: use `!` to perform logical negation or bitwise not
88
|
9-
LL | if !for_you {
10-
| ~
9+
LL - if not for_you {
10+
LL + if !for_you {
11+
|
1112

1213
error: unexpected `the_worst` after identifier
1314
--> $DIR/issue-46836-identifier-not-instead-of-negation.rs:11:15
@@ -17,8 +18,9 @@ LL | while not the_worst {
1718
|
1819
help: use `!` to perform logical negation or bitwise not
1920
|
20-
LL | while !the_worst {
21-
| ~
21+
LL - while not the_worst {
22+
LL + while !the_worst {
23+
|
2224

2325
error: unexpected `println` after identifier
2426
--> $DIR/issue-46836-identifier-not-instead-of-negation.rs:20:9
@@ -28,8 +30,9 @@ LL | println!("Then when?");
2830
|
2931
help: use `!` to perform logical negation or bitwise not
3032
|
31-
LL | if !// lack of braces is [sic]
32-
| ~
33+
LL - if not // lack of braces is [sic]
34+
LL + if !// lack of braces is [sic]
35+
|
3336

3437
error: expected `{`, found `;`
3538
--> $DIR/issue-46836-identifier-not-instead-of-negation.rs:20:31
@@ -53,8 +56,9 @@ LL | let resource = not 2;
5356
|
5457
help: use `!` to perform bitwise not
5558
|
56-
LL | let resource = !2;
57-
| ~
59+
LL - let resource = not 2;
60+
LL + let resource = !2;
61+
|
5862

5963
error: unexpected `be_smothered_out_before` after identifier
6064
--> $DIR/issue-46836-identifier-not-instead-of-negation.rs:32:27
@@ -64,8 +68,9 @@ LL | let young_souls = not be_smothered_out_before;
6468
|
6569
help: use `!` to perform logical negation or bitwise not
6670
|
67-
LL | let young_souls = !be_smothered_out_before;
68-
| ~
71+
LL - let young_souls = not be_smothered_out_before;
72+
LL + let young_souls = !be_smothered_out_before;
73+
|
6974

7075
error: aborting due to 6 previous errors
7176

0 commit comments

Comments
 (0)