Simplify fetching active rustup channel

Author: Xanewok

src/configuration.ts

@@ -50,13 +50,13 @@ export class RLSConfiguration {
    */
   private static readChannel(
     wsPath: string,
-    rustupConfiguration: RustupConfig,
+    rustupPath: string,
     configuration: WorkspaceConfiguration,
   ): string {
     const channel = configuration.get<string>('rust-client.channel');
     if (channel === 'default' || !channel) {
       try {
-        return getActiveChannel(wsPath, rustupConfiguration);
+        return getActiveChannel(wsPath, rustupPath);
       } 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
@@ -94,7 +94,7 @@ export class RLSConfiguration {
   public get channel(): string {
     return RLSConfiguration.readChannel(
       this.wsPath,
-      this.rustupConfig(true),
+      this.rustupPath,
       this.configuration,
     );
   }
@@ -118,10 +118,9 @@ export class RLSConfiguration {
     return this.configuration.get<boolean>('rust-client.autoStartRls', true);
   }
 
-  // Added ignoreChannel for readChannel function. Otherwise we end in an infinite loop.
-  public rustupConfig(ignoreChannel: boolean = false): RustupConfig {
+  public rustupConfig(): RustupConfig {
     return {
-      channel: ignoreChannel ? '' : this.channel,
+      channel: this.channel,
       path: this.rustupPath,
     };
   }

src/rustup.ts

@@ -256,7 +256,7 @@ export function hasRustup(config: RustupConfig): Promise<boolean> {
  * Returns active (including local overrides) toolchain, as specified by rustup.
  * May throw if rustup at specified path can't be executed.
  */
-export function getActiveChannel(wsPath: string, config: RustupConfig): string {
+export function getActiveChannel(wsPath: string, rustupPath: string): string {
   // rustup info might differ depending on where it's executed
   // (e.g. when a toolchain is locally overriden), so executing it
   // under our current workspace root should give us close enough result
@@ -265,7 +265,7 @@ export function getActiveChannel(wsPath: string, config: RustupConfig): string {
   try {
     // `rustup show active-toolchain` is available since rustup 1.12.0
     activeChannel = child_process
-      .execSync(`${config.path} show active-toolchain`, {
+      .execSync(`${rustupPath} show active-toolchain`, {
         cwd: wsPath,
       })
       .toString()
@@ -278,7 +278,7 @@ export function getActiveChannel(wsPath: string, config: RustupConfig): string {
   } catch (e) {
     // Possibly an old rustup version, so try rustup show
     const showOutput = child_process
-      .execSync(`${config.path} show`, {
+      .execSync(`${rustupPath} show`, {
         cwd: wsPath,
       })
       .toString();

test/suite/rustup.test.ts

@@ -18,6 +18,6 @@ suite('Rustup Tests', () => {
     assert(rustupVersion.includes(`rustup ${version}`));
   });
   test('getActiveChannel', async () => {
-    rustup.getActiveChannel('.', config);
+    rustup.getActiveChannel('.', config.path);
   });
 });