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 247b1df1c3faf6413db0353190f6bc63ba83a79f..823f69dc6ff2798050361936e6b27f0faab29695 100644 (file)
--- a/src/rewrite.rs
+++ b/src/rewrite.rs
@@ -13,18 +13,12 @@
 use syntax::codemap::{CodeMap, Span};
 use syntax::parse::ParseSess;
 
-use Indent;
-use config::Config;
+use config::{Config, IndentStyle};
+use shape::Shape;
 
 pub trait Rewrite {
-    /// Rewrite self into offset and width.
-    /// `offset` is the indentation of the first line. The next lines
-    /// should begin with a least `offset` spaces (except backwards
-    /// indentation). The first line should not begin with indentation.
-    /// `width` is the maximum number of characters on the last line
-    /// (excluding offset). The width of other lines is not limited by
-    /// `width`.
-    fn rewrite(&self, context: &RewriteContext, width: usize, offset: Indent) -> Option<String>;
+    /// Rewrite self into shape.
+    fn rewrite(&self, context: &RewriteContext, shape: Shape) -> Option<String>;
 }
 
 #[derive(Clone)]
@@ -32,21 +26,27 @@ pub struct RewriteContext<'a> {
     pub parse_session: &'a ParseSess,
     pub codemap: &'a CodeMap,
     pub config: &'a Config,
-    // Indentation due to nesting of blocks.
-    pub block_indent: Indent,
+    pub inside_macro: bool,
+    // Force block indent style even if we are using visual indent style.
+    pub use_block: bool,
+    // When `format_if_else_cond_comment` is true, unindent the comment on top
+    // of the `else` or `else if`.
+    pub is_if_else_block: bool,
+    // When rewriting chain, veto going multi line except the last element
+    pub force_one_line_chain: bool,
 }
 
 impl<'a> RewriteContext<'a> {
-    pub fn nested_context(&self) -> RewriteContext<'a> {
-        RewriteContext {
-            parse_session: self.parse_session,
-            codemap: self.codemap,
-            config: self.config,
-            block_indent: self.block_indent.block_indent(self.config),
-        }
-    }
-
     pub fn snippet(&self, span: Span) -> String {
         self.codemap.span_to_snippet(span).unwrap()
     }
+
+    /// Return true if we should use block indent style for rewriting function call.
+    pub fn use_block_indent(&self) -> bool {
+        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)
+    }
 }