Merge #9686

9686: Bump deps r=lnicola a=lnicola

bors r+

Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>

Author: bors[bot]

Cargo.lock

@@ -1,8 +1,8 @@
 //! Completes lifetimes and labels.
 //!
 //! These completions work a bit differently in that they are only shown when what the user types
-//! has a `'` preceding it, as our fake syntax tree is invalid otherwise(due to us not inserting a
-//! lifetime but an ident for obvious reasons).
+//! has a `'` preceding it, as our fake syntax tree is invalid otherwise (due to us not inserting
+//! a lifetime but an ident for obvious reasons).
 //! Due to this all the tests for lifetimes and labels live in this module for the time being as
 //! there is no value in lifting these out into the outline module test since they will either not
 //! show up for normal completions, or they won't show completions other than lifetimes depending

crates/ide_completion/src/completions/lifetime.rs

@@ -20,7 +20,7 @@ path = "src/bin/main.rs"
 anyhow = "1.0.26"
 crossbeam-channel = "0.5.0"
 dissimilar = "1.0.2"
-env_logger = { version = "0.8.1", default-features = false }
+env_logger = { version = "0.9", default-features = false }
 itertools = "0.10.0"
 jod-thread = "0.1.0"
 log = "0.4.8"

crates/rust-analyzer/Cargo.toml

@@ -83,7 +83,7 @@ impl NotifyActor {
                         self.watcher = None;
                         if !config.watch.is_empty() {
                             let (watcher_sender, watcher_receiver) = unbounded();
-                            let watcher = log_notify_error(Watcher::new_immediate(move |event| {
+                            let watcher = log_notify_error(RecommendedWatcher::new(move |event| {
                                 watcher_sender.send(event).unwrap()
                             }));
                             self.watcher = watcher.map(|it| (it, watcher_receiver));
@@ -214,7 +214,7 @@ impl NotifyActor {
 
     fn watch(&mut self, path: AbsPathBuf) {
         if let Some((watcher, _)) = &mut self.watcher {
-            log_notify_error(watcher.watch(&path, RecursiveMode::NonRecursive));
+            log_notify_error(watcher.watch(path.as_ref(), RecursiveMode::NonRecursive));
         }
     }
     fn send(&mut self, msg: loader::Message) {