From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 2AABA383F978; Thu, 30 Jun 2022 18:50:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2AABA383F978 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 #1151 #1343 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: 9976c571ff14dc8e3da3ecd719f42b903a30f466 X-Git-Newrev: 81abc8623cb75fa18315c65e94c5965ec36fdb54 Message-Id: <20220630185058.2AABA383F978@sourceware.org> Date: Thu, 30 Jun 2022 18:50: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: Thu, 30 Jun 2022 18:50:58 -0000 https://gcc.gnu.org/g:81abc8623cb75fa18315c65e94c5965ec36fdb54 commit 81abc8623cb75fa18315c65e94c5965ec36fdb54 Merge: 9976c571ff1 0c290e7c6f3 1282974cf89 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Wed Jun 29 14:07:33 2022 +0000 Merge #1151 #1343 1151: backend: handle deprecated attribute r=philberty a=liushuyu - handle the `deprecated` attribute 1343: Ensure we support generic arguments on mangled type-paths r=philberty a=philberty This allows us to have the generic arguments within type paths for mangled symbols such as those in impl-blocks. This also updates our symbol managling to mangle comma's to $C$. Co-authored-by: liushuyu Co-authored-by: Philip Herron Diff: gcc/rust/ast/rust-ast-full-test.cc | 9 ++- gcc/rust/ast/rust-ast.h | 2 + gcc/rust/ast/rust-macro.h | 8 +++ gcc/rust/backend/rust-compile-base.cc | 73 ++++++++++++++++++++++++- gcc/rust/backend/rust-compile-base.h | 3 + gcc/rust/backend/rust-mangle.cc | 6 ++ gcc/rust/resolve/rust-ast-resolve-type.cc | 47 +++++++++++++++- gcc/rust/rust-gcc.cc | 10 ++++ gcc/rust/util/rust-attributes.cc | 1 + gcc/testsuite/rust/compile/attr_deprecated.rs | 14 +++++ gcc/testsuite/rust/compile/attr_deprecated_2.rs | 11 ++++ 11 files changed, 181 insertions(+), 3 deletions(-)