mirrors/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-04-04 19:37:54 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix clippy lints (#6454)

Browse source
This commit is contained in:
Philipp Mildenberger 2023-03-28 01:33:55 +02:00 • committed by GitHub
parent 5323020c3f
commit 198ff2c3f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
helix-core/src/position.rs
View file

@ -309,8 +309,8 @@ pub fn pos_at_visual_coords(text: RopeSlice, coords: Position, tab_width: usize)
/// on the visual line is returned if the visual line contains any text: /// on the visual line is returned if the visual line contains any text:
/// If the visual line at the specified offset is a virtual line generated by a `LineAnnotation` /// If the visual line at the specified offset is a virtual line generated by a `LineAnnotation`
/// the previous char_index is returned, together with the remaining vertical offset (`virtual_lines`) /// the previous char_index is returned, together with the remaining vertical offset (`virtual_lines`)
pub fn char_idx_at_visual_offset<'a>( pub fn char_idx_at_visual_offset(
text: RopeSlice<'a>, text: RopeSlice,
mut anchor: usize, mut anchor: usize,
mut row_offset: isize, mut row_offset: isize,
column: usize, column: usize,

4
helix-term/src/commands.rs
View file

@ -501,7 +501,7 @@ impl std::str::FromStr for MappableCommand {
fn from_str(s: &str) -> Result<Self, Self::Err> { fn from_str(s: &str) -> Result<Self, Self::Err> {
if let Some(suffix) = s.strip_prefix(':') { if let Some(suffix) = s.strip_prefix(':') {
let mut typable_command = suffix.split(' ').into_iter().map(|arg| arg.trim()); let mut typable_command = suffix.split(' ').map(|arg| arg.trim());
let name = typable_command let name = typable_command
.next() .next()
.ok_or_else(|| anyhow!("Expected typable command name"))?; .ok_or_else(|| anyhow!("Expected typable command name"))?;
@ -1470,7 +1470,7 @@ pub fn scroll(cx: &mut Context, offset: usize, direction: Direction) {
let cursor = range.cursor(text); let cursor = range.cursor(text);
let height = view.inner_height(); let height = view.inner_height();
let scrolloff = config.scrolloff.min(height.saturating_sub(1) as usize / 2); let scrolloff = config.scrolloff.min(height.saturating_sub(1) / 2);
let offset = match direction { let offset = match direction {
Forward => offset as isize, Forward => offset as isize,
Backward => -(offset as isize), Backward => -(offset as isize),

9
helix-tui/src/widgets/block.rs
View file

@ -7,8 +7,9 @@ use crate::{
use helix_view::graphics::{Rect, Style}; use helix_view::graphics::{Rect, Style};
/// Border render type. Defaults to [`BorderType::Plain`]. /// Border render type. Defaults to [`BorderType::Plain`].
#[derive(Debug, Clone, Copy, PartialEq, Eq)] #[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
pub enum BorderType { pub enum BorderType {
#[default]
Plain, Plain,
Rounded, Rounded,
Double, Double,
@ -26,12 +27,6 @@ impl BorderType {
} }
} }
impl Default for BorderType {
fn default() -> BorderType {
BorderType::Plain
}
}
/// Base widget to be used with all upper level ones. It may be used to display a box border around /// Base widget to be used with all upper level ones. It may be used to display a box border around
/// the widget and/or add a title. /// the widget and/or add a title.
/// ///

9
helix-view/src/editor.rs
View file

@ -532,10 +532,11 @@ impl Default for CursorShapeConfig {
} }
/// bufferline render modes /// bufferline render modes
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] #[derive(Debug, Default, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "kebab-case")] #[serde(rename_all = "kebab-case")]
pub enum BufferLine { pub enum BufferLine {
/// Don't render bufferline /// Don't render bufferline
#[default]
Never, Never,
/// Always render /// Always render
Always, Always,
@ -543,12 +544,6 @@ pub enum BufferLine {
Multiple, Multiple,
} }
impl Default for BufferLine {
fn default() -> Self {
BufferLine::Never
}
}
#[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)] #[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "kebab-case")] #[serde(rename_all = "kebab-case")]
pub enum LineNumber { pub enum LineNumber {