From: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Fri, 10 Feb 2023 10:17:07 +0000 (+0000) Subject: Merge #1810 #1823 #1824 #1837 #1839 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d5d7a66ac7753f04e882d57388ca060f567d0a0;p=thirdparty%2Fgcc.git Merge #1810 #1823 #1824 #1837 #1839 1810: fixed indentation in AST pretty printed expanded dump of trait. r=CohenArthur a=00AR fixes #1785 Signed-off-by: Abdul Rafey --- In Dump::visit (TraitImpl), the for loop adds indentation before calling visit () on every iteration. I think when Dump::visit (Method) is executed it adds extra indentation on top of it. 1823: parser: Improve parsing of complex generic arguments r=CohenArthur a=CohenArthur The parser was missing code for handling complex type arguments such as type paths or nested generics. gcc/rust/ChangeLog: * parse/rust-parse-impl.h (Parser::parse_generic_arg): Handle type paths and nested generics properly. gcc/testsuite/ChangeLog: * rust/compile/parse_complex_generic_application.rs: New test. * rust/compile/parse_complex_generic_application2.rs: New test. 1824: parser: Fix parsing of closure param list r=CohenArthur a=CohenArthur gcc/rust/ChangeLog: * parse/rust-parse-impl.h (Parser::parse_closure_expr): Advance tokens properly when parsing closure param list. gcc/testsuite/ChangeLog: * rust/compile/closure_move_expr.rs: New test. 1837: typecheck: Refactor rust-hir-trait-reference.h r=CohenArthur a=P-E-P Move function body to their own cc file instead of keeping them in the header file. gcc/rust/ChangeLog: * Make-lang.in: Add `rust-hir-trait-reference.o`. * typecheck/rust-hir-trait-reference.h: Remove multiple function body. * typecheck/rust-hir-trait-reference.cc: Add multiple function body. Fixes #1835 1839: cli: Update safety warning message r=CohenArthur a=P-E-P The compiler's warning message about the safety flag did not match cargo-gccrs environment variable name anymore. gcc/rust/ChangeLog: * rust-session-manager.cc (Session::compile_crate): Update the environment variable name. Signed-off-by: Pierre-Emmanuel Patry Fixes #1829 Co-authored-by: Abdul Rafey Co-authored-by: Arthur Cohen Co-authored-by: Pierre-Emmanuel Patry --- 0d5d7a66ac7753f04e882d57388ca060f567d0a0