clippy fixes for focus change

K Simmons created 3 years ago

Change summary

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(-)

Detailed changes

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;

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,

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()
     }
 }