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

Auto-fix clippy::collapsible_if violations (#36428)

Browse source 
Release Notes:

- N/A
This commit is contained in:
Piotr Osiewicz 2025-08-19 15:27:24 +02:00 • committed by GitHub
parent 9e8ec72bd5
commit 8f567383e4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
281 changed files with 6628 additions and 7089 deletions
Download patch file Download diff file Expand all files Collapse all files

26
crates/text/src/text.rs
View file

@ -446,10 +446,10 @@ impl History {
}
fn merge_transactions(&mut self, transaction: TransactionId, destination: TransactionId) {
if let Some(transaction) = self.forget(transaction) {
if let Some(destination) = self.transaction_mut(destination) {
destination.edit_ids.extend(transaction.edit_ids);
}
if let Some(transaction) = self.forget(transaction)
&& let Some(destination) = self.transaction_mut(destination)
{
destination.edit_ids.extend(transaction.edit_ids);
}
}
@ -1585,11 +1585,11 @@ impl Buffer {
.map(Some)
.chain([None])
.filter_map(move |range| {
if let Some((range, prev_range)) = range.as_ref().zip(prev_range.as_mut()) {
if prev_range.end == range.start {
prev_range.end = range.end;
return None;
}
if let Some((range, prev_range)) = range.as_ref().zip(prev_range.as_mut())
&& prev_range.end == range.start
{
prev_range.end = range.end;
return None;
}
let result = prev_range.clone();
prev_range = range;
@ -1685,10 +1685,10 @@ impl Buffer {
rx = Some(channel.1);
}
async move {
if let Some(mut rx) = rx {
if rx.recv().await.is_none() {
anyhow::bail!("gave up waiting for version");
}
if let Some(mut rx) = rx
&& rx.recv().await.is_none()
{
anyhow::bail!("gave up waiting for version");
}
Ok(())
}