Skip to content

Commit 10b6daa

Browse files
alexregalexreg
committed
Reblessed tests.
1 parent c105c28 commit 10b6daa

Some content is hidden

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

46 files changed

+255
-676
lines changed

‎src/test/run-make-fulldeps/libtest-json/output.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{ "type": "test", "event": "started", "name": "a" }
33
{ "type": "test", "name": "a", "event": "ok" }
44
{ "type": "test", "event": "started", "name": "b" }
5-
{ "type": "test", "name": "b", "event": "failed", "stdout": "thread 'main' panicked at 'assertion failed: false', f.rs:8:5\nnote: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.\n" }
5+
{ "type": "test", "name": "b", "event": "failed", "stdout": "thread 'main' panicked at 'assertion failed: false', f.rs:8:5\nnote: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.\n" }
66
{ "type": "test", "event": "started", "name": "c" }
77
{ "type": "test", "name": "c", "event": "ok" }
88
{ "type": "test", "event": "started", "name": "d" }

‎src/test/run-pass/multi-panic.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ fn check_for_no_backtrace(test: std::process::Output) {
88
let mut it = err.lines();
99

1010
assert_eq!(it.next().map(|l| l.starts_with("thread '<unnamed>' panicked at")), Some(true));
11-
assert_eq!(it.next(), Some("note: Run with `RUST_BACKTRACE=1` \
11+
assert_eq!(it.next(), Some("note: run with `RUST_BACKTRACE=1` \
1212
environment variable to display a backtrace."));
1313
assert_eq!(it.next().map(|l| l.starts_with("thread 'main' panicked at")), Some(true));
1414
assert_eq!(it.next(), None);

‎src/test/rustdoc-ui/failed-doctest-output.stdout‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ stderr:
2727
stderr 1
2828
stderr 2
2929
thread 'main' panicked at 'oh no', $DIR/failed-doctest-output.rs:7:1
30-
note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
30+
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
3131

3232

3333

‎src/test/ui/associated-type-bounds/duplicate.stderr‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
warning: the feature `impl_trait_in_bindings` is incomplete and may cause the compiler to crash
2+
--> $DIR/duplicate.rs:7:12
3+
|
4+
LL | #![feature(impl_trait_in_bindings)]
5+
| ^^^^^^^^^^^^^^^^^^^^^^
6+
17
error[E0719]: the value of the associated type `Item` (from the trait `std::iter::Iterator`) is already specified
28
--> $DIR/duplicate.rs:12:36
39
|
@@ -624,4 +630,3 @@ error: could not find defining uses
624630

625631
error: aborting due to 93 previous errors
626632

627-
For more information about this error, try `rustc --explain E0719`.

‎src/test/ui/associated-type-bounds/dyn-lcsit.stderr‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
warning: the feature `impl_trait_in_bindings` is incomplete and may cause the compiler to crash
2+
--> $DIR/dyn-lcsit.rs:4:12
3+
|
4+
LL | #![feature(impl_trait_in_bindings)]
5+
| ^^^^^^^^^^^^^^^^^^^^^^
6+

‎src/test/ui/associated-type-bounds/implied-region-constraints.stderr‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ error[E0623]: lifetime mismatch
22
--> $DIR/implied-region-constraints.rs:19:64
33
|
44
LL | fn _bad_st<'a, 'b, T>(x: St<'a, 'b, T>)
5-
| -------------
6-
| |
7-
| this type is declared with multiple lifetimes...
5+
| ------------- this type is declared with multiple lifetimes...
86
...
97
LL | let _failure_proves_not_implied_outlives_region_b: &'b T = &x.f0;
108
| ^^^^^ ...but data with one lifetime flows into the other here
@@ -13,13 +11,10 @@ error[E0623]: lifetime mismatch
1311
--> $DIR/implied-region-constraints.rs:40:72
1412
|
1513
LL | fn _bad_en7<'a, 'b, T>(x: En7<'a, 'b, T>)
16-
| --------------
17-
| |
18-
| this type is declared with multiple lifetimes...
14+
| -------------- this type is declared with multiple lifetimes...
1915
...
2016
LL | let _failure_proves_not_implied_outlives_region_b: &'b T = &x;
2117
| ^^ ...but data with one lifetime flows into the other here
2218

2319
error: aborting due to 2 previous errors
2420

25-
For more information about this error, try `rustc --explain E0623`.

‎src/test/ui/associated-type-bounds/lcsit.stderr‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
warning: the feature `impl_trait_in_bindings` is incomplete and may cause the compiler to crash
2+
--> $DIR/lcsit.rs:4:12
3+
|
4+
LL | #![feature(impl_trait_in_bindings)]
5+
| ^^^^^^^^^^^^^^^^^^^^^^
6+

‎src/test/ui/associated-types/associated-types-path-2.stderr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ error[E0308]: mismatched types
4949
|
5050
LL | let _: i32 = f2(2i32);
5151
| ^^^^^^^^ expected i32, found u32
52-
help: you can convert an `u32` to `i32` or panic if it the converted value wouldn't fit
52+
help: you can convert an `u32` to `i32` and panic if the converted value wouldn't fit
5353
|
5454
LL | let _: i32 = f2(2i32).try_into().unwrap();
5555
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^

‎src/test/ui/borrowck/borrowck-closures-two-mut.stderr‎

Lines changed: 13 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,5 @@
1-
error[E0499]: cannot borrow `x` as mutable more than once at a time (Ast)
2-
--> $DIR/borrowck-closures-two-mut.rs:14:24
3-
|
4-
LL | let c1 = to_fn_mut(|| x = 4);
5-
| -- - previous borrow occurs due to use of `x` in closure
6-
| |
7-
| first mutable borrow occurs here
8-
LL | let c2 = to_fn_mut(|| x = 5);
9-
| ^^ - borrow occurs due to use of `x` in closure
10-
| |
11-
| second mutable borrow occurs here
12-
...
13-
LL | }
14-
| - first borrow ends here
15-
16-
error[E0499]: cannot borrow `x` as mutable more than once at a time (Ast)
17-
--> $DIR/borrowck-closures-two-mut.rs:26:24
18-
|
19-
LL | let c1 = to_fn_mut(|| set(&mut x));
20-
| -- - previous borrow occurs due to use of `x` in closure
21-
| |
22-
| first mutable borrow occurs here
23-
LL | let c2 = to_fn_mut(|| set(&mut x));
24-
| ^^ - borrow occurs due to use of `x` in closure
25-
| |
26-
| second mutable borrow occurs here
27-
...
28-
LL | }
29-
| - first borrow ends here
30-
31-
error[E0499]: cannot borrow `x` as mutable more than once at a time (Ast)
32-
--> $DIR/borrowck-closures-two-mut.rs:34:24
33-
|
34-
LL | let c1 = to_fn_mut(|| x = 5);
35-
| -- - previous borrow occurs due to use of `x` in closure
36-
| |
37-
| first mutable borrow occurs here
38-
LL | let c2 = to_fn_mut(|| set(&mut x));
39-
| ^^ - borrow occurs due to use of `x` in closure
40-
| |
41-
| second mutable borrow occurs here
42-
...
43-
LL | }
44-
| - first borrow ends here
45-
46-
error[E0499]: cannot borrow `x` as mutable more than once at a time (Ast)
47-
--> $DIR/borrowck-closures-two-mut.rs:42:24
48-
|
49-
LL | let c1 = to_fn_mut(|| x = 5);
50-
| -- - previous borrow occurs due to use of `x` in closure
51-
| |
52-
| first mutable borrow occurs here
53-
LL | let c2 = to_fn_mut(|| { let _y = to_fn_mut(|| set(&mut x)); }); // (nested closure)
54-
| ^^ - borrow occurs due to use of `x` in closure
55-
| |
56-
| second mutable borrow occurs here
57-
...
58-
LL | }
59-
| - first borrow ends here
60-
61-
error[E0499]: cannot borrow `x` as mutable more than once at a time (Ast)
62-
--> $DIR/borrowck-closures-two-mut.rs:55:24
63-
|
64-
LL | let c1 = to_fn_mut(|| set(&mut *x.f));
65-
| -- - previous borrow occurs due to use of `x` in closure
66-
| |
67-
| first mutable borrow occurs here
68-
LL | let c2 = to_fn_mut(|| set(&mut *x.f));
69-
| ^^ - borrow occurs due to use of `x` in closure
70-
| |
71-
| second mutable borrow occurs here
72-
...
73-
LL | }
74-
| - first borrow ends here
75-
76-
error[E0499]: cannot borrow `x` as mutable more than once at a time (Mir)
77-
--> $DIR/borrowck-closures-two-mut.rs:14:24
1+
error[E0499]: cannot borrow `x` as mutable more than once at a time
2+
--> $DIR/borrowck-closures-two-mut.rs:12:24
783
|
794
LL | let c1 = to_fn_mut(|| x = 4);
805
| -- - first borrow occurs due to use of `x` in closure
@@ -84,12 +9,11 @@ LL | let c2 = to_fn_mut(|| x = 5);
849
| ^^ - second borrow occurs due to use of `x` in closure
8510
| |
8611
| second mutable borrow occurs here
87-
LL |
8812
LL | drop((c1, c2));
8913
| -- first borrow later used here
9014

91-
error[E0499]: cannot borrow `x` as mutable more than once at a time (Mir)
92-
--> $DIR/borrowck-closures-two-mut.rs:26:24
15+
error[E0499]: cannot borrow `x` as mutable more than once at a time
16+
--> $DIR/borrowck-closures-two-mut.rs:23:24
9317
|
9418
LL | let c1 = to_fn_mut(|| set(&mut x));
9519
| -- - first borrow occurs due to use of `x` in closure
@@ -99,12 +23,11 @@ LL | let c2 = to_fn_mut(|| set(&mut x));
9923
| ^^ - second borrow occurs due to use of `x` in closure
10024
| |
10125
| second mutable borrow occurs here
102-
LL |
10326
LL | drop((c1, c2));
10427
| -- first borrow later used here
10528

106-
error[E0499]: cannot borrow `x` as mutable more than once at a time (Mir)
107-
--> $DIR/borrowck-closures-two-mut.rs:34:24
29+
error[E0499]: cannot borrow `x` as mutable more than once at a time
30+
--> $DIR/borrowck-closures-two-mut.rs:30:24
10831
|
10932
LL | let c1 = to_fn_mut(|| x = 5);
11033
| -- - first borrow occurs due to use of `x` in closure
@@ -114,12 +37,11 @@ LL | let c2 = to_fn_mut(|| set(&mut x));
11437
| ^^ - second borrow occurs due to use of `x` in closure
11538
| |
11639
| second mutable borrow occurs here
117-
LL |
11840
LL | drop((c1, c2));
11941
| -- first borrow later used here
12042

121-
error[E0499]: cannot borrow `x` as mutable more than once at a time (Mir)
122-
--> $DIR/borrowck-closures-two-mut.rs:42:24
43+
error[E0499]: cannot borrow `x` as mutable more than once at a time
44+
--> $DIR/borrowck-closures-two-mut.rs:37:24
12345
|
12446
LL | let c1 = to_fn_mut(|| x = 5);
12547
| -- - first borrow occurs due to use of `x` in closure
@@ -129,12 +51,12 @@ LL | let c2 = to_fn_mut(|| { let _y = to_fn_mut(|| set(&mut x)); }); // (nes
12951
| ^^ - second borrow occurs due to use of `x` in closure
13052
| |
13153
| second mutable borrow occurs here
132-
...
54+
LL |
13355
LL | drop((c1, c2));
13456
| -- first borrow later used here
13557

136-
error[E0499]: cannot borrow `x` as mutable more than once at a time (Mir)
137-
--> $DIR/borrowck-closures-two-mut.rs:55:24
58+
error[E0499]: cannot borrow `x` as mutable more than once at a time
59+
--> $DIR/borrowck-closures-two-mut.rs:49:24
13860
|
13961
LL | let c1 = to_fn_mut(|| set(&mut *x.f));
14062
| -- - first borrow occurs due to use of `x` in closure
@@ -144,10 +66,10 @@ LL | let c2 = to_fn_mut(|| set(&mut *x.f));
14466
| ^^ - second borrow occurs due to use of `x` in closure
14567
| |
14668
| second mutable borrow occurs here
147-
...
69+
LL |
14870
LL | drop((c1, c2));
14971
| -- first borrow later used here
15072

151-
error: aborting due to 10 previous errors
73+
error: aborting due to 5 previous errors
15274

15375
For more information about this error, try `rustc --explain E0499`.

‎src/test/ui/borrowck/borrowck-reinit.stderr‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
1-
error[E0382]: use of moved value: `x` (Ast)
2-
--> $DIR/borrowck-reinit.rs:8:16
3-
|
4-
LL | drop(x);
5-
| - value moved here
6-
LL | let _ = (1,x);
7-
| ^ value used here after move
8-
|
9-
= note: move occurs because `x` has type `std::boxed::Box<i32>`, which does not implement the `Copy` trait
10-
11-
error[E0382]: use of moved value: `x` (Mir)
12-
--> $DIR/borrowck-reinit.rs:8:16
1+
error[E0382]: use of moved value: `x`
2+
--> $DIR/borrowck-reinit.rs:6:16
133
|
144
LL | let mut x = Box::new(0);
155
| ----- move occurs because `x` has type `std::boxed::Box<i32>`, which does not implement the `Copy` trait
@@ -19,6 +9,6 @@ LL | drop(x);
199
LL | let _ = (1,x);
2010
| ^ value used here after move
2111

22-
error: aborting due to 2 previous errors
12+
error: aborting due to previous error
2313

2414
For more information about this error, try `rustc --explain E0382`.

0 commit comments

Comments
 (0)