diff options
| author | Gaëtan Cassiers <gaetan.cassiers@gmail.com> | 2015-05-25 13:21:29 +0200 |
|---|---|---|
| committer | Gaëtan Cassiers <gaetan.cassiers@gmail.com> | 2015-05-25 13:22:10 +0200 |
| commit | 113bdaa119d856bdca0a87b20ab41d62a76f1723 (patch) | |
| tree | babb9a51dfe7529f9e06f3c11c196a90ac22bebb /src | |
| parent | b7579f6f6d9799b13259417f66c008b4f0a1ed38 (diff) | |
Fix #79
Diffstat (limited to 'src')
| -rw-r--r-- | src/items.rs | 7 | ||||
| -rw-r--r-- | src/visitor.rs | 9 |
2 files changed, 15 insertions, 1 deletions
diff --git a/src/items.rs b/src/items.rs index 55613ab1bb8..3b174190643 100644 --- a/src/items.rs +++ b/src/items.rs @@ -27,6 +27,7 @@ impl<'a> FmtVisitor<'a> { explicit_self: Option<&ast::ExplicitSelf>, generics: &ast::Generics, unsafety: &ast::Unsafety, + constness: &ast::Constness, abi: &abi::Abi, vis: ast::Visibility, span_end: BytePos) @@ -40,6 +41,7 @@ impl<'a> FmtVisitor<'a> { explicit_self, generics, unsafety, + constness, abi, vis, span_end, @@ -74,6 +76,7 @@ impl<'a> FmtVisitor<'a> { Some(&sig.explicit_self), &sig.generics, &sig.unsafety, + &sig.constness, &sig.abi, ast::Visibility::Inherited, span_end, @@ -92,6 +95,7 @@ impl<'a> FmtVisitor<'a> { explicit_self: Option<&ast::ExplicitSelf>, generics: &ast::Generics, unsafety: &ast::Unsafety, + constness: &ast::Constness, abi: &abi::Abi, vis: ast::Visibility, span_end: BytePos, @@ -111,6 +115,9 @@ impl<'a> FmtVisitor<'a> { if let &ast::Unsafety::Unsafe = unsafety { result.push_str("unsafe "); } + if let &ast::Constness::Const = constness { + result.push_str("const "); + } if *abi != abi::Rust { result.push_str("extern "); result.push_str(&abi.to_string()); diff --git a/src/visitor.rs b/src/visitor.rs index 256c1e6e132..c15b3c34af0 100644 --- a/src/visitor.rs +++ b/src/visitor.rs @@ -98,13 +98,19 @@ impl<'a, 'v> visit::Visitor<'v> for FmtVisitor<'a> { let indent = self.block_indent; match fk { - visit::FkItemFn(ident, ref generics, ref unsafety, ref abi, vis) => { + visit::FkItemFn(ident, + ref generics, + ref unsafety, + ref constness, + ref abi, + vis) => { let new_fn = self.rewrite_fn(indent, ident, fd, None, generics, unsafety, + constness, abi, vis, b.span.lo); @@ -117,6 +123,7 @@ impl<'a, 'v> visit::Visitor<'v> for FmtVisitor<'a> { Some(&sig.explicit_self), &sig.generics, &sig.unsafety, + &sig.constness, &sig.abi, vis.unwrap_or(ast::Visibility::Inherited), b.span.lo); |