https://gcc.gnu.org/g:0d542c18c67e0a2c65f16336ea8f952f016b749e
commit r16-2914-g0d542c18c67e0a2c65f16336ea8f952f016b749e
Author: Owen Avery <powerboat9.ga...@gmail.com>
Date: Thu Jul 3 17:43:55 2025 -0400
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.ga...@gmail.com>
Diff:
---
gcc/testsuite/rust/compile/additional-trait-bounds2nr2.rs | 2 --
gcc/testsuite/rust/compile/const_generics_3.rs | 2 +-
gcc/testsuite/rust/compile/enum_variant_name.rs | 2 +-
gcc/testsuite/rust/compile/generics9.rs | 1 -
gcc/testsuite/rust/compile/invalid_label_name.rs | 1 -
gcc/testsuite/rust/compile/issue-3304.rs | 1 -
gcc/testsuite/rust/compile/macros/mbe/macro-issue3708.rs | 2 +-
gcc/testsuite/rust/compile/macros/mbe/macro-issue3709-2.rs | 2 +-
gcc/testsuite/rust/compile/name_resolution10.rs | 2 +-
gcc/testsuite/rust/compile/name_resolution11.rs | 2 +-
gcc/testsuite/rust/compile/name_resolution12.rs | 2 +-
gcc/testsuite/rust/compile/name_resolution13.rs | 2 --
gcc/testsuite/rust/compile/name_resolution14.rs | 2 --
gcc/testsuite/rust/compile/name_resolution15.rs | 1 -
gcc/testsuite/rust/compile/name_resolution16.rs | 1 -
gcc/testsuite/rust/compile/name_resolution17.rs | 2 --
gcc/testsuite/rust/compile/name_resolution18.rs | 2 --
gcc/testsuite/rust/compile/name_resolution20.rs | 2 --
gcc/testsuite/rust/compile/name_resolution22.rs | 1 -
gcc/testsuite/rust/compile/name_resolution23.rs | 2 --
gcc/testsuite/rust/compile/name_resolution24.rs | 2 --
gcc/testsuite/rust/compile/name_resolution25.rs | 2 --
gcc/testsuite/rust/compile/name_resolution6.rs | 2 +-
gcc/testsuite/rust/compile/name_resolution7.rs | 2 --
gcc/testsuite/rust/compile/name_resolution8.rs | 2 --
gcc/testsuite/rust/compile/name_resolution9.rs | 2 --
gcc/testsuite/rust/compile/nested_macro_definition.rs | 2 --
gcc/testsuite/rust/compile/pub_restricted_1.rs | 2 --
gcc/testsuite/rust/compile/pub_restricted_2.rs | 2 +-
gcc/testsuite/rust/compile/self-in-impl.rs | 2 --
gcc/testsuite/rust/compile/self_import_namespace.rs | 2 --
gcc/testsuite/rust/compile/use_1.rs | 1 -
gcc/testsuite/rust/compile/xfail/name_resolution21.rs | 2 --
gcc/testsuite/rust/execute/torture/name_resolution.rs | 1 -
34 files changed, 9 insertions(+), 51 deletions(-)
diff --git a/gcc/testsuite/rust/compile/additional-trait-bounds2nr2.rs
b/gcc/testsuite/rust/compile/additional-trait-bounds2nr2.rs
index 6764f6e80120..1c49b750319a 100644
--- 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 bd9172949846..09d5835074d1 100644
--- 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 671fced2bb8c..965acd1a9cd7 100644
--- 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 56c619833f4f..949fbb1a41cd 100644
--- 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 66e40a620e09..d1c5a33c62fb 100644
--- 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 6ab614fa2d5d..cc376faeb9dc 100644
--- 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 e5b38bb0da7e..bcbc8dd695af 100644
--- 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 cfc8ab460b78..47514f1e998b 100644
--- 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 33643bd1a147..f156f98c968a 100644
--- 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 a464d2a0fd3e..329567afe960 100644
--- 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 9cce31ceb5c2..0f217aa064d7 100644
--- 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 33edbf9312e2..8356cf6d2d3a 100644
--- 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 eaef6a52f160..44c43aa2c0fd 100644
--- 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 45f38da768af..e82c90eafb51 100644
--- 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 230722ef819c..4db7b2ea164b 100644
--- 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 485947647a95..84ad380fd956 100644
--- 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 5940149d3bbf..17a335280278 100644
--- 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 e6c2dd5ea8f9..f131bb41c170 100644
--- 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 c49331ef38cd..bb5edda6834b 100644
--- 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 50b8e8111525..843be2a8a49a 100644
--- 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 f4eb7b2d38fd..4350cd85bd69 100644
--- 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 3cacac7f64bd..0cadd9e1c216 100644
--- 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 e4087e6281ca..b2b5f6bfc98f 100644
--- 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 fa84e2ffb839..78cb0b2df708 100644
--- 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 6fb517033824..aca19459fd5b 100644
--- 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 792b3bdd6b5c..84ba3c5c7258 100644
--- 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 c0b72506accd..b71afbd7166e 100644
--- 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 44989a887e93..2afbeb419359 100644
--- 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 91f072e890f8..fea9379bf42a 100644
--- 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 f888162a9f06..a56789753e22 100644
--- 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 2d9b2ed8e0fc..a63c1d715a8d 100644
--- 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 e8e2037aac3f..21ee3e17a25e 100644
--- 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 df48d0015987..fc8e94b4b2c8 100644
--- 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 749218352d64..a2eaf4867239 100644
--- 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;
