chore: Bump Rust version to 1.88 (#33439)
Goodies in this version: - if-let chains 🎉 - Better compiler perf for Zed (https://github.com/rust-lang/rust/pull/138522) For more, see: https://releases.rs/docs/1.88.0/ Release Notes: - N/A --------- Co-authored-by: Junkui Zhang <364772080@qq.com>
This commit is contained in:
co-authored by
Junkui Zhang
parent
b079871428
commit
985dcf7523
@@ -565,7 +565,7 @@ mod tests {
|
||||
conflict_set.snapshot().conflicts[0].clone()
|
||||
});
|
||||
cx.update(|cx| {
|
||||
conflict.resolve(buffer.clone(), &[conflict.theirs.clone()], cx);
|
||||
conflict.resolve(buffer.clone(), std::slice::from_ref(&conflict.theirs), cx);
|
||||
});
|
||||
|
||||
cx.run_until_parked();
|
||||
|
||||
Reference in New Issue
Block a user