diff --git a/crates/fs/src/fs.rs b/crates/fs/src/fs.rs
index bb5d6387e03a69db37c17248494e1edf9d2f4a5b..1bc8fa9a241b8d2bf2a1da48b23760fdca0c66a0 100644
--- a/crates/fs/src/fs.rs
+++ b/crates/fs/src/fs.rs
@@ -229,12 +229,11 @@ impl Fs for RealFs {
         } else {
             symlink_metadata
         };
-        let file_type_metadata = metadata.file_type();
         Ok(Some(Metadata {
             inode: metadata.ino(),
             mtime: metadata.modified().unwrap(),
             is_symlink,
-            is_dir: file_type_metadata.is_dir(),
+            is_dir: metadata.file_type().is_dir(),
         }))
     }
 
diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index eccfb0c05902c283b2f2acc06391e0cda8ca1724..207c41e7cdf21a8ec4d61232e071296184b52a5f 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -317,8 +317,8 @@ pub struct Chunk<'a> {
 
 pub struct Diff {
     pub(crate) base_version: clock::Global,
-    pub(crate) line_ending: LineEnding,
-    pub(crate) edits: Vec<(Range<usize>, Arc<str>)>,
+    line_ending: LineEnding,
+    edits: Vec<(Range<usize>, Arc<str>)>,
 }
 
 #[derive(Clone, Copy)]
diff --git a/crates/rpc/proto/zed.proto b/crates/rpc/proto/zed.proto
index 302014ab8e57b4b5c7889c2dfa30835404103282..3501e70e6ac4191c5fe3141620e18cd8f7b8c32d 100644
--- a/crates/rpc/proto/zed.proto
+++ b/crates/rpc/proto/zed.proto
@@ -170,7 +170,7 @@ message Envelope {
 
         LinkChannel link_channel = 140;
         UnlinkChannel unlink_channel = 141;
-        MoveChannel move_channel = 142; // Current max: 144
+        MoveChannel move_channel = 142; // current max: 144
     }
 }
 
diff --git a/crates/rpc/src/proto.rs b/crates/rpc/src/proto.rs
index e976a3d0b56d87e909a0a271f41e051a06d07618..f0d7937f6f9592b2574bff7b93d3097ceba24d94 100644
--- a/crates/rpc/src/proto.rs
+++ b/crates/rpc/src/proto.rs
@@ -349,7 +349,7 @@ request_messages!(
     (UpdateProject, Ack),
     (UpdateWorktree, Ack),
     (JoinChannelBuffer, JoinChannelBufferResponse),
-    (LeaveChannelBuffer, Ack),
+    (LeaveChannelBuffer, Ack)
 );
 
 entity_messages!(
@@ -400,7 +400,7 @@ entity_messages!(
     UpdateProjectCollaborator,
     UpdateWorktree,
     UpdateWorktreeSettings,
-    UpdateDiffBase,
+    UpdateDiffBase
 );
 
 entity_messages!(
diff --git a/crates/zed/src/languages/php.rs b/crates/zed/src/languages/php.rs
index bf65deb642d0ca39f1806acdab13d98e0d5195a8..3096fd16e6b87764a0f9dd127a0dec6eaba0a77a 100644
--- a/crates/zed/src/languages/php.rs
+++ b/crates/zed/src/languages/php.rs
@@ -100,7 +100,6 @@ impl LspAdapter for IntelephenseLspAdapter {
     async fn initialization_options(&self) -> Option<serde_json::Value> {
         None
     }
-
     async fn language_ids(&self) -> HashMap<String, String> {
         HashMap::from_iter([("PHP".into(), "php".into())])
     }