Woops, concat is only for literals

Author: fasterthanlime

crates/rust-analyzer/src/reload.rs

@@ -48,9 +48,6 @@ pub(crate) enum BuildDataProgress {
     End((Arc<Vec<ProjectWorkspace>>, Vec<anyhow::Result<WorkspaceBuildScripts>>)),
 }
 
-const STANDALONE_PROC_MACRO_SERVER_NAME: &str =
-    concat!("rust-analyzer-proc-macro-srv", std::env::consts::EXE_SUFFIX);
-
 impl GlobalState {
     pub(crate) fn is_quiescent(&self) -> bool {
         !(self.fetch_workspaces_queue.op_in_progress()
@@ -306,6 +303,9 @@ impl GlobalState {
         let files_config = self.config.files();
         let project_folders = ProjectFolders::new(&self.workspaces, &files_config.exclude);
 
+        let standalone_server_name =
+            format!("rust-analyzer-proc-macro-srv{}", std::env::consts::EXE_SUFFIX);
+
         if self.proc_macro_clients.is_empty() {
             if let Some((path, args)) = self.config.proc_macro_srv() {
                 self.proc_macro_clients = self
@@ -319,10 +319,8 @@ impl GlobalState {
                             tracing::info!("Found a cargo workspace...");
                             if let Some(sysroot) = sysroot.as_ref() {
                                 tracing::info!("Found a cargo workspace with a sysroot...");
-                                let server_path = sysroot
-                                    .root()
-                                    .join("libexec")
-                                    .join(STANDALONE_PROC_MACRO_SERVER_NAME);
+                                let server_path =
+                                    sysroot.root().join("libexec").join(&standalone_server_name);
                                 if std::fs::metadata(&server_path).is_ok() {
                                     tracing::info!(
                                         "And the server exists at {}",