bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Extract fn rewrite methods from RewriteVisitor

Browse source
This commit is contained in:
Marcus Klaas 2015-11-22 13:45:51 +01:00
parent a871405f45
commit 1b0ae00488
3 changed files with 824 additions and 811 deletions
Download patch file Download diff file Expand all files Collapse all files

1224
src/items.rs
View file

File diff suppressed because it is too large Load diff

13
src/types.rs
View file

@ -492,13 +492,14 @@ impl Rewrite for ast::Ty {
None
}
}
ast::TyBareFn(..) => {
wrap_str(pprust::ty_to_string(self),
context.config.max_width,
width,
offset)
}
ast::TyBareFn(ref bare_fn) => bare_fn.rewrite(context, width, offset),
ast::TyMac(..) | ast::TyTypeof(..) => unreachable!(),
}
}
}
impl Rewrite for ast::BareFnTy {
fn rewrite(&self, context: &RewriteContext, width: usize, offset: Indent) -> Option<String> {
None
}
}

8
src/visitor.rs
View file

@ -220,8 +220,11 @@ impl<'a> FmtVisitor<'a> {
self.last_pos = item.span.hi;
}
ast::Item_::ItemStruct(ref def, ref generics) => {
let rewrite = {
let indent = self.block_indent;
let rewrite = self.format_struct("struct ",
let context = self.get_context();
::items::format_struct(&context,
"struct ",
item.ident,
item.vis,
def,
@ -233,7 +236,8 @@ impl<'a> FmtVisitor<'a> {
ast::VariantData::Tuple(..) => s + ";",
_ => s,
}
});
})
};
self.push_rewrite(item.span, rewrite);
}
ast::Item_::ItemEnum(ref def, ref generics) => {