Skip to content

Commit e741adf

Browse files
committed
chore: fix clippy
1 parent a00e78c commit e741adf

20 files changed

+42
-53
lines changed

examples/custom_item.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ pub fn main() {
4141

4242
let selected_items = Skim::run_with(&options, Some(rx_item))
4343
.map(|out| out.selected_items)
44-
.unwrap_or_else(Vec::new);
44+
.unwrap_or_default();
4545

4646
for item in selected_items.iter() {
4747
println!("{}", item.output());

examples/downcast.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ pub fn main() {
3737

3838
let selected_items = Skim::run_with(&options, Some(rx))
3939
.map(|out| out.selected_items)
40-
.unwrap_or_else(Vec::new)
40+
.unwrap_or_default()
4141
.iter()
4242
.map(|selected_item| (**selected_item).as_any().downcast_ref::<Item>().unwrap().to_owned())
4343
.collect::<Vec<Item>>();

examples/nth.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pub fn main() {
1414
let items = item_reader.of_bufread(Cursor::new(input));
1515
let selected_items = Skim::run_with(&options, Some(items))
1616
.map(|out| out.selected_items)
17-
.unwrap_or_else(Vec::new);
17+
.unwrap_or_default();
1818

1919
for item in selected_items.iter() {
2020
println!("{}", item.output());

examples/option_builder.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub fn main() {
1616
let items = item_reader.of_bufread(Cursor::new(input));
1717
let selected_items = Skim::run_with(&options, Some(items))
1818
.map(|out| out.selected_items)
19-
.unwrap_or_else(Vec::new);
19+
.unwrap_or_default();
2020

2121
for item in selected_items.iter() {
2222
println!("{}", item.output());
@@ -28,7 +28,7 @@ pub fn main() {
2828
let items = item_reader.of_bufread(Cursor::new(input));
2929
let selected_items = Skim::run_with(&options, Some(items))
3030
.map(|out| out.selected_items)
31-
.unwrap_or_else(Vec::new);
31+
.unwrap_or_default();
3232

3333
for item in selected_items.iter() {
3434
println!("{}", item.output());

examples/sample.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ pub fn main() {
66

77
let selected_items = Skim::run_with(&options, None)
88
.map(|out| out.selected_items)
9-
.unwrap_or_else(Vec::new);
9+
.unwrap_or_default();
1010

1111
for item in selected_items.iter() {
1212
println!("{}", item.output());

src/ansi.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ mod tests {
469469
let input = "ab";
470470
let ansistring = ANSIParser::default().parse_ansi(input);
471471

472-
assert_eq!(false, ansistring.has_attrs());
472+
assert!(!ansistring.has_attrs());
473473

474474
let mut it = ansistring.iter();
475475
assert_eq!(Some(('a', Attr::default())), it.next());

src/engine/fuzzy.rs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ use bitflags::_core::cmp::min;
1212

1313
//------------------------------------------------------------------------------
1414
#[derive(Debug, Copy, Clone)]
15+
#[derive(Default)]
1516
pub enum FuzzyAlgorithm {
1617
SkimV1,
18+
#[default]
1719
SkimV2,
1820
Clangd,
1921
}
@@ -29,11 +31,6 @@ impl FuzzyAlgorithm {
2931
}
3032
}
3133

32-
impl Default for FuzzyAlgorithm {
33-
fn default() -> Self {
34-
FuzzyAlgorithm::SkimV2
35-
}
36-
}
3734

3835
const BYTES_1M: usize = 1024 * 1024 * 1024;
3936

@@ -146,9 +143,7 @@ impl MatchEngine for FuzzyEngine {
146143
}
147144
}
148145

149-
if matched_result == None {
150-
return None;
151-
}
146+
matched_result.as_ref()?;
152147

153148
let (score, matched_range) = matched_result.unwrap();
154149

src/event.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ pub enum Event {
8080
bitflags! {
8181
/// `Effect` is the effect of a text
8282
pub struct UpdateScreen: u8 {
83-
const REDRAW = 0b0000_0000;
83+
const REDRAW = 0b0000_0001;
8484
const DONT_REDRAW = 0b0000_0010;
8585
}
8686
}

src/header.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
///! header of the items
1+
//! header of the items
22
use crate::ansi::{ANSIParser, AnsiString};
33
use crate::event::UpdateScreen;
44
use crate::event::{Event, EventHandler};

src/helper/item_reader.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,10 @@ impl SkimItemReader {
170170
break;
171171
}
172172

173-
if buffer.ends_with(&[b'\r', b'\n']) {
173+
if buffer.ends_with(b"\r\n") {
174174
buffer.pop();
175175
buffer.pop();
176-
} else if buffer.ends_with(&[b'\n']) || buffer.ends_with(&[b'\0']) {
176+
} else if buffer.ends_with(b"\n") || buffer.ends_with(b"\0") {
177177
buffer.pop();
178178
}
179179

@@ -264,10 +264,10 @@ impl SkimItemReader {
264264
break;
265265
}
266266

267-
if buffer.ends_with(&[b'\r', b'\n']) {
267+
if buffer.ends_with(b"\r\n") {
268268
buffer.pop();
269269
buffer.pop();
270-
} else if buffer.ends_with(&[b'\n']) || buffer.ends_with(&[b'\0']) {
270+
} else if buffer.ends_with(b"\n") || buffer.ends_with(b"\0") {
271271
buffer.pop();
272272
}
273273

0 commit comments

Comments
 (0)