Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Bump Rust edition to 2024 (#27800)

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

36
crates/worktree/src/worktree_tests.rs
View file

@ -1,13 +1,13 @@
use crate::{
worktree_settings::WorktreeSettings, Entry, EntryKind, Event, PathChange, StatusEntry,
WorkDirectory, Worktree, WorktreeModelHandle,
Entry, EntryKind, Event, PathChange, StatusEntry, WorkDirectory, Worktree, WorktreeModelHandle,
worktree_settings::WorktreeSettings,
};
use anyhow::Result;
use fs::{FakeFs, Fs, RealFs, RemoveOptions};
use git::{
GITIGNORE,
repository::RepoPath,
status::{FileStatus, StatusCode, TrackedStatus},
GITIGNORE,
};
use git2::RepositoryInitOptions;
use gpui::{AppContext as _, BorrowAppContext, Context, Task, TestAppContext};
@ -25,7 +25,7 @@ use std::{
path::{Path, PathBuf},
sync::Arc,
};
use util::{path, test::TempTree, ResultExt};
use util::{ResultExt, path, test::TempTree};
#[gpui::test]
async fn test_traversal(cx: &mut TestAppContext) {
@ -1096,12 +1096,14 @@ async fn test_file_scan_inclusions_reindexes_on_setting_change(cx: &mut TestAppC
tree.flush_fs_events(cx).await;
tree.read_with(cx, |tree, _| {
assert!(tree
.entry_for_path("node_modules")
.is_some_and(|f| f.is_always_included));
assert!(tree
.entry_for_path("node_modules/prettier/package.json")
.is_some_and(|f| f.is_always_included));
assert!(
tree.entry_for_path("node_modules")
.is_some_and(|f| f.is_always_included)
);
assert!(
tree.entry_for_path("node_modules/prettier/package.json")
.is_some_and(|f| f.is_always_included)
);
});
cx.update(|cx| {
@ -1117,12 +1119,14 @@ async fn test_file_scan_inclusions_reindexes_on_setting_change(cx: &mut TestAppC
tree.flush_fs_events(cx).await;
tree.read_with(cx, |tree, _| {
assert!(tree
.entry_for_path("node_modules")
.is_some_and(|f| !f.is_always_included));
assert!(tree
.entry_for_path("node_modules/prettier/package.json")
.is_some_and(|f| !f.is_always_included));
assert!(
tree.entry_for_path("node_modules")
.is_some_and(|f| !f.is_always_included)
);
assert!(
tree.entry_for_path("node_modules/prettier/package.json")
.is_some_and(|f| !f.is_always_included)
);
});
}