mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pass id and span to visit_fn, just like for the immutable visitor

Browse Source
This commit is contained in:
Oli Scherer 2024-07-09 09:43:38 +00:00
parent 1b9ac0011f
commit 545553ca4f
2 changed files with 47 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
compiler/rustc_ast/src/mut_visit.rs
View File

@ -36,7 +36,13 @@ impl<A: Array> ExpectOne<A> for SmallVec<A> {
}
pub trait NoopVisitItemKind {
fn noop_visit(&mut self, ctxt: Option<AssocCtxt>, visitor: &mut impl MutVisitor);
fn noop_visit(
&mut self,
ctxt: Option<AssocCtxt>,
span: Span,
id: NodeId,
visitor: &mut impl MutVisitor,
);
}
pub trait MutVisitor: Sized {
@ -122,7 +128,8 @@ pub trait MutVisitor: Sized {
noop_visit_fn_decl(d, self);
}
fn visit_fn(&mut self, fk: FnKind<'_>) {
/// `Span` and `NodeId` are mutated at the caller site.
fn visit_fn(&mut self, fk: FnKind<'_>, _: Span, _: NodeId) {
noop_visit_fn(fk, self)
}
@ -1078,12 +1085,23 @@ pub fn noop_visit_block<T: MutVisitor>(block: &mut P<Block>, vis: &mut T) {
vis.visit_span(span);
}
pub fn noop_visit_item_kind(kind: &mut impl NoopVisitItemKind, vis: &mut impl MutVisitor) {
kind.noop_visit(None, vis)
pub fn noop_visit_item_kind(
kind: &mut impl NoopVisitItemKind,
span: Span,
id: NodeId,
vis: &mut impl MutVisitor,
) {
kind.noop_visit(None, span, id, vis)
}
impl NoopVisitItemKind for ItemKind {
fn noop_visit(&mut self, ctxt: Option<AssocCtxt>, vis: &mut impl MutVisitor) {
fn noop_visit(
&mut self,
ctxt: Option<AssocCtxt>,
span: Span,
id: NodeId,
vis: &mut impl MutVisitor,
) {
assert_eq!(ctxt, None);
match self {
ItemKind::ExternCrate(_orig_name) => {}
@ -1097,7 +1115,7 @@ impl NoopVisitItemKind for ItemKind {
}
ItemKind::Fn(box Fn { defaultness, generics, sig, body }) => {
visit_defaultness(defaultness, vis);
vis.visit_fn(FnKind::Fn(FnCtxt::Free, sig, generics, body));
vis.visit_fn(FnKind::Fn(FnCtxt::Free, sig, generics, body), span, id);
}
ItemKind::Mod(safety, mod_kind) => {
visit_safety(safety, vis);
@ -1196,7 +1214,13 @@ impl NoopVisitItemKind for ItemKind {
}
impl NoopVisitItemKind for AssocItemKind {
fn noop_visit(&mut self, ctxt: Option<AssocCtxt>, visitor: &mut impl MutVisitor) {
fn noop_visit(
&mut self,
ctxt: Option<AssocCtxt>,
span: Span,
id: NodeId,
visitor: &mut impl MutVisitor,
) {
let ctxt = ctxt.unwrap();
match self {
AssocItemKind::Const(item) => {
@ -1204,7 +1228,7 @@ impl NoopVisitItemKind for AssocItemKind {
}
AssocItemKind::Fn(box Fn { defaultness, generics, sig, body }) => {
visit_defaultness(defaultness, visitor);
visitor.visit_fn(FnKind::Fn(FnCtxt::Assoc(ctxt), sig, generics, body));
visitor.visit_fn(FnKind::Fn(FnCtxt::Assoc(ctxt), sig, generics, body), span, id);
}
AssocItemKind::Type(box TyAlias {
defaultness,
@ -1284,7 +1308,7 @@ pub fn noop_visit_crate<T: MutVisitor>(krate: &mut Crate, vis: &mut T) {
vis.visit_span(inject_use_span);
}
// Mutates one item into possibly many items.
/// Mutates one item, returning the item again.
pub fn noop_flat_map_item<K: NoopVisitItemKind>(
mut item: P<Item<K>>,
ctxt: Option<AssocCtxt>,
@ -1295,14 +1319,20 @@ pub fn noop_flat_map_item<K: NoopVisitItemKind>(
visit_attrs(attrs, visitor);
visitor.visit_vis(vis);
visitor.visit_ident(ident);
kind.noop_visit(ctxt, visitor);
kind.noop_visit(ctxt, *span, *id, visitor);
visit_lazy_tts(tokens, visitor);
visitor.visit_span(span);
smallvec![item]
}
impl NoopVisitItemKind for ForeignItemKind {
fn noop_visit(&mut self, ctxt: Option<AssocCtxt>, visitor: &mut impl MutVisitor) {
fn noop_visit(
&mut self,
ctxt: Option<AssocCtxt>,
span: Span,
id: NodeId,
visitor: &mut impl MutVisitor,
) {
assert_eq!(ctxt, None);
match self {
ForeignItemKind::Static(box StaticItem { ty, mutability: _, expr, safety: _ }) => {
@ -1311,7 +1341,7 @@ impl NoopVisitItemKind for ForeignItemKind {
}
ForeignItemKind::Fn(box Fn { defaultness, generics, sig, body }) => {
visit_defaultness(defaultness, visitor);
visitor.visit_fn(FnKind::Fn(FnCtxt::Foreign, sig, generics, body));
visitor.visit_fn(FnKind::Fn(FnCtxt::Foreign, sig, generics, body), span, id);
}
ForeignItemKind::TyAlias(box TyAlias {
defaultness,
@ -1524,7 +1554,7 @@ pub fn noop_visit_expr<T: MutVisitor>(
visit_constness(constness, vis);
coroutine_kind.as_mut().map(|coroutine_kind| vis.visit_coroutine_kind(coroutine_kind));
vis.visit_capture_by(capture_clause);
vis.visit_fn(FnKind::Closure(binder, fn_decl, body));
vis.visit_fn(FnKind::Closure(binder, fn_decl, body), *span, *id);
vis.visit_span(fn_decl_span);
vis.visit_span(fn_arg_span);
}

8
compiler/rustc_builtin_macros/src/test_harness.rs
View File

@ -129,8 +129,8 @@ impl<'a> MutVisitor for TestHarnessGenerator<'a> {
c.items.push(mk_main(&mut self.cx));
}
fn flat_map_item(&mut self, i: P<ast::Item>) -> SmallVec<[P<ast::Item>; 1]> {
let mut item = i.into_inner();
fn flat_map_item(&mut self, mut i: P<ast::Item>) -> SmallVec<[P<ast::Item>; 1]> {
let item = &mut *i;
if let Some(name) = get_test_name(&item) {
debug!("this is a test item");
@ -144,13 +144,13 @@ impl<'a> MutVisitor for TestHarnessGenerator<'a> {
item.kind
{
let prev_tests = mem::take(&mut self.tests);
noop_visit_item_kind(&mut item.kind, self);
noop_visit_item_kind(&mut item.kind, item.span, item.id, self);
self.add_test_cases(item.id, span, prev_tests);
} else {
// But in those cases, we emit a lint to warn the user of these missing tests.
walk_item(&mut InnerItemLinter { sess: self.cx.ext_cx.sess }, &item);
}
smallvec![P(item)]
smallvec![i]
}
}