aboutsummaryrefslogtreecommitdiff
path: root/alacritty/src/display
diff options
context:
space:
mode:
authorChristian Duerr <contact@christianduerr.com>2022-10-12 04:40:46 +0000
committerGitHub <noreply@github.com>2022-10-12 07:40:46 +0300
commit21c75d9d94e1a338501d2011f17710ff5174ac01 (patch)
tree310d88754f399dc0fe4f8abdc68ba2d4097bdefd /alacritty/src/display
parent182086f59c0148508c31d359eaee2cfef059f45c (diff)
downloadr-alacritty-21c75d9d94e1a338501d2011f17710ff5174ac01.tar.gz
r-alacritty-21c75d9d94e1a338501d2011f17710ff5174ac01.tar.bz2
r-alacritty-21c75d9d94e1a338501d2011f17710ff5174ac01.zip
Fix clippy warnings
This patch applies all clippy lints currently present on the latest clippy master than are compatible with our oldstable clippy (only exception is the `_else(||` stuff).
Diffstat (limited to 'alacritty/src/display')
-rw-r--r--alacritty/src/display/cursor.rs2
-rw-r--r--alacritty/src/display/mod.rs6
2 files changed, 4 insertions, 4 deletions
diff --git a/alacritty/src/display/cursor.rs b/alacritty/src/display/cursor.rs
index 89b0bcde..8a4cc729 100644
--- a/alacritty/src/display/cursor.rs
+++ b/alacritty/src/display/cursor.rs
@@ -22,7 +22,7 @@ impl IntoRects for RenderableCursor {
let mut width = size_info.cell_width();
let height = size_info.cell_height();
- let thickness = (thickness * width as f32).round().max(1.);
+ let thickness = (thickness * width).round().max(1.);
if self.is_wide() {
width *= 2.;
diff --git a/alacritty/src/display/mod.rs b/alacritty/src/display/mod.rs
index bcc7358d..c17d8aa7 100644
--- a/alacritty/src/display/mod.rs
+++ b/alacritty/src/display/mod.rs
@@ -705,7 +705,7 @@ impl Display {
// Update number of column/lines in the viewport.
let message_bar_lines =
message_buffer.message().map_or(0, |m| m.text(&self.size_info).len());
- let search_lines = if search_active { 1 } else { 0 };
+ let search_lines = usize::from(search_active);
self.size_info.reserve_lines(message_bar_lines + search_lines);
// Resize PTY.
@@ -982,7 +982,7 @@ impl Display {
}
if let Some(message) = message_buffer.message() {
- let search_offset = if search_state.regex().is_some() { 1 } else { 0 };
+ let search_offset = usize::from(search_state.regex().is_some());
let text = message.text(&size_info);
// Create a new rectangle for the background.
@@ -1396,7 +1396,7 @@ impl Display {
let x = size_info.padding_x() + point.column.0 as u32 * size_info.cell_width();
let y_top = size_info.height() - size_info.padding_y();
let y = y_top - (point.line as u32 + 1) * size_info.cell_height();
- let width = len as u32 * size_info.cell_width();
+ let width = len * size_info.cell_width();
DamageRect { x, y, width, height: size_info.cell_height() }
}