From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7905) id 744A23858426; Tue, 16 Jan 2024 18:08:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 744A23858426 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1705428526; bh=kzyOQ2D3heZkgRtpOm6EW6eet2m+3RcX5pKZaU2wFeY=; h=From:To:Subject:Date:From; b=KSyyETZX59z1x2mgz0NOcN2PDHPenvPwoHGBw+IB2+8dn3JYYSQQ///NwWh2ojQsg Cf9c29IUs5CijkI66wHJ8L78ObqR6SwxjbEsMxBxGkKs5eFjvDOlDwM1TUflxvpfzT Mk0HojvXtUBmz6Q0PZke/njF2SzekLwFeYPvIf8o= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Arthur Cohen To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-7958] gccrs: [E0658] top level or-patterns are not allowed let binding X-Act-Checkin: gcc X-Git-Author: Muhammad Mahad X-Git-Refname: refs/heads/trunk X-Git-Oldrev: c00624a6c8b9a08b10674abff7826ac990e9248a X-Git-Newrev: 5c339c29f9aa61a2bb0488ca2b3456b2e5c53480 Message-Id: <20240116180846.744A23858426@sourceware.org> Date: Tue, 16 Jan 2024 18:08:46 +0000 (GMT) List-Id: https://gcc.gnu.org/g:5c339c29f9aa61a2bb0488ca2b3456b2e5c53480 commit r14-7958-g5c339c29f9aa61a2bb0488ca2b3456b2e5c53480 Author: Muhammad Mahad Date: Fri Aug 18 17:06:02 2023 +0500 gccrs: [E0658] top level or-patterns are not allowed let binding gcc/rust/ChangeLog: * hir/rust-ast-lower-pattern.cc (ASTLoweringPattern::visit): Added richlocation & error code. gcc/testsuite/ChangeLog: * rust/compile/let_alt.rs: Updated comment. Signed-off-by: Muhammad Mahad Diff: --- gcc/rust/hir/rust-ast-lower-pattern.cc | 9 ++++++--- gcc/testsuite/rust/compile/let_alt.rs | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gcc/rust/hir/rust-ast-lower-pattern.cc b/gcc/rust/hir/rust-ast-lower-pattern.cc index 37f00157641..bfb7b71cef2 100644 --- a/gcc/rust/hir/rust-ast-lower-pattern.cc +++ b/gcc/rust/hir/rust-ast-lower-pattern.cc @@ -333,9 +333,12 @@ ASTLoweringPattern::visit (AST::AltPattern &pattern) = new HIR::AltPattern (mapping, std::move (alts), pattern.get_locus ()); if (is_let_top_level) - rust_error_at (pattern.get_locus (), - "top level alternate patterns are not allowed for % " - "bindings - use an outer grouped pattern"); + { + rich_location richloc (line_table, pattern.get_locus ()); + richloc.add_fixit_replace ("use an outer grouped pattern"); + rust_error_at ( + richloc, "top level or-patterns are not allowed for % bindings"); + } } } // namespace HIR diff --git a/gcc/testsuite/rust/compile/let_alt.rs b/gcc/testsuite/rust/compile/let_alt.rs index 1284627bb72..a2735bdbe77 100644 --- a/gcc/testsuite/rust/compile/let_alt.rs +++ b/gcc/testsuite/rust/compile/let_alt.rs @@ -1,4 +1,4 @@ fn main() { let _a | _a = 12; - // { dg-error "top level alternate patterns are not allowed" "" { target *-*-* } .-1 } + // { dg-error "top level or-patterns are not allowed for .let. bindings" "" { target *-*-* } .-1 } }