Skip to content

Commit 6193b1f

Browse files
author
Jonathan Turner
authored
Rollup merge of #35708 - sanxiyn:new-error-format, r=nikomatsakis
RUST_NEW_ERROR_FORMAT is no more So stop setting the environment variable.
2 parents 3dd060f + d52eb1a commit 6193b1f

19 files changed

+24
-41
lines changed

src/test/ui/codemap_tests/empty_span.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// rustc-env:RUST_NEW_ERROR_FORMAT
1211
#![feature(optin_builtin_traits)]
1312
fn main() {
1413
struct Foo;

src/test/ui/codemap_tests/empty_span.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
error[E0321]: cross-crate traits with a default impl, like `std::marker::Send`, can only be implemented for a struct/enum type, not `&'static main::Foo`
2-
--> $DIR/empty_span.rs:18:5
2+
--> $DIR/empty_span.rs:17:5
33
|
4-
18 | unsafe impl Send for &'static Foo { }
4+
17 | unsafe impl Send for &'static Foo { }
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
66

77
error: aborting due to previous error

src/test/ui/codemap_tests/huge_multispan_highlight.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// rustc-env:RUST_NEW_ERROR_FORMAT
12-
1311
fn main() {
1412
let x = "foo";
1513

@@ -96,9 +94,8 @@ fn main() {
9694

9795

9896

99-
100-
let y = &mut x;
101-
}
10297

10398

10499

100+
let y = &mut x;
101+
}

src/test/ui/codemap_tests/huge_multispan_highlight.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
error: cannot borrow immutable local variable `x` as mutable
22
--> $DIR/huge_multispan_highlight.rs:100:18
33
|
4-
14 | let x = "foo";
4+
12 | let x = "foo";
55
| - use `mut x` here to make mutable
66
...
77
100 | let y = &mut x;

src/test/ui/codemap_tests/issue-11715.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// rustc-env:RUST_NEW_ERROR_FORMAT
11+
1212

1313

1414

@@ -99,6 +99,3 @@ fn main() {
9999
let y = &mut x;
100100
let z = &mut x;
101101
}
102-
103-
104-

src/test/ui/codemap_tests/one_line.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// rustc-env:RUST_NEW_ERROR_FORMAT
12-
1311
fn main() {
1412
let mut v = vec![Some("foo"), Some("bar")];
1513
v.push(v.pop().unwrap());

src/test/ui/codemap_tests/one_line.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
error[E0499]: cannot borrow `v` as mutable more than once at a time
2-
--> $DIR/one_line.rs:15:12
2+
--> $DIR/one_line.rs:13:12
33
|
4-
15 | v.push(v.pop().unwrap());
4+
13 | v.push(v.pop().unwrap());
55
| - ^ - first borrow ends here
66
| | |
77
| | second mutable borrow occurs here

src/test/ui/codemap_tests/overlapping_spans.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// rustc-env:RUST_NEW_ERROR_FORMAT
1211
#[derive(Debug)]
1312
struct Foo { }
1413

src/test/ui/codemap_tests/overlapping_spans.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
error[E0509]: cannot move out of type `S`, which implements the `Drop` trait
2-
--> $DIR/overlapping_spans.rs:22:9
2+
--> $DIR/overlapping_spans.rs:21:9
33
|
4-
22 | S {f:_s} => {}
4+
21 | S {f:_s} => {}
55
| ^^^^^--^
66
| | |
77
| | hint: to prevent move, use `ref _s` or `ref mut _s`

src/test/ui/codemap_tests/tab.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// rustc-env:RUST_NEW_ERROR_FORMAT
1211
// ignore-tidy-tab
12+
1313
fn main() {
1414
bar;
1515
}
16-

0 commit comments

Comments
 (0)