chore: Bump Rust edition to 2024 (#27800)

Follow-up to https://github.com/zed-industries/zed/pull/27791

Release Notes:

- N/A

crates/git_ui/src/askpass_modal.rs

@@ -2,9 +2,9 @@ use editor::Editor;
 use futures::channel::oneshot;
 use gpui::{AppContext, DismissEvent, Entity, EventEmitter, Focusable, Styled};
 use ui::{
-    div, h_flex, v_flex, ActiveTheme, App, Context, DynamicSpacing, Headline, HeadlineSize, Icon,
-    IconName, IconSize, InteractiveElement, IntoElement, ParentElement, Render, SharedString,
-    StyledExt, StyledTypography, Window,
+    ActiveTheme, App, Context, DynamicSpacing, Headline, HeadlineSize, Icon, IconName, IconSize,
+    InteractiveElement, IntoElement, ParentElement, Render, SharedString, StyledExt,
+    StyledTypography, Window, div, h_flex, v_flex,
 };
 use workspace::ModalView;
 

crates/git_ui/src/branch_picker.rs

@@ -1,18 +1,18 @@
-use anyhow::{anyhow, Context as _};
+use anyhow::{Context as _, anyhow};
 use fuzzy::StringMatchCandidate;
 
 use git::repository::Branch;
 use gpui::{
-    rems, App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,
-    InteractiveElement, IntoElement, Modifiers, ModifiersChangedEvent, ParentElement, Render,
-    SharedString, Styled, Subscription, Task, Window,
+    App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, InteractiveElement,
+    IntoElement, Modifiers, ModifiersChangedEvent, ParentElement, Render, SharedString, Styled,
+    Subscription, Task, Window, rems,
 };
 use picker::{Picker, PickerDelegate, PickerEditorPosition};
 use project::git_store::Repository;
 use std::sync::Arc;
 use time::OffsetDateTime;
 use time_format::format_local_timestamp;
-use ui::{prelude::*, HighlightedLabel, ListItem, ListItemSpacing};
+use ui::{HighlightedLabel, ListItem, ListItemSpacing, prelude::*};
 use util::ResultExt;
 use workspace::notifications::DetachAndPromptErr;
 use workspace::{ModalView, Workspace};

crates/git_ui/src/commit_modal.rs

@@ -1,15 +1,15 @@
 use crate::branch_picker::{self, BranchList};
-use crate::git_panel::{commit_message_editor, GitPanel};
+use crate::git_panel::{GitPanel, commit_message_editor};
 use git::{Commit, GenerateCommitMessage};
 use panel::{panel_button, panel_editor_style, panel_filled_button};
-use ui::{prelude::*, KeybindingHint, PopoverMenu, PopoverMenuHandle, Tooltip};
+use ui::{KeybindingHint, PopoverMenu, PopoverMenuHandle, Tooltip, prelude::*};
 
 use editor::{Editor, EditorElement};
 use gpui::*;
 use util::ResultExt;
 use workspace::{
-    dock::{Dock, PanelHandle},
     ModalView, Workspace,
+    dock::{Dock, PanelHandle},
 };
 
 // nate: It is a pain to get editors to size correctly and not overflow.

crates/git_ui/src/git_panel.rs

@@ -4,11 +4,11 @@ use crate::git_panel_settings::StatusStyle;
 use crate::project_diff::Diff;
 use crate::remote_output::{self, RemoteAction, SuccessMessage};
 
+use crate::{ProjectDiff, picker_prompt, project_diff};
 use crate::{branch_picker, render_remote_button};
 use crate::{
     git_panel_settings::GitPanelSettings, git_status_icon, repository_selector::RepositorySelector,
 };
-use crate::{picker_prompt, project_diff, ProjectDiff};
 use anyhow::Result;
 use askpass::AskPassDelegate;
 use assistant_settings::AssistantSettings;
@@ -16,8 +16,8 @@ use db::kvp::KEY_VALUE_STORE;
 use editor::commit_tooltip::CommitTooltip;
 
 use editor::{
-    scroll::ScrollbarAutoHide, Editor, EditorElement, EditorMode, EditorSettings, MultiBuffer,
-    ShowScrollbar,
+    Editor, EditorElement, EditorMode, EditorSettings, MultiBuffer, ShowScrollbar,
+    scroll::ScrollbarAutoHide,
 };
 use futures::StreamExt as _;
 use git::repository::{
@@ -25,14 +25,14 @@ use git::repository::{
     ResetMode, Upstream, UpstreamTracking, UpstreamTrackingStatus,
 };
 use git::status::StageStatus;
-use git::{repository::RepoPath, status::FileStatus, Commit, ToggleStaged};
+use git::{Commit, ToggleStaged, repository::RepoPath, status::FileStatus};
 use git::{ExpandCommitEditor, RestoreTrackedFiles, StageAll, TrashUntrackedFiles, UnstageAll};
 use gpui::{
-    actions, anchored, deferred, percentage, uniform_list, Action, Animation, AnimationExt as _,
-    Axis, ClickEvent, Corner, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,
-    KeyContext, ListHorizontalSizingBehavior, ListSizingBehavior, Modifiers, ModifiersChangedEvent,
-    MouseButton, MouseDownEvent, Point, PromptLevel, ScrollStrategy, Subscription, Task,
-    Transformation, UniformListScrollHandle, WeakEntity,
+    Action, Animation, AnimationExt as _, Axis, ClickEvent, Corner, DismissEvent, Entity,
+    EventEmitter, FocusHandle, Focusable, KeyContext, ListHorizontalSizingBehavior,
+    ListSizingBehavior, Modifiers, ModifiersChangedEvent, MouseButton, MouseDownEvent, Point,
+    PromptLevel, ScrollStrategy, Subscription, Task, Transformation, UniformListScrollHandle,
+    WeakEntity, actions, anchored, deferred, percentage, uniform_list,
 };
 use itertools::Itertools;
 use language::{Buffer, File};
@@ -42,12 +42,12 @@ use language_model::{
 use menu::{Confirm, SecondaryConfirm, SelectFirst, SelectLast, SelectNext, SelectPrevious};
 use multi_buffer::ExcerptInfo;
 use panel::{
-    panel_button, panel_editor_container, panel_editor_style, panel_filled_button,
-    panel_icon_button, PanelHeader,
+    PanelHeader, panel_button, panel_editor_container, panel_editor_style, panel_filled_button,
+    panel_icon_button,
 };
 use project::{
-    git_store::{GitEvent, Repository},
     Fs, Project, ProjectPath,
+    git_store::{GitEvent, Repository},
 };
 use serde::{Deserialize, Serialize};
 use settings::{Settings as _, SettingsStore};
@@ -59,17 +59,17 @@ use std::{collections::HashSet, sync::Arc, time::Duration, usize};
 use strum::{IntoEnumIterator, VariantNames};
 use time::OffsetDateTime;
 use ui::{
-    prelude::*, Checkbox, ContextMenu, ElevationIndex, PopoverMenu, Scrollbar, ScrollbarState,
-    Tooltip,
+    Checkbox, ContextMenu, ElevationIndex, PopoverMenu, Scrollbar, ScrollbarState, Tooltip,
+    prelude::*,
 };
-use util::{maybe, post_inc, ResultExt, TryFutureExt};
+use util::{ResultExt, TryFutureExt, maybe, post_inc};
 use workspace::AppState;
 
 use notifications::status_toast::{StatusToast, ToastIcon};
 use workspace::{
+    Workspace,
     dock::{DockPosition, Panel, PanelEvent},
     notifications::DetachAndPromptErr,
-    Workspace,
 };
 
 actions!(
@@ -4244,182 +4244,186 @@ impl ComponentPreview for PanelRepoFooter {
             .gap_6()
             .w_full()
             .flex_none()
-            .children(vec![example_group_with_title(
-                "Action Button States",
-                vec![
-                    single_example(
-                        "No Branch",
-                        div()
-                            .w(example_width)
-                            .overflow_hidden()
-                            .child(PanelRepoFooter::new_preview(
-                                active_repository(1).clone(),
-                                None,
-                            ))
-                            .into_any_element(),
-                    )
-                    .grow(),
-                    single_example(
-                        "Remote status unknown",
-                        div()
-                            .w(example_width)
-                            .overflow_hidden()
-                            .child(PanelRepoFooter::new_preview(
-                                active_repository(2).clone(),
-                                Some(branch(unknown_upstream)),
-                            ))
-                            .into_any_element(),
-                    )
-                    .grow(),
-                    single_example(
-                        "No Remote Upstream",
-                        div()
-                            .w(example_width)
-                            .overflow_hidden()
-                            .child(PanelRepoFooter::new_preview(
-                                active_repository(3).clone(),
-                                Some(branch(no_remote_upstream)),
-                            ))
-                            .into_any_element(),
-                    )
-                    .grow(),
-                    single_example(
-                        "Not Ahead or Behind",
-                        div()
-                            .w(example_width)
-                            .overflow_hidden()
-                            .child(PanelRepoFooter::new_preview(
-                                active_repository(4).clone(),
-                                Some(branch(not_ahead_or_behind_upstream)),
-                            ))
-                            .into_any_element(),
-                    )
-                    .grow(),
-                    single_example(
-                        "Behind remote",
-                        div()
-                            .w(example_width)
-                            .overflow_hidden()
-                            .child(PanelRepoFooter::new_preview(
-                                active_repository(5).clone(),
-                                Some(branch(behind_upstream)),
-                            ))
-                            .into_any_element(),
-                    )
-                    .grow(),
-                    single_example(
-                        "Ahead of remote",
-                        div()
-                            .w(example_width)
-                            .overflow_hidden()
-                            .child(PanelRepoFooter::new_preview(
-                                active_repository(6).clone(),
-                                Some(branch(ahead_of_upstream)),
-                            ))
-                            .into_any_element(),
-                    )
-                    .grow(),
-                    single_example(
-                        "Ahead and behind remote",
-                        div()
-                            .w(example_width)
-                            .overflow_hidden()
-                            .child(PanelRepoFooter::new_preview(
-                                active_repository(7).clone(),
-                                Some(branch(ahead_and_behind_upstream)),
-                            ))
-                            .into_any_element(),
-                    )
-                    .grow(),
-                ],
-            )
-            .grow()
-            .vertical()])
-            .children(vec![example_group_with_title(
-                "Labels",
-                vec![
-                    single_example(
-                        "Short Branch & Repo",
-                        div()
-                            .w(example_width)
-                            .overflow_hidden()
-                            .child(PanelRepoFooter::new_preview(
-                                SharedString::from("zed"),
-                                Some(custom("main", behind_upstream)),
-                            ))
-                            .into_any_element(),
-                    )
-                    .grow(),
-                    single_example(
-                        "Long Branch",
-                        div()
-                            .w(example_width)
-                            .overflow_hidden()
-                            .child(PanelRepoFooter::new_preview(
-                                SharedString::from("zed"),
-                                Some(custom(
-                                    "redesign-and-update-git-ui-list-entry-style",
-                                    behind_upstream,
-                                )),
-                            ))
-                            .into_any_element(),
-                    )
-                    .grow(),
-                    single_example(
-                        "Long Repo",
-                        div()
-                            .w(example_width)
-                            .overflow_hidden()
-                            .child(PanelRepoFooter::new_preview(
-                                SharedString::from("zed-industries-community-examples"),
-                                Some(custom("gpui", ahead_of_upstream)),
-                            ))
-                            .into_any_element(),
-                    )
-                    .grow(),
-                    single_example(
-                        "Long Repo & Branch",
-                        div()
-                            .w(example_width)
-                            .overflow_hidden()
-                            .child(PanelRepoFooter::new_preview(
-                                SharedString::from("zed-industries-community-examples"),
-                                Some(custom(
-                                    "redesign-and-update-git-ui-list-entry-style",
-                                    behind_upstream,
-                                )),
-                            ))
-                            .into_any_element(),
-                    )
-                    .grow(),
-                    single_example(
-                        "Uppercase Repo",
-                        div()
-                            .w(example_width)
-                            .overflow_hidden()
-                            .child(PanelRepoFooter::new_preview(
-                                SharedString::from("LICENSES"),
-                                Some(custom("main", ahead_of_upstream)),
-                            ))
-                            .into_any_element(),
-                    )
-                    .grow(),
-                    single_example(
-                        "Uppercase Branch",
-                        div()
-                            .w(example_width)
-                            .overflow_hidden()
-                            .child(PanelRepoFooter::new_preview(
-                                SharedString::from("zed"),
-                                Some(custom("update-README", behind_upstream)),
-                            ))
-                            .into_any_element(),
-                    )
-                    .grow(),
-                ],
-            )
-            .grow()
-            .vertical()])
+            .children(vec![
+                example_group_with_title(
+                    "Action Button States",
+                    vec![
+                        single_example(
+                            "No Branch",
+                            div()
+                                .w(example_width)
+                                .overflow_hidden()
+                                .child(PanelRepoFooter::new_preview(
+                                    active_repository(1).clone(),
+                                    None,
+                                ))
+                                .into_any_element(),
+                        )
+                        .grow(),
+                        single_example(
+                            "Remote status unknown",
+                            div()
+                                .w(example_width)
+                                .overflow_hidden()
+                                .child(PanelRepoFooter::new_preview(
+                                    active_repository(2).clone(),
+                                    Some(branch(unknown_upstream)),
+                                ))
+                                .into_any_element(),
+                        )
+                        .grow(),
+                        single_example(
+                            "No Remote Upstream",
+                            div()
+                                .w(example_width)
+                                .overflow_hidden()
+                                .child(PanelRepoFooter::new_preview(
+                                    active_repository(3).clone(),
+                                    Some(branch(no_remote_upstream)),
+                                ))
+                                .into_any_element(),
+                        )
+                        .grow(),
+                        single_example(
+                            "Not Ahead or Behind",
+                            div()
+                                .w(example_width)
+                                .overflow_hidden()
+                                .child(PanelRepoFooter::new_preview(
+                                    active_repository(4).clone(),
+                                    Some(branch(not_ahead_or_behind_upstream)),
+                                ))
+                                .into_any_element(),
+                        )
+                        .grow(),
+                        single_example(
+                            "Behind remote",
+                            div()
+                                .w(example_width)
+                                .overflow_hidden()
+                                .child(PanelRepoFooter::new_preview(
+                                    active_repository(5).clone(),
+                                    Some(branch(behind_upstream)),
+                                ))
+                                .into_any_element(),
+                        )
+                        .grow(),
+                        single_example(
+                            "Ahead of remote",
+                            div()
+                                .w(example_width)
+                                .overflow_hidden()
+                                .child(PanelRepoFooter::new_preview(
+                                    active_repository(6).clone(),
+                                    Some(branch(ahead_of_upstream)),
+                                ))
+                                .into_any_element(),
+                        )
+                        .grow(),
+                        single_example(
+                            "Ahead and behind remote",
+                            div()
+                                .w(example_width)
+                                .overflow_hidden()
+                                .child(PanelRepoFooter::new_preview(
+                                    active_repository(7).clone(),
+                                    Some(branch(ahead_and_behind_upstream)),
+                                ))
+                                .into_any_element(),
+                        )
+                        .grow(),
+                    ],
+                )
+                .grow()
+                .vertical(),
+            ])
+            .children(vec![
+                example_group_with_title(
+                    "Labels",
+                    vec![
+                        single_example(
+                            "Short Branch & Repo",
+                            div()
+                                .w(example_width)
+                                .overflow_hidden()
+                                .child(PanelRepoFooter::new_preview(
+                                    SharedString::from("zed"),
+                                    Some(custom("main", behind_upstream)),
+                                ))
+                                .into_any_element(),
+                        )
+                        .grow(),
+                        single_example(
+                            "Long Branch",
+                            div()
+                                .w(example_width)
+                                .overflow_hidden()
+                                .child(PanelRepoFooter::new_preview(
+                                    SharedString::from("zed"),
+                                    Some(custom(
+                                        "redesign-and-update-git-ui-list-entry-style",
+                                        behind_upstream,
+                                    )),
+                                ))
+                                .into_any_element(),
+                        )
+                        .grow(),
+                        single_example(
+                            "Long Repo",
+                            div()
+                                .w(example_width)
+                                .overflow_hidden()
+                                .child(PanelRepoFooter::new_preview(
+                                    SharedString::from("zed-industries-community-examples"),
+                                    Some(custom("gpui", ahead_of_upstream)),
+                                ))
+                                .into_any_element(),
+                        )
+                        .grow(),
+                        single_example(
+                            "Long Repo & Branch",
+                            div()
+                                .w(example_width)
+                                .overflow_hidden()
+                                .child(PanelRepoFooter::new_preview(
+                                    SharedString::from("zed-industries-community-examples"),
+                                    Some(custom(
+                                        "redesign-and-update-git-ui-list-entry-style",
+                                        behind_upstream,
+                                    )),
+                                ))
+                                .into_any_element(),
+                        )
+                        .grow(),
+                        single_example(
+                            "Uppercase Repo",
+                            div()
+                                .w(example_width)
+                                .overflow_hidden()
+                                .child(PanelRepoFooter::new_preview(
+                                    SharedString::from("LICENSES"),
+                                    Some(custom("main", ahead_of_upstream)),
+                                ))
+                                .into_any_element(),
+                        )
+                        .grow(),
+                        single_example(
+                            "Uppercase Branch",
+                            div()
+                                .w(example_width)
+                                .overflow_hidden()
+                                .child(PanelRepoFooter::new_preview(
+                                    SharedString::from("zed"),
+                                    Some(custom("update-README", behind_upstream)),
+                                ))
+                                .into_any_element(),
+                        )
+                        .grow(),
+                    ],
+                )
+                .grow()
+                .vertical(),
+            ])
             .into_any_element()
     }
 }

crates/git_ui/src/git_ui.rs

@@ -8,7 +8,7 @@ use git::{
     status::{FileStatus, StatusCode, UnmergedStatus, UnmergedStatusCode},
 };
 use git_panel_settings::GitPanelSettings;
-use gpui::{actions, App, FocusHandle};
+use gpui::{App, FocusHandle, actions};
 use onboarding::GitOnboardingModal;
 use project_diff::ProjectDiff;
 use ui::prelude::*;
@@ -165,9 +165,9 @@ fn render_remote_button(
 mod remote_button {
     use gpui::{Action, AnyView, ClickEvent, Corner, FocusHandle};
     use ui::{
-        div, h_flex, rems, App, ButtonCommon, Clickable, ContextMenu, ElementId, FluentBuilder,
-        Icon, IconName, IconSize, IntoElement, Label, LabelCommon, LabelSize, LineHeightStyle,
-        ParentElement, PopoverMenu, SharedString, SplitButton, Styled, Tooltip, Window,
+        App, ButtonCommon, Clickable, ContextMenu, ElementId, FluentBuilder, Icon, IconName,
+        IconSize, IntoElement, Label, LabelCommon, LabelSize, LineHeightStyle, ParentElement,
+        PopoverMenu, SharedString, SplitButton, Styled, Tooltip, Window, div, h_flex, rems,
     };
 
     pub fn render_fetch_button(

crates/git_ui/src/onboarding.rs

@@ -1,8 +1,8 @@
 use gpui::{
-    svg, ClickEvent, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, MouseDownEvent,
-    Render,
+    ClickEvent, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, MouseDownEvent, Render,
+    svg,
 };
-use ui::{prelude::*, TintColor};
+use ui::{TintColor, prelude::*};
 use workspace::{ModalView, Workspace};
 
 use crate::git_panel::GitPanel;

crates/git_ui/src/picker_prompt.rs

@@ -3,13 +3,13 @@ use fuzzy::{StringMatch, StringMatchCandidate};
 
 use core::cmp;
 use gpui::{
-    rems, App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,
-    InteractiveElement, IntoElement, ParentElement, Render, SharedString, Styled, Subscription,
-    Task, WeakEntity, Window,
+    App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, InteractiveElement,
+    IntoElement, ParentElement, Render, SharedString, Styled, Subscription, Task, WeakEntity,
+    Window, rems,
 };
 use picker::{Picker, PickerDelegate};
 use std::sync::Arc;
-use ui::{prelude::*, HighlightedLabel, ListItem, ListItemSpacing};
+use ui::{HighlightedLabel, ListItem, ListItemSpacing, prelude::*};
 use util::ResultExt;
 use workspace::{ModalView, Workspace};
 

crates/git_ui/src/project_diff.rs

@@ -6,35 +6,35 @@ use anyhow::Result;
 use buffer_diff::{BufferDiff, DiffHunkSecondaryStatus};
 use collections::HashSet;
 use editor::{
+    Editor, EditorEvent,
     actions::{GoToHunk, GoToPreviousHunk},
     scroll::Autoscroll,
-    Editor, EditorEvent,
 };
 use futures::StreamExt;
 use git::{
+    Commit, StageAll, StageAndNext, ToggleStaged, UnstageAll, UnstageAndNext,
     repository::{Branch, Upstream, UpstreamTracking, UpstreamTrackingStatus},
     status::FileStatus,
-    Commit, StageAll, StageAndNext, ToggleStaged, UnstageAll, UnstageAndNext,
 };
 use gpui::{
-    actions, Action, AnyElement, AnyView, App, AppContext as _, AsyncWindowContext, Entity,
-    EventEmitter, FocusHandle, Focusable, Render, Subscription, Task, WeakEntity,
+    Action, AnyElement, AnyView, App, AppContext as _, AsyncWindowContext, Entity, EventEmitter,
+    FocusHandle, Focusable, Render, Subscription, Task, WeakEntity, actions,
 };
 use language::{Anchor, Buffer, Capability, OffsetRangeExt};
 use multi_buffer::{MultiBuffer, PathKey};
 use project::{
-    git_store::{GitEvent, GitStore},
     Project, ProjectPath,
+    git_store::{GitEvent, GitStore},
 };
 use std::any::{Any, TypeId};
 use theme::ActiveTheme;
-use ui::{prelude::*, vertical_divider, KeyBinding, Tooltip};
+use ui::{KeyBinding, Tooltip, prelude::*, vertical_divider};
 use util::ResultExt as _;
 use workspace::{
-    item::{BreadcrumbText, Item, ItemEvent, ItemHandle, TabContentParams},
-    searchable::SearchableItemHandle,
     CloseActiveItem, ItemNavHistory, SerializableItem, ToolbarItemEvent, ToolbarItemLocation,
     ToolbarItemView, Workspace,
+    item::{BreadcrumbText, Item, ItemEvent, ItemHandle, TabContentParams},
+    searchable::SearchableItemHandle,
 };
 
 actions!(git, [Diff, Add]);
@@ -1249,41 +1249,43 @@ mod preview {
 
             v_flex()
                 .gap_6()
-                .children(vec![example_group(vec![
-                    single_example(
-                        "No Repo",
-                        div()
-                            .w(width)
-                            .h(height)
-                            .child(no_repo_state)
-                            .into_any_element(),
-                    ),
-                    single_example(
-                        "No Changes",
-                        div()
-                            .w(width)
-                            .h(height)
-                            .child(no_changes_state)
-                            .into_any_element(),
-                    ),
-                    single_example(
-                        "Unknown Upstream",
-                        div()
-                            .w(width)
-                            .h(height)
-                            .child(unknown_upstream_state)
-                            .into_any_element(),
-                    ),
-                    single_example(
-                        "Ahead of Remote",
-                        div()
-                            .w(width)
-                            .h(height)
-                            .child(ahead_of_upstream_state)
-                            .into_any_element(),
-                    ),
+                .children(vec![
+                    example_group(vec![
+                        single_example(
+                            "No Repo",
+                            div()
+                                .w(width)
+                                .h(height)
+                                .child(no_repo_state)
+                                .into_any_element(),
+                        ),
+                        single_example(
+                            "No Changes",
+                            div()
+                                .w(width)
+                                .h(height)
+                                .child(no_changes_state)
+                                .into_any_element(),
+                        ),
+                        single_example(
+                            "Unknown Upstream",
+                            div()
+                                .w(width)
+                                .h(height)
+                                .child(unknown_upstream_state)
+                                .into_any_element(),
+                        ),
+                        single_example(
+                            "Ahead of Remote",
+                            div()
+                                .w(width)
+                                .h(height)
+                                .child(ahead_of_upstream_state)
+                                .into_any_element(),
+                        ),
+                    ])
+                    .vertical(),
                 ])
-                .vertical()])
                 .into_any_element()
         }
     }
@@ -1293,7 +1295,7 @@ mod preview {
 #[cfg(test)]
 mod tests {
     use db::indoc;
-    use editor::test::editor_test_context::{assert_state_with_diff, EditorTestContext};
+    use editor::test::editor_test_context::{EditorTestContext, assert_state_with_diff};
     use gpui::TestAppContext;
     use project::FakeFs;
     use serde_json::json;

crates/git_ui/src/repository_selector.rs

@@ -3,9 +3,9 @@ use gpui::{
 };
 use itertools::Itertools;
 use picker::{Picker, PickerDelegate};
-use project::{git_store::Repository, Project};
+use project::{Project, git_store::Repository};
 use std::sync::Arc;
-use ui::{prelude::*, ListItem, ListItemSpacing};
+use ui::{ListItem, ListItemSpacing, prelude::*};
 use workspace::{ModalView, Workspace};
 
 pub fn register(workspace: &mut Workspace) {