Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide-assists/src/handlers/inline_call.rs')
| -rw-r--r-- | crates/ide-assists/src/handlers/inline_call.rs | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/crates/ide-assists/src/handlers/inline_call.rs b/crates/ide-assists/src/handlers/inline_call.rs index a14b30db42..438966a1d6 100644 --- a/crates/ide-assists/src/handlers/inline_call.rs +++ b/crates/ide-assists/src/handlers/inline_call.rs @@ -1,11 +1,7 @@ use std::collections::BTreeSet; use either::Either; -use hir::{ - FileRange, PathResolution, Semantics, TypeInfo, - db::{ExpandDatabase, HirDatabase}, - sym, -}; +use hir::{FileRange, PathResolution, Semantics, TypeInfo, db::HirDatabase, sym}; use ide_db::{ EditionedFileId, FxHashMap, RootDatabase, base_db::Crate, @@ -352,7 +348,7 @@ fn inline( let file_id = sema.hir_file_for(fn_body.syntax()); let body_to_clone = if let Some(macro_file) = file_id.macro_file() { cov_mark::hit!(inline_call_defined_in_macro); - let span_map = sema.db.expansion_span_map(macro_file); + let span_map = macro_file.expansion_span_map(sema.db); let body_prettified = prettify_macro_expansion(sema.db, fn_body.syntax().clone(), span_map, *krate); if let Some(body) = ast::BlockExpr::cast(body_prettified) { body } else { fn_body.clone() } @@ -496,7 +492,7 @@ fn inline( let param_ty = param_ty.clone().map(|param_ty| { let file_id = sema.hir_file_for(param_ty.syntax()); if let Some(macro_file) = file_id.macro_file() { - let span_map = sema.db.expansion_span_map(macro_file); + let span_map = macro_file.expansion_span_map(sema.db); let param_ty_prettified = prettify_macro_expansion( sema.db, param_ty.syntax().clone(), |