Optimise mutex locking when reading initial configuration

* Remove commented out test line

Author: alexheretic

src/actions/mod.rs

@@ -309,11 +309,16 @@ impl InitActionContext {
     fn init<O: Output>(&self, init_options: InitializationOptions, out: &O) {
         let current_project = self.current_project.clone();
 
-        if let Some(config) = init_options.settings.map(|s| s.rust) {
-            self.config.lock().unwrap().update(config);
-        }
+        let needs_inference = {
+            let mut config = self.config.lock().unwrap();
+
+            if let Some(init_config) = init_options.settings.map(|s| s.rust) {
+                config.update(init_config);
+            }
+            config.needs_inference()
+        };
 
-        if self.config.lock().unwrap().needs_inference() {
+        if needs_inference {
             let config = Arc::clone(&self.config);
             // Spawn another thread since we're shelling out to Cargo and this can
             // cause a non-trivial amount of time due to disk access

src/test/mod.rs

@@ -42,7 +42,6 @@ fn initialize_with_opts(
     root_path: Option<String>,
     initialization_options: Option<serde_json::Value>,
 ) -> Request<ls_server::InitializeRequest> {
-    // let init_opts = initialization_options.map(|val| serde_json::to_value(val).unwrap());
     let params = InitializeParams {
         process_id: None,
         root_path,