[COMMITTED 30/42] gccrs: Change expected error output to match nr2

[arthur . cohen]

From: Pierre-Emmanuel Patry <pierre-emmanuel.pa...@embecosm.com>

Name resolution 2.0 message describes the context around the unresolved
items and should therefore be kept.

gcc/testsuite/ChangeLog:

        * rust/compile/nr2/exclude: Remove test from exclusion list.
        * rust/compile/use_1.rs: Change expected output and remove test from
        nr1.

Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.pa...@embecosm.com>
---
 gcc/testsuite/rust/compile/nr2/exclude | 1 -
 gcc/testsuite/rust/compile/use_1.rs    | 9 +++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gcc/testsuite/rust/compile/nr2/exclude 
b/gcc/testsuite/rust/compile/nr2/exclude
index 2c116be1349..23f3b1bf62c 100644
--- a/gcc/testsuite/rust/compile/nr2/exclude
+++ b/gcc/testsuite/rust/compile/nr2/exclude
@@ -7,7 +7,6 @@ privacy8.rs
 pub_restricted_1.rs
 pub_restricted_2.rs
 pub_restricted_3.rs
-use_1.rs
 issue-2905-2.rs
 derive_clone_enum3.rs
 derive-default1.rs
diff --git a/gcc/testsuite/rust/compile/use_1.rs 
b/gcc/testsuite/rust/compile/use_1.rs
index 94b96321a63..e8e2037aac3 100644
--- a/gcc/testsuite/rust/compile/use_1.rs
+++ b/gcc/testsuite/rust/compile/use_1.rs
@@ -1,7 +1,8 @@
+// { dg-additional-options "-frust-name-resolution-2.0" }
 mod frob {}
 
-use foo::bar::baz; // { dg-error "cannot find simple path segment .foo." }
-use frob::ulator; // { dg-error "cannot find simple path segment .ulator." }
+use foo::bar::baz; // { dg-error "unresolved import .foo::bar::baz." }
+use frob::ulator; // { dg-error "unresolved import .frob::ulator." }
 
 mod sain {
     mod doux {}
@@ -9,8 +10,8 @@ mod sain {
     mod dron {}
 }
 
-use not_sain::*; // { dg-error "cannot find simple path segment .not_sain." }
+use not_sain::*; // { dg-error "unresolved import .not_sain." }
 
 use sain::*;
 use sain::{doux, dron};
-use sain::{doux, dron, graal}; // { dg-error "cannot find simple path segment 
.graal." }
+use sain::{doux, dron, graal}; // { dg-error "unresolved import .sain::graal." 
}
-- 
2.49.0