diff options
| author | Laurențiu Nicola <lnicola@dend.ro> | 2024-02-05 10:33:31 +0200 |
|---|---|---|
| committer | Laurențiu Nicola <lnicola@dend.ro> | 2024-02-05 10:33:31 +0200 |
| commit | 4efdb470e974711a880d422346f8f72e3c137eb7 (patch) | |
| tree | 448a8489e5cc2021e2f96e6e87d50793375a1974 | |
| parent | ec3f7b5169191427cf319bf9b9c619937d41c862 (diff) | |
| parent | 39ad79bec5202fda903893034918cb5526bb834c (diff) | |
| download | rust-4efdb470e974711a880d422346f8f72e3c137eb7.tar.gz rust-4efdb470e974711a880d422346f8f72e3c137eb7.zip | |
Merge branch 'master' into sync-from-rust
| -rw-r--r-- | editors/code/src/main.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts index c386b9e5d8f..0af58fd7812 100644 --- a/editors/code/src/main.ts +++ b/editors/code/src/main.ts @@ -207,7 +207,7 @@ function checkConflictingExtensions() { if (vscode.extensions.getExtension("panicbit.cargo")) { vscode.window .showWarningMessage( - `You have both the rust-analyzer (rust-lang.rust-analyzer) and Cargo (panicbit.cargo) plugins enabled` + + `You have both the rust-analyzer (rust-lang.rust-analyzer) and Cargo (panicbit.cargo) plugins enabled, ` + 'you can disable it or set {"cargo.automaticCheck": false} in settings.json to avoid invoking cargo twice', "Got it", ) |
