1 files changed, 8 insertions, 8 deletions

diff --git a/crates/ra_assists/src/assist_ctx.rs b/crates/ra_assists/src/assist_ctx.rs
index b6cac96fa..f32072dbd 100644
--- a/crates/ra_assists/src/assist_ctx.rs
+++ b/crates/ra_assists/src/assist_ctx.rs
@@ -1,6 +1,6 @@
 //! This module defines `AssistCtx` -- the API surface that is exposed to assists.
 use either::Either;
-use hir::{db::HirDatabase, InFile, SourceAnalyzer, SourceBinder};
+use hir::{InFile, SourceAnalyzer, SourceBinder};
 use ra_db::{FileRange, SourceDatabase};
 use ra_fmt::{leading_indent, reindent};
 use ra_ide_db::RootDatabase;
@@ -50,14 +50,14 @@ pub(crate) enum Assist {
 /// moment, because the LSP API is pretty awkward in this place, and it's much
 /// easier to just compute the edit eagerly :-)
 #[derive(Debug)]
-pub(crate) struct AssistCtx<'a, DB> {
-    pub(crate) db: &'a DB,
+pub(crate) struct AssistCtx<'a> {
+    pub(crate) db: &'a RootDatabase,
     pub(crate) frange: FileRange,
     source_file: SourceFile,
     should_compute_edit: bool,
 }
 
-impl<'a, DB> Clone for AssistCtx<'a, DB> {
+impl<'a> Clone for AssistCtx<'a> {
     fn clone(&self) -> Self {
         AssistCtx {
             db: self.db,
@@ -68,7 +68,7 @@ impl<'a, DB> Clone for AssistCtx<'a, DB> {
     }
 }
 
-impl<'a> AssistCtx<'a, RootDatabase> {
+impl<'a> AssistCtx<'a> {
     pub(crate) fn with_ctx<F, T>(
         db: &RootDatabase,
         frange: FileRange,
@@ -76,7 +76,7 @@ impl<'a> AssistCtx<'a, RootDatabase> {
         f: F,
     ) -> T
     where
-        F: FnOnce(AssistCtx<RootDatabase>) -> T,
+        F: FnOnce(AssistCtx) -> T,
     {
         let parse = db.parse(frange.file_id);
 
@@ -85,7 +85,7 @@ impl<'a> AssistCtx<'a, RootDatabase> {
     }
 }
 
-impl<'a, DB: HirDatabase> AssistCtx<'a, DB> {
+impl<'a> AssistCtx<'a> {
     pub(crate) fn add_assist(
         self,
         id: AssistId,
@@ -149,7 +149,7 @@ impl<'a, DB: HirDatabase> AssistCtx<'a, DB> {
     pub(crate) fn covering_element(&self) -> SyntaxElement {
         find_covering_element(self.source_file.syntax(), self.frange.range)
     }
-    pub(crate) fn source_binder(&self) -> SourceBinder<'a, DB> {
+    pub(crate) fn source_binder(&self) -> SourceBinder<'a, RootDatabase> {
         SourceBinder::new(self.db)
     }
     pub(crate) fn source_analyzer(