From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 23B0E385740B; Wed, 15 Jun 2022 07:00:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 23B0E385740B Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] Merge #1312 X-Act-Checkin: gcc X-Git-Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: 61e95a9bf6d4e8cc4de7b2d2b4c1ac989fa76836 X-Git-Newrev: 44f2de02d478b5d3defa5f091ee6504fa5d2e2e6 Message-Id: <20220615070058.23B0E385740B@sourceware.org> Date: Wed, 15 Jun 2022 07:00:58 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jun 2022 07:00:58 -0000 https://gcc.gnu.org/g:44f2de02d478b5d3defa5f091ee6504fa5d2e2e6 commit 44f2de02d478b5d3defa5f091ee6504fa5d2e2e6 Merge: 61e95a9bf6d 8e22742c9ad Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Tue Jun 14 18:44:26 2022 +0000 Merge #1312 1312: Refactor generic parameter parsing and report order errors r=CohenArthur a=CohenArthur Closes #1311 This allows us to parse lifetimes and types (and later const generics) in any order without necessarily erroring out for the wrong reason. It also simplifies the code greatly and makes it easier to modify. This also removes an unused duplicate `parse_generic_params` function Co-authored-by: Arthur Cohen Diff: gcc/rust/ast/rust-ast.h | 11 + gcc/rust/ast/rust-item.h | 2 + gcc/rust/parse/rust-parse-impl.h | 403 +++++++------------------------ gcc/rust/parse/rust-parse.h | 4 +- gcc/testsuite/rust/compile/generics13.rs | 1 + 5 files changed, 106 insertions(+), 315 deletions(-)