Skip to content

Commit

Permalink
Resolve new Clippy lints
Browse files Browse the repository at this point in the history
  • Loading branch information
the-mikedavis committed May 7, 2024
1 parent 3cf2a91 commit 9dd51e7
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 14 deletions.
2 changes: 1 addition & 1 deletion helix-core/src/indent.rs
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,7 @@ fn init_indent_query<'a, 'b>(

crate::syntax::PARSER.with(|ts_parser| {
let mut ts_parser = ts_parser.borrow_mut();
let mut cursor = ts_parser.cursors.pop().unwrap_or_else(QueryCursor::new);
let mut cursor = ts_parser.cursors.pop().unwrap_or_default();
let query_result = query_indents(
query,
syntax,
Expand Down
13 changes: 8 additions & 5 deletions helix-core/src/syntax.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use std::{
borrow::Cow,
cell::RefCell,
collections::{HashMap, HashSet, VecDeque},
fmt::{self, Display},
fmt::{self, Display, Write},
hash::{Hash, Hasher},
mem::replace,
path::{Path, PathBuf},
Expand Down Expand Up @@ -729,8 +729,11 @@ pub fn read_query(language: &str, filename: &str) -> String {
.replace_all(&query, |captures: &regex::Captures| {
captures[1]
.split(',')
.map(|language| format!("\n{}\n", read_query(language, filename)))
.collect::<String>()
.fold(String::new(), |mut output, language| {
// `write!` to a String cannot fail.
write!(output, "\n{}\n", read_query(language, filename)).unwrap();
output
})
})
.to_string()
}
Expand Down Expand Up @@ -1245,7 +1248,7 @@ impl Syntax {
PARSER.with(|ts_parser| {
let ts_parser = &mut ts_parser.borrow_mut();
ts_parser.parser.set_timeout_micros(1000 * 500); // half a second is pretty generours
let mut cursor = ts_parser.cursors.pop().unwrap_or_else(QueryCursor::new);
let mut cursor = ts_parser.cursors.pop().unwrap_or_default();
// TODO: might need to set cursor range
cursor.set_byte_range(0..usize::MAX);
cursor.set_match_limit(TREE_SITTER_MATCH_LIMIT);
Expand Down Expand Up @@ -1419,7 +1422,7 @@ impl Syntax {
// Reuse a cursor from the pool if available.
let mut cursor = PARSER.with(|ts_parser| {
let highlighter = &mut ts_parser.borrow_mut();
highlighter.cursors.pop().unwrap_or_else(QueryCursor::new)
highlighter.cursors.pop().unwrap_or_default()
});

// The `captures` iterator borrows the `Tree` and the `QueryCursor`, which
Expand Down
9 changes: 7 additions & 2 deletions helix-core/src/transaction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,9 @@ impl ChangeSet {
macro_rules! map {
($map: expr, $i: expr) => {
loop {
let Some((pos, assoc)) = positions.peek_mut() else { return; };
let Some((pos, assoc)) = positions.peek_mut() else {
return;
};
if **pos < old_pos {
// Positions are not sorted, revert to the last Operation that
// contains this position and continue iterating from there.
Expand All @@ -405,7 +407,10 @@ impl ChangeSet {
debug_assert!(old_pos <= **pos, "Reverse Iter across changeset works");
continue 'outer;
}
let Some(new_pos) = $map(**pos, *assoc) else { break; };
#[allow(clippy::redundant_closure_call)]
let Some(new_pos) = $map(**pos, *assoc) else {
break;
};
**pos = new_pos;
positions.next();
}
Expand Down
3 changes: 2 additions & 1 deletion helix-core/tests/indent.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ fn test_treesitter_indent_rust_helix() {
.unwrap();
let files = String::from_utf8(files.stdout).unwrap();

let ignored_files = vec![
let ignored_files = [
// Contains many macros that tree-sitter does not parse in a meaningful way and is otherwise not very interesting
"helix-term/src/health.rs",
];
Expand All @@ -45,6 +45,7 @@ fn test_treesitter_indent_rust_helix() {
if ignored_files.contains(&file) {
continue;
}
#[allow(clippy::single_range_in_vec_init)]
let ignored_lines: Vec<Range<usize>> = match file {
"helix-term/src/application.rs" => vec![
// We can't handle complicated indent rules inside macros (`json!` in this case) since
Expand Down
2 changes: 1 addition & 1 deletion helix-lsp/src/file_event.rs
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ impl Handler {
registration_id
);

let entry = state.entry(client_id).or_insert_with(ClientState::default);
let entry = state.entry(client_id).or_default();
entry.client = client;

let mut builder = GlobSetBuilder::new();
Expand Down
2 changes: 1 addition & 1 deletion helix-term/src/application.rs
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ impl Application {
}
Notification::PublishDiagnostics(mut params) => {
let path = match params.uri.to_file_path() {
Ok(path) => helix_stdx::path::normalize(&path),
Ok(path) => helix_stdx::path::normalize(path),
Err(_) => {
log::error!("Unsupported file URI: {}", params.uri);
return;
Expand Down
4 changes: 2 additions & 2 deletions helix-view/src/register.rs
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ impl Registers {
_ => unreachable!(),
};
let contents = self.clipboard_provider.get_contents(clipboard_type)?;
let saved_values = self.inner.entry(name).or_insert_with(Vec::new);
let saved_values = self.inner.entry(name).or_default();

if !contents_are_saved(saved_values, &contents) {
anyhow::bail!("Failed to push to register {name}: clipboard does not match register contents");
Expand All @@ -140,7 +140,7 @@ impl Registers {
Ok(())
}
_ => {
self.inner.entry(name).or_insert_with(Vec::new).push(value);
self.inner.entry(name).or_default().push(value);
Ok(())
}
}
Expand Down
2 changes: 1 addition & 1 deletion helix-view/src/tree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ impl Tree {
id
} else {
// extremely crude, take the last item
let (key, _) = self.traverse().rev().next().unwrap();
let (key, _) = self.traverse().next_back().unwrap();
key
}
}
Expand Down

0 comments on commit 9dd51e7

Please sign in to comment.