From 5e20b59c052b477ee26cc1ec173d9ea0923c08c8 Mon Sep 17 00:00:00 2001
From: Owen Avery <powerboat9.gamer@gmail.com>
Date: Wed, 16 Oct 2024 22:38:55 -0400
Subject: [PATCH] Modify test cfg1.rs for name resolution 2.0

gcc/testsuite/ChangeLog:

	* rust/compile/cfg1.rs: Run test with name resolution 2.0 only
	and adjust expected error message.
	* rust/compile/nr2/exclude: Remove cfg1.rs.

Signed-off-by: Owen Avery <powerboat9.gamer@gmail.com>
---
 gcc/testsuite/rust/compile/cfg1.rs     | 4 ++--
 gcc/testsuite/rust/compile/nr2/exclude | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/gcc/testsuite/rust/compile/cfg1.rs b/gcc/testsuite/rust/compile/cfg1.rs
index 6984f04d1b92..9eadad765da5 100644
--- a/gcc/testsuite/rust/compile/cfg1.rs
+++ b/gcc/testsuite/rust/compile/cfg1.rs
@@ -1,4 +1,4 @@
-// { dg-additional-options "-w" }
+// { dg-additional-options "-w -frust-name-resolution-2.0" }
 extern "C" {
     fn printf(s: *const i8, ...);
 }
@@ -27,5 +27,5 @@ fn test() {
 
 fn main() {
     test();
-    // { dg-error "Cannot find path .test. in this scope" "" { target *-*-* } .-1 }
+    // { dg-error "could not resolve path expression: .test." "" { target *-*-* } .-1 }
 }
diff --git a/gcc/testsuite/rust/compile/nr2/exclude b/gcc/testsuite/rust/compile/nr2/exclude
index f91cf3132c79..1f7c5150e301 100644
--- a/gcc/testsuite/rust/compile/nr2/exclude
+++ b/gcc/testsuite/rust/compile/nr2/exclude
@@ -19,7 +19,6 @@ macros/builtin/recurse2.rs
 macros/builtin/include3.rs
 macros/builtin/include4.rs
 canonical_paths1.rs
-cfg1.rs
 cfg3.rs
 cfg4.rs
 cfg5.rs