Update rustc-ap-* crates to 581.0.0 (#3783)

[rust.git] / src / rewrite.rs

diff --git a/src/rewrite.rs b/src/rewrite.rs
index 9a955dbd91b830788ab0be34113e8dbc6436e35f..19b749dc8e1b76fe4d2cc9b52f169ddaa0c01625 100644 (file)
--- a/src/rewrite.rs
+++ b/src/rewrite.rs
@@ -1,6 +1,7 @@
 // A generic trait to abstract the rewriting of an element (of the AST).
 
 use std::cell::RefCell;
+use std::rc::Rc;
 
 use syntax::parse::ParseSess;
 use syntax::ptr;
@@ -8,6 +9,7 @@
 
 use crate::config::{Config, IndentStyle};
 use crate::shape::Shape;
+use crate::skip::SkipContext;
 use crate::visitor::SnippetProvider;
 use crate::FormatReport;
 
@@ -27,7 +29,7 @@ pub(crate) struct RewriteContext<'a> {
     pub(crate) parse_session: &'a ParseSess,
     pub(crate) source_map: &'a SourceMap,
     pub(crate) config: &'a Config,
-    pub(crate) inside_macro: RefCell<bool>,
+    pub(crate) inside_macro: Rc<RefCell<bool>>,
     // Force block indent style even if we are using visual indent style.
     pub(crate) use_block: RefCell<bool>,
     // When `is_if_else_block` is true, unindent the comment on top
@@ -39,7 +41,25 @@ pub(crate) struct RewriteContext<'a> {
     // Used for `format_snippet`
     pub(crate) macro_rewrite_failure: RefCell<bool>,
     pub(crate) report: FormatReport,
-    pub(crate) skip_macro_names: RefCell<Vec<String>>,
+    pub(crate) skip_context: SkipContext,
+    pub(crate) skipped_range: Rc<RefCell<Vec<(usize, usize)>>>,
+}
+
+pub(crate) struct InsideMacroGuard {
+    is_nested_macro_context: bool,
+    inside_macro_ref: Rc<RefCell<bool>>,
+}
+
+impl InsideMacroGuard {
+    pub(crate) fn is_nested(&self) -> bool {
+        self.is_nested_macro_context
+    }
+}
+
+impl Drop for InsideMacroGuard {
+    fn drop(&mut self) {
+        self.inside_macro_ref.replace(self.is_nested_macro_context);
+    }
 }
 
 impl<'a> RewriteContext<'a> {
@@ -60,6 +80,18 @@ pub(crate) fn inside_macro(&self) -> bool {
         *self.inside_macro.borrow()
     }
 
+    pub(crate) fn enter_macro(&self) -> InsideMacroGuard {
+        let is_nested_macro_context = self.inside_macro.replace(true);
+        InsideMacroGuard {
+            is_nested_macro_context,
+            inside_macro_ref: self.inside_macro.clone(),
+        }
+    }
+
+    pub(crate) fn leave_macro(&self) {
+        self.inside_macro.replace(false);
+    }
+
     pub(crate) fn is_if_else_block(&self) -> bool {
         *self.is_if_else_block.borrow()
     }