Fix formatting

crates/call/src/room.rs

@@ -10,9 +10,7 @@ use client::{
 use collections::{BTreeMap, HashMap, HashSet};
 use fs::Fs;
 use futures::{FutureExt, StreamExt};
-use gpui::{
+use gpui::{AppContext, AsyncAppContext, Entity, ModelContext, ModelHandle, Task, WeakModelHandle};
-    AsyncAppContext, Entity, ModelContext, ModelHandle, AppContext, Task, WeakModelHandle,
-};
 use language::LanguageRegistry;
 use live_kit_client::{LocalTrackPublication, LocalVideoTrack, RemoteVideoTrackUpdate};
 use postage::stream::Stream;
@@ -70,10 +68,7 @@ impl Entity for Room {
         }
     }
 
-    fn app_will_quit(
+    fn app_will_quit(&mut self, cx: &mut AppContext) -> Option<Pin<Box<dyn Future<Output = ()>>>> {
-        &mut self,
-        cx: &mut AppContext,
-    ) -> Option<Pin<Box<dyn Future<Output = ()>>>> {
         if self.status.is_online() {
             let leave = self.leave_internal(cx);
             Some(

crates/collab_ui/src/contact_notification.rs

@@ -3,8 +3,8 @@ use std::sync::Arc;
 use crate::notifications::render_user_notification;
 use client::{ContactEventKind, User, UserStore};
 use gpui::{
-    elements::*, impl_internal_actions, Entity, ModelHandle, AppContext, RenderContext,
+    elements::*, impl_internal_actions, AppContext, Entity, ModelHandle, RenderContext, View,
-    View, ViewContext,
+    ViewContext,
 };
 use workspace::notifications::Notification;
 

crates/collab_ui/src/incoming_call_notification.rs

@@ -4,8 +4,8 @@ use futures::StreamExt;
 use gpui::{
     elements::*,
     geometry::{rect::RectF, vector::vec2f},
-    impl_internal_actions, CursorStyle, Entity, MouseButton, AppContext, RenderContext,
+    impl_internal_actions, AppContext, CursorStyle, Entity, MouseButton, RenderContext, View,
-    View, ViewContext, WindowBounds, WindowKind, WindowOptions,
+    ViewContext, WindowBounds, WindowKind, WindowOptions,
 };
 use settings::Settings;
 use util::ResultExt;

crates/collab_ui/src/project_shared_notification.rs

@@ -5,8 +5,8 @@ use gpui::{
     actions,
     elements::*,
     geometry::{rect::RectF, vector::vec2f},
-    CursorStyle, Entity, MouseButton, AppContext, RenderContext, View, ViewContext,
+    AppContext, CursorStyle, Entity, MouseButton, RenderContext, View, ViewContext, WindowBounds,
-    WindowBounds, WindowKind, WindowOptions,
+    WindowKind, WindowOptions,
 };
 use settings::Settings;
 use std::sync::Arc;

crates/collab_ui/src/sharing_status_indicator.rs

@@ -2,7 +2,7 @@ use call::ActiveCall;
 use gpui::{
     color::Color,
     elements::{MouseEventHandler, Svg},
-    Appearance, Element, ElementBox, Entity, MouseButton, AppContext, RenderContext, View,
+    AppContext, Appearance, Element, ElementBox, Entity, MouseButton, RenderContext, View,
 };
 use settings::Settings;
 

crates/command_palette/src/command_palette.rs

@@ -4,7 +4,7 @@ use gpui::{
     actions,
     elements::{ChildView, Flex, Label, ParentElement},
     keymap_matcher::Keystroke,
-    Action, AnyViewHandle, Element, Entity, MouseState, AppContext, RenderContext, View,
+    Action, AnyViewHandle, AppContext, Element, Entity, MouseState, RenderContext, View,
     ViewContext, ViewHandle,
 };
 use picker::{Picker, PickerDelegate};

crates/copilot/src/sign_in.rs

@@ -1,6 +1,6 @@
 use crate::{request::PromptUserDeviceFlow, Copilot, Status};
 use gpui::{
-    elements::*, geometry::rect::RectF, ClipboardItem, Element, Entity, AppContext, View,
+    elements::*, geometry::rect::RectF, AppContext, ClipboardItem, Element, Entity, View,
     ViewContext, ViewHandle, WindowKind, WindowOptions,
 };
 use settings::Settings;

crates/diagnostics/src/items.rs

@@ -1,8 +1,8 @@
 use collections::HashSet;
 use editor::{Editor, GoToDiagnostic};
 use gpui::{
-    elements::*, platform::CursorStyle, serde_json, Entity, ModelHandle, MouseButton,
+    elements::*, platform::CursorStyle, serde_json, AppContext, Entity, ModelHandle, MouseButton,
-    AppContext, RenderContext, Subscription, View, ViewContext, ViewHandle, WeakViewHandle,
+    RenderContext, Subscription, View, ViewContext, ViewHandle, WeakViewHandle,
 };
 use language::Diagnostic;
 use project::Project;

crates/editor/src/display_map/tab_map.rs

@@ -640,9 +640,7 @@ mod tests {
     }
 
     #[gpui::test]
-    fn test_long_lines_with_character_spanning_max_expansion_column(
+    fn test_long_lines_with_character_spanning_max_expansion_column(cx: &mut gpui::AppContext) {
-        cx: &mut gpui::AppContext,
-    ) {
         let max_expansion_column = 8;
         let input = "abcdefg⋯hij";
 

crates/editor/src/scroll.rs

@@ -9,7 +9,7 @@ use std::{
 
 use gpui::{
     geometry::vector::{vec2f, Vector2F},
-    Axis, AppContext, Task, ViewContext,
+    AppContext, Axis, Task, ViewContext,
 };
 use language::{Bias, Point};
 use util::ResultExt;

crates/editor/src/scroll/actions.rs

@@ -1,6 +1,5 @@
 use gpui::{
-    actions, geometry::vector::Vector2F, impl_internal_actions, Axis, AppContext,
+    actions, geometry::vector::Vector2F, impl_internal_actions, AppContext, Axis, ViewContext,
-    ViewContext,
 };
 use language::Bias;
 

crates/feedback/src/feedback.rs

@@ -6,7 +6,7 @@ pub mod submit_feedback_button;
 use std::sync::Arc;
 
 mod system_specs;
-use gpui::{actions, impl_actions, ClipboardItem, AppContext, PromptLevel, ViewContext};
+use gpui::{actions, impl_actions, AppContext, ClipboardItem, PromptLevel, ViewContext};
 use serde::Deserialize;
 use system_specs::SystemSpecs;
 use workspace::{AppState, Workspace};

crates/recent_projects/src/recent_projects.rs

@@ -4,8 +4,8 @@ use fuzzy::{StringMatch, StringMatchCandidate};
 use gpui::{
     actions,
     elements::{ChildView, Flex, ParentElement},
-    AnyViewHandle, Element, ElementBox, Entity, AppContext, RenderContext, Task, View,
+    AnyViewHandle, AppContext, Element, ElementBox, Entity, RenderContext, Task, View, ViewContext,
-    ViewContext, ViewHandle,
+    ViewHandle,
 };
 use highlighted_workspace_location::HighlightedWorkspaceLocation;
 use ordered_float::OrderedFloat;

crates/staff_mode/src/staff_mode.rs

@@ -13,10 +13,7 @@ impl std::ops::Deref for StaffMode {
 
 /// Despite what the type system requires me to tell you, the init function will only be called a once
 /// as soon as we know that the staff mode is enabled.
-pub fn staff_mode<F: FnMut(&mut AppContext) + 'static>(
+pub fn staff_mode<F: FnMut(&mut AppContext) + 'static>(cx: &mut AppContext, mut init: F) {
-    cx: &mut AppContext,
-    mut init: F,
-) {
     if **cx.default_global::<StaffMode>() {
         init(cx)
     } else {
@@ -32,10 +29,7 @@ pub fn staff_mode<F: FnMut(&mut AppContext) + 'static>(
 
 /// Immediately checks and runs the init function if the staff mode is not enabled.
 /// This is only included for symettry with staff_mode() above
-pub fn not_staff_mode<F: FnOnce(&mut AppContext) + 'static>(
+pub fn not_staff_mode<F: FnOnce(&mut AppContext) + 'static>(cx: &mut AppContext, init: F) {
-    cx: &mut AppContext,
-    init: F,
-) {
     if !**cx.default_global::<StaffMode>() {
         init(cx)
     }

crates/terminal_view/src/terminal_button.rs

@@ -1,8 +1,7 @@
 use context_menu::{ContextMenu, ContextMenuItem};
 use gpui::{
-    elements::*, impl_internal_actions, CursorStyle, Element, ElementBox, Entity, MouseButton,
+    elements::*, impl_internal_actions, AppContext, CursorStyle, Element, ElementBox, Entity,
-    AppContext, RenderContext, View, ViewContext, ViewHandle, WeakModelHandle,
+    MouseButton, RenderContext, View, ViewContext, ViewHandle, WeakModelHandle, WeakViewHandle,
-    WeakViewHandle,
 };
 use settings::Settings;
 use std::any::TypeId;

crates/welcome/src/base_keymap_picker.rs

@@ -2,7 +2,7 @@ use fuzzy::{match_strings, StringMatch, StringMatchCandidate};
 use gpui::{
     actions,
     elements::{ChildView, Element as _, Label},
-    AnyViewHandle, Entity, AppContext, View, ViewContext, ViewHandle,
+    AnyViewHandle, AppContext, Entity, View, ViewContext, ViewHandle,
 };
 use picker::{Picker, PickerDelegate};
 use settings::{settings_file::SettingsFile, BaseKeymap, Settings};

crates/welcome/src/welcome.rs

@@ -5,7 +5,7 @@ use std::sync::Arc;
 use db::kvp::KEY_VALUE_STORE;
 use gpui::{
     elements::{Flex, Label, ParentElement},
-    Element, ElementBox, Entity, AppContext, Subscription, View, ViewContext,
+    AppContext, Element, ElementBox, Entity, Subscription, View, ViewContext,
 };
 use settings::{settings_file::SettingsFile, Settings};
 

crates/workspace/src/notifications.rs

@@ -1,7 +1,7 @@
 use std::{any::TypeId, ops::DerefMut};
 
 use collections::HashSet;
-use gpui::{AnyViewHandle, Entity, AppContext, View, ViewContext, ViewHandle};
+use gpui::{AnyViewHandle, AppContext, Entity, View, ViewContext, ViewHandle};
 
 use crate::Workspace;
 
@@ -138,7 +138,7 @@ pub mod simple_message_notification {
     use gpui::{
         actions,
         elements::{Flex, MouseEventHandler, Padding, ParentElement, Svg, Text},
-        impl_actions, Action, CursorStyle, Element, Entity, MouseButton, AppContext, View,
+        impl_actions, Action, AppContext, CursorStyle, Element, Entity, MouseButton, View,
         ViewContext,
     };
     use menu::Cancel;

crates/zed/src/languages/yaml.rs

@@ -99,10 +99,7 @@ impl LspAdapter for YamlLspAdapter {
         .log_err()
     }
 
-    fn workspace_configuration(
+    fn workspace_configuration(&self, cx: &mut AppContext) -> Option<BoxFuture<'static, Value>> {
-        &self,
-        cx: &mut AppContext,
-    ) -> Option<BoxFuture<'static, Value>> {
         let settings = cx.global::<Settings>();
         Some(
             future::ready(serde_json::json!({