From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 313BB380F3DC; Wed, 8 Jun 2022 12:16:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 313BB380F3DC 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 #999 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: 39c04258300be68a36b80f2f23929a97e8af1865 X-Git-Newrev: 77a49507446b67a6c207b4e4fec3639f536b9eca Message-Id: <20220608121643.313BB380F3DC@sourceware.org> Date: Wed, 8 Jun 2022 12:16:43 +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, 08 Jun 2022 12:16:43 -0000 https://gcc.gnu.org/g:77a49507446b67a6c207b4e4fec3639f536b9eca commit 77a49507446b67a6c207b4e4fec3639f536b9eca Merge: 39c04258300 749a419a2e9 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Wed Mar 9 17:17:25 2022 +0000 Merge #999 999: Refactor ABI options as part of HIR function qualifiers r=philberty a=philberty This is a refactor to cleanup HIR::ExternBlock and HIR::FunctionQualifiers to have an enum of ABI options to improve the error handling. Co-authored-by: Philip Herron Diff: gcc/rust/ast/rust-item.h | 22 +++++++------- gcc/rust/hir/rust-ast-lower-item.h | 14 +++++++-- gcc/rust/hir/rust-ast-lower.cc | 12 ++++++-- gcc/rust/hir/tree/rust-hir-full-test.cc | 10 ++----- gcc/rust/hir/tree/rust-hir-item.h | 36 +++++++---------------- gcc/rust/parse/rust-parse-impl.h | 4 +-- gcc/rust/typecheck/rust-hir-type-check-implitem.h | 10 ++----- gcc/testsuite/rust/compile/abi-options1.rs | 7 +++++ 8 files changed, 54 insertions(+), 61 deletions(-)