Change `print_diff` to output the correct line number.

[rust.git] / src / overflow.rs

diff --git a/src/overflow.rs b/src/overflow.rs
index e18fe140c8de8249e82a566b11eeffe47d1d2a72..674eb14b677b3435faa03a77f49c3860d066480f 100644 (file)
--- a/src/overflow.rs
+++ b/src/overflow.rs
@@ -13,15 +13,15 @@
 
 use config::lists::*;
 use syntax::ast;
-use syntax::codemap::Span;
 use syntax::parse::token::DelimToken;
+use syntax::source_map::Span;
 
 use closures;
-use codemap::SpanUtils;
 use expr::{is_every_expr_simple, is_method_call, is_nested_call, maybe_get_args_offset, ToExpr};
 use lists::{definitive_tactic, itemize_list, write_list, ListFormatting, ListItem, Separator};
 use rewrite::{Rewrite, RewriteContext};
 use shape::Shape;
+use source_map::SpanUtils;
 use spanned::Spanned;
 use utils::{count_newlines, extra_offset, first_line_width, last_line_width, mk_sp};
 
@@ -223,7 +223,7 @@ fn try_overflow_last_item(&self, list_items: &mut Vec<ListItem>) -> DefinitiveLi
         // 1 = "("
         let combine_arg_with_callee = self.items.len() == 1
             && self.items[0].to_expr().is_some()
-            && self.ident.len() + 1 <= self.context.config.tab_spaces();
+            && self.ident.len() < self.context.config.tab_spaces();
         let overflow_last = combine_arg_with_callee || can_be_overflowed(self.context, self.items);
 
         // Replace the last item with its first line to see if it fits with
@@ -291,7 +291,7 @@ fn try_overflow_last_item(&self, list_items: &mut Vec<ListItem>) -> DefinitiveLi
             (true, DefinitiveListTactic::Horizontal, placeholder @ Some(..)) => {
                 list_items[self.items.len() - 1].item = placeholder;
             }
-            _ if self.items.len() >= 1 => {
+            _ if !self.items.is_empty() => {
                 list_items[self.items.len() - 1].item = self
                     .items
                     .last()