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
|
@ -6,7 +6,7 @@ use alacritty_terminal::grid::Dimensions;
|
|||
/// with modifications for our circumstances
|
||||
use alacritty_terminal::index::{Column as GridCol, Line as GridLine, Point as AlacPoint, Side};
|
||||
use alacritty_terminal::term::TermMode;
|
||||
use gpui::{px, Modifiers, MouseButton, Pixels, Point, ScrollWheelEvent};
|
||||
use gpui::{Modifiers, MouseButton, Pixels, Point, ScrollWheelEvent, px};
|
||||
|
||||
use crate::TerminalBounds;
|
||||
|
||||
|
|
|
@ -6,6 +6,7 @@ mod pty_info;
|
|||
pub mod terminal_settings;
|
||||
|
||||
use alacritty_terminal::{
|
||||
Term,
|
||||
event::{Event as AlacTermEvent, EventListener, Notify, WindowSize},
|
||||
event_loop::{EventLoop, Msg, Notifier},
|
||||
grid::{Dimensions, Grid, Row, Scroll as AlacScroll},
|
||||
|
@ -13,22 +14,21 @@ use alacritty_terminal::{
|
|||
selection::{Selection, SelectionRange, SelectionType},
|
||||
sync::FairMutex,
|
||||
term::{
|
||||
Config, RenderableCursor, TermMode,
|
||||
cell::{Cell, Flags},
|
||||
search::{Match, RegexIter, RegexSearch},
|
||||
Config, RenderableCursor, TermMode,
|
||||
},
|
||||
tty::{self},
|
||||
vi_mode::{ViModeCursor, ViMotion},
|
||||
vte::ansi::{
|
||||
ClearMode, CursorStyle as AlacCursorStyle, Handler, NamedPrivateMode, PrivateMode,
|
||||
},
|
||||
Term,
|
||||
};
|
||||
use anyhow::{bail, Result};
|
||||
use anyhow::{Result, bail};
|
||||
|
||||
use futures::{
|
||||
channel::mpsc::{unbounded, UnboundedReceiver, UnboundedSender},
|
||||
FutureExt,
|
||||
channel::mpsc::{UnboundedReceiver, UnboundedSender, unbounded},
|
||||
};
|
||||
|
||||
use mappings::mouse::{
|
||||
|
@ -59,10 +59,9 @@ use std::{
|
|||
use thiserror::Error;
|
||||
|
||||
use gpui::{
|
||||
actions, black, px, AnyWindowHandle, App, AppContext as _, Bounds, ClipboardItem, Context,
|
||||
EventEmitter, Hsla, Keystroke, Modifiers, MouseButton, MouseDownEvent, MouseMoveEvent,
|
||||
MouseUpEvent, Pixels, Point, Rgba, ScrollWheelEvent, SharedString, Size, Task, TouchPhase,
|
||||
Window,
|
||||
AnyWindowHandle, App, AppContext as _, Bounds, ClipboardItem, Context, EventEmitter, Hsla,
|
||||
Keystroke, Modifiers, MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent, Pixels, Point,
|
||||
Rgba, ScrollWheelEvent, SharedString, Size, Task, TouchPhase, Window, actions, black, px,
|
||||
};
|
||||
|
||||
use crate::mappings::{colors::to_alac_rgb, keys::to_esc_str};
|
||||
|
@ -2146,12 +2145,12 @@ mod tests {
|
|||
index::{Column, Line, Point as AlacPoint},
|
||||
term::cell::Cell,
|
||||
};
|
||||
use gpui::{bounds, point, size, Pixels, Point};
|
||||
use rand::{distributions::Alphanumeric, rngs::ThreadRng, thread_rng, Rng};
|
||||
use gpui::{Pixels, Point, bounds, point, size};
|
||||
use rand::{Rng, distributions::Alphanumeric, rngs::ThreadRng, thread_rng};
|
||||
|
||||
use crate::{
|
||||
content_index_for_mouse, python_extract_path_and_line, rgb_for_index, IndexedCell,
|
||||
TerminalBounds, TerminalContent,
|
||||
IndexedCell, TerminalBounds, TerminalContent, content_index_for_mouse,
|
||||
python_extract_path_and_line, rgb_for_index,
|
||||
};
|
||||
|
||||
#[test]
|
||||
|
|
|
@ -3,11 +3,11 @@ use alacritty_terminal::vte::ansi::{
|
|||
};
|
||||
use collections::HashMap;
|
||||
use gpui::{
|
||||
px, AbsoluteLength, App, FontFallbacks, FontFeatures, FontWeight, Pixels, SharedString,
|
||||
AbsoluteLength, App, FontFallbacks, FontFeatures, FontWeight, Pixels, SharedString, px,
|
||||
};
|
||||
use schemars::{r#gen::SchemaGenerator, schema::RootSchema, JsonSchema};
|
||||
use schemars::{JsonSchema, r#gen::SchemaGenerator, schema::RootSchema};
|
||||
use serde_derive::{Deserialize, Serialize};
|
||||
use settings::{add_references_to_properties, SettingsJsonSchemaParams, SettingsSources};
|
||||
use settings::{SettingsJsonSchemaParams, SettingsSources, add_references_to_properties};
|
||||
use std::path::PathBuf;
|
||||
use task::Shell;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue