Skip to content

Commit 497dcfa

Browse files
varkorvarkor
committed
Update ui tests
1 parent 6283897 commit 497dcfa

31 files changed

+98
-98
lines changed

‎src/test/ui/borrowck/two-phase-activation-sharing-interference.nll_target.stderr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0502]: cannot borrow `x` as immutable because it is also borrowed as mutable
2-
--> $DIR/two-phase-activation-sharing-interference.rs:32:15
2+
--> $DIR/two-phase-activation-sharing-interference.rs:30:15
33
|
44
LL | let y = &mut x;
55
| ------ mutable borrow occurs here
@@ -10,7 +10,7 @@ LL | *y += 1;
1010
| ------- mutable borrow later used here
1111

1212
error[E0502]: cannot borrow `x` as immutable because it is also borrowed as mutable
13-
--> $DIR/two-phase-activation-sharing-interference.rs:40:13
13+
--> $DIR/two-phase-activation-sharing-interference.rs:38:13
1414
|
1515
LL | let y = &mut x;
1616
| ------ mutable borrow occurs here
@@ -21,7 +21,7 @@ LL | *y += 1;
2121
| ------- mutable borrow later used here
2222

2323
error[E0502]: cannot borrow `x` as immutable because it is also borrowed as mutable
24-
--> $DIR/two-phase-activation-sharing-interference.rs:51:13
24+
--> $DIR/two-phase-activation-sharing-interference.rs:49:13
2525
|
2626
LL | let y = &mut x;
2727
| ------ mutable borrow occurs here
@@ -32,7 +32,7 @@ LL | *y += 1;
3232
| ------- mutable borrow later used here
3333

3434
error[E0502]: cannot borrow `x` as immutable because it is also borrowed as mutable
35-
--> $DIR/two-phase-activation-sharing-interference.rs:62:14
35+
--> $DIR/two-phase-activation-sharing-interference.rs:60:14
3636
|
3737
LL | let y = &mut x;
3838
| ------ mutable borrow occurs here

‎src/test/ui/consts/const-array-oob.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0080]: evaluation of constant value failed
2-
--> $DIR/const-array-oob.rs:8:19
2+
--> $DIR/const-array-oob.rs:6:19
33
|
44
LL | const BLUB: [u32; FOO[4]] = [5, 6];
55
| ^^^^^^ index out of bounds: the len is 3 but the index is 4

‎src/test/ui/deprecation/deprecation-in-future.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
warning: use of deprecated item 'deprecated_future': text
2-
--> $DIR/deprecation-in-future.rs:11:5
2+
--> $DIR/deprecation-in-future.rs:9:5
33
|
44
LL | deprecated_future(); // ok; deprecated_in_future only applies to rustc_deprecated
55
| ^^^^^^^^^^^^^^^^^

‎src/test/ui/derives/deriving-meta-unknown-trait.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: cannot find derive macro `Eqr` in this scope
2-
--> $DIR/deriving-meta-unknown-trait.rs:3:10
2+
--> $DIR/deriving-meta-unknown-trait.rs:1:10
33
|
44
LL | #[derive(Eqr)]
55
| ^^^ help: try: `Eq`

‎src/test/ui/discrim/discrim-overflow-2.stderr

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,61 @@
11
error[E0370]: enum discriminant overflowed
2-
--> $DIR/discrim-overflow-2.rs:17:9
2+
--> $DIR/discrim-overflow-2.rs:15:9
33
|
44
LL | OhNo,
55
| ^^^^ overflowed on value after 127
66
|
77
= note: explicitly set `OhNo = -128` if that is desired outcome
88

99
error[E0370]: enum discriminant overflowed
10-
--> $DIR/discrim-overflow-2.rs:26:9
10+
--> $DIR/discrim-overflow-2.rs:24:9
1111
|
1212
LL | OhNo,
1313
| ^^^^ overflowed on value after 255
1414
|
1515
= note: explicitly set `OhNo = 0` if that is desired outcome
1616

1717
error[E0370]: enum discriminant overflowed
18-
--> $DIR/discrim-overflow-2.rs:35:9
18+
--> $DIR/discrim-overflow-2.rs:33:9
1919
|
2020
LL | OhNo,
2121
| ^^^^ overflowed on value after 32767
2222
|
2323
= note: explicitly set `OhNo = -32768` if that is desired outcome
2424

2525
error[E0370]: enum discriminant overflowed
26-
--> $DIR/discrim-overflow-2.rs:44:9
26+
--> $DIR/discrim-overflow-2.rs:42:9
2727
|
2828
LL | OhNo,
2929
| ^^^^ overflowed on value after 65535
3030
|
3131
= note: explicitly set `OhNo = 0` if that is desired outcome
3232

3333
error[E0370]: enum discriminant overflowed
34-
--> $DIR/discrim-overflow-2.rs:53:9
34+
--> $DIR/discrim-overflow-2.rs:51:9
3535
|
3636
LL | OhNo,
3737
| ^^^^ overflowed on value after 2147483647
3838
|
3939
= note: explicitly set `OhNo = -2147483648` if that is desired outcome
4040

4141
error[E0370]: enum discriminant overflowed
42-
--> $DIR/discrim-overflow-2.rs:62:9
42+
--> $DIR/discrim-overflow-2.rs:60:9
4343
|
4444
LL | OhNo,
4545
| ^^^^ overflowed on value after 4294967295
4646
|
4747
= note: explicitly set `OhNo = 0` if that is desired outcome
4848

4949
error[E0370]: enum discriminant overflowed
50-
--> $DIR/discrim-overflow-2.rs:71:9
50+
--> $DIR/discrim-overflow-2.rs:69:9
5151
|
5252
LL | OhNo,
5353
| ^^^^ overflowed on value after 9223372036854775807
5454
|
5555
= note: explicitly set `OhNo = -9223372036854775808` if that is desired outcome
5656

5757
error[E0370]: enum discriminant overflowed
58-
--> $DIR/discrim-overflow-2.rs:80:9
58+
--> $DIR/discrim-overflow-2.rs:78:9
5959
|
6060
LL | OhNo,
6161
| ^^^^ overflowed on value after 18446744073709551615

‎src/test/ui/discrim/discrim-overflow.stderr

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,61 @@
11
error[E0370]: enum discriminant overflowed
2-
--> $DIR/discrim-overflow.rs:15:9
2+
--> $DIR/discrim-overflow.rs:13:9
33
|
44
LL | OhNo,
55
| ^^^^ overflowed on value after 127
66
|
77
= note: explicitly set `OhNo = -128` if that is desired outcome
88

99
error[E0370]: enum discriminant overflowed
10-
--> $DIR/discrim-overflow.rs:26:9
10+
--> $DIR/discrim-overflow.rs:24:9
1111
|
1212
LL | OhNo,
1313
| ^^^^ overflowed on value after 255
1414
|
1515
= note: explicitly set `OhNo = 0` if that is desired outcome
1616

1717
error[E0370]: enum discriminant overflowed
18-
--> $DIR/discrim-overflow.rs:37:9
18+
--> $DIR/discrim-overflow.rs:35:9
1919
|
2020
LL | OhNo,
2121
| ^^^^ overflowed on value after 32767
2222
|
2323
= note: explicitly set `OhNo = -32768` if that is desired outcome
2424

2525
error[E0370]: enum discriminant overflowed
26-
--> $DIR/discrim-overflow.rs:48:9
26+
--> $DIR/discrim-overflow.rs:46:9
2727
|
2828
LL | OhNo,
2929
| ^^^^ overflowed on value after 65535
3030
|
3131
= note: explicitly set `OhNo = 0` if that is desired outcome
3232

3333
error[E0370]: enum discriminant overflowed
34-
--> $DIR/discrim-overflow.rs:60:9
34+
--> $DIR/discrim-overflow.rs:58:9
3535
|
3636
LL | OhNo,
3737
| ^^^^ overflowed on value after 2147483647
3838
|
3939
= note: explicitly set `OhNo = -2147483648` if that is desired outcome
4040

4141
error[E0370]: enum discriminant overflowed
42-
--> $DIR/discrim-overflow.rs:72:9
42+
--> $DIR/discrim-overflow.rs:70:9
4343
|
4444
LL | OhNo,
4545
| ^^^^ overflowed on value after 4294967295
4646
|
4747
= note: explicitly set `OhNo = 0` if that is desired outcome
4848

4949
error[E0370]: enum discriminant overflowed
50-
--> $DIR/discrim-overflow.rs:84:9
50+
--> $DIR/discrim-overflow.rs:82:9
5151
|
5252
LL | OhNo,
5353
| ^^^^ overflowed on value after 9223372036854775807
5454
|
5555
= note: explicitly set `OhNo = -9223372036854775808` if that is desired outcome
5656

5757
error[E0370]: enum discriminant overflowed
58-
--> $DIR/discrim-overflow.rs:96:9
58+
--> $DIR/discrim-overflow.rs:94:9
5959
|
6060
LL | OhNo,
6161
| ^^^^ overflowed on value after 18446744073709551615

‎src/test/ui/editions/edition-raw-pointer-method-2015.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error: type annotations needed
2-
--> $DIR/edition-raw-pointer-method-2015.rs:10:15
2+
--> $DIR/edition-raw-pointer-method-2015.rs:9:15
33
|
44
LL | let _ = y.is_null();
55
| ^^^^^^^
66
|
77
note: lint level defined here
8-
--> $DIR/edition-raw-pointer-method-2015.rs:6:8
8+
--> $DIR/edition-raw-pointer-method-2015.rs:5:8
99
|
1010
LL | #[deny(warnings)]
1111
| ^^^^^^^^

‎src/test/ui/editions/edition-raw-pointer-method-2018.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0699]: the type of this value must be known to call a method on a raw pointer on it
2-
--> $DIR/edition-raw-pointer-method-2018.rs:10:15
2+
--> $DIR/edition-raw-pointer-method-2018.rs:9:15
33
|
44
LL | let _ = y.is_null();
55
| ^^^^^^^

‎src/test/ui/error-codes/E0375.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0375]: implementing the trait `CoerceUnsized` requires multiple coercions
2-
--> $DIR/E0375.rs:12:12
2+
--> $DIR/E0375.rs:10:12
33
|
44
LL | impl<T, U> CoerceUnsized<Foo<U, T>> for Foo<T, U> {}
55
| ^^^^^^^^^^^^^^^^^^^^^^^^ requires multiple coercions

‎src/test/ui/feature-gates/feature-gate-ffi_returns_twice.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0658]: the `#[ffi_returns_twice]` attribute is an experimental feature
2-
--> $DIR/feature-gate-ffi_returns_twice.rs:5:5
2+
--> $DIR/feature-gate-ffi_returns_twice.rs:4:5
33
|
44
LL | #[ffi_returns_twice]
55
| ^^^^^^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)