diff options
| author | Owen Avery <powerboat9.gamer@gmail.com> | 2025-02-25 10:16:18 -0500 |
|---|---|---|
| committer | CohenArthur <arthur.cohen@embecosm.com> | 2025-02-25 15:45:53 +0000 |
| commit | 3ebd4c90f8c912ec53e229e506d458c3ca3cd9a1 (patch) | |
| tree | dafd67217eb6ecff68ca5298234f60a69427b8ba | |
| parent | b1e30683d9ba61181b68d21489a616f5f86d9263 (diff) | |
| download | gcc-3ebd4c90f8c912ec53e229e506d458c3ca3cd9a1.zip gcc-3ebd4c90f8c912ec53e229e506d458c3ca3cd9a1.tar.gz gcc-3ebd4c90f8c912ec53e229e506d458c3ca3cd9a1.tar.bz2 | |
Adjust unknown macro error message
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 <powerboat9.gamer@gmail.com>
| -rw-r--r-- | gcc/rust/resolve/rust-early-name-resolver-2.0.cc | 3 | ||||
| -rw-r--r-- | gcc/rust/resolve/rust-early-name-resolver.cc | 3 | ||||
| -rw-r--r-- | gcc/testsuite/rust/compile/macros/mbe/macro43.rs | 2 | ||||
| -rw-r--r-- | gcc/testsuite/rust/compile/macros/mbe/macro44.rs | 2 | ||||
| -rw-r--r-- | gcc/testsuite/rust/compile/nested_macro_use2.rs | 2 | ||||
| -rw-r--r-- | 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 319bc1d..1b8f659 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 c67e45d..77c7182 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 992bc77..fbc36a9 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 dabac6f..0cfd987 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 4659500..7bb6154 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 6dba0f7..02da99d 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 |