Use concat() instead of join("")

[rust.git] / src / rewrite.rs

diff --git a/src/rewrite.rs b/src/rewrite.rs
index 5e4d00518a54c3856f901ab45b58d837cfd19a2f..17bb027bd5685b64a41fa0f2e1409aafc318e784 100644 (file)
--- a/src/rewrite.rs
+++ b/src/rewrite.rs
@@ -10,32 +10,45 @@
 
 // A generic trait to abstract the rewriting of an element (of the AST).
 
-use syntax::codemap::{CodeMap, Span};
 use syntax::parse::ParseSess;
+use syntax::ptr;
+use syntax::source_map::{SourceMap, Span};
 
 use config::{Config, IndentStyle};
 use shape::Shape;
 use visitor::SnippetProvider;
+use FormatReport;
+
+use std::cell::RefCell;
 
 pub trait Rewrite {
     /// Rewrite self into shape.
     fn rewrite(&self, context: &RewriteContext, shape: Shape) -> Option<String>;
 }
 
+impl<T: Rewrite> Rewrite for ptr::P<T> {
+    fn rewrite(&self, context: &RewriteContext, shape: Shape) -> Option<String> {
+        (**self).rewrite(context, shape)
+    }
+}
+
 #[derive(Clone)]
 pub struct RewriteContext<'a> {
     pub parse_session: &'a ParseSess,
-    pub codemap: &'a CodeMap,
+    pub source_map: &'a SourceMap,
     pub config: &'a Config,
-    pub inside_macro: bool,
+    pub inside_macro: RefCell<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
+    pub use_block: RefCell<bool>,
+    // When `is_if_else_block` is true, unindent the comment on top
     // of the `else` or `else if`.
-    pub is_if_else_block: bool,
+    pub is_if_else_block: RefCell<bool>,
     // When rewriting chain, veto going multi line except the last element
-    pub force_one_line_chain: bool,
-    pub snippet_provider: &'a SnippetProvider,
+    pub force_one_line_chain: RefCell<bool>,
+    pub snippet_provider: &'a SnippetProvider<'a>,
+    // Used for `format_snippet`
+    pub(crate) macro_rewrite_failure: RefCell<bool>,
+    pub(crate) report: FormatReport,
 }
 
 impl<'a> RewriteContext<'a> {
@@ -45,10 +58,18 @@ pub fn snippet(&self, span: Span) -> &str {
 
     /// Return true if we should use block indent style for rewriting function call.
     pub fn use_block_indent(&self) -> bool {
-        self.config.indent_style() == IndentStyle::Block || self.use_block
+        self.config.indent_style() == IndentStyle::Block || *self.use_block.borrow()
     }
 
     pub fn budget(&self, used_width: usize) -> usize {
-        self.config.max_width().checked_sub(used_width).unwrap_or(0)
+        self.config.max_width().saturating_sub(used_width)
+    }
+
+    pub fn inside_macro(&self) -> bool {
+        *self.inside_macro.borrow()
+    }
+
+    pub fn is_if_else_block(&self) -> bool {
+        *self.is_if_else_block.borrow()
     }
 }