From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id B85CF385C31E; Thu, 9 Jun 2022 06:17:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B85CF385C31E 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 #1299 #1300 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: 9d81164aa0447c738fe0435de14ec9666a03d5da X-Git-Newrev: 8f47bc322cc0e49fd249a63292173821a70d9a53 Message-Id: <20220609061709.B85CF385C31E@sourceware.org> Date: Thu, 9 Jun 2022 06:17:09 +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, 09 Jun 2022 06:17:09 -0000 https://gcc.gnu.org/g:8f47bc322cc0e49fd249a63292173821a70d9a53 commit 8f47bc322cc0e49fd249a63292173821a70d9a53 Merge: 9d81164aa04 46e248fb7fe ab0f9f9e1b9 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Wed Jun 8 15:25:06 2022 +0000 Merge #1299 #1300 1299: rust/lex: skip broken string expression r=philberty a=liushuyu - rust/lex: skip broken string expression and unstuck the parser when it could not advance should fix #1297 1300: docker: Fix GCCRS_BUILD info r=CohenArthur a=CohenArthur Sometimes, the GCCRS_BUILD file would end up empty. I believe this is due to how Dockerfiles work in that there was a "race condition" between the two `RUN` commands. Hopefully this should fix it. Co-authored-by: liushuyu Co-authored-by: Arthur Cohen Diff: Dockerfile | 4 +-- gcc/rust/lex/rust-lex.cc | 32 ++++++++++++++++++++++ gcc/rust/lex/rust-lex.h | 1 + gcc/rust/parse/rust-parse-impl.h | 3 +- .../rust/compile/torture/check-doc-attr-string.rs | 13 +++++++++ .../compile/torture/very-broken-attr-string.rs | 3 ++ 6 files changed, 52 insertions(+), 4 deletions(-)