diff options
| author | Muhammad Mahad <mahadtxt@gmail.com> | 2023-08-16 15:30:45 +0500 |
|---|---|---|
| committer | Philip Herron <philip.herron@embecosm.com> | 2023-08-30 21:55:31 +0000 |
| commit | 1c4f312e49d7baf4ec0db452b77c33695cb66938 (patch) | |
| tree | 7a2fd596c34a78868788702cab29736e58e53495 /gcc | |
| parent | aea10051a69fcdb6ade515bab9dc61177f0d339c (diff) | |
| download | gcc-1c4f312e49d7baf4ec0db452b77c33695cb66938.zip gcc-1c4f312e49d7baf4ec0db452b77c33695cb66938.tar.gz gcc-1c4f312e49d7baf4ec0db452b77c33695cb66938.tar.bz2 | |
gccrs: [E0769] Use of tuple struct/variant in struct variant
gcc/rust/ChangeLog:
* typecheck/rust-hir-type-check-pattern.cc (TypeCheckPattern::visit):
Added error code and rich location.
gcc/testsuite/ChangeLog:
* rust/compile/match4.rs:
Updated new error commment.
Signed-off-by: Muhammad Mahad <mahadtxt@gmail.com>
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/rust/typecheck/rust-hir-type-check-pattern.cc | 10 | ||||
| -rw-r--r-- | gcc/testsuite/rust/compile/match4.rs | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/gcc/rust/typecheck/rust-hir-type-check-pattern.cc b/gcc/rust/typecheck/rust-hir-type-check-pattern.cc index 66641b4..fd9cfd2 100644 --- a/gcc/rust/typecheck/rust-hir-type-check-pattern.cc +++ b/gcc/rust/typecheck/rust-hir-type-check-pattern.cc @@ -184,8 +184,14 @@ TypeCheckPattern::visit (HIR::StructPattern &pattern) { std::string variant_type = TyTy::VariantDef::variant_type_string (variant->get_variant_type ()); - rust_error_at (pattern.get_locus (), - "expected struct variant, found %s variant %s", + + rich_location rich_locus (line_table, pattern.get_locus ()); + std::string rich_msg = "use the tuple variant pattern syntax instead " + + variant->get_identifier () + "(_)"; + rich_locus.add_fixit_replace (rich_msg.c_str ()); + + rust_error_at (rich_locus, ErrorCode::E0769, + "%s variant %qs written as struct variant", variant_type.c_str (), variant->get_identifier ().c_str ()); return; diff --git a/gcc/testsuite/rust/compile/match4.rs b/gcc/testsuite/rust/compile/match4.rs index 35b90a6..552aa16 100644 --- a/gcc/testsuite/rust/compile/match4.rs +++ b/gcc/testsuite/rust/compile/match4.rs @@ -10,7 +10,7 @@ fn inspect(f: Foo) { Foo::A => {} Foo::B => {} Foo::C { a } => {} - // { dg-error "expected struct variant, found tuple variant C" "" { target *-*-* } .-1 } + // { dg-error "tuple variant .C. written as struct variant" "" { target *-*-* } .-1 } Foo::D { x, y } => {} } } |