Skip to content

Commit

Permalink
use display_settings! macro for display of CompiledPerFileIgnore
Browse files Browse the repository at this point in the history
Co-authored-by: Alex Waygood <alex.waygood@gmail.com>
  • Loading branch information
carljm and AlexWaygood committed Apr 11, 2024
1 parent 867a355 commit b2f074e
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 8 deletions.
3 changes: 3 additions & 0 deletions crates/ruff_linter/src/settings/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,9 @@ macro_rules! display_settings {
(@field $fmt:ident, $prefix:ident, $settings:ident.$field:ident | quoted) => {
writeln!($fmt, "{}{} = \"{}\"", $prefix, stringify!($field), $settings.$field)?;
};
(@field $fmt:ident, $prefix:ident, $settings:ident.$field:ident | globmatcher) => {
writeln!($fmt, "{}{} = \"{}\"", $prefix, stringify!($field), $settings.$field.glob())?;
};
(@field $fmt:ident, $prefix:ident, $settings:ident.$field:ident | nested) => {
write!($fmt, "{}", $settings.$field)?;
};
Expand Down
18 changes: 10 additions & 8 deletions crates/ruff_linter/src/settings/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -610,14 +610,16 @@ pub struct CompiledPerFileIgnore {

impl Display for CompiledPerFileIgnore {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
writeln!(
f,
"{{ absolute_matcher = {:#?}, \
basename_matcher = {:#?}, \
negated = {}, \
rules = {} }}",
self.absolute_matcher, self.basename_matcher, self.negated, self.rules
)
display_settings! {
formatter = f,
fields = [
self.absolute_matcher | globmatcher,
self.basename_matcher | globmatcher,
self.negated,
self.rules,
]
}
Ok(())
}
}

Expand Down

0 comments on commit b2f074e

Please sign in to comment.