Merge pull request #712 from Steven0351/default-channel

Specify Default Toolchain as Active Channel

Author: Xanewok

package.json

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

src/configuration.ts

@@ -62,16 +62,16 @@ export class RLSConfiguration {
     configuration: WorkspaceConfiguration,
   ): string {
     const channel = configuration.get<string>('rust-client.channel');
-    if (channel) {
-      return channel;
-    } else {
+    if (channel === 'default' || !channel) {
       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';
       }
+    } else {
+      return channel;
     }
   }
 

src/rustup.ts

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