tyler.durden
/
bottom
mirror of https://github.com/ClementTsang/bottom.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clippy: clippy error due to redundant conversion 

Fixes a redundant usize to usize conversion.
This commit is contained in:
ClementTsang 2020-07-06 02:35:39 -04:00
parent ad99803d09
commit be6f824a43
2 changed files with 41 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -130,7 +130,7 @@ dependencies = [
[[package]] [[package]]
name = "bottom" name = "bottom"
version = "0.4.3" version = "0.4.4"
dependencies = [ dependencies = [
"assert_cmd", "assert_cmd",
"backtrace", "backtrace",

87
src/canvas/widgets/cpu_graph.rs
View File

@ -100,8 +100,6 @@ impl CpuGraphWidget for Painter {
fn draw_cpu_graph<B: Backend>( fn draw_cpu_graph<B: Backend>(
&self, f: &mut Frame<'_, B>, app_state: &mut App, draw_loc: Rect, widget_id: u64, &self, f: &mut Frame<'_, B>, app_state: &mut App, draw_loc: Rect, widget_id: u64,
) { ) {
use std::convert::TryFrom;
if let Some(cpu_widget_state) = app_state.cpu_state.widget_states.get_mut(&widget_id) { if let Some(cpu_widget_state) = app_state.cpu_state.widget_states.get_mut(&widget_id) {
let cpu_data: &mut [ConvertedCpuData] = &mut app_state.canvas_data.cpu_data; let cpu_data: &mut [ConvertedCpuData] = &mut app_state.canvas_data.cpu_data;
@ -147,51 +145,46 @@ impl CpuGraphWidget for Painter {
let use_dot = app_state.app_config_fields.use_dot; let use_dot = app_state.app_config_fields.use_dot;
let show_avg_cpu = app_state.app_config_fields.show_average_cpu; let show_avg_cpu = app_state.app_config_fields.show_average_cpu;
let dataset_vector: Vec<Dataset<'_>> = if let Ok(current_scroll_position) = let current_scroll_position = cpu_widget_state.scroll_state.current_scroll_position;
usize::try_from(cpu_widget_state.scroll_state.current_scroll_position) let dataset_vector: Vec<Dataset<'_>> = if current_scroll_position == ALL_POSITION {
{ cpu_data
if current_scroll_position == ALL_POSITION { .iter()
cpu_data .enumerate()
.iter() .rev()
.enumerate() .map(|(itx, cpu)| {
.rev() Dataset::default()
.map(|(itx, cpu)| { .marker(if use_dot {
Dataset::default() Marker::Dot
.marker(if use_dot { } else {
Marker::Dot Marker::Braille
} else { })
Marker::Braille .style(if show_avg_cpu && itx == AVG_POSITION {
}) self.colours.avg_colour_style
.style(if show_avg_cpu && itx == AVG_POSITION { } else {
self.colours.avg_colour_style self.colours.cpu_colour_styles
} else { [itx % self.colours.cpu_colour_styles.len()]
self.colours.cpu_colour_styles })
[itx % self.colours.cpu_colour_styles.len()] .data(&cpu.cpu_data[..])
}) .graph_type(tui::widgets::GraphType::Line)
.data(&cpu.cpu_data[..]) })
.graph_type(tui::widgets::GraphType::Line) .collect()
}) } else if let Some(cpu) = cpu_data.get(current_scroll_position) {
.collect() vec![Dataset::default()
} else if let Some(cpu) = cpu_data.get(current_scroll_position) { .marker(if use_dot {
vec![Dataset::default() Marker::Dot
.marker(if use_dot { } else {
Marker::Dot Marker::Braille
} else { })
Marker::Braille .style(if show_avg_cpu && current_scroll_position == AVG_POSITION {
}) self.colours.avg_colour_style
.style(if show_avg_cpu && current_scroll_position == AVG_POSITION { } else {
self.colours.avg_colour_style self.colours.cpu_colour_styles[cpu_widget_state
} else { .scroll_state
self.colours.cpu_colour_styles[cpu_widget_state .current_scroll_position
.scroll_state % self.colours.cpu_colour_styles.len()]
.current_scroll_position })
% self.colours.cpu_colour_styles.len()] .data(&cpu.cpu_data[..])
}) .graph_type(tui::widgets::GraphType::Line)]
.data(&cpu.cpu_data[..])
.graph_type(tui::widgets::GraphType::Line)]
} else {
vec![]
}
} else { } else {
vec![] vec![]
}; };