Auto merge of #17087 - davidbarsky:david/fix-some-tracing-spans, r=Veykril

chore: fix a few spans without `.entered()`

Author: bors

crates/hir-ty/src/diagnostics/unsafe_check.rs

@@ -13,7 +13,7 @@ use crate::{
 };
 
 pubfnmissing_unsafe(db:&dynHirDatabase,def:DefWithBodyId) -> Vec<ExprId>{
-let _p = tracing::span!(tracing::Level::INFO,"missing_unsafe",);
+let _p = tracing::span!(tracing::Level::INFO,"missing_unsafe").entered();
 
 letmut res = Vec::new();
 let is_unsafe = match def {

crates/hir-ty/src/inhabitedness.rs

@@ -15,7 +15,7 @@ use crate::{
 // FIXME: Turn this into a query, it can be quite slow
 /// Checks whether a type is visibly uninhabited from a particular module.
 pub(crate)fnis_ty_uninhabited_from(db:&dynHirDatabase,ty:&Ty,target_mod:ModuleId) -> bool{
-let _p = tracing::span!(tracing::Level::INFO,"is_ty_uninhabited_from", ?ty);
+let _p = tracing::span!(tracing::Level::INFO,"is_ty_uninhabited_from", ?ty).entered();
 letmut uninhabited_from =
 UninhabitedFrom{ target_mod, db,max_depth:500,recursive_ty:FxHashSet::default()};
 let inhabitedness = ty.visit_with(&mut uninhabited_from,DebruijnIndex::INNERMOST);
@@ -30,7 +30,7 @@ pub(crate) fn is_enum_variant_uninhabited_from(
 subst:&Substitution,
 target_mod:ModuleId,
 ) -> bool{
-let _p = tracing::span!(tracing::Level::INFO,"is_enum_variant_uninhabited_from",);
+let _p = tracing::span!(tracing::Level::INFO,"is_enum_variant_uninhabited_from").entered();
 
 letmut uninhabited_from =
 UninhabitedFrom{ target_mod, db,max_depth:500,recursive_ty:FxHashSet::default()};

crates/hir/src/lib.rs

@@ -239,7 +239,7 @@ impl Crate {
 db:&dynDefDatabase,
 query: import_map::Query,
 ) -> implIterator<Item = Either<ModuleDef,Macro>>{
-let _p = tracing::span!(tracing::Level::INFO,"query_external_importables");
+let _p = tracing::span!(tracing::Level::INFO,"query_external_importables").entered();
  import_map::search_dependencies(db,self.into(),&query).into_iter().map(|item| {
 matchItemInNs::from(item){
 ItemInNs::Types(mod_id) | ItemInNs::Values(mod_id) => Either::Left(mod_id),
@@ -548,7 +548,8 @@ impl Module {
 acc:&mutVec<AnyDiagnostic>,
 style_lints:bool,
 ){
-let _p = tracing::span!(tracing::Level::INFO,"Module::diagnostics", name = ?self.name(db));
+let _p = tracing::span!(tracing::Level::INFO,"Module::diagnostics", name = ?self.name(db))
+.entered();
 let def_map = self.id.def_map(db.upcast());
 for diag in def_map.diagnostics(){
 if diag.in_module != self.id.local_id{
@@ -4494,7 +4495,7 @@ impl Type {
 name:Option<&Name>,
 mutcallback:implFnMut(Function) -> Option<T>,
 ) -> Option<T>{
-let _p = tracing::span!(tracing::Level::INFO,"iterate_method_candidates");
+let _p = tracing::span!(tracing::Level::INFO,"iterate_method_candidates").entered();
 letmut slot = None;
 
 self.iterate_method_candidates_dyn(
@@ -4582,7 +4583,7 @@ impl Type {
 name:Option<&Name>,
 mutcallback:implFnMut(AssocItem) -> Option<T>,
 ) -> Option<T>{
-let _p = tracing::span!(tracing::Level::INFO,"iterate_path_candidates");
+let _p = tracing::span!(tracing::Level::INFO,"iterate_path_candidates").entered();
 letmut slot = None;
 self.iterate_path_candidates_dyn(
  db,
@@ -4649,15 +4650,15 @@ impl Type {
 &'aself,
 db:&'adynHirDatabase,
 ) -> implIterator<Item = Trait> + 'a{
-let _p = tracing::span!(tracing::Level::INFO,"applicable_inherent_traits");
+let _p = tracing::span!(tracing::Level::INFO,"applicable_inherent_traits").entered();
 self.autoderef_(db)
 .filter_map(|ty| ty.dyn_trait())
 .flat_map(move |dyn_trait_id| hir_ty::all_super_traits(db.upcast(), dyn_trait_id))
 .map(Trait::from)
 }
 
 pubfnenv_traits<'a>(&'aself,db:&'adynHirDatabase) -> implIterator<Item = Trait> + 'a{
-let _p = tracing::span!(tracing::Level::INFO,"env_traits");
+let _p = tracing::span!(tracing::Level::INFO,"env_traits").entered();
 self.autoderef_(db)
 .filter(|ty| matches!(ty.kind(Interner),TyKind::Placeholder(_)))
 .flat_map(|ty| {

crates/hir/src/semantics.rs

@@ -722,7 +722,7 @@ impl<'db> SemanticsImpl<'db> {
 muttoken:SyntaxToken,
 f:&mutdynFnMut(InFile<SyntaxToken>) -> ControlFlow<()>,
 ){
-let _p = tracing::span!(tracing::Level::INFO,"descend_into_macros");
+let _p = tracing::span!(tracing::Level::INFO,"descend_into_macros").entered();
 let(sa, span, file_id) =
 match token.parent().and_then(|parent| self.analyze_no_infer(&parent)){
 Some(sa) => match sa.file_id.file_id(){
@@ -1359,7 +1359,7 @@ impl<'db> SemanticsImpl<'db> {
 offset:Option<TextSize>,
 infer_body:bool,
 ) -> Option<SourceAnalyzer>{
-let _p = tracing::span!(tracing::Level::INFO,"Semantics::analyze_impl");
+let _p = tracing::span!(tracing::Level::INFO,"Semantics::analyze_impl").entered();
 let node = self.find_file(node);
 
 let container = self.with_ctx(|ctx| ctx.find_container(node))?;

crates/hir/src/semantics/source_to_def.rs

@@ -118,7 +118,7 @@ pub(super) struct SourceToDefCtx<'a, 'b> {
 
 implSourceToDefCtx<'_,'_>{
 pub(super)fnfile_to_def(&self,file:FileId) -> SmallVec<[ModuleId;1]>{
-let _p = tracing::span!(tracing::Level::INFO,"SourceBinder::file_to_module_def");
+let _p = tracing::span!(tracing::Level::INFO,"SourceBinder::file_to_module_def").entered();
 letmut mods = SmallVec::new();
 for&crate_id inself.db.relevant_crates(file).iter(){
 // FIXME: inner items
@@ -133,7 +133,7 @@ impl SourceToDefCtx<'_, '_> {
 }
 
 pub(super)fnmodule_to_def(&mutself,src:InFile<ast::Module>) -> Option<ModuleId>{
-let _p = tracing::span!(tracing::Level::INFO,"module_to_def");
+let _p = tracing::span!(tracing::Level::INFO,"module_to_def").entered();
 let parent_declaration = src
 .syntax()
 .ancestors_with_macros_skip_attr_item(self.db.upcast())
@@ -158,7 +158,7 @@ impl SourceToDefCtx<'_, '_> {
 }
 
 pub(super)fnsource_file_to_def(&self,src:InFile<ast::SourceFile>) -> Option<ModuleId>{
-let _p = tracing::span!(tracing::Level::INFO,"source_file_to_def");
+let _p = tracing::span!(tracing::Level::INFO,"source_file_to_def").entered();
 let file_id = src.file_id.original_file(self.db.upcast());
 self.file_to_def(file_id).first().copied()
 }

crates/ide-assists/src/handlers/add_missing_impl_members.rs

@@ -105,7 +105,7 @@ fn add_missing_impl_members_inner(
 assist_id:&'staticstr,
 label:&'staticstr,
 ) -> Option<()>{
-let _p = tracing::span!(tracing::Level::INFO,"add_missing_impl_members_inner");
+let _p = tracing::span!(tracing::Level::INFO,"add_missing_impl_members_inner").entered();
 let impl_def = ctx.find_node_at_offset::<ast::Impl>()?;
 let impl_ = ctx.sema.to_def(&impl_def)?;