Skip to content

Commit 20a911f

Browse files
bors[bot]matklad
andauthored
Merge #7707
7707: rename completion -> ide_completion r=matklad a=matklad bors r+ πŸ€– Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
2 parents 6334ce8 + 3db64a4 commit 20a911f

37 files changed

+33
-32
lines changed

β€ŽCargo.lock

Lines changed: 20 additions & 20 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ profile = { path = "../profile", version = "0.0.0" }
2929
test_utils = { path = "../test_utils", version = "0.0.0" }
3030
assists = { path = "../assists", version = "0.0.0" }
3131
ssr = { path = "../ssr", version = "0.0.0" }
32-
completion = { path = "../completion", version = "0.0.0" }
32+
ide_completion = { path = "../ide_completion", version = "0.0.0" }
3333

3434
# ide should depend only on the top-level `hir` package. if you need
3535
# something from some `hir_xxx` subpackage, reexport the API via `hir`.

β€Žcrates/ide/src/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ pub use crate::{
8383
},
8484
};
8585
pub use assists::{Assist, AssistConfig, AssistId, AssistKind};
86-
pub use completion::{
86+
pub use hir::{Documentation, Semantics};
87+
pub use ide_completion::{
8788
CompletionConfig, CompletionItem, CompletionItemKind, CompletionScore, ImportEdit,
8889
InsertTextFormat,
8990
};
90-
pub use hir::{Documentation, Semantics};
9191
pub use ide_db::{
9292
base_db::{
9393
Canceled, Change, CrateGraph, CrateId, Edition, FileId, FilePosition, FileRange,
@@ -468,7 +468,7 @@ impl Analysis {
468468
config: &CompletionConfig,
469469
position: FilePosition,
470470
) -> Cancelable<Option<Vec<CompletionItem>>> {
471-
self.with_db(|db| completion::completions(db, config, position).map(Into::into))
471+
self.with_db(|db| ide_completion::completions(db, config, position).map(Into::into))
472472
}
473473

474474
/// Resolves additional completion data at the position given.
@@ -482,7 +482,7 @@ impl Analysis {
482482
) -> Cancelable<Vec<TextEdit>> {
483483
Ok(self
484484
.with_db(|db| {
485-
completion::resolve_completion_edits(
485+
ide_completion::resolve_completion_edits(
486486
db,
487487
config,
488488
position,

β€Žcrates/completion/Cargo.toml renamed to β€Žcrates/ide_completion/Cargo.toml

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

0 commit comments

Comments
Β (0)