chore: Bump Rust edition to 2024 (#27800)
Follow-up to https://github.com/zed-industries/zed/pull/27791 Release Notes: - N/A
This commit is contained in:
parent
d50905e000
commit
dc64ec9cc8
802 changed files with 3775 additions and 3662 deletions
|
@ -5,11 +5,11 @@ use project::project_settings::ProjectSettings;
|
|||
use remote::SshConnectionOptions;
|
||||
use settings::Settings;
|
||||
use ui::{
|
||||
div, h_flex, rems, Button, ButtonCommon, ButtonStyle, Clickable, Context, ElevationIndex,
|
||||
FluentBuilder, Headline, HeadlineSize, IconName, IconPosition, InteractiveElement, IntoElement,
|
||||
Label, Modal, ModalFooter, ModalHeader, ParentElement, Section, Styled, StyledExt, Window,
|
||||
Button, ButtonCommon, ButtonStyle, Clickable, Context, ElevationIndex, FluentBuilder, Headline,
|
||||
HeadlineSize, IconName, IconPosition, InteractiveElement, IntoElement, Label, Modal,
|
||||
ModalFooter, ModalHeader, ParentElement, Section, Styled, StyledExt, Window, div, h_flex, rems,
|
||||
};
|
||||
use workspace::{notifications::DetachAndPromptErr, ModalView, OpenOptions, Workspace};
|
||||
use workspace::{ModalView, OpenOptions, Workspace, notifications::DetachAndPromptErr};
|
||||
|
||||
use crate::open_ssh_project;
|
||||
|
||||
|
|
|
@ -11,8 +11,8 @@ use gpui::{
|
|||
};
|
||||
use ordered_float::OrderedFloat;
|
||||
use picker::{
|
||||
highlighted_match_with_paths::{HighlightedMatch, HighlightedMatchWithPaths},
|
||||
Picker, PickerDelegate,
|
||||
highlighted_match_with_paths::{HighlightedMatch, HighlightedMatchWithPaths},
|
||||
};
|
||||
pub use remote_servers::RemoteServerProjects;
|
||||
use settings::Settings;
|
||||
|
@ -21,11 +21,11 @@ use std::{
|
|||
path::{Path, PathBuf},
|
||||
sync::Arc,
|
||||
};
|
||||
use ui::{prelude::*, tooltip_container, KeyBinding, ListItem, ListItemSpacing, Tooltip};
|
||||
use util::{paths::PathExt, ResultExt};
|
||||
use ui::{KeyBinding, ListItem, ListItemSpacing, Tooltip, prelude::*, tooltip_container};
|
||||
use util::{ResultExt, paths::PathExt};
|
||||
use workspace::{
|
||||
CloseIntent, ModalView, OpenOptions, SerializedWorkspaceLocation, Workspace, WorkspaceId,
|
||||
WORKSPACE_DB,
|
||||
CloseIntent, ModalView, OpenOptions, SerializedWorkspaceLocation, WORKSPACE_DB, Workspace,
|
||||
WorkspaceId,
|
||||
};
|
||||
use zed_actions::{OpenRecent, OpenRemote};
|
||||
|
||||
|
@ -594,11 +594,11 @@ mod tests {
|
|||
use dap::debugger_settings::DebuggerSettings;
|
||||
use editor::Editor;
|
||||
use gpui::{TestAppContext, UpdateGlobal, WindowHandle};
|
||||
use project::{project_settings::ProjectSettings, Project};
|
||||
use project::{Project, project_settings::ProjectSettings};
|
||||
use serde_json::json;
|
||||
use settings::SettingsStore;
|
||||
use util::path;
|
||||
use workspace::{open_paths, AppState};
|
||||
use workspace::{AppState, open_paths};
|
||||
|
||||
use super::*;
|
||||
|
||||
|
|
|
@ -4,38 +4,37 @@ use std::sync::Arc;
|
|||
|
||||
use editor::Editor;
|
||||
use file_finder::OpenPathDelegate;
|
||||
use futures::FutureExt;
|
||||
use futures::channel::oneshot;
|
||||
use futures::future::Shared;
|
||||
use futures::FutureExt;
|
||||
use gpui::canvas;
|
||||
use gpui::ClipboardItem;
|
||||
use gpui::Task;
|
||||
use gpui::WeakEntity;
|
||||
use gpui::canvas;
|
||||
use gpui::{
|
||||
AnyElement, App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,
|
||||
PromptLevel, ScrollHandle, Window,
|
||||
};
|
||||
use picker::Picker;
|
||||
use project::Project;
|
||||
use remote::ssh_session::ConnectionIdentifier;
|
||||
use remote::SshConnectionOptions;
|
||||
use remote::SshRemoteClient;
|
||||
use settings::update_settings_file;
|
||||
use remote::ssh_session::ConnectionIdentifier;
|
||||
use settings::Settings;
|
||||
use settings::update_settings_file;
|
||||
use ui::Navigable;
|
||||
use ui::NavigableEntry;
|
||||
use ui::{
|
||||
prelude::*, IconButtonShape, List, ListItem, ListSeparator, Modal, ModalHeader, Scrollbar,
|
||||
ScrollbarState, Section, Tooltip,
|
||||
IconButtonShape, List, ListItem, ListSeparator, Modal, ModalHeader, Scrollbar, ScrollbarState,
|
||||
Section, Tooltip, prelude::*,
|
||||
};
|
||||
use util::ResultExt;
|
||||
use workspace::notifications::NotificationId;
|
||||
use workspace::OpenOptions;
|
||||
use workspace::Toast;
|
||||
use workspace::{notifications::DetachAndPromptErr, ModalView, Workspace};
|
||||
use workspace::notifications::NotificationId;
|
||||
use workspace::{ModalView, Workspace, notifications::DetachAndPromptErr};
|
||||
|
||||
use crate::ssh_connections::connect_over_ssh;
|
||||
use crate::ssh_connections::open_ssh_project;
|
||||
use crate::OpenRemote;
|
||||
use crate::ssh_connections::RemoteSettingsContent;
|
||||
use crate::ssh_connections::SshConnection;
|
||||
use crate::ssh_connections::SshConnectionHeader;
|
||||
|
@ -43,7 +42,8 @@ use crate::ssh_connections::SshConnectionModal;
|
|||
use crate::ssh_connections::SshProject;
|
||||
use crate::ssh_connections::SshPrompt;
|
||||
use crate::ssh_connections::SshSettings;
|
||||
use crate::OpenRemote;
|
||||
use crate::ssh_connections::connect_over_ssh;
|
||||
use crate::ssh_connections::open_ssh_project;
|
||||
|
||||
mod navigation_base {}
|
||||
pub struct RemoteServerProjects {
|
||||
|
|
|
@ -1,15 +1,15 @@
|
|||
use std::collections::BTreeSet;
|
||||
use std::{path::PathBuf, sync::Arc, time::Duration};
|
||||
|
||||
use anyhow::{anyhow, Result};
|
||||
use anyhow::{Result, anyhow};
|
||||
use auto_update::AutoUpdater;
|
||||
use editor::Editor;
|
||||
use extension_host::ExtensionStore;
|
||||
use futures::channel::oneshot;
|
||||
use gpui::{
|
||||
percentage, Animation, AnimationExt, AnyWindowHandle, App, AsyncApp, DismissEvent, Entity,
|
||||
EventEmitter, Focusable, FontFeatures, ParentElement as _, PromptLevel, Render,
|
||||
SemanticVersion, SharedString, Task, TextStyleRefinement, Transformation, WeakEntity,
|
||||
Animation, AnimationExt, AnyWindowHandle, App, AsyncApp, DismissEvent, Entity, EventEmitter,
|
||||
Focusable, FontFeatures, ParentElement as _, PromptLevel, Render, SemanticVersion,
|
||||
SharedString, Task, TextStyleRefinement, Transformation, WeakEntity, percentage,
|
||||
};
|
||||
|
||||
use language::CursorShape;
|
||||
|
@ -22,8 +22,8 @@ use serde::{Deserialize, Serialize};
|
|||
use settings::{Settings, SettingsSources};
|
||||
use theme::ThemeSettings;
|
||||
use ui::{
|
||||
prelude::*, ActiveTheme, Color, Context, Icon, IconName, IconSize, InteractiveElement,
|
||||
IntoElement, Label, LabelCommon, Styled, Window,
|
||||
ActiveTheme, Color, Context, Icon, IconName, IconSize, InteractiveElement, IntoElement, Label,
|
||||
LabelCommon, Styled, Window, prelude::*,
|
||||
};
|
||||
use workspace::{AppState, ModalView, Workspace};
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue