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
|
@ -1,5 +1,5 @@
|
|||
use gpui::AnyElement;
|
||||
use ui::{prelude::*, Indicator, ListItem};
|
||||
use ui::{Indicator, ListItem, prelude::*};
|
||||
|
||||
use crate::KernelSpecification;
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
use crate::KERNEL_DOCS_URL;
|
||||
use crate::kernels::KernelSpecification;
|
||||
use crate::repl_store::ReplStore;
|
||||
use crate::KERNEL_DOCS_URL;
|
||||
|
||||
use gpui::AnyView;
|
||||
use gpui::DismissEvent;
|
||||
|
@ -15,7 +15,7 @@ use ui::ListItemSpacing;
|
|||
|
||||
use gpui::SharedString;
|
||||
use gpui::Task;
|
||||
use ui::{prelude::*, ListItem, PopoverMenu, PopoverMenuHandle, PopoverTrigger};
|
||||
use ui::{ListItem, PopoverMenu, PopoverMenuHandle, PopoverTrigger, prelude::*};
|
||||
|
||||
type OnSelect = Box<dyn Fn(KernelSpecification, &mut Window, &mut App)>;
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
use anyhow::{Context as _, Result};
|
||||
use futures::{
|
||||
AsyncBufReadExt as _, SinkExt as _,
|
||||
channel::mpsc::{self},
|
||||
io::BufReader,
|
||||
stream::{SelectAll, StreamExt},
|
||||
AsyncBufReadExt as _, SinkExt as _,
|
||||
};
|
||||
use gpui::{App, AppContext as _, Entity, EntityId, Task, Window};
|
||||
use jupyter_protocol::{
|
||||
connection_info::{ConnectionInfo, Transport},
|
||||
ExecutionState, JupyterKernelspec, JupyterMessage, JupyterMessageContent, KernelInfoReply,
|
||||
connection_info::{ConnectionInfo, Transport},
|
||||
};
|
||||
use project::Fs;
|
||||
use runtimelib::dirs;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
use futures::{channel::mpsc, SinkExt as _};
|
||||
use futures::{SinkExt as _, channel::mpsc};
|
||||
use gpui::{App, AppContext as _, Entity, Task, Window};
|
||||
use http_client::{AsyncBody, HttpClient, Request};
|
||||
use jupyter_protocol::{ExecutionState, JupyterKernelspec, JupyterMessage, KernelInfoReply};
|
||||
|
|
|
@ -3,18 +3,18 @@ use std::sync::Arc;
|
|||
|
||||
use editor::{Editor, EditorMode, MultiBuffer};
|
||||
use futures::future::Shared;
|
||||
use gpui::{prelude::*, App, Entity, Hsla, Task, TextStyleRefinement};
|
||||
use gpui::{App, Entity, Hsla, Task, TextStyleRefinement, prelude::*};
|
||||
use language::{Buffer, Language, LanguageRegistry};
|
||||
use markdown_preview::{markdown_parser::parse_markdown, markdown_renderer::render_markdown_block};
|
||||
use nbformat::v4::{CellId, CellMetadata, CellType};
|
||||
use settings::Settings as _;
|
||||
use theme::ThemeSettings;
|
||||
use ui::{prelude::*, IconButtonShape};
|
||||
use ui::{IconButtonShape, prelude::*};
|
||||
use util::ResultExt;
|
||||
|
||||
use crate::{
|
||||
notebook::{CODE_BLOCK_INSET, GUTTER_WIDTH},
|
||||
outputs::{plain::TerminalOutput, user_error::ErrorView, Output},
|
||||
outputs::{Output, plain::TerminalOutput, user_error::ErrorView},
|
||||
};
|
||||
|
||||
#[derive(Copy, Clone, PartialEq, PartialOrd)]
|
||||
|
|
|
@ -6,15 +6,15 @@ use anyhow::{Context as _, Result};
|
|||
use client::proto::ViewId;
|
||||
use collections::HashMap;
|
||||
use feature_flags::{FeatureFlagAppExt as _, NotebookFeatureFlag};
|
||||
use futures::future::Shared;
|
||||
use futures::FutureExt;
|
||||
use futures::future::Shared;
|
||||
use gpui::{
|
||||
actions, list, prelude::*, AnyElement, App, Entity, EventEmitter, FocusHandle, Focusable,
|
||||
ListScrollEvent, ListState, Point, Task,
|
||||
AnyElement, App, Entity, EventEmitter, FocusHandle, Focusable, ListScrollEvent, ListState,
|
||||
Point, Task, actions, list, prelude::*,
|
||||
};
|
||||
use language::{Language, LanguageRegistry};
|
||||
use project::{Project, ProjectEntryId, ProjectPath};
|
||||
use ui::{prelude::*, Tooltip};
|
||||
use ui::{Tooltip, prelude::*};
|
||||
use workspace::item::{ItemEvent, TabContentParams};
|
||||
use workspace::searchable::SearchableItemHandle;
|
||||
use workspace::{Item, ItemHandle, Pane, ProjectItem, ToolbarItemLocation};
|
||||
|
|
|
@ -37,12 +37,12 @@ use std::time::Duration;
|
|||
|
||||
use editor::{Editor, MultiBuffer};
|
||||
use gpui::{
|
||||
percentage, Animation, AnimationExt, AnyElement, ClipboardItem, Entity, Render, Transformation,
|
||||
WeakEntity,
|
||||
Animation, AnimationExt, AnyElement, ClipboardItem, Entity, Render, Transformation, WeakEntity,
|
||||
percentage,
|
||||
};
|
||||
use language::Buffer;
|
||||
use runtimelib::{ExecutionState, JupyterMessageContent, MimeBundle, MimeType};
|
||||
use ui::{div, prelude::*, v_flex, Context, IntoElement, Styled, Tooltip, Window};
|
||||
use ui::{Context, IntoElement, Styled, Tooltip, Window, div, prelude::*, v_flex};
|
||||
|
||||
mod image;
|
||||
use image::ImageView;
|
||||
|
|
|
@ -1,12 +1,11 @@
|
|||
use anyhow::Result;
|
||||
use base64::{
|
||||
alphabet,
|
||||
Engine as _, alphabet,
|
||||
engine::{DecodePaddingMode, GeneralPurpose, GeneralPurposeConfig},
|
||||
Engine as _,
|
||||
};
|
||||
use gpui::{img, App, ClipboardItem, Image, ImageFormat, Pixels, RenderImage, Window};
|
||||
use gpui::{App, ClipboardItem, Image, ImageFormat, Pixels, RenderImage, Window, img};
|
||||
use std::sync::Arc;
|
||||
use ui::{div, prelude::*, IntoElement, Styled};
|
||||
use ui::{IntoElement, Styled, div, prelude::*};
|
||||
|
||||
use crate::outputs::OutputContent;
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
use anyhow::Result;
|
||||
use gpui::{div, prelude::*, App, ClipboardItem, Context, Entity, Task, Window};
|
||||
use gpui::{App, ClipboardItem, Context, Entity, Task, Window, div, prelude::*};
|
||||
use language::Buffer;
|
||||
use markdown_preview::{
|
||||
markdown_elements::ParsedMarkdown, markdown_parser::parse_markdown,
|
||||
|
|
|
@ -22,12 +22,12 @@ use alacritty_terminal::{
|
|||
term::Config,
|
||||
vte::ansi::Processor,
|
||||
};
|
||||
use gpui::{canvas, size, Bounds, ClipboardItem, Entity, FontStyle, TextStyle, WhiteSpace};
|
||||
use gpui::{Bounds, ClipboardItem, Entity, FontStyle, TextStyle, WhiteSpace, canvas, size};
|
||||
use language::Buffer;
|
||||
use settings::Settings as _;
|
||||
use terminal_view::terminal_element::TerminalElement;
|
||||
use theme::ThemeSettings;
|
||||
use ui::{prelude::*, IntoElement};
|
||||
use ui::{IntoElement, prelude::*};
|
||||
|
||||
use crate::outputs::OutputContent;
|
||||
|
||||
|
|
|
@ -60,7 +60,7 @@ use runtimelib::media::datatable::TabularDataResource;
|
|||
use serde_json::Value;
|
||||
use settings::Settings;
|
||||
use theme::ThemeSettings;
|
||||
use ui::{div, prelude::*, v_flex, IntoElement, Styled};
|
||||
use ui::{IntoElement, Styled, div, prelude::*, v_flex};
|
||||
use util::markdown::MarkdownString;
|
||||
|
||||
use crate::outputs::OutputContent;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
use gpui::{AnyElement, App, Entity, FontWeight, Window};
|
||||
use ui::{h_flex, prelude::*, v_flex, Label};
|
||||
use ui::{Label, h_flex, prelude::*, v_flex};
|
||||
|
||||
use crate::outputs::plain::TerminalOutput;
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@ mod session;
|
|||
|
||||
use std::{sync::Arc, time::Duration};
|
||||
|
||||
use async_dispatcher::{set_dispatcher, Dispatcher, Runnable};
|
||||
use async_dispatcher::{Dispatcher, Runnable, set_dispatcher};
|
||||
use gpui::{App, PlatformDispatcher};
|
||||
use project::Fs;
|
||||
pub use runtimelib::ExecutionState;
|
||||
|
|
|
@ -5,7 +5,7 @@ use std::sync::Arc;
|
|||
|
||||
use anyhow::{Context as _, Result};
|
||||
use editor::Editor;
|
||||
use gpui::{prelude::*, App, Entity, WeakEntity, Window};
|
||||
use gpui::{App, Entity, WeakEntity, Window, prelude::*};
|
||||
use language::{BufferSnapshot, Language, LanguageName, Point};
|
||||
use project::{ProjectItem as _, WorktreeId};
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
use editor::Editor;
|
||||
use gpui::{
|
||||
actions, prelude::*, AnyElement, App, Entity, EventEmitter, FocusHandle, Focusable,
|
||||
Subscription,
|
||||
AnyElement, App, Entity, EventEmitter, FocusHandle, Focusable, Subscription, actions,
|
||||
prelude::*,
|
||||
};
|
||||
use project::ProjectItem as _;
|
||||
use ui::{prelude::*, ButtonLike, ElevationIndex, KeyBinding};
|
||||
use ui::{ButtonLike, ElevationIndex, KeyBinding, prelude::*};
|
||||
use util::ResultExt as _;
|
||||
use workspace::item::ItemEvent;
|
||||
use workspace::WorkspaceId;
|
||||
use workspace::{item::Item, Workspace};
|
||||
use workspace::item::ItemEvent;
|
||||
use workspace::{Workspace, item::Item};
|
||||
|
||||
use crate::jupyter_settings::JupyterSettings;
|
||||
use crate::repl_store::ReplStore;
|
||||
|
|
|
@ -3,7 +3,7 @@ use std::sync::Arc;
|
|||
use anyhow::Result;
|
||||
use collections::HashMap;
|
||||
use command_palette_hooks::CommandPaletteFilter;
|
||||
use gpui::{prelude::*, App, Context, Entity, EntityId, Global, Subscription, Task};
|
||||
use gpui::{App, Context, Entity, EntityId, Global, Subscription, Task, prelude::*};
|
||||
use jupyter_websocket_client::RemoteServer;
|
||||
use language::Language;
|
||||
use project::{Fs, Project, WorktreeId};
|
||||
|
|
|
@ -2,22 +2,22 @@ use crate::components::KernelListItem;
|
|||
use crate::kernels::RemoteRunningKernel;
|
||||
use crate::setup_editor_session_actions;
|
||||
use crate::{
|
||||
KernelStatus,
|
||||
kernels::{Kernel, KernelSpecification, NativeRunningKernel},
|
||||
outputs::{ExecutionStatus, ExecutionView},
|
||||
KernelStatus,
|
||||
};
|
||||
use collections::{HashMap, HashSet};
|
||||
use editor::{
|
||||
Anchor, AnchorRangeExt as _, Editor, MultiBuffer, ToPoint,
|
||||
display_map::{
|
||||
BlockContext, BlockId, BlockPlacement, BlockProperties, BlockStyle, CustomBlockId,
|
||||
RenderBlock,
|
||||
},
|
||||
scroll::Autoscroll,
|
||||
Anchor, AnchorRangeExt as _, Editor, MultiBuffer, ToPoint,
|
||||
};
|
||||
use futures::FutureExt as _;
|
||||
use gpui::{
|
||||
div, prelude::*, Context, Entity, EventEmitter, Render, Subscription, Task, WeakEntity, Window,
|
||||
Context, Entity, EventEmitter, Render, Subscription, Task, WeakEntity, Window, div, prelude::*,
|
||||
};
|
||||
use language::Point;
|
||||
use project::Fs;
|
||||
|
@ -27,7 +27,7 @@ use runtimelib::{
|
|||
};
|
||||
use std::{env::temp_dir, ops::Range, sync::Arc, time::Duration};
|
||||
use theme::ActiveTheme;
|
||||
use ui::{prelude::*, IconButtonShape, Tooltip};
|
||||
use ui::{IconButtonShape, Tooltip, prelude::*};
|
||||
use util::ResultExt as _;
|
||||
|
||||
pub struct Session {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue