Skip to content

Format modules defined in cfg_attr #3604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jun 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions src/attr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -488,3 +488,36 @@ fn attr_prefix(attr: &ast::Attribute) -> &'static str {
ast::AttrStyle::Outer => "#",
}
}

pub(crate) trait MetaVisitor<'ast> {
fn visit_meta_item(&mut self, meta_item: &'ast ast::MetaItem) {
match meta_item.node {
ast::MetaItemKind::Word => self.visit_meta_word(meta_item),
ast::MetaItemKind::List(ref list) => self.visit_meta_list(meta_item, list),
ast::MetaItemKind::NameValue(ref lit) => self.visit_meta_name_value(meta_item, lit),
}
}

fn visit_meta_list(
&mut self,
_meta_item: &'ast ast::MetaItem,
list: &'ast [ast::NestedMetaItem],
) {
for nm in list {
self.visit_nested_meta_item(nm);
}
}

fn visit_meta_word(&mut self, _meta_item: &'ast ast::MetaItem) {}

fn visit_meta_name_value(&mut self, _meta_item: &'ast ast::MetaItem, _lit: &'ast ast::Lit) {}

fn visit_nested_meta_item(&mut self, nm: &'ast ast::NestedMetaItem) {
match nm {
ast::NestedMetaItem::MetaItem(ref meta_item) => self.visit_meta_item(meta_item),
ast::NestedMetaItem::Literal(ref lit) => self.visit_literal(lit),
}
}

fn visit_literal(&mut self, _lit: &'ast ast::Lit) {}
}
2 changes: 1 addition & 1 deletion src/formatting.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ fn format_project<T: FormatHandler>(
)
.visit_crate(&krate)
.map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;
for (path, (module, _)) in files {
for (path, module) in files {
let should_ignore = !input_is_stdin && ignore_path_set.is_match(&path);
if (config.skip_children() && path != main_file) || should_ignore {
continue;
Expand Down
Loading