Skip to content

Commit d52eb1a

Browse files
sanxiynsanxiyn
committed
RUST_NEW_ERROR_FORMAT is no more
1 parent 13ff307 commit d52eb1a

19 files changed

+24
-41
lines changed

Diff for: ‎src/test/ui/codemap_tests/empty_span.rs

-1
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;

Diff for: ‎src/test/ui/codemap_tests/empty_span.stderr

+2-2
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

Diff for: ‎src/test/ui/codemap_tests/huge_multispan_highlight.rs

+2-5
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+
}

Diff for: ‎src/test/ui/codemap_tests/huge_multispan_highlight.stderr

+1-1
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;

Diff for: ‎src/test/ui/codemap_tests/issue-11715.rs

+1-4
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-

Diff for: ‎src/test/ui/codemap_tests/one_line.rs

-2
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());

Diff for: ‎src/test/ui/codemap_tests/one_line.stderr

+2-2
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

Diff for: ‎src/test/ui/codemap_tests/overlapping_spans.rs

-1
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

Diff for: ‎src/test/ui/codemap_tests/overlapping_spans.stderr

+2-2
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`

Diff for: ‎src/test/ui/codemap_tests/tab.rs

+1-2
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-

Diff for: ‎src/test/ui/codemap_tests/two_files.rs

-1
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
include!("two_files_data.rs");
1312

1413
struct Baz { }

Diff for: ‎src/test/ui/codemap_tests/two_files.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
error[E0404]: `Bar` is not a trait
2-
--> $DIR/two_files.rs:16:6
2+
--> $DIR/two_files.rs:15:6
33
|
4-
16 | impl Bar for Baz { }
4+
15 | impl Bar for Baz { }
55
| ^^^ not a trait
66
|
77
= note: type aliases cannot be used for traits

Diff for: ‎src/test/ui/codemap_tests/two_files_data.rs

+1-2
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-test
12+
1313
trait Foo { }
1414

1515
type Bar = Foo;
16-

Diff for: ‎src/test/ui/codemap_tests/unicode.rs

-1
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
extern "路濫狼á́́" fn foo() {}
1312

1413
fn main() { }

Diff for: ‎src/test/ui/codemap_tests/unicode.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
error: invalid ABI: expected one of [cdecl, stdcall, fastcall, vectorcall, aapcs, win64, Rust, C, system, rust-intrinsic, rust-call, platform-intrinsic], found `路濫狼á́́`
2-
--> $DIR/unicode.rs:12:8
2+
--> $DIR/unicode.rs:11:8
33
|
4-
12 | extern "路濫狼á́́" fn foo() {}
4+
11 | extern "路濫狼á́́" fn foo() {}
55
| ^^^^^^^^
66

77
error: aborting due to previous error

Diff for: ‎src/test/ui/mismatched_types/issue-26480.rs

-1
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
extern {
1312
fn write(fildes: i32, buf: *const i8, nbyte: u64) -> i64;
1413
}

Diff for: ‎src/test/ui/mismatched_types/issue-26480.stderr

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
error[E0308]: mismatched types
2-
--> $DIR/issue-26480.rs:27:19
2+
--> $DIR/issue-26480.rs:26:19
33
|
4-
27 | $arr.len() * size_of($arr[0]));
4+
26 | $arr.len() * size_of($arr[0]));
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected u64, found usize
6-
$DIR/issue-26480.rs:38:5: 38:19 note: in this expansion of write! (defined in $DIR/issue-26480.rs)
6+
$DIR/issue-26480.rs:37:5: 37:19 note: in this expansion of write! (defined in $DIR/issue-26480.rs)
77

88
error: non-scalar cast: `{integer}` as `()`
9-
--> $DIR/issue-26480.rs:33:19
9+
--> $DIR/issue-26480.rs:32:19
1010
|
11-
33 | ($x:expr) => ($x as ())
11+
32 | ($x:expr) => ($x as ())
1212
| ^^^^^^^^
13-
$DIR/issue-26480.rs:39:5: 39:14 note: in this expansion of cast! (defined in $DIR/issue-26480.rs)
13+
$DIR/issue-26480.rs:38:5: 38:14 note: in this expansion of cast! (defined in $DIR/issue-26480.rs)
1414

1515
error: aborting due to 2 previous errors
1616

Diff for: ‎src/test/ui/mismatched_types/main.rs

-2
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: u32 = (
1513
);

Diff for: ‎src/test/ui/mismatched_types/main.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
error[E0308]: mismatched types
2-
--> $DIR/main.rs:14:18
2+
--> $DIR/main.rs:12:18
33
|
4-
14 | let x: u32 = (
4+
12 | let x: u32 = (
55
| ^ expected u32, found ()
66
|
77
= note: expected type `u32`

0 commit comments

Comments
 (0)