diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-01-16 17:52:29 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-01-16 17:52:29 +0000 |
| commit | 9a349f280ff1c6d0b57df80aa3d6720474e4b00a (patch) | |
| tree | 23bbb365f31438949358a576bc9467fa70fa874e /crates/ide | |
| parent | 3782c78d7558633be5483a04aa1c098fe76100b9 (diff) | |
| parent | 497fc232e7d90d8d39c7a13742dd85d758dc2f72 (diff) | |
Merge #7295
7295: Share import_assets and related entities r=matklad a=SomeoneToIgnore
Part of https://github.com/rust-analyzer/rust-analyzer/pull/7293
Addresses https://github.com/rust-analyzer/rust-analyzer/pull/7293#issuecomment-761569558
Prepares `import_assets` and related to be used later for the trait fuzzy importing.
Also moves fuzzy imports into a separate completion module and renames them, as suggested in https://github.com/rust-analyzer/rust-analyzer/pull/7293#discussion_r558896685
Co-authored-by: Kirill Bulatov <[email protected]>
Diffstat (limited to 'crates/ide')
| -rw-r--r-- | crates/ide/src/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs index afd552008..f8d69382e 100644 --- a/crates/ide/src/lib.rs +++ b/crates/ide/src/lib.rs | |||
| @@ -80,7 +80,7 @@ pub use crate::{ | |||
| 80 | HlRange, | 80 | HlRange, |
| 81 | }, | 81 | }, |
| 82 | }; | 82 | }; |
| 83 | pub use assists::{Assist, AssistConfig, AssistId, AssistKind, InsertUseConfig}; | 83 | pub use assists::{Assist, AssistConfig, AssistId, AssistKind}; |
| 84 | pub use completion::{ | 84 | pub use completion::{ |
| 85 | CompletionConfig, CompletionItem, CompletionItemKind, CompletionScore, ImportEdit, | 85 | CompletionConfig, CompletionItem, CompletionItemKind, CompletionScore, ImportEdit, |
| 86 | InsertTextFormat, | 86 | InsertTextFormat, |