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 crate::FakeFs;
|
||||
use anyhow::{anyhow, Context as _, Result};
|
||||
use anyhow::{Context as _, Result, anyhow};
|
||||
use collections::{HashMap, HashSet};
|
||||
use futures::future::{self, BoxFuture};
|
||||
use git::{
|
||||
|
|
|
@ -4,7 +4,7 @@ mod mac_watcher;
|
|||
#[cfg(not(target_os = "macos"))]
|
||||
pub mod fs_watcher;
|
||||
|
||||
use anyhow::{anyhow, Context as _, Result};
|
||||
use anyhow::{Context as _, Result, anyhow};
|
||||
#[cfg(any(target_os = "linux", target_os = "freebsd"))]
|
||||
use ashpd::desktop::trash;
|
||||
use gpui::App;
|
||||
|
@ -21,7 +21,7 @@ use std::os::fd::{AsFd, AsRawFd};
|
|||
use std::os::unix::fs::{FileTypeExt, MetadataExt};
|
||||
|
||||
use async_tar::Archive;
|
||||
use futures::{future::BoxFuture, AsyncRead, Stream, StreamExt};
|
||||
use futures::{AsyncRead, Stream, StreamExt, future::BoxFuture};
|
||||
use git::repository::{GitRepository, RealGitRepository};
|
||||
use rope::Rope;
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
@ -39,7 +39,7 @@ use text::LineEnding;
|
|||
#[cfg(any(test, feature = "test-support"))]
|
||||
mod fake_git_repo;
|
||||
#[cfg(any(test, feature = "test-support"))]
|
||||
use collections::{btree_map, BTreeMap};
|
||||
use collections::{BTreeMap, btree_map};
|
||||
#[cfg(any(test, feature = "test-support"))]
|
||||
use fake_git_repo::FakeGitRepositoryState;
|
||||
#[cfg(any(test, feature = "test-support"))]
|
||||
|
@ -466,8 +466,8 @@ impl Fs for RealFs {
|
|||
async fn trash_file(&self, path: &Path, _options: RemoveOptions) -> Result<()> {
|
||||
use util::paths::SanitizedPath;
|
||||
use windows::{
|
||||
core::HSTRING,
|
||||
Storage::{StorageDeleteOption, StorageFile},
|
||||
core::HSTRING,
|
||||
};
|
||||
// todo(windows)
|
||||
// When new version of `windows-rs` release, make this operation `async`
|
||||
|
@ -492,8 +492,8 @@ impl Fs for RealFs {
|
|||
async fn trash_dir(&self, path: &Path, _options: RemoveOptions) -> Result<()> {
|
||||
use util::paths::SanitizedPath;
|
||||
use windows::{
|
||||
core::HSTRING,
|
||||
Storage::{StorageDeleteOption, StorageFolder},
|
||||
core::HSTRING,
|
||||
};
|
||||
|
||||
// todo(windows)
|
||||
|
@ -710,7 +710,7 @@ impl Fs for RealFs {
|
|||
Arc<dyn Watcher>,
|
||||
) {
|
||||
use parking_lot::Mutex;
|
||||
use util::{paths::SanitizedPath, ResultExt as _};
|
||||
use util::{ResultExt as _, paths::SanitizedPath};
|
||||
|
||||
let (tx, rx) = smol::channel::unbounded();
|
||||
let pending_paths: Arc<Mutex<Vec<PathEvent>>> = Default::default();
|
||||
|
@ -2300,7 +2300,7 @@ async fn file_id(path: impl AsRef<Path>) -> Result<u64> {
|
|||
use windows::Win32::{
|
||||
Foundation::HANDLE,
|
||||
Storage::FileSystem::{
|
||||
GetFileInformationByHandle, BY_HANDLE_FILE_INFORMATION, FILE_FLAG_BACKUP_SEMANTICS,
|
||||
BY_HANDLE_FILE_INFORMATION, FILE_FLAG_BACKUP_SEMANTICS, GetFileInformationByHandle,
|
||||
},
|
||||
};
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
use notify::EventKind;
|
||||
use parking_lot::Mutex;
|
||||
use std::sync::{Arc, OnceLock};
|
||||
use util::{paths::SanitizedPath, ResultExt};
|
||||
use util::{ResultExt, paths::SanitizedPath};
|
||||
|
||||
use crate::{PathEvent, PathEventKind, Watcher};
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue