Merge #1776

1776: fixed compiler error message on wildcard pattern within expression r=CohenArthur a=00AR

Signed-off-by: Abdul Rafey <abdulrafeyq@gmail.com>

fixed compiler error message on wildcard pattern '_'  within expression.
Added a new testcase for the same.
#867 

Co-authored-by: Abdul Rafey <abdulrafeyq@gmail.com>

2 files changed, 14 insertions, 0 deletions

diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h
index 7e4e794..f60d34f 100644
--- a/gcc/rust/parse/rust-parse-impl.h
+++ b/gcc/rust/parse/rust-parse-impl.h
@@ -13015,6 +13015,12 @@ Parser<ManagedTokenSource>::null_denotation (const_TokenPtr tok,
     case UNSAFE:
       return parse_unsafe_block_expr (std::move (outer_attrs),
 				      tok->get_locus ());
+    case UNDERSCORE:
+      add_error (
+	Error (tok->get_locus (),
+	       "use of %qs is not allowed on the right-side of an assignment",
+	       tok->get_token_description ()));
+      return nullptr;
     default:
       if (!restrictions.expr_can_be_null)
 	add_error (Error (tok->get_locus (),
diff --git a/gcc/testsuite/rust/compile/issue-867.rs b/gcc/testsuite/rust/compile/issue-867.rs
new file mode 100644
index 0000000..8e12068
--- /dev/null
+++ b/gcc/testsuite/rust/compile/issue-867.rs
@@ -0,0 +1,8 @@
+fn main() {
+    let _ = 42;
+    let a = _ + 123; // { dg-error "use of '_' is not allowed on the right-side of an assignment" }
+                     // { dg-error {failed to parse expression in let statement} "" { target *-*-* } .-1  }
+                     // { dg-error {failed to parse statement or expression without block in block expression} "" { target *-*-* } .-2 }
+                     // { dg-error {unrecognised token '\}' for start of item} "" { target *-*-* } .+2 }
+                     // { dg-error {failed to parse item in crate} "" { target *-*-* } .+1 }
+}