aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_ide_api
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2019-06-11 15:54:51 +0100
committerAleksey Kladov <[email protected]>2019-06-11 16:28:51 +0100
commitc4512fadb1b332b13bb41b0aa8a28aa964664842 (patch)
treeca958cd714324a36bb9095afd63aa6d02b2a7757 /crates/ra_ide_api
parentdd63f17027d5c873a5782dcbb08e9b068fc8ee00 (diff)
remove inherent source impls
Diffstat (limited to 'crates/ra_ide_api')
-rw-r--r--crates/ra_ide_api/src/completion/presentation.rs2
-rw-r--r--crates/ra_ide_api/src/display/function_signature.rs7
-rw-r--r--crates/ra_ide_api/src/display/navigation_target.rs4
-rw-r--r--crates/ra_ide_api/src/hover.rs4
4 files changed, 9 insertions, 8 deletions
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 @@
1//! This modules takes care of rendering various defenitions as completion items. 1//! This modules takes care of rendering various defenitions as completion items.
2use join_to_string::join; 2use join_to_string::join;
3use test_utils::tested_by; 3use test_utils::tested_by;
4use hir::{Docs, PerNs, Resolution, HirDisplay}; 4use hir::{Docs, PerNs, Resolution, HirDisplay, HasSource};
5use ra_syntax::ast::NameOwner; 5use ra_syntax::ast::NameOwner;
6 6
7use crate::completion::{ 7use 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 @@
1use super::{where_predicates, generic_parameters};
2use crate::db;
3use std::fmt::{self, Display}; 1use std::fmt::{self, Display};
2
4use join_to_string::join; 3use join_to_string::join;
5use ra_syntax::ast::{self, AstNode, NameOwner, VisibilityOwner}; 4use ra_syntax::ast::{self, AstNode, NameOwner, VisibilityOwner};
6use std::convert::From; 5use std::convert::From;
7use hir::{Docs, Documentation}; 6use hir::{Docs, Documentation, HasSource};
7
8use crate::{db, display::{where_predicates, generic_parameters}};
8 9
9/// Contains information about a function signature 10/// Contains information about a function signature
10#[derive(Debug)] 11#[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::{
5 ast::{self, DocCommentsOwner}, 5 ast::{self, DocCommentsOwner},
6 algo::visit::{visitor, Visitor}, 6 algo::visit::{visitor, Visitor},
7}; 7};
8use hir::{ModuleSource, FieldSource, ImplItem}; 8use hir::{ModuleSource, FieldSource, ImplItem, HasSource};
9 9
10use crate::{FileSymbol, db::RootDatabase}; 10use crate::{FileSymbol, db::RootDatabase};
11use super::short_label::ShortLabel; 11use super::short_label::ShortLabel;
@@ -182,7 +182,7 @@ impl NavigationTarget {
182 182
183 pub(crate) fn from_def_source<A, D>(db: &RootDatabase, def: D) -> NavigationTarget 183 pub(crate) fn from_def_source<A, D>(db: &RootDatabase, def: D) -> NavigationTarget
184 where 184 where
185 D: hir::HasSource<Ast = TreeArc<A>>, 185 D: HasSource<Ast = TreeArc<A>>,
186 A: ast::DocCommentsOwner + ast::NameOwner + ShortLabel, 186 A: ast::DocCommentsOwner + ast::NameOwner + ShortLabel,
187 { 187 {
188 let src = def.source(db); 188 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::{
4 ast::{self, DocCommentsOwner}, 4 ast::{self, DocCommentsOwner},
5 algo::{find_covering_element, find_node_at_offset, ancestors_at_offset, visit::{visitor, Visitor}}, 5 algo::{find_covering_element, find_node_at_offset, ancestors_at_offset, visit::{visitor, Visitor}},
6}; 6};
7use hir::HirDisplay; 7use hir::{HirDisplay, HasSource};
8 8
9use crate::{ 9use crate::{
10 db::RootDatabase, 10 db::RootDatabase,
@@ -226,7 +226,7 @@ pub(crate) fn hover(db: &RootDatabase, position: FilePosition) -> Option<RangeIn
226 226
227 fn from_def_source<A, D>(db: &RootDatabase, def: D) -> Option<String> 227 fn from_def_source<A, D>(db: &RootDatabase, def: D) -> Option<String>
228 where 228 where
229 D: hir::HasSource<Ast = TreeArc<A>>, 229 D: HasSource<Ast = TreeArc<A>>,
230 A: ast::DocCommentsOwner + ast::NameOwner + ShortLabel, 230 A: ast::DocCommentsOwner + ast::NameOwner + ShortLabel,
231 { 231 {
232 let src = def.source(db); 232 let src = def.source(db);