Change error message to match expected test output

gcc/rust/ChangeLog:

	* resolve/rust-late-name-resolver-2.0.cc (Late::visit): Change error
	message.

gcc/testsuite/ChangeLog:

	* rust/compile/nr2/exclude: Remove passing test from exclusion list.

Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>

diff --git a/gcc/rust/resolve/rust-late-name-resolver-2.0.cc b/gcc/rust/resolve/rust-late-name-resolver-2.0.cc
index 6ac249b4cf22b4cba73a4865f4664cf12378e621..59aa4a8f6649ca9867123bc2b2bd23c15788a918 100644 (file)
--- a/gcc/rust/resolve/rust-late-name-resolver-2.0.cc
+++ b/gcc/rust/resolve/rust-late-name-resolver-2.0.cc
@@ -355,8 +355,8 @@ Late::visit (AST::PathInExpression &expr)
   if (!resolved)
     {
       if (!ctx.lookup (expr.get_segments ().front ().get_node_id ()))
-       rust_error_at (expr.get_locus (),
-                      "could not resolve path expression: %qs",
+       rust_error_at (expr.get_locus (), ErrorCode::E0433,
+                      "Cannot find path %qs in this scope",
                       expr.as_simple_path ().as_string ().c_str ());
       return;
     }

diff --git a/gcc/testsuite/rust/compile/nr2/exclude b/gcc/testsuite/rust/compile/nr2/exclude
index d3efe08a531eb0a3ac6daf8475c45f20ff0ea9ba..ed1241bcdf6bb1317641b2c40bd870faea9cd239 100644 (file)
--- a/gcc/testsuite/rust/compile/nr2/exclude
+++ b/gcc/testsuite/rust/compile/nr2/exclude
@@ -1,8 +1,6 @@
 canonical_paths1.rs
-cfg1.rs
 generics9.rs
 issue-3315-2.rs
-lookup_err1.rs
 multiple_bindings1.rs
 multiple_bindings2.rs
 privacy5.rs