Skip to content

Commit 00d902c

Browse files
oli-obkoli-obk
authored
Merge pull request #189 from oli-obk/next_stable
Update for latest nightly
2 parents b6d9ea6 + 1a49824 commit 00d902c

27 files changed

+82
-43
lines changed

‎tests/integrations/basic-bin/tests/actual_tests/foomp.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ error[E0432]: unresolved import `basic_bin`
44
1 | use basic_bin::add;
55
| ^^^^^^^^^ use of undeclared crate or module `basic_bin`
66

7-
error: aborting due to previous error
7+
error: aborting due to 1 previous error
88

99
For more information about this error, try `rustc --explain E0432`.

‎tests/integrations/basic-fail-mode/tests/actual_tests/foomp.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ note: function defined here
1212
1 | pub fn add(left: usize, right: usize) -> usize {
1313
| ^^^
1414

15-
error: aborting due to previous error
15+
error: aborting due to 1 previous error
1616

1717
For more information about this error, try `rustc --explain E0308`.

‎tests/integrations/basic-fail/Cargo.stdout

Lines changed: 56 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,21 @@ tests/actual_tests/rustc_ice.rs ... FAILED
1717
FAILED TEST: tests/actual_tests/bad_pattern.rs
1818
command: "rustc" "--error-format=json" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--out-dir" "$TMP "tests/actual_tests/bad_pattern.rs" "--edition" "2021"
1919

20+
error: actual output differed from expected
21+
Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/bad_pattern.stderr` to the actual output
22+
--- tests/actual_tests/bad_pattern.stderr
23+
+++ <stderr output>
24+
error[E0308]: mismatched types
25+
--> tests/actual_tests/bad_pattern.rs:4:9
26+
... 10 lines skipped ...
27+
| ^^^
28+
29+
-error: aborting due to previous error
30+
+error: aborting due to 1 previous error
31+
32+
For more information about this error, try `rustc --explain E0308`.
33+
34+
2035
error: `miesmätsched types` not found in diagnostics on line 4
2136
--> tests/actual_tests/bad_pattern.rs:5:17
2237
|
@@ -46,7 +61,7 @@ note: function defined here
4661
1 | pub fn add(left: usize, right: usize) -> usize {
4762
| ^^^
4863

49-
error: aborting due to previous error
64+
error: aborting due to 1 previous error
5065

5166
For more information about this error, try `rustc --explain E0308`.
5267

@@ -88,7 +103,7 @@ Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/ex
88103
+4 |
89104
+ | ^
90105
+
91-
+error: aborting due to previous error
106+
+error: aborting due to 1 previous error
92107
+
93108

94109

@@ -108,7 +123,7 @@ error: this file contains an unclosed delimiter
108123
4 |
109124
| ^
110125

111-
error: aborting due to previous error
126+
error: aborting due to 1 previous error
112127

113128

114129
full stdout:
@@ -168,7 +183,7 @@ Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/fo
168183
+ | ^^^
169184

170185
-error: aborting doo to previous error
171-
+error: aborting due to previous error
186+
+error: aborting due to 1 previous error
172187

173188
For more information about this error, try `rustc --explain E0308`.
174189

@@ -188,7 +203,7 @@ note: function defined here
188203
1 | pub fn add(left: usize, right: usize) -> usize {
189204
| ^^^
190205

191-
error: aborting due to previous error
206+
error: aborting due to 1 previous error
192207

193208
For more information about this error, try `rustc --explain E0308`.
194209

@@ -197,17 +212,41 @@ full stdout:
197212

198213

199214
FAILED TEST: tests/actual_tests/foomp2.rs
200-
command: "$CMD"
215+
command: "rustc" "--error-format=json" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail.rlib" "--extern" "basic_fail=$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug/libbasic_fail-$HASH.rmeta" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "-L" "$DIR/tests/integrations/basic-fail/../../../target/$TMP/$TRIPLE/debug" "--out-dir" "$TMP "tests/actual_tests/foomp2.rs" "--edition" "2021"
201216

202217
error: actual output differed from expected
203-
Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/foomp2.fixed` to the actual output
204-
--- tests/actual_tests/foomp2.fixed
205-
+++ <fixed output>
206-
-this is just a test file showing that
207-
-stray .fixed files are detected and blessed away
218+
Execute `DO NOT BLESS. These are meant to fail` to update `tests/actual_tests/foomp2.stderr` to the actual output
219+
--- tests/actual_tests/foomp2.stderr
220+
+++ <stderr output>
221+
error[E0308]: mismatched types
222+
--> tests/actual_tests/foomp2.rs:4:9
223+
... 10 lines skipped ...
224+
| ^^^
225+
226+
-error: aborting due to previous error
227+
+error: aborting due to 1 previous error
228+
229+
For more information about this error, try `rustc --explain E0308`.
208230

209231

210232
full stderr:
233+
error[E0308]: mismatched types
234+
--> tests/actual_tests/foomp2.rs:4:9
235+
|
236+
4 | add("42", 3);
237+
| --- ^^^^ expected `usize`, found `&str`
238+
| |
239+
| arguments to this function are incorrect
240+
|
241+
note: function defined here
242+
--> $DIR/tests/integrations/basic-fail/src/lib.rs:LL:CC
243+
|
244+
1 | pub fn add(left: usize, right: usize) -> usize {
245+
| ^^^
246+
247+
error: aborting due to 1 previous error
248+
249+
For more information about this error, try `rustc --explain E0308`.
211250

212251
full stdout:
213252

@@ -375,7 +414,7 @@ error: expected one of `!` or `::`, found `<eof>`
375414
7 | thing!(cake);
376415
| ^^^^ expected one of `!` or `::`
377416

378-
error: aborting due to previous error
417+
error: aborting due to 1 previous error
379418

380419

381420
full stdout:
@@ -627,7 +666,7 @@ error[E0601]: `main` function not found in crate `revisions_bad`
627666
10 | }
628667
| ^ consider adding a `main` function to `tests/actual_tests_bless/revisions_bad.rs`
629668

630-
error: aborting due to previous error
669+
error: aborting due to 1 previous error
631670

632671
For more information about this error, try `rustc --explain E0601`.
633672

@@ -657,7 +696,7 @@ help: consider cloning the value if the performance cost is acceptable
657696
11 | x.clone();
658697
| ++++++++
659698

660-
error: aborting due to previous error
699+
error: aborting due to 1 previous error
661700

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

@@ -687,7 +726,7 @@ help: consider cloning the value if the performance cost is acceptable
687726
11 | x.clone();
688727
| ++++++++
689728

690-
error: aborting due to previous error
729+
error: aborting due to 1 previous error
691730

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

@@ -717,7 +756,7 @@ help: consider cloning the value if the performance cost is acceptable
717756
10 | x.clone();
718757
| ++++++++
719758

720-
error: aborting due to previous error
759+
error: aborting due to 1 previous error
721760

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

@@ -854,7 +893,7 @@ error[E0601]: `main` function not found in crate `revisions_bad`
854893
10 | }
855894
| ^ consider adding a `main` function to `tests/actual_tests_bless_yolo/revisions_bad.rs`
856895

857-
error: aborting due to previous error
896+
error: aborting due to 1 previous error
858897

859898
For more information about this error, try `rustc --explain E0601`.
860899

‎tests/integrations/basic-fail/tests/actual_tests_bless/aux_proc_macro_no_main.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ error: expected one of `!` or `::`, found `<eof>`
44
7 | thing!(cake);
55
| ^^^^ expected one of `!` or `::`
66

7-
error: aborting due to previous error
7+
error: aborting due to 1 previous error
88

‎tests/integrations/basic-fail/tests/actual_tests_bless/foomp_aux.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ note: function defined here
1212
1 | pub fn add(_: u8, _: u8) {}
1313
| ^^^
1414

15-
error: aborting due to previous error
15+
error: aborting due to 1 previous error
1616

1717
For more information about this error, try `rustc --explain E0308`.

‎tests/integrations/basic-fail/tests/actual_tests_bless/revisions.bar.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ note: function defined here
1212
1 | pub fn add(left: usize, right: usize) -> usize {
1313
| ^^^
1414

15-
error: aborting due to previous error
15+
error: aborting due to 1 previous error
1616

1717
For more information about this error, try `rustc --explain E0308`.

‎tests/integrations/basic-fail/tests/actual_tests_bless/revisions.foo.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ note: function defined here
1212
1 | pub fn add(left: usize, right: usize) -> usize {
1313
| ^^^
1414

15-
error: aborting due to previous error
15+
error: aborting due to 1 previous error
1616

1717
For more information about this error, try `rustc --explain E0308`.

‎tests/integrations/basic-fail/tests/actual_tests_bless/revisions_bad.bar.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ error[E0601]: `main` function not found in crate `revisions_bad`
44
10 | }
55
| ^ consider adding a `main` function to `tests/actual_tests_bless/revisions_bad.rs`
66

7-
error: aborting due to previous error
7+
error: aborting due to 1 previous error
88

99
For more information about this error, try `rustc --explain E0601`.

‎tests/integrations/basic-fail/tests/actual_tests_bless/revisions_bad.foo.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ note: function defined here
1212
1 | pub fn add(left: usize, right: usize) -> usize {
1313
| ^^^
1414

15-
error: aborting due to previous error
15+
error: aborting due to 1 previous error
1616

1717
For more information about this error, try `rustc --explain E0308`.

‎tests/integrations/basic-fail/tests/actual_tests_bless/revisions_filter2.bar.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ note: function defined here
1212
1 | pub fn add(left: usize, right: usize) -> usize {
1313
| ^^^
1414

15-
error: aborting due to previous error
15+
error: aborting due to 1 previous error
1616

1717
For more information about this error, try `rustc --explain E0308`.

0 commit comments

Comments
 (0)