From 7ec973d9ce7bc02577efde54929ad38bcf5a40eb Mon Sep 17 00:00:00 2001 From: Camille GILLOT Date: Thu, 26 Aug 2021 18:42:08 +0200 Subject: Stop using walk_crate. --- src/librustdoc/doctest.rs | 7 ++----- src/librustdoc/html/render/span_map.rs | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/librustdoc/doctest.rs b/src/librustdoc/doctest.rs index e61b7a09038..1554e4d9ef2 100644 --- a/src/librustdoc/doctest.rs +++ b/src/librustdoc/doctest.rs @@ -116,7 +116,6 @@ crate fn run(options: Options) -> Result<(), ErrorReported> { let mut global_ctxt = queries.global_ctxt()?.take(); let collector = global_ctxt.enter(|tcx| { - let krate = tcx.hir().krate(); let crate_attrs = tcx.hir().attrs(CRATE_HIR_ID); let mut opts = scrape_test_config(crate_attrs); @@ -144,10 +143,8 @@ crate fn run(options: Options) -> Result<(), ErrorReported> { hir_collector.visit_testable( "".to_string(), CRATE_HIR_ID, - krate.module().inner, - |this| { - intravisit::walk_crate(this, krate); - }, + tcx.hir().span(CRATE_HIR_ID), + |this| tcx.hir().walk_crate(this), ); collector diff --git a/src/librustdoc/html/render/span_map.rs b/src/librustdoc/html/render/span_map.rs index b35cd45dc9a..df31de50434 100644 --- a/src/librustdoc/html/render/span_map.rs +++ b/src/librustdoc/html/render/span_map.rs @@ -45,7 +45,7 @@ crate fn collect_spans_and_sources( if include_sources { if generate_link_to_definition { - intravisit::walk_crate(&mut visitor, tcx.hir().krate()); + tcx.hir().walk_crate(&mut visitor); } let (krate, sources) = sources::collect_local_sources(tcx, src_root, krate); (krate, sources, visitor.matches) -- cgit 1.4.1-3-g733a5