Apply requested changes round 2

rust-lang · Apr 28, 2024 · 2199f2d · 2199f2d
1 parent eed470a
commit 2199f2d
Show file tree

Hide file tree

Showing 11 changed files with 1,159 additions and 1,269 deletions.
diff --git a/crates/paths/src/lib.rs b/crates/paths/src/lib.rs
@@ -150,7 +150,7 @@ impl AbsPathBuf {
     /// * if `self` has a verbatim prefix (e.g. `\\?\C:\windows`)
     ///   and `path` is not empty, the new path is normalized: all references
     ///   to `.` and `..` are removed.
-    pub fn push(&mut self, suffix: &str) {
+    pub fn push<P: AsRef<Utf8Path>>(&mut self, suffix: P) {
         self.0.push(suffix)
     }
 }

diff --git a/crates/rust-analyzer/src/bin/main.rs b/crates/rust-analyzer/src/bin/main.rs
@@ -229,7 +229,7 @@ fn run_server() -> anyhow::Result<()> {
         let mut change = ConfigChange::default();
         change.change_client_config(json);
         let mut error_sink = ConfigError::default();
-        config = config.apply_change(change, &mut error_sink);
+        (config, _) = config.apply_change(change, &mut error_sink);
         if !error_sink.is_empty() {
             use lsp_types::{
                 notification::{Notification, ShowMessage},

diff --git a/crates/rust-analyzer/src/cli/scip.rs b/crates/rust-analyzer/src/cli/scip.rs
@@ -46,7 +46,7 @@ impl flags::Scip {
             let mut change = ConfigChange::default();
             change.change_client_config(json);
             let mut error_sink = ConfigError::default();
-            config = config.apply_change(change, &mut error_sink);
+            (config, _) = config.apply_change(change, &mut error_sink);
             // FIXME @alibektas : What happens to errors without logging?
             error!(?error_sink, "Config Error(s)");
         }