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

41
crates/rope/src/rope.rs
View file

@ -31,22 +31,21 @@ impl Rope {
}
pub fn append(&mut self, rope: Rope) {
if let Some(chunk) = rope.chunks.first() {
if self
if let Some(chunk) = rope.chunks.first()
&& (self
.chunks
.last()
.map_or(false, |c| c.text.len() < chunk::MIN_BASE)
|| chunk.text.len() < chunk::MIN_BASE
{
self.push_chunk(chunk.as_slice());
|| chunk.text.len() < chunk::MIN_BASE)
{
self.push_chunk(chunk.as_slice());
let mut chunks = rope.chunks.cursor::<()>(&());
chunks.next();
chunks.next();
self.chunks.append(chunks.suffix(), &());
self.check_invariants();
return;
}
let mut chunks = rope.chunks.cursor::<()>(&());
chunks.next();
chunks.next();
self.chunks.append(chunks.suffix(), &());
self.check_invariants();
return;
}
self.chunks.append(rope.chunks.clone(), &());
@ -735,16 +734,16 @@ impl<'a> Chunks<'a> {
self.chunks
.search_backward(|summary| summary.text.lines.row > 0);
self.offset = *self.chunks.start();
if let Some(chunk) = self.chunks.item() {
if let Some(newline_ix) = chunk.text.rfind('\n') {
self.offset += newline_ix + 1;
if self.offset_is_valid() {
if self.offset == self.chunks.end() {
self.chunks.next();
}
return true;
if let Some(chunk) = self.chunks.item()
&& let Some(newline_ix) = chunk.text.rfind('\n')
{
self.offset += newline_ix + 1;
if self.offset_is_valid() {
if self.offset == self.chunks.end() {
self.chunks.next();
}
return true;
}
}