gccrs: Remove -frust-name-resolution-2.0 usage in tests

gcc/testsuite/ChangeLog:

	* rust/compile/additional-trait-bounds2nr2.rs: Remove
	-frust-name-resolution-2.0 usage.
	* rust/compile/const_generics_3.rs: Likewise.
	* rust/compile/enum_variant_name.rs: Likewise.
	* rust/compile/generics9.rs: Likewise.
	* rust/compile/invalid_label_name.rs: Likewise.
	* rust/compile/issue-3304.rs: Likewise.
	* rust/compile/macros/mbe/macro-issue3708.rs: Likewise.
	* rust/compile/macros/mbe/macro-issue3709-2.rs: Likewise.
	* rust/compile/name_resolution10.rs: Likewise.
	* rust/compile/name_resolution11.rs: Likewise.
	* rust/compile/name_resolution12.rs: Likewise.
	* rust/compile/name_resolution13.rs: Likewise.
	* rust/compile/name_resolution14.rs: Likewise.
	* rust/compile/name_resolution15.rs: Likewise.
	* rust/compile/name_resolution16.rs: Likewise.
	* rust/compile/name_resolution17.rs: Likewise.
	* rust/compile/name_resolution18.rs: Likewise.
	* rust/compile/name_resolution20.rs: Likewise.
	* rust/compile/name_resolution22.rs: Likewise.
	* rust/compile/name_resolution23.rs: Likewise.
	* rust/compile/name_resolution24.rs: Likewise.
	* rust/compile/name_resolution25.rs: Likewise.
	* rust/compile/name_resolution6.rs: Likewise.
	* rust/compile/name_resolution7.rs: Likewise.
	* rust/compile/name_resolution8.rs: Likewise.
	* rust/compile/name_resolution9.rs: Likewise.
	* rust/compile/nested_macro_definition.rs: Likewise.
	* rust/compile/pub_restricted_1.rs: Likewise.
	* rust/compile/pub_restricted_2.rs: Likewise.
	* rust/compile/self-in-impl.rs: Likewise.
	* rust/compile/self_import_namespace.rs: Likewise.
	* rust/compile/use_1.rs: Likewise.
	* rust/compile/xfail/name_resolution21.rs: Likewise.
	* rust/execute/torture/name_resolution.rs: Likewise.

Signed-off-by: Owen Avery <powerboat9.gamer@gmail.com>

diff --git a/gcc/testsuite/rust/compile/additional-trait-bounds2nr2.rs b/gcc/testsuite/rust/compile/additional-trait-bounds2nr2.rs
index 6764f6e801207b6726ebba0f3278d498a911ed23..1c49b750319af9bbe37490f129340707dffbe7c3 100644 (file)
--- a/gcc/testsuite/rust/compile/additional-trait-bounds2nr2.rs
+++ b/gcc/testsuite/rust/compile/additional-trait-bounds2nr2.rs
@@ -1,5 +1,3 @@
-// { dg-additional-options "-frust-name-resolution-2.0" }
-
 #![feature(optin_builtin_traits)]
 
 pub unsafe auto trait Send {}

diff --git a/gcc/testsuite/rust/compile/const_generics_3.rs b/gcc/testsuite/rust/compile/const_generics_3.rs
index bd9172949846651057563f3d6d2ab17fb9ef780b..09d5835074d1d8683f04dcc2066c005bff40a94a 100644 (file)
--- a/gcc/testsuite/rust/compile/const_generics_3.rs
+++ b/gcc/testsuite/rust/compile/const_generics_3.rs
@@ -1,4 +1,4 @@
-// { dg-additional-options "-w -frust-name-resolution-2.0 -frust-compile-until=compilation" }
+// { dg-additional-options "-w -frust-compile-until=compilation" }
 
 #[lang = "sized"]
 trait Sized {}

diff --git a/gcc/testsuite/rust/compile/enum_variant_name.rs b/gcc/testsuite/rust/compile/enum_variant_name.rs
index 671fced2bb8c8581f98e5054e77e18a5a40762b0..965acd1a9cd7ddde26c347dcc20d7be81566fd7a 100644 (file)
--- a/gcc/testsuite/rust/compile/enum_variant_name.rs
+++ b/gcc/testsuite/rust/compile/enum_variant_name.rs
@@ -1,4 +1,4 @@
-// { dg-additional-options "-w -frust-name-resolution-2.0" }
+// { dg-additional-options "-w" }
 struct E1;
 
 enum Test {

diff --git a/gcc/testsuite/rust/compile/generics9.rs b/gcc/testsuite/rust/compile/generics9.rs
index 56c619833f4f499c925ca464b64937cb286e6c02..949fbb1a41cd6525444f27aaf57f598d5fd1fb09 100644 (file)
--- a/gcc/testsuite/rust/compile/generics9.rs
+++ b/gcc/testsuite/rust/compile/generics9.rs
@@ -1,4 +1,3 @@
-// { dg-additional-options "-frust-name-resolution-2.0" }
 struct Foo<A, B = (A, B)>(A, B);
 // { dg-error "type parameters with a default cannot use forward declared identifiers" "" { target *-*-* } .-1 }
 

diff --git a/gcc/testsuite/rust/compile/invalid_label_name.rs b/gcc/testsuite/rust/compile/invalid_label_name.rs
index 66e40a620e0992b06b043657ea1239948faefe88..d1c5a33c62fbdda5e493bb800a540f9c8e587a65 100644 (file)
--- a/gcc/testsuite/rust/compile/invalid_label_name.rs
+++ b/gcc/testsuite/rust/compile/invalid_label_name.rs
@@ -1,4 +1,3 @@
-// { dg-additional-options "-frust-name-resolution-2.0" }
 pub fn function() {
     'continue: loop {
         // { dg-error "invalid label name .'continue." "" { target *-*-* } .-1 }

diff --git a/gcc/testsuite/rust/compile/issue-3304.rs b/gcc/testsuite/rust/compile/issue-3304.rs
index 6ab614fa2d5d8b92ba59bb3aa919b3a067681a97..cc376faeb9dc52b7db4127f1dc6614f6a4dfa6f3 100644 (file)
--- a/gcc/testsuite/rust/compile/issue-3304.rs
+++ b/gcc/testsuite/rust/compile/issue-3304.rs
@@ -1,4 +1,3 @@
-// { dg-additional-options "-frust-name-resolution-2.0" }
 #[lang = "sized"]
 trait Sized {}
 

diff --git a/gcc/testsuite/rust/compile/macros/mbe/macro-issue3708.rs b/gcc/testsuite/rust/compile/macros/mbe/macro-issue3708.rs
index e5b38bb0da7e3b1fde08737437ac825a9e20538c..bcbc8dd695afde5e96ea1589a5fddfe5f31386e1 100644 (file)
--- a/gcc/testsuite/rust/compile/macros/mbe/macro-issue3708.rs
+++ b/gcc/testsuite/rust/compile/macros/mbe/macro-issue3708.rs
@@ -1,4 +1,4 @@
-// { dg-additional-options "-frust-name-resolution-2.0 -frust-compile-until=lowering" }
+// { dg-additional-options "-frust-compile-until=lowering" }
 
 macro_rules! impl_fn_for_zst {
     ($(

diff --git a/gcc/testsuite/rust/compile/macros/mbe/macro-issue3709-2.rs b/gcc/testsuite/rust/compile/macros/mbe/macro-issue3709-2.rs
index cfc8ab460b78d7520a958ec7bce280cbfd1016c9..47514f1e998b428787d0485360e2f4367a22cb02 100644 (file)
--- a/gcc/testsuite/rust/compile/macros/mbe/macro-issue3709-2.rs
+++ b/gcc/testsuite/rust/compile/macros/mbe/macro-issue3709-2.rs
@@ -1,4 +1,4 @@
-// { dg-additional-options "-frust-name-resolution-2.0 -frust-compile-until=lowering" }
+// { dg-additional-options "-frust-compile-until=lowering" }
 
 macro_rules! impl_fn_for_zst {
     ($(

diff --git a/gcc/testsuite/rust/compile/name_resolution10.rs b/gcc/testsuite/rust/compile/name_resolution10.rs
index 33643bd1a1477896d71e0dc3336d5303e9c02062..f156f98c968aea4269bb72bede3cfa7c833c4de4 100644 (file)
--- a/gcc/testsuite/rust/compile/name_resolution10.rs
+++ b/gcc/testsuite/rust/compile/name_resolution10.rs
@@ -1,4 +1,4 @@
-// { dg-options "-frust-name-resolution-2.0 -frust-compile-until=lowering" }
+// { dg-options "-frust-compile-until=lowering" }
 
 #![feature(decl_macro)]
 

diff --git a/gcc/testsuite/rust/compile/name_resolution11.rs b/gcc/testsuite/rust/compile/name_resolution11.rs
index a464d2a0fd3e5e73a7660ad8ecfe3141aa6dfc4d..329567afe960bf486976b55a800771d3eab513ea 100644 (file)
--- a/gcc/testsuite/rust/compile/name_resolution11.rs
+++ b/gcc/testsuite/rust/compile/name_resolution11.rs
@@ -1,4 +1,4 @@
-// { dg-additional-options "-frust-name-resolution-2.0 -frust-compile-until=lowering" }
+// { dg-additional-options "-frust-compile-until=lowering" }
 fn foo() {
     let b = 10;
     fn bar() {

diff --git a/gcc/testsuite/rust/compile/name_resolution12.rs b/gcc/testsuite/rust/compile/name_resolution12.rs
index 9cce31ceb5c296ce4c386934338bca91894190b6..0f217aa064d746e19e868015ab6fdc75f711338a 100644 (file)
--- a/gcc/testsuite/rust/compile/name_resolution12.rs
+++ b/gcc/testsuite/rust/compile/name_resolution12.rs
@@ -1,4 +1,4 @@
-// { dg-additional-options "-frust-name-resolution-2.0 -frust-compile-until=lowering" }
+// { dg-additional-options "-frust-compile-until=lowering" }
 
 const TOTO: i32 = 10;
 

diff --git a/gcc/testsuite/rust/compile/name_resolution13.rs b/gcc/testsuite/rust/compile/name_resolution13.rs
index 33edbf9312e26f37b4a9056fd19647d61ee71089..8356cf6d2d3a0755e1cbb2228c78ce3d0191dee1 100644 (file)
--- a/gcc/testsuite/rust/compile/name_resolution13.rs
+++ b/gcc/testsuite/rust/compile/name_resolution13.rs
@@ -1,5 +1,3 @@
-// { dg-options "-frust-name-resolution-2.0" }
-
 pub mod foo {
     pub macro bar() {}
 }

diff --git a/gcc/testsuite/rust/compile/name_resolution14.rs b/gcc/testsuite/rust/compile/name_resolution14.rs
index eaef6a52f160723e87053b339413e72a03326284..44c43aa2c0fda80cc773489648ee471fee0c5ab0 100644 (file)
--- a/gcc/testsuite/rust/compile/name_resolution14.rs
+++ b/gcc/testsuite/rust/compile/name_resolution14.rs
@@ -1,5 +1,3 @@
-// { dg-options "-frust-name-resolution-2.0" }
-
 pub mod foo {
     pub macro bar() {}
 }

diff --git a/gcc/testsuite/rust/compile/name_resolution15.rs b/gcc/testsuite/rust/compile/name_resolution15.rs
index 45f38da768af11794bb55760278f261edbe3bcea..e82c90eafb511c73dbd6d6ed3b57c0da08a7ff11 100644 (file)
--- a/gcc/testsuite/rust/compile/name_resolution15.rs
+++ b/gcc/testsuite/rust/compile/name_resolution15.rs
@@ -1,4 +1,3 @@
-// { dg-additional-options "-frust-name-resolution-2.0" }
 #![feature(decl_macro)]
 
 pub mod foo {

diff --git a/gcc/testsuite/rust/compile/name_resolution16.rs b/gcc/testsuite/rust/compile/name_resolution16.rs
index 230722ef819c3b0a5928fc3c66a466892e8a982d..4db7b2ea164bb25d90426d052fa69dd2964f322c 100644 (file)
--- a/gcc/testsuite/rust/compile/name_resolution16.rs
+++ b/gcc/testsuite/rust/compile/name_resolution16.rs
@@ -1,4 +1,3 @@
-// { dg-additional-options "-frust-name-resolution-2.0" }
 #![feature(decl_macro)]
 
 pub mod foo {

diff --git a/gcc/testsuite/rust/compile/name_resolution17.rs b/gcc/testsuite/rust/compile/name_resolution17.rs
index 485947647a9566a0edd20f6d2aae456f3cc9743e..84ad380fd956f6c579f548975988a2b2d5edda29 100644 (file)
--- a/gcc/testsuite/rust/compile/name_resolution17.rs
+++ b/gcc/testsuite/rust/compile/name_resolution17.rs
@@ -1,5 +1,3 @@
-// { dg-options "-frust-name-resolution-2.0" }
-
 struct Foo;
 fn Foo() {} // { dg-error ".Foo. defined multiple times" }
 

diff --git a/gcc/testsuite/rust/compile/name_resolution18.rs b/gcc/testsuite/rust/compile/name_resolution18.rs
index 5940149d3bbfe693b95382b5c5ed753a5353ffa3..17a335280278b4adf27cfc14aebc3c2315650ffd 100644 (file)
--- a/gcc/testsuite/rust/compile/name_resolution18.rs
+++ b/gcc/testsuite/rust/compile/name_resolution18.rs
@@ -1,5 +1,3 @@
-// { dg-options "-frust-name-resolution-2.0" }
-
 struct Marker;
 
 struct Foo {

diff --git a/gcc/testsuite/rust/compile/name_resolution20.rs b/gcc/testsuite/rust/compile/name_resolution20.rs
index e6c2dd5ea8f92ba12aae1910793a04a10d475d78..f131bb41c1706a9ebcac88034db1c157d6dd74a2 100644 (file)
--- a/gcc/testsuite/rust/compile/name_resolution20.rs
+++ b/gcc/testsuite/rust/compile/name_resolution20.rs
@@ -1,5 +1,3 @@
-// { dg-options "-frust-name-resolution-2.0" }
-
 pub mod foo {
     pub macro bar() {}
 }

diff --git a/gcc/testsuite/rust/compile/name_resolution22.rs b/gcc/testsuite/rust/compile/name_resolution22.rs
index c49331ef38cd4238bad12ca1c085e2e71d7f35b1..bb5edda6834b9235c40bbe4b2920b475d2a1c616 100644 (file)
--- a/gcc/testsuite/rust/compile/name_resolution22.rs
+++ b/gcc/testsuite/rust/compile/name_resolution22.rs
@@ -1,4 +1,3 @@
-// { dg-options "-frust-name-resolution-2.0" }
 struct Marker;
 struct Foo(Marker);
 

diff --git a/gcc/testsuite/rust/compile/name_resolution23.rs b/gcc/testsuite/rust/compile/name_resolution23.rs
index 50b8e8111525689aa0a51f7773fe4c2cffb60f69..843be2a8a49a06d80975e8639847800f97e1ce30 100644 (file)
--- a/gcc/testsuite/rust/compile/name_resolution23.rs
+++ b/gcc/testsuite/rust/compile/name_resolution23.rs
@@ -1,5 +1,3 @@
-// { dg-options "-frust-name-resolution-2.0" }
-
 mod a {
     pub mod b {
         pub fn foo() {}

diff --git a/gcc/testsuite/rust/compile/name_resolution24.rs b/gcc/testsuite/rust/compile/name_resolution24.rs
index f4eb7b2d38fd1aa6feeff9354a9dc0d18940dd02..4350cd85bd69abb08555d14c1c3ca063d19378db 100644 (file)
--- a/gcc/testsuite/rust/compile/name_resolution24.rs
+++ b/gcc/testsuite/rust/compile/name_resolution24.rs
@@ -1,5 +1,3 @@
-// { dg-options "-frust-name-resolution-2.0" }
-
 mod a {
     pub mod b {
         pub fn baz() {}

diff --git a/gcc/testsuite/rust/compile/name_resolution25.rs b/gcc/testsuite/rust/compile/name_resolution25.rs
index 3cacac7f64bdf3e8f400f3c90cb1c7b2e7060412..0cadd9e1c216d678b1cdb2b81e17701099e2bf39 100644 (file)
--- a/gcc/testsuite/rust/compile/name_resolution25.rs
+++ b/gcc/testsuite/rust/compile/name_resolution25.rs
@@ -1,5 +1,3 @@
-// { dg-options "-frust-name-resolution-2.0" }
-
 struct Test; // { dg-warning "struct is never constructed: .Test." }
 
 impl Test {}

diff --git a/gcc/testsuite/rust/compile/name_resolution6.rs b/gcc/testsuite/rust/compile/name_resolution6.rs
index e4087e6281ca97219625aa62103e2f7783096636..b2b5f6bfc98f43a2e0536eb58ee9d29b2077512c 100644 (file)
--- a/gcc/testsuite/rust/compile/name_resolution6.rs
+++ b/gcc/testsuite/rust/compile/name_resolution6.rs
@@ -1,4 +1,4 @@
-// { dg-options "-frust-name-resolution-2.0 -frust-compile-until=lowering" }
+// { dg-options "-frust-compile-until=lowering" }
 
 pub mod foo {
     pub mod bar {

diff --git a/gcc/testsuite/rust/compile/name_resolution7.rs b/gcc/testsuite/rust/compile/name_resolution7.rs
index fa84e2ffb8394963a83653fe651ff10447f52cb2..78cb0b2df7080d346c00631eccc5cec5cb011765 100644 (file)
--- a/gcc/testsuite/rust/compile/name_resolution7.rs
+++ b/gcc/testsuite/rust/compile/name_resolution7.rs
@@ -1,5 +1,3 @@
-// { dg-options "-frust-name-resolution-2.0" }
-
 // check that macros by example do not get inserted in ribs like regular items
 pub mod foo {
     pub mod bar {

diff --git a/gcc/testsuite/rust/compile/name_resolution8.rs b/gcc/testsuite/rust/compile/name_resolution8.rs
index 6fb5170338243393901f1e0deb066c4a83839bb4..aca19459fd5b573b8060c01f301e972700f7ed60 100644 (file)
--- a/gcc/testsuite/rust/compile/name_resolution8.rs
+++ b/gcc/testsuite/rust/compile/name_resolution8.rs
@@ -1,5 +1,3 @@
-// { dg-options "-frust-name-resolution-2.0" }
-
 // check that macros by example get exported to the crate's root with #[macro_export]
 pub mod foo {
     pub mod bar {

diff --git a/gcc/testsuite/rust/compile/name_resolution9.rs b/gcc/testsuite/rust/compile/name_resolution9.rs
index 792b3bdd6b5c87f5f89158efde44be3f250859f6..84ba3c5c725809e2823b8afe94ba83e1cb43366f 100644 (file)
--- a/gcc/testsuite/rust/compile/name_resolution9.rs
+++ b/gcc/testsuite/rust/compile/name_resolution9.rs
@@ -1,5 +1,3 @@
-// { dg-options "-frust-name-resolution-2.0" }
-
 pub mod foo {
     pub mod bar {
         fn f() {

diff --git a/gcc/testsuite/rust/compile/nested_macro_definition.rs b/gcc/testsuite/rust/compile/nested_macro_definition.rs
index c0b72506accd8df80ab22e8844d1f060a76432ce..b71afbd7166e8e3f95350ca05db8aee6c9be38dc 100644 (file)
--- a/gcc/testsuite/rust/compile/nested_macro_definition.rs
+++ b/gcc/testsuite/rust/compile/nested_macro_definition.rs
@@ -1,5 +1,3 @@
-// { dg-options "-frust-name-resolution-2.0" }
-
 macro_rules! toto {
     () => {
         macro_rules! tata {

diff --git a/gcc/testsuite/rust/compile/pub_restricted_1.rs b/gcc/testsuite/rust/compile/pub_restricted_1.rs
index 44989a887e93106d70dc0561e9da4fe2d0598e06..2afbeb41935910acda7701c50cb9299f250dcb35 100644 (file)
--- a/gcc/testsuite/rust/compile/pub_restricted_1.rs
+++ b/gcc/testsuite/rust/compile/pub_restricted_1.rs
@@ -1,5 +1,3 @@
-// { dg-additional-options "-frust-name-resolution-2.0" }
-
 pub mod foo {
     pub mod bar {
         pub fn baz() {}

diff --git a/gcc/testsuite/rust/compile/pub_restricted_2.rs b/gcc/testsuite/rust/compile/pub_restricted_2.rs
index 91f072e890f85754930ae0bbb82b031d47b76e52..fea9379bf42a75627adc66267c7b17cf7835a0cd 100644 (file)
--- a/gcc/testsuite/rust/compile/pub_restricted_2.rs
+++ b/gcc/testsuite/rust/compile/pub_restricted_2.rs
@@ -1,4 +1,4 @@
-// { dg-additional-options "-w -frust-name-resolution-2.0" }
+// { dg-additional-options "-w" }
 
 mod foo {
     mod bar {

diff --git a/gcc/testsuite/rust/compile/self-in-impl.rs b/gcc/testsuite/rust/compile/self-in-impl.rs
index f888162a9f06039759999bbfae1bf49a3fe61fe6..a56789753e22a081f8e601ab6c4dbd8f0aec202e 100644 (file)
--- a/gcc/testsuite/rust/compile/self-in-impl.rs
+++ b/gcc/testsuite/rust/compile/self-in-impl.rs
@@ -1,5 +1,3 @@
-// { dg-additional-options "-frust-name-resolution-2.0" }
-
 // the error message here is what rustc >=1.66 emits
 // rustc <1.66 emits a "cycle detected" error when
 //   trying to calculate the impl type

diff --git a/gcc/testsuite/rust/compile/self_import_namespace.rs b/gcc/testsuite/rust/compile/self_import_namespace.rs
index 2d9b2ed8e0fc2f630e9bd47dd2b79d94455f93e4..a63c1d715a8df8120212568c3e62e26477205e5d 100644 (file)
--- a/gcc/testsuite/rust/compile/self_import_namespace.rs
+++ b/gcc/testsuite/rust/compile/self_import_namespace.rs
@@ -1,5 +1,3 @@
-// { dg-additional-options "-frust-name-resolution-2.0" }
-
 mod bar {
     pub mod foo {}
     pub fn foo() {}

diff --git a/gcc/testsuite/rust/compile/use_1.rs b/gcc/testsuite/rust/compile/use_1.rs
index e8e2037aac3f50d78369c66d3d90410cc0418c76..21ee3e17a25e05973cfbb15e3762c48cd80e3ef1 100644 (file)
--- a/gcc/testsuite/rust/compile/use_1.rs
+++ b/gcc/testsuite/rust/compile/use_1.rs
@@ -1,4 +1,3 @@
-// { dg-additional-options "-frust-name-resolution-2.0" }
 mod frob {}
 
 use foo::bar::baz; // { dg-error "unresolved import .foo::bar::baz." }

diff --git a/gcc/testsuite/rust/compile/xfail/name_resolution21.rs b/gcc/testsuite/rust/compile/xfail/name_resolution21.rs
index df48d0015987b6047aaae40da42dacb49576f32c..fc8e94b4b2c87ac947b8514331f1e598fa50d254 100644 (file)
--- a/gcc/testsuite/rust/compile/xfail/name_resolution21.rs
+++ b/gcc/testsuite/rust/compile/xfail/name_resolution21.rs
@@ -1,5 +1,3 @@
-// { dg-additional-options "-frust-name-resolution-2.0" }
-
 pub mod foo {
     pub macro bar() {}
 }

diff --git a/gcc/testsuite/rust/execute/torture/name_resolution.rs b/gcc/testsuite/rust/execute/torture/name_resolution.rs
index 749218352d648c077cbc53364fd04632001fa974..a2eaf486723992f2e7188f6679e643b7e1f9b903 100644 (file)
--- a/gcc/testsuite/rust/execute/torture/name_resolution.rs
+++ b/gcc/testsuite/rust/execute/torture/name_resolution.rs
@@ -1,4 +1,3 @@
-// { dg-additional-options "-frust-name-resolution-2.0" }
 // { dg-output "Value is 10\r*\n" }
 
 const BAZ: i32 = 10;