Skip to content

Commit b4eacf1

Browse files
committed
Merge branch 'master' of github.com:rust-analyzer/rust-analyzer
2 parents d6cd46d + 636b413 commit b4eacf1

File tree

109 files changed

+3772
-1418
lines changed

Some content is hidden

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

109 files changed

+3772
-1418
lines changed

Cargo.lock

+53-46
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

PRIVACY.md

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Privacy Notes
2+
3+
## LSP server binary
4+
5+
The LSP server performs no network access in itself, but runs `cargo metadata` which will update or download the crate registry and the source code of the project dependencies.
6+
7+
## Visual Studio Code extension
8+
9+
The Code extension connects to GitHub to download updated LSP binaries and, if the nightly channel is selected, to perform update checks.
10+
11+
## Other editor plugins
12+
13+
Any other editor plugins that integrate with `rust-analyzer` are not under the control of the `rust-analyzer` developers. For any privacy concerns, you should check with their respective developers.
14+
15+
## Others
16+
17+
If `cargo check` is enabled (the default), any build scripts or procedural macros used by the project or its dependencies will be executed. This is also the case when `cargo check` is disabled, but build script or procedural macro support is enabled in `rust-analyzer` (off by default).

crates/assists/src/assist_config.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
//! module, and we use to statically check that we only produce snippet
55
//! assists if we are allowed to.
66
7+
use hir::PrefixKind;
8+
79
use crate::{utils::MergeBehaviour, AssistKind};
810

911
#[derive(Clone, Debug, PartialEq, Eq)]
@@ -37,10 +39,11 @@ impl Default for AssistConfig {
3739
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
3840
pub struct InsertUseConfig {
3941
pub merge: Option<MergeBehaviour>,
42+
pub prefix_kind: PrefixKind,
4043
}
4144

4245
impl Default for InsertUseConfig {
4346
fn default() -> Self {
44-
InsertUseConfig { merge: Some(MergeBehaviour::Full) }
47+
InsertUseConfig { merge: Some(MergeBehaviour::Full), prefix_kind: PrefixKind::Plain }
4548
}
4649
}

0 commit comments

Comments
 (0)