diff options
| author | Nicholas Nethercote <n.nethercote@gmail.com> | 2022-11-23 15:39:42 +1100 |
|---|---|---|
| committer | Nicholas Nethercote <n.nethercote@gmail.com> | 2022-11-28 15:18:49 +1100 |
| commit | cdff11ce94a6d70873920a4347de41adc5763d03 (patch) | |
| tree | 4128febb20241efb481acdfb320aaa589753ab76 | |
| parent | 3d44530eb081d6ffb45124bb25feb2738f6f09ac (diff) | |
| download | rust-cdff11ce94a6d70873920a4347de41adc5763d03.tar.gz rust-cdff11ce94a6d70873920a4347de41adc5763d03.zip | |
Rename `ast::Lit` as `ast::MetaItemLit`.
| -rw-r--r-- | src/attr.rs | 11 | ||||
| -rw-r--r-- | src/modules/visitor.rs | 12 |
2 files changed, 16 insertions, 7 deletions
diff --git a/src/attr.rs b/src/attr.rs index 23f55db773e..8cba2a850e5 100644 --- a/src/attr.rs +++ b/src/attr.rs @@ -527,14 +527,19 @@ pub(crate) trait MetaVisitor<'ast> { 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_meta_name_value( + &mut self, + _meta_item: &'ast ast::MetaItem, + _lit: &'ast ast::MetaItemLit, + ) { + } 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), + ast::NestedMetaItem::Literal(ref lit) => self.visit_meta_item_lit(lit), } } - fn visit_literal(&mut self, _lit: &'ast ast::Lit) {} + fn visit_meta_item_lit(&mut self, _lit: &'ast ast::MetaItemLit) {} } diff --git a/src/modules/visitor.rs b/src/modules/visitor.rs index ea67977c17a..48431693332 100644 --- a/src/modules/visitor.rs +++ b/src/modules/visitor.rs @@ -84,15 +84,19 @@ impl PathVisitor { } impl<'ast> MetaVisitor<'ast> for PathVisitor { - fn visit_meta_name_value(&mut self, meta_item: &'ast ast::MetaItem, lit: &'ast ast::Lit) { + fn visit_meta_name_value( + &mut self, + meta_item: &'ast ast::MetaItem, + lit: &'ast ast::MetaItemLit, + ) { if meta_item.has_name(Symbol::intern("path")) && lit.kind.is_str() { - self.paths.push(lit_to_str(lit)); + self.paths.push(meta_item_lit_to_str(lit)); } } } #[cfg(not(windows))] -fn lit_to_str(lit: &ast::Lit) -> String { +fn meta_item_lit_to_str(lit: &ast::MetaItemLit) -> String { match lit.kind { ast::LitKind::Str(symbol, ..) => symbol.to_string(), _ => unreachable!(), @@ -100,7 +104,7 @@ fn lit_to_str(lit: &ast::Lit) -> String { } #[cfg(windows)] -fn lit_to_str(lit: &ast::Lit) -> String { +fn meta_item_lit_to_str(lit: &ast::MetaItemLit) -> String { match lit.kind { ast::LitKind::Str(symbol, ..) => symbol.as_str().replace("/", "\\"), _ => unreachable!(), |
