Skip to content

Commit a64f7ad

Browse files
Aaron1011calebcartwright
authored andcommitted
Don't expose is_macro_def in public API
1 parent 9872429 commit a64f7ad

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

src/formatting.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -62,20 +62,22 @@ pub(crate) fn format_input_inner(
6262
input: Input,
6363
config: &Config,
6464
operation_setting: OperationSetting,
65+
is_macro_def: bool,
6566
) -> Result<FormatReport, OperationError> {
6667
if !config.version_meets_requirement() {
6768
return Err(OperationError::VersionMismatch);
6869
}
6970

7071
rustc_span::with_session_globals(config.edition().into(), || {
71-
format_project(input, config, operation_setting)
72+
format_project(input, config, operation_setting, is_macro_def)
7273
})
7374
}
7475

7576
fn format_project(
7677
input: Input,
7778
config: &Config,
7879
operation_setting: OperationSetting,
80+
is_macro_def: bool,
7981
) -> Result<FormatReport, OperationError> {
8082
let mut timer = Timer::start();
8183

@@ -149,7 +151,7 @@ fn format_project(
149151
&format_report,
150152
&files,
151153
original_snippet.clone(),
152-
operation_setting.is_macro_def,
154+
is_macro_def,
153155
)?;
154156
}
155157
timer = timer.done_formatting();

src/formatting/utils.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -717,14 +717,14 @@ pub(crate) fn format_snippet(
717717

718718
let result = {
719719
let input = Input::Text(snippet.into());
720-
crate::format(
720+
crate::format_input_inner(
721721
input,
722722
&config,
723723
OperationSetting {
724724
verbosity: Verbosity::Quiet,
725-
is_macro_def,
726725
..OperationSetting::default()
727726
},
727+
is_macro_def,
728728
)
729729
};
730730
match result {

src/lib.rs

+7-4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pub use crate::emitter::rustfmt_diff::{ModifiedChunk, ModifiedLines};
1818
pub use crate::format_report_formatter::{FormatReportFormatter, FormatReportFormatterBuilder};
1919
pub use crate::formatting::report::{FormatReport, FormatResult};
2020

21-
use crate::formatting::format_input_inner;
21+
pub(crate) use crate::formatting::format_input_inner;
2222
use crate::{emitter::Verbosity, result::OperationError};
2323

2424
#[cfg(feature = "config")]
@@ -39,8 +39,6 @@ mod test;
3939
pub struct OperationSetting {
4040
/// If set to `true`, format sub-modules which are defined in the given input.
4141
pub recursive: bool,
42-
/// If set to `true`, we are formatting a macro definition
43-
pub is_macro_def: bool,
4442
pub verbosity: Verbosity,
4543
}
4644

@@ -51,7 +49,12 @@ pub fn format(
5149
config: &Config,
5250
operation_setting: OperationSetting,
5351
) -> Result<FormatReport, OperationError> {
54-
format_input_inner(input, config, operation_setting)
52+
format_input_inner(
53+
input,
54+
config,
55+
operation_setting,
56+
/* is_macro_def */ false,
57+
)
5558
}
5659

5760
pub fn format_inputs<'a>(

src/rustfmt/main.rs

-2
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,6 @@ fn format_string(input: String, opt: Opt) -> Result<i32> {
438438
let setting = OperationSetting {
439439
recursive: opt.recursive,
440440
verbosity: Verbosity::Quiet,
441-
is_macro_def: false,
442441
};
443442
let report = rustfmt_nightly::format(Input::Text(input), &config, setting)?;
444443

@@ -539,7 +538,6 @@ fn format(opt: Opt) -> Result<i32> {
539538
let setting = OperationSetting {
540539
recursive: opt.recursive,
541540
verbosity: opt.verbosity(),
542-
is_macro_def: false,
543541
};
544542

545543
let inputs = FileConfigPairIter::new(&opt, config_paths.is_some()).collect::<Vec<_>>();

0 commit comments

Comments
 (0)