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:
Piotr Osiewicz 2025-03-31 20:55:27 +02:00 committed by GitHub
parent d50905e000
commit dc64ec9cc8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
802 changed files with 3775 additions and 3662 deletions

View file

@ -5,11 +5,11 @@ use language::{Bias, Point, SelectionGoal};
use multi_buffer::MultiBufferRow;
use crate::{
Vim,
motion::Motion,
normal::{ChangeCase, ConvertToLowerCase, ConvertToUpperCase},
object::Object,
state::Mode,
Vim,
};
pub enum CaseTarget {

View file

@ -1,14 +1,14 @@
use crate::{
Vim,
motion::{self, Motion, MotionKind},
object::Object,
state::Mode,
Vim,
};
use editor::{
Bias, DisplayPoint,
display_map::{DisplaySnapshot, ToDisplayPoint},
movement::TextLayoutDetails,
scroll::Autoscroll,
Bias, DisplayPoint,
};
use gpui::{Context, Window};
use language::Selection;

View file

@ -1,13 +1,13 @@
use crate::{
Vim,
motion::{Motion, MotionKind},
object::Object,
Vim,
};
use collections::{HashMap, HashSet};
use editor::{
Bias, DisplayPoint,
display_map::{DisplaySnapshot, ToDisplayPoint},
scroll::Autoscroll,
Bias, DisplayPoint,
};
use gpui::{Context, Window};
use language::{Point, Selection};

View file

@ -1,11 +1,11 @@
use editor::{scroll::Autoscroll, Editor, MultiBufferSnapshot, ToOffset, ToPoint};
use gpui::{impl_actions, Context, Window};
use editor::{Editor, MultiBufferSnapshot, ToOffset, ToPoint, scroll::Autoscroll};
use gpui::{Context, Window, impl_actions};
use language::{Bias, Point};
use schemars::JsonSchema;
use serde::Deserialize;
use std::ops::Range;
use crate::{state::Mode, Vim};
use crate::{Vim, state::Mode};
const BOOLEAN_PAIRS: &[(&str, &str)] = &[("true", "false"), ("yes", "no"), ("on", "off")];

View file

@ -1,10 +1,10 @@
use std::{ops::Range, path::Path, sync::Arc};
use editor::{
Anchor, Bias, DisplayPoint, Editor, MultiBuffer,
display_map::{DisplaySnapshot, ToDisplayPoint},
movement,
scroll::Autoscroll,
Anchor, Bias, DisplayPoint, Editor, MultiBuffer,
};
use gpui::{Context, Entity, EntityId, UpdateGlobal, Window};
use language::SelectionGoal;
@ -13,9 +13,9 @@ use ui::App;
use workspace::OpenOptions;
use crate::{
Vim,
motion::{self, Motion},
state::{Mark, Mode, VimGlobals},
Vim,
};
impl Vim {

View file

@ -1,15 +1,15 @@
use editor::{display_map::ToDisplayPoint, movement, scroll::Autoscroll, DisplayPoint, RowExt};
use gpui::{impl_actions, Context, Window};
use editor::{DisplayPoint, RowExt, display_map::ToDisplayPoint, movement, scroll::Autoscroll};
use gpui::{Context, Window, impl_actions};
use language::{Bias, SelectionGoal};
use schemars::JsonSchema;
use serde::Deserialize;
use std::cmp;
use crate::{
Vim,
motion::{Motion, MotionKind},
object::Object,
state::{Mode, Register},
Vim,
};
#[derive(Clone, Deserialize, JsonSchema, PartialEq)]
@ -283,15 +283,15 @@ impl Vim {
#[cfg(test)]
mod test {
use crate::{
UseSystemClipboard, VimSettings,
state::{Mode, Register},
test::{NeovimBackedTestContext, VimTestContext},
UseSystemClipboard, VimSettings,
};
use gpui::ClipboardItem;
use indoc::indoc;
use language::{
language_settings::{AllLanguageSettings, LanguageSettingsContent},
LanguageName,
language_settings::{AllLanguageSettings, LanguageSettingsContent},
};
use settings::SettingsStore;

View file

@ -1,14 +1,14 @@
use std::{cell::RefCell, rc::Rc};
use crate::{
Vim,
insert::NormalBefore,
motion::Motion,
normal::InsertBefore,
state::{Mode, Operator, RecordedSelection, ReplayableAction, VimGlobals},
Vim,
};
use editor::Editor;
use gpui::{actions, Action, App, Context, Window};
use gpui::{Action, App, Context, Window, actions};
use workspace::Workspace;
actions!(vim, [Repeat, EndRepeat, ToggleRecord, ReplayLastRecording]);

View file

@ -1,10 +1,10 @@
use crate::Vim;
use editor::{
DisplayPoint, Editor, EditorSettings,
display_map::{DisplayRow, ToDisplayPoint},
scroll::ScrollAmount,
DisplayPoint, Editor, EditorSettings,
};
use gpui::{actions, Context, Window};
use gpui::{Context, Window, actions};
use language::Bias;
use settings::Settings;
@ -163,7 +163,7 @@ mod test {
test::{NeovimBackedTestContext, VimTestContext},
};
use editor::{EditorSettings, ScrollBeyondLastLine};
use gpui::{point, px, size, AppContext as _};
use gpui::{AppContext as _, point, px, size};
use indoc::indoc;
use language::Point;
use settings::SettingsStore;

View file

@ -1,18 +1,18 @@
use editor::Editor;
use gpui::{actions, impl_actions, impl_internal_actions, Context, Window};
use gpui::{Context, Window, actions, impl_actions, impl_internal_actions};
use language::Point;
use schemars::JsonSchema;
use search::{buffer_search, BufferSearchBar, SearchOptions};
use search::{BufferSearchBar, SearchOptions, buffer_search};
use serde_derive::Deserialize;
use std::{iter::Peekable, str::Chars, time::Duration};
use util::serde::default_true;
use workspace::{notifications::NotifyResultExt, searchable::Direction};
use crate::{
Vim,
command::CommandRange,
motion::Motion,
state::{Mode, SearchState},
Vim,
};
#[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq)]
@ -590,7 +590,7 @@ mod test {
test::{NeovimBackedTestContext, VimTestContext},
};
use editor::EditorSettings;
use editor::{display_map::DisplayRow, DisplayPoint};
use editor::{DisplayPoint, display_map::DisplayRow};
use indoc::indoc;
use search::BufferSearchBar;

View file

@ -1,10 +1,10 @@
use editor::{movement, Editor};
use gpui::{actions, Context, Window};
use editor::{Editor, movement};
use gpui::{Context, Window, actions};
use language::Point;
use crate::{
motion::{Motion, MotionKind},
Mode, Vim,
motion::{Motion, MotionKind},
};
actions!(vim, [Substitute, SubstituteLine]);

View file

@ -1,6 +1,6 @@
use crate::{motion::Motion, object::Object, Vim};
use crate::{Vim, motion::Motion, object::Object};
use collections::HashMap;
use editor::{display_map::ToDisplayPoint, Bias};
use editor::{Bias, display_map::ToDisplayPoint};
use gpui::{Context, Window};
use language::SelectionGoal;

View file

@ -1,10 +1,10 @@
use std::{ops::Range, time::Duration};
use crate::{
Vim, VimSettings,
motion::{Motion, MotionKind},
object::Object,
state::{Mode, Register},
Vim, VimSettings,
};
use collections::HashMap;
use editor::{ClipboardSelection, Editor};