From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id CAA4938207CF; Wed, 8 Jun 2022 12:34:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CAA4938207CF 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 #1139 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: cb42c3674a5a9ab77cb0c1216a1b776c323037e2 X-Git-Newrev: 243ef0dfe713a9fc8d4d80feb488a58b2639f39f Message-Id: <20220608123434.CAA4938207CF@sourceware.org> Date: Wed, 8 Jun 2022 12:34:34 +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:34:34 -0000 https://gcc.gnu.org/g:243ef0dfe713a9fc8d4d80feb488a58b2639f39f commit 243ef0dfe713a9fc8d4d80feb488a58b2639f39f Merge: cb42c3674a5 a1c34b478fe Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Thu Apr 21 19:25:01 2022 +0000 Merge #1139 1139: hir: improve doc attribute handling r=philberty a=liushuyu - hir: improve doc attribute handling Addresses #1140 Co-authored-by: liushuyu Diff: gcc/rust/hir/rust-ast-lower-base.cc | 27 ++++++++++++++++++++++- gcc/rust/hir/rust-ast-lower-base.h | 3 +++ gcc/rust/util/rust-attributes.cc | 9 ++++---- gcc/testsuite/rust/compile/torture/doc_comment.rs | 16 ++++++++++++++ 4 files changed, 50 insertions(+), 5 deletions(-)