about summary refs log tree commit diff
diff options
context:
space:
mode:
author许杰友 Jieyou Xu (Joe) <jieyouxu@outlook.com>2024-04-07 16:36:44 +0000
committer许杰友 Jieyou Xu (Joe) <jieyouxu@outlook.com>2024-04-07 17:06:15 +0000
commitde3857e553b0bfaff2a6bc42a03fc9c8df9f777b (patch)
tree768ec51fee0911c94a51cc8d58234db54fda5d48
parent5dc276c0da0a79bb84e3b67db677da29db989d92 (diff)
downloadrust-de3857e553b0bfaff2a6bc42a03fc9c8df9f777b.tar.gz
rust-de3857e553b0bfaff2a6bc42a03fc9c8df9f777b.zip
tests/ui: remove workaround for broken revisioned run-rustfix test
-rw-r--r--tests/ui/object-safety/bare-trait-dont-suggest-dyn.new.fixed2
-rw-r--r--tests/ui/object-safety/bare-trait-dont-suggest-dyn.new.stderr2
-rw-r--r--tests/ui/object-safety/bare-trait-dont-suggest-dyn.old.stderr6
-rw-r--r--tests/ui/object-safety/bare-trait-dont-suggest-dyn.rs2
4 files changed, 4 insertions, 8 deletions
diff --git a/tests/ui/object-safety/bare-trait-dont-suggest-dyn.new.fixed b/tests/ui/object-safety/bare-trait-dont-suggest-dyn.new.fixed
index aee05f5e512..4f5310082e1 100644
--- a/tests/ui/object-safety/bare-trait-dont-suggest-dyn.new.fixed
+++ b/tests/ui/object-safety/bare-trait-dont-suggest-dyn.new.fixed
@@ -2,8 +2,6 @@
 //@[old] edition:2015
 //@[new] edition:2021
 //@[new] run-rustfix
-// FIXME: the test suite tries to create a crate called `bare_trait_dont_suggest_dyn.new`
-#![crate_name="bare_trait_dont_suggest_dyn"]
 #![deny(bare_trait_objects)]
 fn ord_prefer_dot(s: String) -> impl Ord {
     //~^ ERROR the trait `Ord` cannot be made into an object
diff --git a/tests/ui/object-safety/bare-trait-dont-suggest-dyn.new.stderr b/tests/ui/object-safety/bare-trait-dont-suggest-dyn.new.stderr
index 52db31d620c..efddab6dff6 100644
--- a/tests/ui/object-safety/bare-trait-dont-suggest-dyn.new.stderr
+++ b/tests/ui/object-safety/bare-trait-dont-suggest-dyn.new.stderr
@@ -1,5 +1,5 @@
 error[E0038]: the trait `Ord` cannot be made into an object
-  --> $DIR/bare-trait-dont-suggest-dyn.rs:8:33
+  --> $DIR/bare-trait-dont-suggest-dyn.rs:6:33
    |
 LL | fn ord_prefer_dot(s: String) -> Ord {
    |                                 ^^^ `Ord` cannot be made into an object
diff --git a/tests/ui/object-safety/bare-trait-dont-suggest-dyn.old.stderr b/tests/ui/object-safety/bare-trait-dont-suggest-dyn.old.stderr
index f795e910d21..0545a1afcc1 100644
--- a/tests/ui/object-safety/bare-trait-dont-suggest-dyn.old.stderr
+++ b/tests/ui/object-safety/bare-trait-dont-suggest-dyn.old.stderr
@@ -1,5 +1,5 @@
 error: trait objects without an explicit `dyn` are deprecated
-  --> $DIR/bare-trait-dont-suggest-dyn.rs:8:33
+  --> $DIR/bare-trait-dont-suggest-dyn.rs:6:33
    |
 LL | fn ord_prefer_dot(s: String) -> Ord {
    |                                 ^^^
@@ -7,7 +7,7 @@ LL | fn ord_prefer_dot(s: String) -> Ord {
    = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>
 note: the lint level is defined here
-  --> $DIR/bare-trait-dont-suggest-dyn.rs:7:9
+  --> $DIR/bare-trait-dont-suggest-dyn.rs:5:9
    |
 LL | #![deny(bare_trait_objects)]
    |         ^^^^^^^^^^^^^^^^^^
@@ -17,7 +17,7 @@ LL | fn ord_prefer_dot(s: String) -> dyn Ord {
    |                                 +++
 
 error[E0038]: the trait `Ord` cannot be made into an object
-  --> $DIR/bare-trait-dont-suggest-dyn.rs:8:33
+  --> $DIR/bare-trait-dont-suggest-dyn.rs:6:33
    |
 LL | fn ord_prefer_dot(s: String) -> Ord {
    |                                 ^^^ `Ord` cannot be made into an object
diff --git a/tests/ui/object-safety/bare-trait-dont-suggest-dyn.rs b/tests/ui/object-safety/bare-trait-dont-suggest-dyn.rs
index e927b510b9d..cb5a305eab0 100644
--- a/tests/ui/object-safety/bare-trait-dont-suggest-dyn.rs
+++ b/tests/ui/object-safety/bare-trait-dont-suggest-dyn.rs
@@ -2,8 +2,6 @@
 //@[old] edition:2015
 //@[new] edition:2021
 //@[new] run-rustfix
-// FIXME: the test suite tries to create a crate called `bare_trait_dont_suggest_dyn.new`
-#![crate_name="bare_trait_dont_suggest_dyn"]
 #![deny(bare_trait_objects)]
 fn ord_prefer_dot(s: String) -> Ord {
     //~^ ERROR the trait `Ord` cannot be made into an object