aboutsummaryrefslogtreecommitdiff
path: root/gcc/testsuite/rust/compile
diff options
context:
space:
mode:
authorOwen Avery <powerboat9.gamer@gmail.com>2025-02-23 16:45:41 -0500
committerArthur Cohen <arthur.cohen@embecosm.com>2025-03-24 13:30:43 +0100
commit853f57877d56db503075c1ea3ffc29a005c6489c (patch)
tree1a4f5cbf624347c07b68347529fa6f0123b67140 /gcc/testsuite/rust/compile
parentf1ccfd074bc3a95eb6289c08b44f79aed8ad7b84 (diff)
downloadgcc-853f57877d56db503075c1ea3ffc29a005c6489c.zip
gcc-853f57877d56db503075c1ea3ffc29a005c6489c.tar.gz
gcc-853f57877d56db503075c1ea3ffc29a005c6489c.tar.bz2
gccrs: Modify multiple definition error
gcc/rust/ChangeLog: * resolve/rust-ast-resolve-expr.cc (ResolveExpr::visit): Modify error message. * resolve/rust-ast-resolve-implitem.h (ResolveToplevelImplItem::visit): Likewise. (ResolveTopLevelTraitItems::visit): Likewise. (ResolveToplevelExternItem::visit): Likewise. * resolve/rust-ast-resolve-stmt.cc (ResolveStmt::visit): Likewise. * resolve/rust-ast-resolve-stmt.h (ResolveStmt::visit): Likewise. * resolve/rust-ast-resolve-toplevel.h (ResolveTopLevel::visit): Likewise. * resolve/rust-ast-resolve-type.h (ResolveGenericParams::visit): Likewise. gcc/testsuite/ChangeLog: * rust/compile/nr2/exclude: Remove entries. * rust/compile/redef_error2.rs: Modify expected error. * rust/compile/redef_error5.rs: Likewise. Signed-off-by: Owen Avery <powerboat9.gamer@gmail.com>
Diffstat (limited to 'gcc/testsuite/rust/compile')
-rw-r--r--gcc/testsuite/rust/compile/nr2/exclude2
-rw-r--r--gcc/testsuite/rust/compile/redef_error2.rs2
-rw-r--r--gcc/testsuite/rust/compile/redef_error5.rs2
3 files changed, 2 insertions, 4 deletions
diff --git a/gcc/testsuite/rust/compile/nr2/exclude b/gcc/testsuite/rust/compile/nr2/exclude
index 6b8cf98..de58248 100644
--- a/gcc/testsuite/rust/compile/nr2/exclude
+++ b/gcc/testsuite/rust/compile/nr2/exclude
@@ -25,8 +25,6 @@ privacy8.rs
pub_restricted_1.rs
pub_restricted_2.rs
pub_restricted_3.rs
-redef_error2.rs
-redef_error5.rs
sizeof-stray-infer-var-bug.rs
struct-expr-parse.rs
undeclared_label.rs
diff --git a/gcc/testsuite/rust/compile/redef_error2.rs b/gcc/testsuite/rust/compile/redef_error2.rs
index 65793bc..ed946f8 100644
--- a/gcc/testsuite/rust/compile/redef_error2.rs
+++ b/gcc/testsuite/rust/compile/redef_error2.rs
@@ -1,4 +1,4 @@
const TEST: i32 = 2;
-const TEST: f32 = 3.0; // { dg-error "redefined multiple times" }
+const TEST: f32 = 3.0; // { dg-error "defined multiple times" }
fn main() {}
diff --git a/gcc/testsuite/rust/compile/redef_error5.rs b/gcc/testsuite/rust/compile/redef_error5.rs
index dc6ad50..b3d71e1 100644
--- a/gcc/testsuite/rust/compile/redef_error5.rs
+++ b/gcc/testsuite/rust/compile/redef_error5.rs
@@ -2,7 +2,7 @@ struct Foo(i32, bool);
impl Foo {
const TEST: i32 = 123;
- const TEST: bool = false; // { dg-error "redefined multiple times" }
+ const TEST: bool = false; // { dg-error "defined multiple times" }
}
fn main() {}