Don't expose is_macro_def in public API

Author: Aaron1011

src/formatting.rs

@@ -62,20 +62,22 @@ pub(crate) fn format_input_inner(
     input: Input,
     config: &Config,
     operation_setting: OperationSetting,
+    is_macro_def: bool,
 ) -> Result<FormatReport, OperationError> {
     if !config.version_meets_requirement() {
         return Err(OperationError::VersionMismatch);
     }
 
     rustc_span::with_session_globals(config.edition().into(), || {
-        format_project(input, config, operation_setting)
+        format_project(input, config, operation_setting, is_macro_def)
     })
 }
 
 fn format_project(
     input: Input,
     config: &Config,
     operation_setting: OperationSetting,
+    is_macro_def: bool,
 ) -> Result<FormatReport, OperationError> {
     let mut timer = Timer::start();
 
@@ -149,7 +151,7 @@ fn format_project(
             &format_report,
             &files,
             original_snippet.clone(),
-            operation_setting.is_macro_def,
+            is_macro_def,
         )?;
     }
     timer = timer.done_formatting();

src/formatting/utils.rs

@@ -717,14 +717,14 @@ pub(crate) fn format_snippet(
 
         let result = {
             let input = Input::Text(snippet.into());
-            crate::format(
+            crate::format_input_inner(
                 input,
                 &config,
                 OperationSetting {
                     verbosity: Verbosity::Quiet,
-                    is_macro_def,
                     ..OperationSetting::default()
                 },
+                is_macro_def,
             )
         };
         match result {

src/lib.rs

@@ -18,7 +18,7 @@ pub use crate::emitter::rustfmt_diff::{ModifiedChunk, ModifiedLines};
 pub use crate::format_report_formatter::{FormatReportFormatter, FormatReportFormatterBuilder};
 pub use crate::formatting::report::{FormatReport, FormatResult};
 
-use crate::formatting::format_input_inner;
+pub(crate) use crate::formatting::format_input_inner;
 use crate::{emitter::Verbosity, result::OperationError};
 
 #[cfg(feature = "config")]
@@ -39,8 +39,6 @@ mod test;
 pub struct OperationSetting {
     /// If set to `true`, format sub-modules which are defined in the given input.
     pub recursive: bool,
-    /// If set to `true`, we are formatting a macro definition
-    pub is_macro_def: bool,
     pub verbosity: Verbosity,
 }
 
@@ -51,7 +49,12 @@ pub fn format(
     config: &Config,
     operation_setting: OperationSetting,
 ) -> Result<FormatReport, OperationError> {
-    format_input_inner(input, config, operation_setting)
+    format_input_inner(
+        input,
+        config,
+        operation_setting,
+        /* is_macro_def */ false,
+    )
 }
 
 pub fn format_inputs<'a>(

src/rustfmt/main.rs

@@ -438,7 +438,6 @@ fn format_string(input: String, opt: Opt) -> Result<i32> {
     let setting = OperationSetting {
         recursive: opt.recursive,
         verbosity: Verbosity::Quiet,
-        is_macro_def: false,
     };
     let report = rustfmt_nightly::format(Input::Text(input), &config, setting)?;
 
@@ -539,7 +538,6 @@ fn format(opt: Opt) -> Result<i32> {
     let setting = OperationSetting {
         recursive: opt.recursive,
         verbosity: opt.verbosity(),
-        is_macro_def: false,
     };
 
     let inputs = FileConfigPairIter::new(&opt, config_paths.is_some()).collect::<Vec<_>>();