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

chore: Prepare for Rust edition bump to 2024 (without autofix) (#27791)

Browse source 
Successor to #27779 - in this PR I've applied changes manually, without
futzing with if let lifetimes at all.

Release Notes:

- N/A
This commit is contained in:
Piotr Osiewicz 2025-03-31 20:10:36 +02:00 • committed by GitHub
parent d51aa2ffb0
commit 0729d24d77
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
162 changed files with 2333 additions and 1937 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/worktree/src/worktree.rs
View file

@ -1162,9 +1162,9 @@ impl Worktree {
Worktree::Remote(this) => this.delete_entry(entry_id, trash, cx),
}?;
let entry = match self {
Worktree::Local(ref this) => this.entry_for_id(entry_id),
Worktree::Remote(ref this) => this.entry_for_id(entry_id),
let entry = match &*self {
Worktree::Local(this) => this.entry_for_id(entry_id),
Worktree::Remote(this) => this.entry_for_id(entry_id),
}?;
let mut ids = vec![entry_id];
@ -1674,7 +1674,7 @@ impl LocalWorktree {
changes.into()
}
pub fn scan_complete(&self) -> impl Future<Output = ()> {
pub fn scan_complete(&self) -> impl Future<Output = ()> + use<> {
let mut is_scanning_rx = self.is_scanning.1.clone();
async move {
let mut is_scanning = *is_scanning_rx.borrow();
@ -2407,7 +2407,10 @@ impl RemoteWorktree {
self.completed_scan_id >= scan_id
}
pub fn wait_for_snapshot(&mut self, scan_id: usize) -> impl Future<Output = Result<()>> {
pub fn wait_for_snapshot(
&mut self,
scan_id: usize,
) -> impl Future<Output = Result<()>> + use<> {
let (tx, rx) = oneshot::channel();
if self.observed_snapshot(scan_id) {
let _ = tx.send(());

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

@ -1958,7 +1958,7 @@ async fn randomly_mutate_fs(
let path = dirs.choose(rng).unwrap();
let new_path = path.join(random_filename(rng));
if rng.gen() {
if rng.r#gen() {
log::info!(
"creating dir {:?}",
new_path.strip_prefix(root_path).unwrap()
@ -2026,7 +2026,7 @@ async fn randomly_mutate_fs(
file_path.into_iter().chain(dir_path).choose(rng).unwrap()
};
let is_rename = rng.gen();
let is_rename = rng.r#gen();
if is_rename {
let new_path_parent = dirs
.iter()