Skip to content

Commit f572397

Browse files
Remove unnecessary lifetime parameter
1 parent 316795e commit f572397

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

crates/ra_assists/src/assists/auto_import.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ use crate::{
2828
// let map = HashMap<|>::new();
2929
// }
3030
// ```
31-
pub(crate) fn auto_import<'a, F: ImportsLocator<'a>>(
31+
pub(crate) fn auto_import<F: ImportsLocator>(
3232
ctx: AssistCtx<impl HirDatabase>,
3333
imports_locator: &mut F,
3434
) -> Option<Assist> {
@@ -108,7 +108,7 @@ mod tests {
108108
}
109109
}
110110

111-
impl<'a> ImportsLocator<'_> for TestImportsLocator<'_> {
111+
impl<'a> ImportsLocator for TestImportsLocator<'a> {
112112
fn find_imports(
113113
&mut self,
114114
_: hir::InFile<&ast::NameRef>,

crates/ra_assists/src/lib.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ where
8383
/// due to the search functionality located there.
8484
/// Later, this trait should be removed completely and the search functionality moved to a separate crate,
8585
/// accessible from the ra_assists crate.
86-
pub trait ImportsLocator<'a> {
86+
pub trait ImportsLocator {
8787
/// Finds all imports for the given name and the module that contains this name.
8888
fn find_imports(
8989
&mut self,
@@ -97,14 +97,14 @@ pub trait ImportsLocator<'a> {
9797
///
9898
/// Assists are returned in the "resolved" state, that is with edit fully
9999
/// computed.
100-
pub fn assists_with_imports_locator<'a, H, F: 'a>(
100+
pub fn assists_with_imports_locator<H, F>(
101101
db: &H,
102102
range: FileRange,
103103
mut imports_locator: F,
104104
) -> Vec<ResolvedAssist>
105105
where
106106
H: HirDatabase + 'static,
107-
F: ImportsLocator<'a>,
107+
F: ImportsLocator,
108108
{
109109
AssistCtx::with_ctx(db, range, true, |ctx| {
110110
let mut assists = assists::all()
@@ -222,7 +222,7 @@ mod assists {
222222
]
223223
}
224224

225-
pub(crate) fn all_with_imports_locator<'a, DB: HirDatabase, F: ImportsLocator<'a>>(
225+
pub(crate) fn all_with_imports_locator<'a, DB: HirDatabase, F: ImportsLocator>(
226226
) -> &'a [fn(AssistCtx<DB>, &mut F) -> Option<Assist>] {
227227
&[auto_import::auto_import]
228228
}
@@ -264,7 +264,7 @@ mod helpers {
264264
assert_eq_text!(after, &actual);
265265
}
266266

267-
pub(crate) fn check_assist_with_imports_locator<'a, F: ImportsLocator<'a>>(
267+
pub(crate) fn check_assist_with_imports_locator<F: ImportsLocator>(
268268
assist: fn(AssistCtx<TestDB>, &mut F) -> Option<Assist>,
269269
imports_locator: &mut F,
270270
before: &str,
@@ -366,7 +366,7 @@ mod helpers {
366366
assert!(assist.is_none());
367367
}
368368

369-
pub(crate) fn check_assist_with_imports_locator_not_applicable<'a, F: ImportsLocator<'a>>(
369+
pub(crate) fn check_assist_with_imports_locator_not_applicable<F: ImportsLocator>(
370370
assist: fn(AssistCtx<TestDB>, &mut F) -> Option<Assist>,
371371
imports_locator: &mut F,
372372
before: &str,

crates/ra_ide/src/imports_locator.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ impl<'a> ImportsLocatorIde<'a> {
8282
}
8383
}
8484

85-
impl<'a> ImportsLocator<'a> for ImportsLocatorIde<'a> {
85+
impl<'a> ImportsLocator for ImportsLocatorIde<'a> {
8686
fn find_imports(
8787
&mut self,
8888
name_to_import: InFile<&NameRef>,

0 commit comments

Comments
 (0)