bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Re-add support for parsing (and pretty-printing) inner-attributes within body of a match.

Browse source 
In other words, we can do `match EXPR { #![inner_attr] ARM_1 ARM_2 ... }` again.

I believe this unbreaks the only four crates that crater flagged as broken by PR 83312.

(I am putting this up so that the lang-team can check it out and decide whether
it changes their mind about what to do regarding PR 83312.)
This commit is contained in:
Felix S. Klock II 2021-05-11 15:18:09 -04:00
parent 2bafe96272
commit 75d6293128
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_ast_pretty/src/pprust/state.rs
View file

@ -366,6 +366,10 @@ pub trait PrintState<'a>: std::ops::Deref<Target = pp::Printer> + std::ops::Dere
self.print_either_attributes(attrs, ast::AttrStyle::Inner, false, true)
}
fn print_inner_attributes_no_trailing_hardbreak(&mut self, attrs: &[ast::Attribute]) {
self.print_either_attributes(attrs, ast::AttrStyle::Inner, false, false)
}
fn print_outer_attributes(&mut self, attrs: &[ast::Attribute]) {
self.print_either_attributes(attrs, ast::AttrStyle::Outer, false, true)
}
@ -1940,6 +1944,7 @@ impl<'a> State<'a> {
self.print_expr_as_cond(expr);
self.s.space();
self.bopen();
self.print_inner_attributes_no_trailing_hardbreak(attrs);
for arm in arms {
self.print_arm(arm);
}