Merge #3029

3029: Docs r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>

Author: bors[bot]

Cargo.lock

@@ -28,6 +28,7 @@ once_cell = "1.2.0"
 ra_syntax = { path = "../ra_syntax" }
 ra_text_edit = { path = "../ra_text_edit" }
 ra_db = { path = "../ra_db" }
+ra_ide_db = { path = "../ra_ide_db" }
 ra_cfg = { path = "../ra_cfg" }
 ra_fmt = { path = "../ra_fmt" }
 ra_prof = { path = "../ra_prof" }

crates/ra_ide/Cargo.toml

@@ -1,13 +1,13 @@
 //! FIXME: write short doc here
 
+use either::Either;
+use ra_assists::{AssistAction, AssistLabel};
 use ra_db::{FilePosition, FileRange};
+use ra_ide_db::RootDatabase;
+
+use crate::{imports_locator::ImportsLocatorIde, FileId, SourceChange, SourceFileEdit};
 
-use crate::{
-    db::RootDatabase, imports_locator::ImportsLocatorIde, FileId, SourceChange, SourceFileEdit,
-};
-use either::Either;
 pub use ra_assists::AssistId;
-use ra_assists::{AssistAction, AssistLabel};
 
 #[derive(Debug)]
 pub struct Assist {

crates/ra_ide/src/assists.rs

@@ -3,14 +3,14 @@
 use indexmap::IndexMap;
 
 use hir::db::AstDatabase;
+use ra_ide_db::RootDatabase;
 use ra_syntax::{
     ast::{self, DocCommentsOwner},
     match_ast, AstNode, TextRange,
 };
 
 use crate::{
     call_info::FnCallNode,
-    db::RootDatabase,
     display::{ShortLabel, ToNav},
     expand::descend_into_macros,
     goto_definition, references, FilePosition, NavigationTarget, RangeInfo,

crates/ra_ide/src/call_hierarchy.rs

@@ -1,15 +1,13 @@
 //! FIXME: write short doc here
 use hir::db::AstDatabase;
+use ra_ide_db::RootDatabase;
 use ra_syntax::{
     ast::{self, ArgListOwner},
     match_ast, AstNode, SyntaxNode,
 };
-
 use test_utils::tested_by;
 
-use crate::{
-    db::RootDatabase, expand::descend_into_macros, CallInfo, FilePosition, FunctionSignature,
-};
+use crate::{expand::descend_into_macros, CallInfo, FilePosition, FunctionSignature};
 
 /// Computes parameter information for the given call expression.
 pub(crate) fn call_info(db: &RootDatabase, position: FilePosition) -> Option<CallInfo> {

crates/ra_ide/src/call_info.rs

@@ -17,6 +17,7 @@ mod complete_postfix;
 mod complete_macro_in_item_position;
 
 use ra_db::SourceDatabase;
+use ra_ide_db::RootDatabase;
 
 #[cfg(test)]
 use crate::completion::completion_item::do_completion;
@@ -25,7 +26,7 @@ use crate::{
         completion_context::CompletionContext,
         completion_item::{CompletionKind, Completions},
     },
-    db, FilePosition,
+    FilePosition,
 };
 
 pub use crate::completion::completion_item::{
@@ -54,7 +55,7 @@ pub use crate::completion::completion_item::{
 /// `foo` *should* be present among the completion variants. Filtering by
 /// identifier prefix/fuzzy match should be done higher in the stack, together
 /// with ordering of completions (currently this is done by the client).
-pub(crate) fn completions(db: &db::RootDatabase, position: FilePosition) -> Option<Completions> {
+pub(crate) fn completions(db: &RootDatabase, position: FilePosition) -> Option<Completions> {
     let original_parse = db.parse(position.file_id);
     let ctx = CompletionContext::new(db, &original_parse, position)?;
 

crates/ra_ide/src/completion.rs

@@ -1,5 +1,6 @@
 //! FIXME: write short doc here
 
+use ra_ide_db::RootDatabase;
 use ra_syntax::{
     algo::{find_covering_element, find_node_at_offset},
     ast, AstNode, Parse, SourceFile,
@@ -8,13 +9,13 @@ use ra_syntax::{
 };
 use ra_text_edit::AtomTextEdit;
 
-use crate::{db, FilePosition};
+use crate::FilePosition;
 
 /// `CompletionContext` is created early during completion to figure out, where
 /// exactly is the cursor, syntax-wise.
 #[derive(Debug)]
 pub(crate) struct CompletionContext<'a> {
-    pub(super) db: &'a db::RootDatabase,
+    pub(super) db: &'a RootDatabase,
     pub(super) analyzer: hir::SourceAnalyzer,
     pub(super) offset: TextUnit,
     pub(super) token: SyntaxToken,
@@ -48,7 +49,7 @@ pub(crate) struct CompletionContext<'a> {
 
 impl<'a> CompletionContext<'a> {
     pub(super) fn new(
-        db: &'a db::RootDatabase,
+        db: &'a RootDatabase,
         original_parse: &'a Parse<ast::SourceFile>,
         position: FilePosition,
     ) -> Option<CompletionContext<'a>> {

crates/ra_ide/src/completion/completion_context.rs

@@ -5,6 +5,7 @@ use std::cell::RefCell;
 use hir::diagnostics::{AstDiagnostic, Diagnostic as _, DiagnosticSink};
 use itertools::Itertools;
 use ra_db::{RelativePath, SourceDatabase, SourceDatabaseExt};
+use ra_ide_db::RootDatabase;
 use ra_prof::profile;
 use ra_syntax::{
     algo,
@@ -13,7 +14,7 @@ use ra_syntax::{
 };
 use ra_text_edit::{TextEdit, TextEditBuilder};
 
-use crate::{db::RootDatabase, Diagnostic, FileId, FileSystemEdit, SourceChange, SourceFileEdit};
+use crate::{Diagnostic, FileId, FileSystemEdit, SourceChange, SourceFileEdit};
 
 #[derive(Debug, Copy, Clone)]
 pub enum Severity {

crates/ra_ide/src/diagnostics.rs

@@ -4,13 +4,11 @@ use std::fmt::{self, Display};
 
 use hir::{Docs, Documentation, HasSource, HirDisplay};
 use join_to_string::join;
+use ra_ide_db::RootDatabase;
 use ra_syntax::ast::{self, AstNode, NameOwner, VisibilityOwner};
 use std::convert::From;
 
-use crate::{
-    db,
-    display::{generic_parameters, where_predicates},
-};
+use crate::display::{generic_parameters, where_predicates};
 
 #[derive(Debug)]
 pub enum CallableKind {
@@ -48,13 +46,13 @@ impl FunctionSignature {
         self
     }
 
-    pub(crate) fn from_hir(db: &db::RootDatabase, function: hir::Function) -> Self {
+    pub(crate) fn from_hir(db: &RootDatabase, function: hir::Function) -> Self {
         let doc = function.docs(db);
         let ast_node = function.source(db).value;
         FunctionSignature::from(&ast_node).with_doc_opt(doc)
     }
 
-    pub(crate) fn from_struct(db: &db::RootDatabase, st: hir::Struct) -> Option<Self> {
+    pub(crate) fn from_struct(db: &RootDatabase, st: hir::Struct) -> Option<Self> {
         let node: ast::StructDef = st.source(db).value;
         match node.kind() {
             ast::StructKind::Record(_) => return None,
@@ -86,10 +84,7 @@ impl FunctionSignature {
         )
     }
 
-    pub(crate) fn from_enum_variant(
-        db: &db::RootDatabase,
-        variant: hir::EnumVariant,
-    ) -> Option<Self> {
+    pub(crate) fn from_enum_variant(db: &RootDatabase, variant: hir::EnumVariant) -> Option<Self> {
         let node: ast::EnumVariant = variant.source(db).value;
         match node.kind() {
             ast::StructKind::Record(_) | ast::StructKind::Unit => return None,
@@ -126,7 +121,7 @@ impl FunctionSignature {
         )
     }
 
-    pub(crate) fn from_macro(db: &db::RootDatabase, macro_def: hir::MacroDef) -> Option<Self> {
+    pub(crate) fn from_macro(db: &RootDatabase, macro_def: hir::MacroDef) -> Option<Self> {
         let node: ast::MacroCall = macro_def.source(db).value;
 
         let params = vec![];

crates/ra_ide/src/display/function_signature.rs

@@ -3,14 +3,15 @@
 use either::Either;
 use hir::{AssocItem, FieldSource, HasSource, InFile, ModuleSource};
 use ra_db::{FileId, SourceDatabase};
+use ra_ide_db::RootDatabase;
 use ra_syntax::{
     ast::{self, DocCommentsOwner, NameOwner},
     match_ast, AstNode, SmolStr,
     SyntaxKind::{self, BIND_PAT, TYPE_PARAM},
     TextRange,
 };
 
-use crate::{db::RootDatabase, expand::original_range, FileSymbol};
+use crate::{expand::original_range, FileSymbol};
 
 use super::short_label::ShortLabel;