From 7aea95704eb53b35f2d956c30b829a1dc4e91829 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Thu, 12 Oct 2023 16:15:42 +0300
Subject: [PATCH] Revert unnecessary style changes

---
 crates/fs/src/fs.rs             | 3 +--
 crates/language/src/buffer.rs   | 4 ++--
 crates/rpc/proto/zed.proto      | 2 +-
 crates/rpc/src/proto.rs         | 4 ++--
 crates/zed/src/languages/php.rs | 1 -
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/crates/fs/src/fs.rs b/crates/fs/src/fs.rs
index bb5d6387e0..1bc8fa9a24 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 eccfb0c059..207c41e7cd 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 302014ab8e..3501e70e6a 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 e976a3d0b5..f0d7937f6f 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 bf65deb642..3096fd16e6 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())])
     }