From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 000043870847; Tue, 21 Jun 2022 10:33:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 000043870847 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 #1322 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: 76f7e45179de4e6e53caab104022cc0784ecd618 X-Git-Newrev: b711799e3eb450463a9f3be3b082b3ced9356358 Message-Id: <20220621103355.000043870847@sourceware.org> Date: Tue, 21 Jun 2022 10:33:54 +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: Tue, 21 Jun 2022 10:33:55 -0000 https://gcc.gnu.org/g:b711799e3eb450463a9f3be3b082b3ced9356358 commit b711799e3eb450463a9f3be3b082b3ced9356358 Merge: 76f7e45179d 747700e045c Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Fri Jun 17 14:34:20 2022 +0000 Merge #1322 1322: Fixes #1263; diagnostics/feature/wrapper r=CohenArthur a=ndrwnaguib * wrapping GCC's diagnostics `sorry_at` with a new rust macro named `rust_sorry_at` which accepts `Location` instead of the default `location_t`. * refactoring previous usage of `sorry_at` to `rust_sorry_at` Fixes #1263 Co-authored-by: andrewnaguib <24280372+ndrwnaguib@users.noreply.github.com> Diff: gcc/rust/backend/rust-compile-expr.cc | 4 ++-- gcc/rust/backend/rust-compile-pattern.cc | 3 +-- gcc/rust/privacy/rust-privacy-reporter.cc | 3 +-- gcc/rust/rust-diagnostics.h | 5 +++++ 4 files changed, 9 insertions(+), 6 deletions(-)