nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-28 02:57:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

snuggle where

Browse Source
This commit is contained in:
csmoe 2018-05-31 18:33:45 +08:00
parent 8536c288f2
commit 0468c134f4
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/items.rs
View File

@ -651,9 +651,15 @@ pub fn format_impl(
};
let mut option = WhereClauseOption::snuggled(&ref_and_type);
if items.is_empty() && generics.where_clause.predicates.len() == 1 {
option.compress_where();
let snippet = context.snippet(item.span);
let open_pos = snippet.find_uncommented("{")? + 1;
if !contains_comment(&snippet[open_pos..])
&& items.is_empty()
&& generics.where_clause.predicates.len() == 1
{
option.suppress_comma();
option.snuggle();
option.compress_where();
}
let mut where_clause_str = rewrite_where_clause(
@ -1386,9 +1392,9 @@ fn format_tuple_struct(
// We need to put the where clause on a new line, but we didn't
// know that earlier, so the where clause will not be indented properly.
result.push('\n');
result
.push_str(&(offset.block_only() + (context.config.tab_spaces() - 1))
.to_string(context.config));
result.push_str(
&(offset.block_only() + (context.config.tab_spaces() - 1)).to_string(context.config),
);
}
result.push_str(&where_clause_str);
@ -2147,6 +2153,10 @@ impl WhereClauseOption {
pub fn compress_where(&mut self) {
self.compress_where = true
}
pub fn snuggle(&mut self) {
self.snuggle = true
}
}
fn rewrite_args(