Skip to content

Commit de3857e

Browse files
committed
tests/ui: remove workaround for broken revisioned run-rustfix test
1 parent 5dc276c commit de3857e

4 files changed

+4
-8
lines changed

tests/ui/object-safety/bare-trait-dont-suggest-dyn.new.fixed

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
//@[old] edition:2015
33
//@[new] edition:2021
44
//@[new] run-rustfix
5-
// FIXME: the test suite tries to create a crate called `bare_trait_dont_suggest_dyn.new`
6-
#![crate_name="bare_trait_dont_suggest_dyn"]
75
#![deny(bare_trait_objects)]
86
fn ord_prefer_dot(s: String) -> impl Ord {
97
//~^ ERROR the trait `Ord` cannot be made into an object

tests/ui/object-safety/bare-trait-dont-suggest-dyn.new.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0038]: the trait `Ord` cannot be made into an object
2-
--> $DIR/bare-trait-dont-suggest-dyn.rs:8:33
2+
--> $DIR/bare-trait-dont-suggest-dyn.rs:6:33
33
|
44
LL | fn ord_prefer_dot(s: String) -> Ord {
55
| ^^^ `Ord` cannot be made into an object

tests/ui/object-safety/bare-trait-dont-suggest-dyn.old.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
error: trait objects without an explicit `dyn` are deprecated
2-
--> $DIR/bare-trait-dont-suggest-dyn.rs:8:33
2+
--> $DIR/bare-trait-dont-suggest-dyn.rs:6:33
33
|
44
LL | fn ord_prefer_dot(s: String) -> Ord {
55
| ^^^
66
|
77
= warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
88
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
99
note: the lint level is defined here
10-
--> $DIR/bare-trait-dont-suggest-dyn.rs:7:9
10+
--> $DIR/bare-trait-dont-suggest-dyn.rs:5:9
1111
|
1212
LL | #![deny(bare_trait_objects)]
1313
| ^^^^^^^^^^^^^^^^^^
@@ -17,7 +17,7 @@ LL | fn ord_prefer_dot(s: String) -> dyn Ord {
1717
| +++
1818

1919
error[E0038]: the trait `Ord` cannot be made into an object
20-
--> $DIR/bare-trait-dont-suggest-dyn.rs:8:33
20+
--> $DIR/bare-trait-dont-suggest-dyn.rs:6:33
2121
|
2222
LL | fn ord_prefer_dot(s: String) -> Ord {
2323
| ^^^ `Ord` cannot be made into an object

tests/ui/object-safety/bare-trait-dont-suggest-dyn.rs

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
//@[old] edition:2015
33
//@[new] edition:2021
44
//@[new] run-rustfix
5-
// FIXME: the test suite tries to create a crate called `bare_trait_dont_suggest_dyn.new`
6-
#![crate_name="bare_trait_dont_suggest_dyn"]
75
#![deny(bare_trait_objects)]
86
fn ord_prefer_dot(s: String) -> Ord {
97
//~^ ERROR the trait `Ord` cannot be made into an object

0 commit comments

Comments
 (0)