This patch address the inability to specify the default active toolchain as the active channel.

This can be painful for nightly because RLS is not always available.

Author: Steven0351

package.json

@@ -196,6 +196,7 @@
                         "null"
                     ],
                     "enum": [
+                        "default",
                         "stable",
                         "beta",
                         "nightly"

src/configuration.ts

@@ -62,16 +62,25 @@ export class RLSConfiguration {
     configuration: WorkspaceConfiguration,
   ): string {
     const channel = configuration.get<string>('rust-client.channel');
-    if (channel) {
+    if(channel && channel === "default") {
+      return RLSConfiguration.defaultOrNightly(wsPath, rustupConfiguration);
+    } else if(channel) {
       return channel;
     } else {
-      try {
-        return getActiveChannel(wsPath, rustupConfiguration);
-      } catch (e) {
-        // rustup might not be installed at the time the configuration is
-        // initially loaded, so silently ignore the error and return a default value
-        return 'nightly';
-      }
+      return RLSConfiguration.defaultOrNightly(wsPath, rustupConfiguration);
+    }
+  }
+  
+  private static defaultOrNightly(
+    wsPath: string,
+    rustupConfiguration: RustupConfig,
+  ): string {
+    try {
+      return getActiveChannel(wsPath, rustupConfiguration);
+    } catch (e) {
+      // rustup might not be installed at the time the configuration is
+      // initially loaded, so silently ignore the error and return a default value
+      return 'nightly';
     }
   }
 

src/rustup.ts

@@ -274,7 +274,7 @@ export function getActiveChannel(wsPath: string, config: RustupConfig): string {
   }
 
   console.info(
-    `Detected active channel: ${activeChannel} (since 'rust-client.channel' is unspecified)`,
+    `Using active channel: ${activeChannel}`,
   );
   return activeChannel;
 }