Skip to content

Commit d1f74a2

Browse files
borsbors
committed
Auto merge of #17356 - Wilfred:span_shorthand, r=lnicola
chore: Prefer tracing span shorthand macros Use `info_span!()` and `debug_span!()` rather than the more verbose `tracing::span!(tracing::Level::INFO)`.
2 parents 5f3de78 + 27182bb commit d1f74a2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+240
-275
lines changed

‎crates/base-db/src/change.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ impl FileChange {
5151
}
5252

5353
pub fn apply(self, db: &mut dyn SourceDatabaseExt) {
54-
let _p = tracing::span!(tracing::Level::INFO, "FileChange::apply").entered();
54+
let _p = tracing::info_span!("FileChange::apply").entered();
5555
if let Some(roots) = self.roots {
5656
for (idx, root) in roots.into_iter().enumerate() {
5757
let root_id = SourceRootId(idx as u32);

‎crates/base-db/src/input.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ impl CrateGraph {
412412
from: CrateId,
413413
dep: Dependency,
414414
) -> Result<(), CyclicDependenciesError> {
415-
let _p = tracing::span!(tracing::Level::INFO, "add_dep").entered();
415+
let _p = tracing::info_span!("add_dep").entered();
416416

417417
self.check_cycle_after_dependency(from, dep.crate_id)?;
418418

‎crates/base-db/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ fn toolchain_channel(db: &dyn SourceDatabase, krate: CrateId) -> Option<ReleaseC
8585
}
8686

8787
fn parse(db: &dyn SourceDatabase, file_id: FileId) -> Parse<ast::SourceFile> {
88-
let _p = tracing::span!(tracing::Level::INFO, "parse", ?file_id).entered();
88+
let _p = tracing::info_span!("parse", ?file_id).entered();
8989
let text = db.file_text(file_id);
9090
// FIXME: Edition based parsing
9191
SourceFile::parse(&text, span::Edition::CURRENT)
@@ -187,7 +187,7 @@ impl<T: SourceDatabaseExt> FileLoader for FileLoaderDelegate<&'_ T> {
187187
}
188188

189189
fn relevant_crates(&self, file_id: FileId) -> Arc<[CrateId]> {
190-
let _p = tracing::span!(tracing::Level::INFO, "relevant_crates").entered();
190+
let _p = tracing::info_span!("relevant_crates").entered();
191191
let source_root = self.0.file_source_root(file_id);
192192
self.0.source_root_crates(source_root)
193193
}

‎crates/hir-def/src/attr.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ impl Attrs {
7070
db: &dyn DefDatabase,
7171
v: VariantId,
7272
) -> Arc<ArenaMap<LocalFieldId, Attrs>> {
73-
let _p = tracing::span!(tracing::Level::INFO, "fields_attrs_query").entered();
73+
let _p = tracing::info_span!("fields_attrs_query").entered();
7474
// FIXME: There should be some proper form of mapping between item tree field ids and hir field ids
7575
let mut res = ArenaMap::default();
7676

@@ -321,7 +321,7 @@ impl AttrsWithOwner {
321321
}
322322

323323
pub(crate) fn attrs_query(db: &dyn DefDatabase, def: AttrDefId) -> Attrs {
324-
let _p = tracing::span!(tracing::Level::INFO, "attrs_query").entered();
324+
let _p = tracing::info_span!("attrs_query").entered();
325325
// FIXME: this should use `Trace` to avoid duplication in `source_map` below
326326
let raw_attrs = match def {
327327
AttrDefId::ModuleId(module) => {

‎crates/hir-def/src/body.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ impl Body {
124124
db: &dyn DefDatabase,
125125
def: DefWithBodyId,
126126
) -> (Arc<Body>, Arc<BodySourceMap>) {
127-
let _p = tracing::span!(tracing::Level::INFO, "body_with_source_map_query").entered();
127+
let _p = tracing::info_span!("body_with_source_map_query").entered();
128128
let mut params = None;
129129

130130
let mut is_async_fn = false;

‎crates/hir-def/src/data.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ impl ImplData {
340340
db: &dyn DefDatabase,
341341
id: ImplId,
342342
) -> (Arc<ImplData>, DefDiagnostics) {
343-
let _p = tracing::span!(tracing::Level::INFO, "impl_data_with_diagnostics_query").entered();
343+
let _p = tracing::info_span!("impl_data_with_diagnostics_query").entered();
344344
let ItemLoc { container: module_id, id: tree_id } = id.lookup(db);
345345

346346
let item_tree = tree_id.item_tree(db);

‎crates/hir-def/src/find_path.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pub fn find_path(
2727
ignore_local_imports: bool,
2828
mut cfg: ImportPathConfig,
2929
) -> Option<ModPath> {
30-
let _p = tracing::span!(tracing::Level::INFO, "find_path").entered();
30+
let _p = tracing::info_span!("find_path").entered();
3131

3232
// - if the item is a builtin, it's in scope
3333
if let ItemInNs::Types(ModuleDefId::BuiltinType(builtin)) = item {
@@ -474,7 +474,7 @@ fn find_local_import_locations(
474474
def_map: &DefMap,
475475
mut cb: impl FnMut(&Name, ModuleId),
476476
) {
477-
let _p = tracing::span!(tracing::Level::INFO, "find_local_import_locations").entered();
477+
let _p = tracing::info_span!("find_local_import_locations").entered();
478478

479479
// `from` can import anything below `from` with visibility of at least `from`, and anything
480480
// above `from` with any visibility. That means we do not need to descend into private siblings

‎crates/hir-def/src/generics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ impl GenericParams {
467467
db: &dyn DefDatabase,
468468
def: GenericDefId,
469469
) -> Interned<GenericParams> {
470-
let _p = tracing::span!(tracing::Level::INFO, "generic_params_query").entered();
470+
let _p = tracing::info_span!("generic_params_query").entered();
471471

472472
let krate = def.module(db).krate;
473473
let cfg_options = db.crate_graph();

‎crates/hir-def/src/import_map.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ impl ImportMap {
7373
}
7474

7575
pub(crate) fn import_map_query(db: &dyn DefDatabase, krate: CrateId) -> Arc<Self> {
76-
let _p = tracing::span!(tracing::Level::INFO, "import_map_query").entered();
76+
let _p = tracing::info_span!("import_map_query").entered();
7777

7878
let map = Self::collect_import_map(db, krate);
7979

@@ -124,7 +124,7 @@ impl ImportMap {
124124
}
125125

126126
fn collect_import_map(db: &dyn DefDatabase, krate: CrateId) -> ImportMapIndex {
127-
let _p = tracing::span!(tracing::Level::INFO, "collect_import_map").entered();
127+
let _p = tracing::info_span!("collect_import_map").entered();
128128

129129
let def_map = db.crate_def_map(krate);
130130
let mut map = FxIndexMap::default();
@@ -214,7 +214,7 @@ impl ImportMap {
214214
is_type_in_ns: bool,
215215
trait_import_info: &ImportInfo,
216216
) {
217-
let _p = tracing::span!(tracing::Level::INFO, "collect_trait_assoc_items").entered();
217+
let _p = tracing::info_span!("collect_trait_assoc_items").entered();
218218
for &(ref assoc_item_name, item) in &db.trait_data(tr).items {
219219
let module_def_id = match item {
220220
AssocItemId::FunctionId(f) => ModuleDefId::from(f),
@@ -396,7 +396,7 @@ pub fn search_dependencies(
396396
krate: CrateId,
397397
query: &Query,
398398
) -> FxHashSet<ItemInNs> {
399-
let _p = tracing::span!(tracing::Level::INFO, "search_dependencies", ?query).entered();
399+
let _p = tracing::info_span!("search_dependencies", ?query).entered();
400400

401401
let graph = db.crate_graph();
402402

‎crates/hir-def/src/item_tree.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ pub struct ItemTree {
9999

100100
impl ItemTree {
101101
pub(crate) fn file_item_tree_query(db: &dyn DefDatabase, file_id: HirFileId) -> Arc<ItemTree> {
102-
let _p = tracing::span!(tracing::Level::INFO, "file_item_tree_query", ?file_id).entered();
102+
let _p = tracing::info_span!("file_item_tree_query", ?file_id).entered();
103103

104104
let syntax = db.parse_or_expand(file_id);
105105

0 commit comments

Comments
 (0)