bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

coverage: Make HolesVisitor::visit_hole_span a regular method

Browse source
This commit is contained in:
Zalathar 2025-02-19 01:22:28 +11:00
parent 51f704f0ff
commit d38f6880c0
1 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

36
compiler/rustc_mir_transform/src/coverage/mod.rs
View file

@ -346,18 +346,19 @@ fn extract_hole_spans_from_hir<'tcx>(
body_span: Span, // Usually `hir_body.value.span`, but not always body_span: Span, // Usually `hir_body.value.span`, but not always
hir_body: &hir::Body<'tcx>, hir_body: &hir::Body<'tcx>,
) -> Vec<Span> { ) -> Vec<Span> {
struct HolesVisitor<'hir, F> { struct HolesVisitor<'tcx> {
tcx: TyCtxt<'hir>, tcx: TyCtxt<'tcx>,
visit_hole_span: F, body_span: Span,
hole_spans: Vec<Span>,
} }
impl<'hir, F: FnMut(Span)> Visitor<'hir> for HolesVisitor<'hir, F> { impl<'tcx> Visitor<'tcx> for HolesVisitor<'tcx> {
/// We have special handling for nested items, but we still want to /// We have special handling for nested items, but we still want to
/// traverse into nested bodies of things that are not considered items, /// traverse into nested bodies of things that are not considered items,
/// such as "anon consts" (e.g. array lengths). /// such as "anon consts" (e.g. array lengths).
type NestedFilter = nested_filter::OnlyBodies; type NestedFilter = nested_filter::OnlyBodies;
fn maybe_tcx(&mut self) -> Self::MaybeTyCtxt { fn maybe_tcx(&mut self) -> TyCtxt<'tcx> {
self.tcx self.tcx
} }
@ -365,17 +366,17 @@ fn extract_hole_spans_from_hir<'tcx>(
/// only need the item's span, not the item itself. /// only need the item's span, not the item itself.
fn visit_nested_item(&mut self, id: hir::ItemId) -> Self::Result { fn visit_nested_item(&mut self, id: hir::ItemId) -> Self::Result {
let span = self.tcx.def_span(id.owner_id.def_id); let span = self.tcx.def_span(id.owner_id.def_id);
(self.visit_hole_span)(span); self.visit_hole_span(span);
// Having visited this item, we don't care about its children, // Having visited this item, we don't care about its children,
// so don't call `walk_item`. // so don't call `walk_item`.
} }
// We override `visit_expr` instead of the more specific expression // We override `visit_expr` instead of the more specific expression
// visitors, so that we have direct access to the expression span. // visitors, so that we have direct access to the expression span.
fn visit_expr(&mut self, expr: &'hir hir::Expr<'hir>) { fn visit_expr(&mut self, expr: &'tcx hir::Expr<'tcx>) {
match expr.kind { match expr.kind {
hir::ExprKind::Closure(_) | hir::ExprKind::ConstBlock(_) => { hir::ExprKind::Closure(_) | hir::ExprKind::ConstBlock(_) => {
(self.visit_hole_span)(expr.span); self.visit_hole_span(expr.span);
// Having visited this expression, we don't care about its // Having visited this expression, we don't care about its
// children, so don't call `walk_expr`. // children, so don't call `walk_expr`.
} }
@ -385,18 +386,17 @@ fn extract_hole_spans_from_hir<'tcx>(
} }
} }
} }
impl HolesVisitor<'_> {
let mut hole_spans = vec![]; fn visit_hole_span(&mut self, hole_span: Span) {
let mut visitor = HolesVisitor {
tcx,
visit_hole_span: |hole_span| {
// Discard any holes that aren't directly visible within the body span. // Discard any holes that aren't directly visible within the body span.
if body_span.contains(hole_span) && body_span.eq_ctxt(hole_span) { if self.body_span.contains(hole_span) && self.body_span.eq_ctxt(hole_span) {
hole_spans.push(hole_span); self.hole_spans.push(hole_span);
} }
}, }
}; }
let mut visitor = HolesVisitor { tcx, body_span, hole_spans: vec![] };
visitor.visit_body(hir_body); visitor.visit_body(hir_body);
hole_spans visitor.hole_spans
} }