Cleaned up implementation of default-channel handling. It was largely unneccesary to pull the getActiveChannel error handling logic out into its own function as a simple short-circuit OR would also do the trick.

Author: Steven0351

src/configuration.ts

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