nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-14 02:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to fixup impls with long generics

Browse Source
This commit is contained in:
Nick Cameron 2017-03-10 15:58:35 +13:00
parent c8af03f475
commit a1d94e545c
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/items.rs
View File

@ -527,7 +527,7 @@ pub fn format_impl(context: &RewriteContext, item: &ast::Item, offset: Indent) -
context.config.where_density, context.config.where_density,
"{", "{",
false, false,
false, last_line_width(&ref_and_type) == 1,
None)); None));
if try_opt!(is_impl_single_line(context, &items, &result, &where_clause_str, &item)) { if try_opt!(is_impl_single_line(context, &items, &result, &where_clause_str, &item)) {
@ -626,7 +626,7 @@ fn format_impl_ref_and_type(context: &RewriteContext,
item.node { item.node {
let mut result = String::new(); let mut result = String::new();
result.push_str(&*format_visibility(&item.vis)); result.push_str(&format_visibility(&item.vis));
result.push_str(format_unsafety(unsafety)); result.push_str(format_unsafety(unsafety));
result.push_str("impl"); result.push_str("impl");
@ -650,8 +650,9 @@ fn format_impl_ref_and_type(context: &RewriteContext,
if polarity != ast::ImplPolarity::Negative { if polarity != ast::ImplPolarity::Negative {
result.push_str(" "); result.push_str(" ");
} }
let budget = try_opt!(context.config.max_width.checked_sub(result.len())); let used_space = last_line_width(&result);
let indent = offset + result.len(); let budget = try_opt!(context.config.max_width.checked_sub(used_space));
let indent = offset + used_space;
result.push_str(&*try_opt!(trait_ref.rewrite(context, Shape::legacy(budget, indent)))); result.push_str(&*try_opt!(trait_ref.rewrite(context, Shape::legacy(budget, indent))));
if split_at_for { if split_at_for {
@ -1119,7 +1120,7 @@ pub fn rewrite_type_alias(context: &RewriteContext,
context.config.where_density, context.config.where_density,
"=", "=",
true, true,
false, true,
Some(span.hi))); Some(span.hi)));
result.push_str(&where_clause_str); result.push_str(&where_clause_str);
result.push_str(" = "); result.push_str(" = ");