Revert unnecessary style changes

Kirill Bulatov created 2 years ago

Change summary

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

Detailed changes

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

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

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

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

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