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

powerboat9 · P-E-P · commit 8aa9c2a679dd · 2025-07-04T13:00:08.000Z
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 &lt;powerboat9.gamer@gmail.com&gt;
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,3 @@
-// { dg-additional-options "-frust-name-resolution-2.0" }
 // { dg-output "Value is 10\r*\n" }
 
 const BAZ: i32 = 10;

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// { dg-additional-options "-frust-name-resolution-2.0" }`
`2`		`-`
`3`	`1`	`#![feature(optin_builtin_traits)]`
`4`	`2`
`5`	`3`	`pub unsafe auto trait Send {}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// { dg-additional-options "-w -frust-name-resolution-2.0 -frust-compile-until=compilation" }`
	`1`	`+// { dg-additional-options "-w -frust-compile-until=compilation" }`
`2`	`2`
`3`	`3`	`#[lang = "sized"]`
`4`	`4`	`trait Sized {}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// { dg-additional-options "-w -frust-name-resolution-2.0" }`
	`1`	`+// { dg-additional-options "-w" }`
`2`	`2`	`struct E1;`
`3`	`3`
`4`	`4`	`enum Test {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-// { dg-additional-options "-frust-name-resolution-2.0" }`
`2`	`1`	`struct Foo<A, B = (A, B)>(A, B);`
`3`	`2`	`// { dg-error "type parameters with a default cannot use forward declared identifiers" "" { target --* } .-1 }`
`4`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-// { dg-additional-options "-frust-name-resolution-2.0" }`
`2`	`1`	`pub fn function() {`
`3`	`2`	`'continue: loop {`
`4`	`3`	`// { dg-error "invalid label name .'continue." "" { target --* } .-1 }`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// { dg-additional-options "-frust-name-resolution-2.0 -frust-compile-until=lowering" }`
	`1`	`+// { dg-additional-options "-frust-compile-until=lowering" }`
`2`	`2`
`3`	`3`	`macro_rules! impl_fn_for_zst {`
`4`	`4`	`($(`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// { dg-options "-frust-name-resolution-2.0 -frust-compile-until=lowering" }`
	`1`	`+// { dg-options "-frust-compile-until=lowering" }`
`2`	`2`
`3`	`3`	`#![feature(decl_macro)]`
`4`	`4`