bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Format required methods on traits

Browse source
This commit is contained in:
Marcus Klaas 2015-05-04 00:12:39 +02:00
commit 4aa3518703
4 changed files with 110 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/visitor.rs
View file

@ -107,7 +107,7 @@ impl<'a, 'v> visit::Visitor<'v> for FmtVisitor<'a> {
unsafety,
abi,
vis,
b.span);
b.span.lo);
self.changes.push_str_span(s, &new_fn);
}
visit::FkMethod(ident, ref sig, vis) => {
@ -119,7 +119,7 @@ impl<'a, 'v> visit::Visitor<'v> for FmtVisitor<'a> {
&sig.unsafety,
&sig.abi,
vis.unwrap_or(ast::Visibility::Inherited),
b.span);
b.span.lo);
self.changes.push_str_span(s, &new_fn);
}
visit::FkFnBlock(..) => {}
@ -190,6 +190,21 @@ impl<'a, 'v> visit::Visitor<'v> for FmtVisitor<'a> {
if self.visit_attrs(&ti.attrs) {
return;
}
if let ast::TraitItem_::MethodTraitItem(ref sig, None) = ti.node {
self.format_missing_with_indent(ti.span.lo);
let indent = self.block_indent;
let new_fn = self.rewrite_required_fn(indent,
ti.ident,
sig,
ti.span);
self.changes.push_str_span(ti.span, &new_fn);
self.last_pos = ti.span.hi;
}
// TODO format trait types
visit::walk_trait_item(self, ti)
}