[gcc/devel/rust/master] Merge #934 #937

[gcc/devel/rust/master] Merge #934 #937

[Thomas Schwinge]

https://gcc.gnu.org/g:a5272f389b02623b8bc4aaeafcf84013dae7c9fb

commit a5272f389b02623b8bc4aaeafcf84013dae7c9fb
Merge: 733db624cf2 3ac17160c80 85d78c1b8dd
Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com>
Date:   Wed Feb 16 18:38:44 2022 +0000

    Merge #934 #937
    
    934: macromatch: Add location to abstract MacroMatch class r=philberty a=CohenArthur
    
    Closes #928
    
    This adds location to the all child classes of the `MacroMatch` abstract class. The current locations are as follow, which I believe is what is expected but might be wrong.
    
    ```rust
    test.rs:2:6: error: macro match fragment
        2 |     ($a:expr, $b:expr) => { $a + $b };
          |      ^
    test.rs:2:15: error: macro match fragment
        2 |     ($a:expr, $b:expr) => { $a + $b };
          |               ^
    test.rs:2:5: error: macro matcher
        2 |     ($a:expr, $b:expr) => { $a + $b };
          |     ^
    test.rs:3:8: error: macro match fragment
        3 |     ($($i:ident)*) => { $($i)* }
          |        ^
    test.rs:3:17: error: macro match repetition!
        3 |     ($($i:ident)*) => { $($i)* }
          |                 ^
    test.rs:3:5: error: macro matcher
        3 |     ($($i:ident)*) => { $($i)* }
          |     ^
    ```
    
    I think this should be rebased on #932 so that I can remove the FIXME
    
    937: dockerfile: Install cargo-gccrs alongside gccrs r=philberty a=CohenArthur
    
    Closes #826
    
    Co-authored-by: Arthur Cohen <arthur.cohen@embecosm.com>

Diff:

 Dockerfile                       |  5 +++-
 gcc/rust/ast/rust-ast.h          |  2 ++
 gcc/rust/ast/rust-macro.h        | 51 +++++++++++++++++++++++++---------------
 gcc/rust/parse/rust-parse-impl.h | 14 ++++++-----
 4 files changed, 46 insertions(+), 26 deletions(-)