From fc34403018079ea053f26d0a31b7517053c7dd8c Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 13 Aug 2020 17:33:38 +0200 Subject: Rename ra_assists -> assists --- crates/ra_ide/Cargo.toml | 2 +- crates/ra_ide/src/completion/complete_postfix.rs | 2 +- crates/ra_ide/src/completion/complete_trait_impl.rs | 2 +- crates/ra_ide/src/join_lines.rs | 2 +- crates/ra_ide/src/lib.rs | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'crates/ra_ide') diff --git a/crates/ra_ide/Cargo.toml b/crates/ra_ide/Cargo.toml index 8519e9cca..2eb86755f 100644 --- a/crates/ra_ide/Cargo.toml +++ b/crates/ra_ide/Cargo.toml @@ -28,7 +28,7 @@ ide_db = { path = "../ide_db" } cfg = { path = "../cfg" } profile = { path = "../profile" } test_utils = { path = "../test_utils" } -ra_assists = { path = "../ra_assists" } +assists = { path = "../assists" } ssr = { path = "../ssr" } # ra_ide should depend only on the top-level `hir` package. if you need diff --git a/crates/ra_ide/src/completion/complete_postfix.rs b/crates/ra_ide/src/completion/complete_postfix.rs index 05e15d464..d50b13c52 100644 --- a/crates/ra_ide/src/completion/complete_postfix.rs +++ b/crates/ra_ide/src/completion/complete_postfix.rs @@ -1,5 +1,5 @@ //! FIXME: write short doc here -use ra_assists::utils::TryEnum; +use assists::utils::TryEnum; use syntax::{ ast::{self, AstNode}, TextRange, TextSize, diff --git a/crates/ra_ide/src/completion/complete_trait_impl.rs b/crates/ra_ide/src/completion/complete_trait_impl.rs index d7edd92cf..478e31262 100644 --- a/crates/ra_ide/src/completion/complete_trait_impl.rs +++ b/crates/ra_ide/src/completion/complete_trait_impl.rs @@ -31,8 +31,8 @@ //! } //! ``` +use assists::utils::get_missing_assoc_items; use hir::{self, Docs, HasSource}; -use ra_assists::utils::get_missing_assoc_items; use syntax::{ ast::{self, edit, Impl}, AstNode, SyntaxKind, SyntaxNode, TextRange, T, diff --git a/crates/ra_ide/src/join_lines.rs b/crates/ra_ide/src/join_lines.rs index f5c310701..e37702acd 100644 --- a/crates/ra_ide/src/join_lines.rs +++ b/crates/ra_ide/src/join_lines.rs @@ -1,5 +1,5 @@ +use assists::utils::extract_trivial_expression; use itertools::Itertools; -use ra_assists::utils::extract_trivial_expression; use syntax::{ algo::{find_covering_element, non_trivia_sibling}, ast::{self, AstNode, AstToken}, diff --git a/crates/ra_ide/src/lib.rs b/crates/ra_ide/src/lib.rs index bbc9e4b8a..4321a6b74 100644 --- a/crates/ra_ide/src/lib.rs +++ b/crates/ra_ide/src/lib.rs @@ -80,6 +80,7 @@ pub use crate::{ }, }; +pub use assists::{Assist, AssistConfig, AssistId, AssistKind, ResolvedAssist}; pub use base_db::{ Canceled, CrateGraph, CrateId, Edition, FileId, FilePosition, FileRange, SourceRoot, SourceRootId, @@ -93,7 +94,6 @@ pub use ide_db::{ symbol_index::Query, RootDatabase, }; -pub use ra_assists::{Assist, AssistConfig, AssistId, AssistKind, ResolvedAssist}; pub use ssr::SsrError; pub use text_edit::{Indel, TextEdit}; @@ -478,7 +478,7 @@ impl Analysis { config: &AssistConfig, frange: FileRange, ) -> Cancelable> { - self.with_db(|db| ra_assists::Assist::resolved(db, config, frange)) + self.with_db(|db| assists::Assist::resolved(db, config, frange)) } /// Computes unresolved assists (aka code actions aka intentions) for the given -- cgit v1.2.3