[gcc/devel/rust/master] Merge #1299 #1300

[gcc/devel/rust/master] Merge #1299 #1300

[Thomas Schwinge]

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 <liushuyu011@gmail.com>
    Co-authored-by: Arthur Cohen <arthur.cohen@embecosm.com>

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(-)