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

Preserve polarity on negative non-trait impl

Browse Source
This commit is contained in:
David Tolnay 2020-11-30 18:57:07 -08:00 committed by Caleb Cartwright
parent 29f33eb7d6
commit 96ee060529
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/items.rs
View File

@ -857,6 +857,8 @@ fn format_impl_ref_and_type(
ast::ImplPolarity::Positive => "", ast::ImplPolarity::Positive => "",
}; };
let polarity_overhead;
let trait_ref_overhead;
if let Some(ref trait_ref) = *trait_ref { if let Some(ref trait_ref) = *trait_ref {
let result_len = last_line_width(&result); let result_len = last_line_width(&result);
result.push_str(&rewrite_trait_ref( result.push_str(&rewrite_trait_ref(
@ -866,11 +868,14 @@ fn format_impl_ref_and_type(
polarity_str, polarity_str,
result_len, result_len,
)?); )?);
polarity_overhead = 0; // already written
trait_ref_overhead = " for".len();
} else {
polarity_overhead = polarity_str.len();
trait_ref_overhead = 0;
} }
// Try to put the self type in a single line. // Try to put the self type in a single line.
// ` for`
let trait_ref_overhead = if trait_ref.is_some() { 4 } else { 0 };
let curly_brace_overhead = if generics.where_clause.predicates.is_empty() { let curly_brace_overhead = if generics.where_clause.predicates.is_empty() {
// If there is no where-clause adapt budget for type formatting to take space and curly // If there is no where-clause adapt budget for type formatting to take space and curly
// brace into account. // brace into account.
@ -881,7 +886,10 @@ fn format_impl_ref_and_type(
} else { } else {
0 0
}; };
let used_space = last_line_width(&result) + trait_ref_overhead + curly_brace_overhead; let used_space = last_line_width(&result)
+ polarity_overhead
+ trait_ref_overhead
+ curly_brace_overhead;
// 1 = space before the type. // 1 = space before the type.
let budget = context.budget(used_space + 1); let budget = context.budget(used_space + 1);
if let Some(self_ty_str) = self_ty.rewrite(context, Shape::legacy(budget, offset)) { if let Some(self_ty_str) = self_ty.rewrite(context, Shape::legacy(budget, offset)) {
@ -890,6 +898,7 @@ fn format_impl_ref_and_type(
result.push_str(" for "); result.push_str(" for ");
} else { } else {
result.push(' '); result.push(' ');
result.push_str(polarity_str);
} }
result.push_str(&self_ty_str); result.push_str(&self_ty_str);
return Some(result); return Some(result);
@ -903,8 +912,10 @@ fn format_impl_ref_and_type(
result.push_str(&new_line_offset.to_string(context.config)); result.push_str(&new_line_offset.to_string(context.config));
if trait_ref.is_some() { if trait_ref.is_some() {
result.push_str("for "); result.push_str("for ");
} else {
result.push_str(polarity_str);
} }
let budget = context.budget(last_line_width(&result)); let budget = context.budget(last_line_width(&result) + polarity_overhead);
let type_offset = match context.config.indent_style() { let type_offset = match context.config.indent_style() {
IndentStyle::Visual => new_line_offset + trait_ref_overhead, IndentStyle::Visual => new_line_offset + trait_ref_overhead,
IndentStyle::Block => new_line_offset, IndentStyle::Block => new_line_offset,