Add do_rewrite_in_macro_context

Author: topecongiro

src/macros.rs

@@ -149,13 +149,13 @@ pub fn rewrite_macro(
     shape: Shape,
     position: MacroPosition,
 ) -> Option<String> {
-    let old_value = context.inside_macro.replace(true);
-    let result = rewrite_macro_inner(mac, extra_ident, context, shape, position);
-    if result.is_none() {
-        context.macro_rewrite_failure.replace(true);
-    }
-    context.inside_macro.replace(old_value);
-    result
+    context.do_rewrite_in_macro_context(|| {
+        let result = rewrite_macro_inner(mac, extra_ident, context, shape, position);
+        if result.is_none() {
+            context.macro_rewrite_failure.replace(true);
+        }
+        result
+    })
 }
 
 pub fn rewrite_macro_inner(

src/rewrite.rs

@@ -65,4 +65,14 @@ impl<'a> RewriteContext<'a> {
     pub fn is_if_else_block(&self) -> bool {
         *self.is_if_else_block.borrow()
     }
+
+    pub fn do_rewrite_in_macro_context<F>(&self, f: F) -> Option<String>
+    where
+        F: Fn() -> Option<String>,
+    {
+        let inside_macro = self.inside_macro.replace(true);
+        let result = f();
+        self.inside_macro.replace(inside_macro);
+        result
+    }
 }