Skip to content

Commit 37d1ce9

Browse files
committed
Remove #[macro_use] extern crate tracing from rustdoc.
1 parent bf662eb commit 37d1ce9

30 files changed

+30
-2
lines changed

src/librustdoc/clean/auto_trait.rs

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ use rustc_span::def_id::DefId;
77
use rustc_span::symbol::{kw, Symbol};
88
use rustc_trait_selection::traits::auto_trait::{self, RegionTarget};
99
use thin_vec::ThinVec;
10+
use tracing::{debug, instrument};
1011

1112
use crate::clean::{
1213
self, clean_generic_param_def, clean_middle_ty, clean_predicate,

src/librustdoc/clean/blanket_impl.rs

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ use rustc_span::def_id::DefId;
66
use rustc_span::DUMMY_SP;
77
use rustc_trait_selection::traits::query::evaluate_obligation::InferCtxtExt;
88
use thin_vec::ThinVec;
9+
use tracing::{debug, instrument, trace};
910

1011
use crate::clean;
1112
use crate::clean::{

src/librustdoc/clean/inline.rs

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ use rustc_span::def_id::LOCAL_CRATE;
1414
use rustc_span::hygiene::MacroKind;
1515
use rustc_span::symbol::{sym, Symbol};
1616
use thin_vec::{thin_vec, ThinVec};
17+
use tracing::{debug, trace};
1718
use {rustc_ast as ast, rustc_hir as hir};
1819

1920
use super::Item;

src/librustdoc/clean/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ use rustc_span::symbol::{kw, sym, Ident, Symbol};
5252
use rustc_span::ExpnKind;
5353
use rustc_trait_selection::traits::wf::object_region_bounds;
5454
use thin_vec::ThinVec;
55+
use tracing::{debug, instrument};
5556
use utils::*;
5657
use {rustc_ast as ast, rustc_attr as attr, rustc_hir as hir};
5758

src/librustdoc/clean/types.rs

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ use rustc_span::{FileName, Loc, DUMMY_SP};
3131
use rustc_target::abi::VariantIdx;
3232
use rustc_target::spec::abi::Abi;
3333
use thin_vec::ThinVec;
34+
use tracing::{debug, trace};
3435
use {rustc_ast as ast, rustc_hir as hir};
3536

3637
pub(crate) use self::ItemKind::*;

src/librustdoc/clean/utils.rs

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ use rustc_middle::mir;
1111
use rustc_middle::ty::{self, GenericArgKind, GenericArgsRef, TyCtxt, TypeVisitableExt};
1212
use rustc_span::symbol::{kw, sym, Symbol};
1313
use thin_vec::{thin_vec, ThinVec};
14+
use tracing::{debug, warn};
1415
use {rustc_ast as ast, rustc_hir as hir};
1516

1617
use crate::clean::auto_trait::synthesize_auto_trait_impls;

src/librustdoc/core.rs

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ pub(crate) use rustc_session::config::{Options, UnstableOptions};
2525
use rustc_session::{lint, Session};
2626
use rustc_span::symbol::sym;
2727
use rustc_span::{source_map, Span};
28+
use tracing::{debug, info};
2829

2930
use crate::clean::inline::build_external_trait;
3031
use crate::clean::{self, ItemId};

src/librustdoc/doctest.rs

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ use rustc_span::symbol::sym;
2626
use rustc_span::FileName;
2727
use rustc_target::spec::{Target, TargetTriple};
2828
use tempfile::{Builder as TempFileBuilder, TempDir};
29+
use tracing::debug;
2930

3031
use self::rust::HirCollector;
3132
use crate::config::Options as RustdocOptions;

src/librustdoc/doctest/make.rs

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ use rustc_span::edition::Edition;
1414
use rustc_span::source_map::SourceMap;
1515
use rustc_span::symbol::sym;
1616
use rustc_span::FileName;
17+
use tracing::debug;
1718

1819
use super::GlobalTestOptions;
1920
use crate::html::markdown::LangString;

src/librustdoc/formats/cache.rs

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ use rustc_data_structures::fx::{FxHashMap, FxHashSet, FxIndexSet};
44
use rustc_hir::def_id::{CrateNum, DefId, DefIdMap, DefIdSet};
55
use rustc_middle::ty::{self, TyCtxt};
66
use rustc_span::Symbol;
7+
use tracing::debug;
78

89
use crate::clean::types::ExternalLocation;
910
use crate::clean::{self, ExternalCrate, ItemId, PrimitiveType};

src/librustdoc/formats/renderer.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
use rustc_middle::ty::TyCtxt;
2+
use tracing::debug;
23

34
use crate::clean;
45
use crate::config::RenderOptions;

src/librustdoc/html/format.rs

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ use rustc_middle::ty::TyCtxt;
2424
use rustc_span::symbol::kw;
2525
use rustc_span::{sym, Symbol};
2626
use rustc_target::spec::abi::Abi;
27+
use tracing::{debug, trace};
2728
use {rustc_ast as ast, rustc_hir as hir};
2829

2930
use super::url_parts_builder::{estimate_item_path_byte_length, UrlPartsBuilder};

src/librustdoc/html/markdown.rs

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ pub(crate) use rustc_resolve::rustdoc::main_body_opts;
4646
use rustc_resolve::rustdoc::may_be_doc_link;
4747
use rustc_span::edition::Edition;
4848
use rustc_span::{Span, Symbol};
49+
use tracing::{debug, trace};
4950

5051
use crate::clean::RenderedLink;
5152
use crate::doctest;

src/librustdoc/html/render/context.rs

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ use rustc_middle::ty::TyCtxt;
1212
use rustc_session::Session;
1313
use rustc_span::edition::Edition;
1414
use rustc_span::{sym, FileName, Symbol};
15+
use tracing::info;
1516

1617
use super::print_item::{full_path, item_path, print_item};
1718
use super::sidebar::{print_sidebar, sidebar_module_like, Sidebar};

src/librustdoc/html/render/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ use rustc_span::symbol::{sym, Symbol};
5757
use rustc_span::{BytePos, FileName, RealFileName, DUMMY_SP};
5858
use serde::ser::SerializeMap;
5959
use serde::{Serialize, Serializer};
60+
use tracing::{debug, info};
6061

6162
pub(crate) use self::context::*;
6263
pub(crate) use self::span_map::{collect_spans_and_sources, LinkFromSrc};

src/librustdoc/html/render/print_item.rs

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ use rustc_middle::ty::{self, TyCtxt};
1515
use rustc_span::hygiene::MacroKind;
1616
use rustc_span::symbol::{kw, sym, Symbol};
1717
use rustc_target::abi::VariantIdx;
18+
use tracing::{debug, info};
1819

1920
use super::type_layout::document_type_layout;
2021
use super::{

src/librustdoc/html/render/search_index.rs

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ use rustc_span::sym;
1111
use rustc_span::symbol::{kw, Symbol};
1212
use serde::ser::{Serialize, SerializeSeq, SerializeStruct, Serializer};
1313
use thin_vec::ThinVec;
14+
use tracing::instrument;
1415

1516
use crate::clean;
1617
use crate::clean::types::{Function, Generics, ItemId, Type, WherePredicate};

src/librustdoc/html/render/sidebar.rs

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ use rustc_data_structures::fx::FxHashSet;
66
use rustc_hir::def::CtorKind;
77
use rustc_hir::def_id::DefIdSet;
88
use rustc_middle::ty::{self, TyCtxt};
9+
use tracing::debug;
910

1011
use super::{item_ty_to_section, Context, ItemSection};
1112
use crate::clean;

src/librustdoc/html/sources.rs

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ use rustc_hir::def_id::LOCAL_CRATE;
1111
use rustc_middle::ty::TyCtxt;
1212
use rustc_session::Session;
1313
use rustc_span::{sym, FileName};
14+
use tracing::info;
1415

1516
use crate::clean;
1617
use crate::clean::utils::has_doc_flag;

src/librustdoc/json/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ use rustdoc_json_types as types;
2222
// the one from rustc_data_structures, as they're different types due to sysroots.
2323
// See #110051 and #127456 for details
2424
use rustdoc_json_types::FxHashMap;
25+
use tracing::{debug, trace};
2526

2627
use crate::clean::types::{ExternalCrate, ExternalLocation};
2728
use crate::clean::ItemKind;

src/librustdoc/lib.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
#![allow(rustc::untranslatable_diagnostic)]
2323

2424
extern crate thin_vec;
25-
#[macro_use]
26-
extern crate tracing;
2725

2826
// N.B. these need `extern crate` even in 2018 edition
2927
// because they're loaded implicitly from the sysroot.
@@ -83,6 +81,7 @@ use rustc_interface::interface;
8381
use rustc_middle::ty::TyCtxt;
8482
use rustc_session::config::{make_crate_type_option, ErrorOutputType, RustcOptGroup};
8583
use rustc_session::{getopts, EarlyDiagCtxt};
84+
use tracing::info;
8685

8786
use crate::clean::utils::DOC_RUST_LANG_ORG_CHANNEL;
8887

src/librustdoc/passes/calculate_doc_coverage.rs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ use rustc_middle::lint::LintLevelSource;
99
use rustc_session::lint;
1010
use rustc_span::FileName;
1111
use serde::Serialize;
12+
use tracing::debug;
1213

1314
use crate::clean;
1415
use crate::core::DocContext;

src/librustdoc/passes/check_doc_test_visibility.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use rustc_hir as hir;
99
use rustc_middle::lint::LintLevelSource;
1010
use rustc_session::lint;
11+
use tracing::debug;
1112

1213
use super::Pass;
1314
use crate::clean;

src/librustdoc/passes/collect_intra_doc_links.rs

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ use rustc_span::hygiene::MacroKind;
2727
use rustc_span::symbol::{sym, Ident, Symbol};
2828
use rustc_span::BytePos;
2929
use smallvec::{smallvec, SmallVec};
30+
use tracing::{debug, info, instrument, trace};
3031

3132
use crate::clean::utils::find_nearest_parent_module;
3233
use crate::clean::{self, Crate, Item, ItemLink, PrimitiveType};

src/librustdoc/passes/collect_trait_impls.rs

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ use rustc_data_structures::fx::FxHashSet;
66
use rustc_hir::def_id::{DefId, DefIdMap, DefIdSet, LOCAL_CRATE};
77
use rustc_middle::ty;
88
use rustc_span::symbol::sym;
9+
use tracing::debug;
910

1011
use super::Pass;
1112
use crate::clean::*;

src/librustdoc/passes/lint/bare_urls.rs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ use pulldown_cmark::{Event, Parser, Tag};
99
use regex::Regex;
1010
use rustc_errors::Applicability;
1111
use rustc_resolve::rustdoc::source_span_for_markdown_range;
12+
use tracing::trace;
1213

1314
use crate::clean::*;
1415
use crate::core::DocContext;

src/librustdoc/passes/strip_hidden.rs

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ use std::mem;
55
use rustc_hir::def_id::{LocalDefId, CRATE_DEF_ID};
66
use rustc_middle::ty::TyCtxt;
77
use rustc_span::symbol::sym;
8+
use tracing::debug;
89

910
use crate::clean;
1011
use crate::clean::utils::inherits_doc_hidden;

src/librustdoc/passes/stripper.rs

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ use std::mem;
44

55
use rustc_hir::def_id::DefId;
66
use rustc_middle::ty::{TyCtxt, Visibility};
7+
use tracing::debug;
78

89
use crate::clean::utils::inherits_doc_hidden;
910
use crate::clean::{self, Item, ItemId, ItemIdSet};

src/librustdoc/scrape_examples.rs

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ use rustc_session::getopts;
1818
use rustc_span::def_id::{CrateNum, DefPathHash, LOCAL_CRATE};
1919
use rustc_span::edition::Edition;
2020
use rustc_span::{BytePos, FileName, SourceFile};
21+
use tracing::{debug, trace, warn};
2122

2223
use crate::formats::renderer::FormatRenderer;
2324
use crate::html::render::Context;

src/librustdoc/visit_ast.rs

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ use rustc_span::def_id::{CRATE_DEF_ID, LOCAL_CRATE};
1515
use rustc_span::hygiene::MacroKind;
1616
use rustc_span::symbol::{kw, sym, Symbol};
1717
use rustc_span::Span;
18+
use tracing::debug;
1819

1920
use crate::clean::cfg::Cfg;
2021
use crate::clean::utils::{inherits_doc_hidden, should_ignore_res};

0 commit comments

Comments
 (0)