Merge pull request #2138 from topecongiro/comments-around-trait-bounds

[rust.git] / src / rewrite.rs

diff --git a/src/rewrite.rs b/src/rewrite.rs
index 5c1236104b520a70cf5380908e96fbdf89b51d64..823f69dc6ff2798050361936e6b27f0faab29695 100644 (file)
--- a/src/rewrite.rs
+++ b/src/rewrite.rs
@@ -13,8 +13,8 @@
 use syntax::codemap::{CodeMap, Span};
 use syntax::parse::ParseSess;
 
-use Shape;
 use config::{Config, IndentStyle};
+use shape::Shape;
 
 pub trait Rewrite {
     /// Rewrite self into shape.
@@ -43,6 +43,10 @@ pub fn snippet(&self, span: Span) -> String {
 
     /// Return true if we should use block indent style for rewriting function call.
     pub fn use_block_indent(&self) -> bool {
-        self.config.fn_call_style() == IndentStyle::Block || self.use_block
+        self.config.fn_call_indent() == IndentStyle::Block || self.use_block
+    }
+
+    pub fn budget(&self, used_width: usize) -> usize {
+        self.config.max_width().checked_sub(used_width).unwrap_or(0)
     }
 }