Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve clippy lints #3307

Merged
merged 1 commit into from
Aug 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion helix-core/src/increment/date_time.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use ropey::RopeSlice;

use std::borrow::Cow;
use std::cmp;
use std::fmt::Write;

use super::Increment;
use crate::{Range, Tendril};
Expand Down Expand Up @@ -162,7 +163,7 @@ impl Format {
fields.push(field);
max_len += field.max_len + remaining[..i].len();
regex += &remaining[..i];
regex += &format!("({})", field.regex);
write!(regex, "({})", field.regex).unwrap();
remaining = &after[spec_len..];
}

Expand Down
2 changes: 1 addition & 1 deletion helix-term/src/ui/editor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1011,7 +1011,7 @@ impl EditorView {
None => return EventResult::Ignored(None),
}

let offset = config.scroll_lines.abs() as usize;
let offset = config.scroll_lines.unsigned_abs();
commands::scroll(cxt, offset, direction);

cxt.editor.tree.focus = current_view;
Expand Down
5 changes: 3 additions & 2 deletions helix-view/src/handlers/dap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use helix_core::Selection;
use helix_dap::{self as dap, Client, Payload, Request, ThreadId};
use helix_lsp::block_on;
use log::warn;
use std::fmt::Write;
use std::io::ErrorKind;
use std::path::PathBuf;

Expand Down Expand Up @@ -180,10 +181,10 @@ impl Editor {

let mut status = format!("{} stopped because of {}", scope, reason);
if let Some(desc) = description {
status.push_str(&format!(" {}", desc));
write!(status, " {}", desc).unwrap();
}
if let Some(text) = text {
status.push_str(&format!(" {}", text));
write!(status, " {}", text).unwrap();
}
if all_threads_stopped {
status.push_str(" (all threads stopped)");
Expand Down