From: Owen Avery <[email protected]>
gcc/rust/ChangeLog:
* resolve/rust-early-name-resolver-2.0.cc
(Early::visit): Adjust error produced when macro resolution
fails.
* resolve/rust-early-name-resolver.cc
(EarlyNameResolver::visit): Likewise.
gcc/testsuite/ChangeLog:
* rust/compile/macros/mbe/macro43.rs: Adjust expected errors.
* rust/compile/macros/mbe/macro44.rs: Likewise.
* rust/compile/nested_macro_use2.rs: Likewise.
* rust/compile/nr2/exclude: Remove entries.
Signed-off-by: Owen Avery <[email protected]>
---
gcc/rust/resolve/rust-early-name-resolver-2.0.cc | 3 ++-
gcc/rust/resolve/rust-early-name-resolver.cc | 3 ++-
gcc/testsuite/rust/compile/macros/mbe/macro43.rs | 2 +-
gcc/testsuite/rust/compile/macros/mbe/macro44.rs | 2 +-
gcc/testsuite/rust/compile/nested_macro_use2.rs | 2 +-
gcc/testsuite/rust/compile/nr2/exclude | 2 --
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/gcc/rust/resolve/rust-early-name-resolver-2.0.cc
b/gcc/rust/resolve/rust-early-name-resolver-2.0.cc
index 764be45e34c..b894d130ccf 100644
--- a/gcc/rust/resolve/rust-early-name-resolver-2.0.cc
+++ b/gcc/rust/resolve/rust-early-name-resolver-2.0.cc
@@ -280,7 +280,8 @@ Early::visit (AST::MacroInvocation &invoc)
if (!definition.has_value ())
{
collect_error (Error (invoc.get_locus (), ErrorCode::E0433,
- "could not resolve macro invocation"));
+ "could not resolve macro invocation %qs",
+ path.as_string ().c_str ()));
return;
}
diff --git a/gcc/rust/resolve/rust-early-name-resolver.cc
b/gcc/rust/resolve/rust-early-name-resolver.cc
index a8df631200c..fc9a26ccac0 100644
--- a/gcc/rust/resolve/rust-early-name-resolver.cc
+++ b/gcc/rust/resolve/rust-early-name-resolver.cc
@@ -477,7 +477,8 @@ EarlyNameResolver::visit (AST::MacroInvocation &invoc)
bool found = resolver.get_macro_scope ().lookup (seg, &resolved_node);
if (!found)
{
- rust_error_at (invoc.get_locus (), "unknown macro: [%s]",
+ rust_error_at (invoc.get_locus (), ErrorCode::E0433,
+ "could not resolve macro invocation %qs",
seg.get ().c_str ());
return;
}
diff --git a/gcc/testsuite/rust/compile/macros/mbe/macro43.rs
b/gcc/testsuite/rust/compile/macros/mbe/macro43.rs
index 992bc77cedf..fbc36a9d6e5 100644
--- a/gcc/testsuite/rust/compile/macros/mbe/macro43.rs
+++ b/gcc/testsuite/rust/compile/macros/mbe/macro43.rs
@@ -48,7 +48,7 @@ macro_rules! nonzero_integers {
}
- impl_nonzero_fmt! { // { dg-error "unknown macro" }
+ impl_nonzero_fmt! { // { dg-error "could not resolve macro
invocation" }
(Debug, Display, Binary, Octal, LowerHex, UpperHex) for $Ty
}
)+
diff --git a/gcc/testsuite/rust/compile/macros/mbe/macro44.rs
b/gcc/testsuite/rust/compile/macros/mbe/macro44.rs
index dabac6f7844..0cfd98718b4 100644
--- a/gcc/testsuite/rust/compile/macros/mbe/macro44.rs
+++ b/gcc/testsuite/rust/compile/macros/mbe/macro44.rs
@@ -16,7 +16,7 @@ mod foo {
}
fn bar_f() {
- baz!(); // { dg-error "unknown macro" }
+ baz!(); // { dg-error "could not resolve macro invocation" }
}
}
diff --git a/gcc/testsuite/rust/compile/nested_macro_use2.rs
b/gcc/testsuite/rust/compile/nested_macro_use2.rs
index 46595008710..7bb6154c28c 100644
--- a/gcc/testsuite/rust/compile/nested_macro_use2.rs
+++ b/gcc/testsuite/rust/compile/nested_macro_use2.rs
@@ -8,5 +8,5 @@ mod foo {
}
fn main() {
- baz!(); // { dg-error "unknown macro: .baz." }
+ baz!(); // { dg-error "could not resolve macro invocation .baz." }
}
diff --git a/gcc/testsuite/rust/compile/nr2/exclude
b/gcc/testsuite/rust/compile/nr2/exclude
index 6dba0f71705..02da99de52f 100644
--- a/gcc/testsuite/rust/compile/nr2/exclude
+++ b/gcc/testsuite/rust/compile/nr2/exclude
@@ -21,11 +21,9 @@ issue-855.rs
iterators1.rs
lookup_err1.rs
macros/mbe/macro43.rs
-macros/mbe/macro44.rs
macros/mbe/macro6.rs
multiple_bindings1.rs
multiple_bindings2.rs
-nested_macro_use2.rs
not_find_value_in_scope.rs
privacy5.rs
privacy8.rs
--
2.45.2
