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

Fix clippy errors

Browse source
This commit is contained in:
Anthony 2025-07-08 16:45:39 -04:00
parent 6c9b2795b0
commit b4251681c7
2 changed files with 10 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/editor/benches/editor_render.rs
View file

@ -62,7 +62,7 @@ pub fn benches() {
criterion.bench_with_input( criterion.bench_with_input(
BenchmarkId::new("editor_render", "TestAppContext"), BenchmarkId::new("editor_render", "TestAppContext"),
&cx, &cx,
|bencher, cx| editor_render(bencher, cx), editor_render,
); );
} }

30
crates/editor/src/display_map/tab_map.rs
View file

@ -1139,16 +1139,13 @@ mod tests {
let mut all_tab_stops = Vec::new(); let mut all_tab_stops = Vec::new();
let mut byte_offset = 0; let mut byte_offset = 0;
let mut char_offset = 0; for (offset, ch) in buffer.read(cx).snapshot(cx).text().char_indices() {
for ch in buffer.read(cx).snapshot(cx).text().chars() {
// byte_offset += ch.len_utf8();
byte_offset += ch.len_utf8() as u32; byte_offset += ch.len_utf8() as u32;
char_offset += 1;
if ch == '\t' { if ch == '\t' {
all_tab_stops.push(TabStop { all_tab_stops.push(TabStop {
byte_offset, byte_offset,
char_offset, char_offset: offset as u32 + 1,
}); });
} }
} }
@ -1177,16 +1174,13 @@ mod tests {
let mut expected_tab_stops = Vec::new(); let mut expected_tab_stops = Vec::new();
let mut byte_offset = 0; let mut byte_offset = 0;
let mut char_offset = 0; for (offset, ch) in buffer.read(cx).snapshot(cx).text().char_indices() {
for ch in buffer.read(cx).snapshot(cx).text().chars() {
// byte_offset += ch.len_utf8();
byte_offset += ch.len_utf8() as u32; byte_offset += ch.len_utf8() as u32;
char_offset += 1;
if ch == '\t' { if ch == '\t' {
expected_tab_stops.push(TabStop { expected_tab_stops.push(TabStop {
byte_offset, byte_offset,
char_offset, char_offset: offset as u32 + 1,
}); });
} }
} }
@ -1306,15 +1300,13 @@ mod tests {
let mut expected_tab_stops = Vec::new(); let mut expected_tab_stops = Vec::new();
let mut byte_offset = 0; let mut byte_offset = 0;
let mut char_offset = 0; for (i, ch) in fold_snapshot.chars_at(FoldPoint::new(0, 0)).enumerate() {
for ch in fold_snapshot.chars_at(FoldPoint::new(0, 0)) {
byte_offset += ch.len_utf8() as u32; byte_offset += ch.len_utf8() as u32;
char_offset += 1;
if ch == '\t' { if ch == '\t' {
expected_tab_stops.push(TabStop { expected_tab_stops.push(TabStop {
byte_offset, byte_offset,
char_offset, char_offset: i as u32 + 1,
}); });
} }
} }
@ -1346,17 +1338,14 @@ mod tests {
// First, collect all expected tab positions // First, collect all expected tab positions
let mut all_tab_stops = Vec::new(); let mut all_tab_stops = Vec::new();
let mut byte_offset = 0; let mut byte_offset = 0;
let mut char_offset = 0; for (i, ch) in buffer_snapshot.text().chars().enumerate() {
for ch in buffer_snapshot.text().chars() {
byte_offset += ch.len_utf8() as u32; byte_offset += ch.len_utf8() as u32;
char_offset += 1;
if ch == '\t' { if ch == '\t' {
all_tab_stops.push(TabStop { all_tab_stops.push(TabStop {
byte_offset, byte_offset,
char_offset, char_offset: i as u32 + 1,
}); });
} }
// byte_offset += ch.len_utf8();
} }
// Test with various distances // Test with various distances
@ -1451,8 +1440,7 @@ impl<'a> TabStopCursor<'a> {
/// distance: length to move forward while searching for the next tab stop /// distance: length to move forward while searching for the next tab stop
fn seek(&mut self, distance: u32) -> Option<TabStop> { fn seek(&mut self, distance: u32) -> Option<TabStop> {
if distance <= 0 { if distance == 0 {
debug_assert!(distance == 0, "Can't seek backwards: {distance}");
return None; return None;
} }