From c4512fadb1b332b13bb41b0aa8a28aa964664842 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Tue, 11 Jun 2019 17:54:51 +0300
Subject: remove inherent source impls

---
 crates/ra_ide_api/src/completion/presentation.rs    | 2 +-
 crates/ra_ide_api/src/display/function_signature.rs | 7 ++++---
 crates/ra_ide_api/src/display/navigation_target.rs  | 4 ++--
 crates/ra_ide_api/src/hover.rs                      | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'crates/ra_ide_api')

diff --git a/crates/ra_ide_api/src/completion/presentation.rs b/crates/ra_ide_api/src/completion/presentation.rs
index 495899262..f4ff4404b 100644
--- a/crates/ra_ide_api/src/completion/presentation.rs
+++ b/crates/ra_ide_api/src/completion/presentation.rs
@@ -1,7 +1,7 @@
 //! This modules takes care of rendering various defenitions as completion items.
 use join_to_string::join;
 use test_utils::tested_by;
-use hir::{Docs, PerNs, Resolution, HirDisplay};
+use hir::{Docs, PerNs, Resolution, HirDisplay, HasSource};
 use ra_syntax::ast::NameOwner;
 
 use crate::completion::{
diff --git a/crates/ra_ide_api/src/display/function_signature.rs b/crates/ra_ide_api/src/display/function_signature.rs
index d0c155de7..b0b0c7122 100644
--- a/crates/ra_ide_api/src/display/function_signature.rs
+++ b/crates/ra_ide_api/src/display/function_signature.rs
@@ -1,10 +1,11 @@
-use super::{where_predicates, generic_parameters};
-use crate::db;
 use std::fmt::{self, Display};
+
 use join_to_string::join;
 use ra_syntax::ast::{self, AstNode, NameOwner, VisibilityOwner};
 use std::convert::From;
-use hir::{Docs, Documentation};
+use hir::{Docs, Documentation, HasSource};
+
+use crate::{db, display::{where_predicates, generic_parameters}};
 
 /// Contains information about a function signature
 #[derive(Debug)]
diff --git a/crates/ra_ide_api/src/display/navigation_target.rs b/crates/ra_ide_api/src/display/navigation_target.rs
index d7687e1a4..1e9cdaff4 100644
--- a/crates/ra_ide_api/src/display/navigation_target.rs
+++ b/crates/ra_ide_api/src/display/navigation_target.rs
@@ -5,7 +5,7 @@ use ra_syntax::{
     ast::{self, DocCommentsOwner},
     algo::visit::{visitor, Visitor},
 };
-use hir::{ModuleSource, FieldSource, ImplItem};
+use hir::{ModuleSource, FieldSource, ImplItem, HasSource};
 
 use crate::{FileSymbol, db::RootDatabase};
 use super::short_label::ShortLabel;
@@ -182,7 +182,7 @@ impl NavigationTarget {
 
     pub(crate) fn from_def_source<A, D>(db: &RootDatabase, def: D) -> NavigationTarget
     where
-        D: hir::HasSource<Ast = TreeArc<A>>,
+        D: HasSource<Ast = TreeArc<A>>,
         A: ast::DocCommentsOwner + ast::NameOwner + ShortLabel,
     {
         let src = def.source(db);
diff --git a/crates/ra_ide_api/src/hover.rs b/crates/ra_ide_api/src/hover.rs
index 77657607b..ad00abe49 100644
--- a/crates/ra_ide_api/src/hover.rs
+++ b/crates/ra_ide_api/src/hover.rs
@@ -4,7 +4,7 @@ use ra_syntax::{
     ast::{self, DocCommentsOwner},
     algo::{find_covering_element, find_node_at_offset, ancestors_at_offset, visit::{visitor, Visitor}},
 };
-use hir::HirDisplay;
+use hir::{HirDisplay, HasSource};
 
 use crate::{
     db::RootDatabase,
@@ -226,7 +226,7 @@ pub(crate) fn hover(db: &RootDatabase, position: FilePosition) -> Option<RangeIn
 
     fn from_def_source<A, D>(db: &RootDatabase, def: D) -> Option<String>
     where
-        D: hir::HasSource<Ast = TreeArc<A>>,
+        D: HasSource<Ast = TreeArc<A>>,
         A: ast::DocCommentsOwner + ast::NameOwner + ShortLabel,
     {
         let src = def.source(db);
-- 
cgit v1.2.3