mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3050 from andrehjr/empty-impl-body-with-braces-newline

Browse Source 
Trait Implementation - Adds a newline before the last brace on impls without a body if the first brace is also on a newline
This commit is contained in:
Seiichi Uchida 2018-09-28 11:10:58 +09:00 committed by GitHub
commit 86fff9eafa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/items.rs
View File

@ -755,11 +755,10 @@ pub fn format_impl(
result.push_str(&inner_indent_str); result.push_str(&inner_indent_str);
result.push_str(visitor.buffer.to_string().trim()); result.push_str(visitor.buffer.to_string().trim());
result.push_str(&outer_indent_str); result.push_str(&outer_indent_str);
} } else if need_newline || !context.config.empty_item_single_line() {
if result.ends_with('{') && !context.config.empty_item_single_line() {
result.push_str(&sep); result.push_str(&sep);
} }
result.push('}'); result.push('}');
Some(result) Some(result)

3
tests/target/big-impl-block.rs
View File

@ -78,4 +78,5 @@ where
S: event::Stream, S: event::Stream,
F: for<'t> FnMut(transform::Api<'t, Stream<ContentStream<S>>>) -> transform::Api<'t, X>, F: for<'t> FnMut(transform::Api<'t, Stream<ContentStream<S>>>) -> transform::Api<'t, X>,
X: event::Stream, X: event::Stream,
{} {
}

12
tests/target/impls.rs
View File

@ -134,11 +134,13 @@ mod m {
impl<BorrowType, K, V, NodeType, HandleType> impl<BorrowType, K, V, NodeType, HandleType>
Handle<NodeRef<BorrowType, K, V, NodeType>, HandleType> Handle<NodeRef<BorrowType, K, V, NodeType>, HandleType>
{} {
}
impl<BorrowType, K, V, NodeType, HandleType> PartialEq impl<BorrowType, K, V, NodeType, HandleType> PartialEq
for Handle<NodeRef<BorrowType, K, V, NodeType>, HandleType> for Handle<NodeRef<BorrowType, K, V, NodeType>, HandleType>
{} {
}
mod x { mod x {
impl<A, B, C, D> Foo impl<A, B, C, D> Foo
@ -147,7 +149,8 @@ mod x {
B: 'static, B: 'static,
C: 'static, C: 'static,
D: 'static, D: 'static,
{} {
}
} }
impl<ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNodeFoo> impl<ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNodeFoo>
@ -229,4 +232,5 @@ impl<'seq1, 'seq2, 'body, 'scope, Channel>
> >
where where
Channel: DmaChannel, Channel: DmaChannel,
{} {
}