about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-11-19 15:35:09 +0000
committerGitHub <noreply@github.com>2021-11-19 15:35:09 +0000
commitcf2ddb935e12f4bf57aea76b3caee882e14a7d92 (patch)
treef4ac8d7bef8a2bc998180d1f14bd6bc295494dee
parent4c20d6879f7b23c532dee908031caab178bb79fa (diff)
parent7e25f1b7e26b9d0378995c8e5ad10f76a00da2ae (diff)
downloadrust-cf2ddb935e12f4bf57aea76b3caee882e14a7d92.tar.gz
rust-cf2ddb935e12f4bf57aea76b3caee882e14a7d92.zip
Merge #10808
10808: fix: show custom check-command r=Veykril a=Florian-Schoenherr

just realized this is a lot cleaner and actually shows something on a custom command,
also debugged it this time.

Co-authored-by: Florian-Schoenherr <65456722+Florian-Schoenherr@users.noreply.github.com>
-rw-r--r--crates/rust-analyzer/src/main_loop.rs11
1 files changed, 1 insertions, 10 deletions
diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs
index 8f00c6f6df3..eab4b2e6a30 100644
--- a/crates/rust-analyzer/src/main_loop.rs
+++ b/crates/rust-analyzer/src/main_loop.rs
@@ -407,16 +407,7 @@ impl GlobalState {
                             // the title, or the editor complains. Note that this is a user-facing string.
                             let title = if self.flycheck.len() == 1 {
                                 match self.config.flycheck() {
-                                    Some(flycheck::FlycheckConfig::CargoCommand {
-                                        command,
-                                        ..
-                                    }) => {
-                                        format!("cargo {}", command)
-                                    }
-                                    Some(flycheck::FlycheckConfig::CustomCommand {
-                                        command,
-                                        ..
-                                    }) => command,
+                                    Some(config) => format!("{}", config),
                                     None => "cargo check".to_string(),
                                 }
                             } else {