Skip to content

Commit 27ed1eb

Browse files
Merge #7759
7759: 7526: Rename ide related crates r=Veykril a=chetankhilosiya renamed assists -> ide_assists and ssr -> ide_ssr. the completion crate is already renamed. Co-authored-by: Chetan Khilosiya <chetan.khilosiya@gmail.com>
2 parents 8687053 + eb6cfa7 commit 27ed1eb

File tree

86 files changed

+51
-50
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+51
-50
lines changed

Cargo.lock

Lines changed: 34 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/ide/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ ide_db = { path = "../ide_db", version = "0.0.0" }
2727
cfg = { path = "../cfg", version = "0.0.0" }
2828
profile = { path = "../profile", version = "0.0.0" }
2929
test_utils = { path = "../test_utils", version = "0.0.0" }
30-
assists = { path = "../assists", version = "0.0.0" }
31-
ssr = { path = "../ssr", version = "0.0.0" }
30+
ide_assists = { path = "../ide_assists", version = "0.0.0" }
31+
ide_ssr = { path = "../ide_ssr", version = "0.0.0" }
3232
ide_completion = { path = "../ide_completion", version = "0.0.0" }
3333

3434
# ide should depend only on the top-level `hir` package. if you need

crates/ide/src/fn_references.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
//! This module implements a methods and free functions search in the specified file.
22
//! We have to skip tests, so cannot reuse file_structure module.
33
4-
use assists::utils::test_related_attribute;
54
use hir::Semantics;
5+
use ide_assists::utils::test_related_attribute;
66
use ide_db::RootDatabase;
77
use syntax::{ast, ast::NameOwner, AstNode, SyntaxNode};
88

crates/ide/src/join_lines.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use assists::utils::extract_trivial_expression;
1+
use ide_assists::utils::extract_trivial_expression;
22
use itertools::Itertools;
33
use syntax::{
44
algo::non_trivia_sibling,

crates/ide/src/lib.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ pub use crate::{
8282
HlRange,
8383
},
8484
};
85-
pub use assists::{Assist, AssistConfig, AssistId, AssistKind};
8685
pub use hir::{Documentation, Semantics};
86+
pub use ide_assists::{Assist, AssistConfig, AssistId, AssistKind};
8787
pub use ide_completion::{
8888
CompletionConfig, CompletionItem, CompletionItemKind, CompletionScore, ImportEdit,
8989
InsertTextFormat,
@@ -101,7 +101,7 @@ pub use ide_db::{
101101
symbol_index::Query,
102102
RootDatabase,
103103
};
104-
pub use ssr::SsrError;
104+
pub use ide_ssr::SsrError;
105105
pub use syntax::{TextRange, TextSize};
106106
pub use text_edit::{Indel, TextEdit};
107107

@@ -549,8 +549,9 @@ impl Analysis {
549549
selections: Vec<FileRange>,
550550
) -> Cancelable<Result<SourceChange, SsrError>> {
551551
self.with_db(|db| {
552-
let rule: ssr::SsrRule = query.parse()?;
553-
let mut match_finder = ssr::MatchFinder::in_context(db, resolve_context, selections);
552+
let rule: ide_ssr::SsrRule = query.parse()?;
553+
let mut match_finder =
554+
ide_ssr::MatchFinder::in_context(db, resolve_context, selections);
554555
match_finder.add_rule(rule)?;
555556
let edits = if parse_only { Default::default() } else { match_finder.edits() };
556557
Ok(SourceChange::from(edits))

crates/ide/src/runnables.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use std::fmt;
22

3-
use assists::utils::test_related_attribute;
43
use cfg::CfgExpr;
54
use hir::{AsAssocItem, HasAttrs, HasSource, Semantics};
5+
use ide_assists::utils::test_related_attribute;
66
use ide_db::{defs::Definition, RootDatabase, SymbolKind};
77
use itertools::Itertools;
88
use syntax::{

crates/assists/Cargo.toml renamed to crates/ide_assists/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "assists"
2+
name = "ide_assists"
33
version = "0.0.0"
44
description = "TBD"
55
license = "MIT OR Apache-2.0"

0 commit comments

Comments
 (0)