From 9aa3f2d7772ddd84ca3550d5f0ccd74f45249d54 Mon Sep 17 00:00:00 2001
From: K Simmons <keith@zed.dev>
Date: Wed, 10 Aug 2022 16:49:17 -0700
Subject: [PATCH] clippy fixes for focus change

---
 crates/collab/src/rpc.rs          | 2 +-
 crates/language/src/buffer.rs     | 9 ++++-----
 crates/workspace/src/workspace.rs | 6 +++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs
index 6346e15830..4164424a2b 100644
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -1711,7 +1711,7 @@ impl Server {
         Ok(())
     }
 
-    pub(crate) async fn store(&self) -> StoreGuard {
+    pub(crate) async fn store(&self) -> StoreGuard<'_> {
         #[cfg(test)]
         tokio::task::yield_now().await;
         let guard = self.store.lock().await;
diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index 52ad88f092..c8180e0a8f 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -442,12 +442,11 @@ impl Buffer {
     }
 
     fn build(buffer: TextBuffer, file: Option<Arc<dyn File>>) -> Self {
-        let saved_mtime;
-        if let Some(file) = file.as_ref() {
-            saved_mtime = file.mtime();
+        let saved_mtime = if let Some(file) = file.as_ref() {
+            file.mtime()
         } else {
-            saved_mtime = UNIX_EPOCH;
-        }
+            UNIX_EPOCH
+        };
 
         Self {
             saved_mtime,
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 1137098d16..40934f4ed7 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -703,9 +703,9 @@ impl From<Box<dyn ItemHandle>> for AnyViewHandle {
     }
 }
 
-impl Into<AnyViewHandle> for &Box<dyn ItemHandle> {
-    fn into(self) -> AnyViewHandle {
-        self.to_any()
+impl From<&Box<dyn ItemHandle>> for AnyViewHandle {
+    fn from(val: &Box<dyn ItemHandle>) -> Self {
+        val.to_any()
     }
 }