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,7 +1,7 @@
|
|||
use fs::Fs;
|
||||
use gpui::{App, RenderOnce, SharedString};
|
||||
|
||||
use crate::{update_settings_file, Settings};
|
||||
use crate::{Settings, update_settings_file};
|
||||
|
||||
/// A UI control that can be used to edit a setting.
|
||||
pub trait EditableSettingControl: RenderOnce {
|
||||
|
|
|
@ -1,21 +1,21 @@
|
|||
use anyhow::{anyhow, Result};
|
||||
use anyhow::{Result, anyhow};
|
||||
use collections::{BTreeMap, HashMap, IndexMap};
|
||||
use fs::Fs;
|
||||
use gpui::{
|
||||
Action, ActionBuildError, App, InvalidKeystrokeError, KeyBinding, KeyBindingContextPredicate,
|
||||
NoAction, SharedString, KEYSTROKE_PARSE_EXPECTED_MESSAGE,
|
||||
Action, ActionBuildError, App, InvalidKeystrokeError, KEYSTROKE_PARSE_EXPECTED_MESSAGE,
|
||||
KeyBinding, KeyBindingContextPredicate, NoAction, SharedString,
|
||||
};
|
||||
use schemars::{
|
||||
JsonSchema,
|
||||
r#gen::{SchemaGenerator, SchemaSettings},
|
||||
schema::{ArrayValidation, InstanceType, Schema, SchemaObject, SubschemaValidation},
|
||||
JsonSchema,
|
||||
};
|
||||
use serde::Deserialize;
|
||||
use serde_json::Value;
|
||||
use std::{any::TypeId, fmt::Write, rc::Rc, sync::Arc, sync::LazyLock};
|
||||
use util::{asset_str, markdown::MarkdownString};
|
||||
|
||||
use crate::{settings_store::parse_json_with_comments, SettingsAssets};
|
||||
use crate::{SettingsAssets, settings_store::parse_json_with_comments};
|
||||
|
||||
pub trait KeyBindingValidator: Send + Sync {
|
||||
fn action_type_id(&self) -> TypeId;
|
||||
|
|
|
@ -18,8 +18,8 @@ pub use keymap_file::{
|
|||
};
|
||||
pub use settings_file::*;
|
||||
pub use settings_store::{
|
||||
parse_json_with_comments, InvalidSettingsError, LocalSettingsKind, Settings, SettingsLocation,
|
||||
SettingsSources, SettingsStore, TaskKind,
|
||||
InvalidSettingsError, LocalSettingsKind, Settings, SettingsLocation, SettingsSources,
|
||||
SettingsStore, TaskKind, parse_json_with_comments,
|
||||
};
|
||||
|
||||
#[derive(Copy, Clone, PartialEq, Eq, Debug, Hash, PartialOrd, Ord)]
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
use crate::{settings_store::SettingsStore, Settings};
|
||||
use crate::{Settings, settings_store::SettingsStore};
|
||||
use collections::HashSet;
|
||||
use fs::{Fs, PathEventKind};
|
||||
use futures::{channel::mpsc, StreamExt};
|
||||
use futures::{StreamExt, channel::mpsc};
|
||||
use gpui::{App, BackgroundExecutor, ReadGlobal};
|
||||
use std::{path::PathBuf, sync::Arc, time::Duration};
|
||||
|
||||
|
|
|
@ -1,18 +1,18 @@
|
|||
use anyhow::{anyhow, Context as _, Result};
|
||||
use collections::{btree_map, hash_map, BTreeMap, HashMap};
|
||||
use anyhow::{Context as _, Result, anyhow};
|
||||
use collections::{BTreeMap, HashMap, btree_map, hash_map};
|
||||
use ec4rs::{ConfigParser, PropertiesSource, Section};
|
||||
use fs::Fs;
|
||||
use futures::{channel::mpsc, future::LocalBoxFuture, FutureExt, StreamExt};
|
||||
use futures::{FutureExt, StreamExt, channel::mpsc, future::LocalBoxFuture};
|
||||
use gpui::{App, AsyncApp, BorrowAppContext, Global, Task, UpdateGlobal};
|
||||
|
||||
use paths::{
|
||||
debug_task_file_name, local_settings_file_relative_path, task_file_name, EDITORCONFIG_NAME,
|
||||
EDITORCONFIG_NAME, debug_task_file_name, local_settings_file_relative_path, task_file_name,
|
||||
};
|
||||
use schemars::{r#gen::SchemaGenerator, schema::RootSchema, JsonSchema};
|
||||
use serde::{de::DeserializeOwned, Deserialize, Serialize};
|
||||
use schemars::{JsonSchema, r#gen::SchemaGenerator, schema::RootSchema};
|
||||
use serde::{Deserialize, Serialize, de::DeserializeOwned};
|
||||
use smallvec::SmallVec;
|
||||
use std::{
|
||||
any::{type_name, Any, TypeId},
|
||||
any::{Any, TypeId, type_name},
|
||||
fmt::Debug,
|
||||
ops::Range,
|
||||
path::{Path, PathBuf},
|
||||
|
@ -23,7 +23,7 @@ use streaming_iterator::StreamingIterator;
|
|||
use tree_sitter::Query;
|
||||
use util::RangeExt;
|
||||
|
||||
use util::{merge_non_null_json_value_into, ResultExt as _};
|
||||
use util::{ResultExt as _, merge_non_null_json_value_into};
|
||||
|
||||
pub type EditorconfigProperties = ec4rs::Properties;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue