tyler.durden/bottom
1
0
Fork 0
mirror of https://github.com/ClementTsang/bottom.git synced 2025-07-23 21:55:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Some more suggestions based on clion. Mostly removing brackets.

Browse Source
This commit is contained in:
ClementTsang 2020-02-28 22:39:26 -05:00
parent eb159a45c4
commit c715133b4d
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app.rs
View File

@ -1032,7 +1032,7 @@ impl App {
pub fn kill_highlighted_process(&mut self) -> Result<()> { pub fn kill_highlighted_process(&mut self) -> Result<()> {
// Technically unnecessary but this is a good check... // Technically unnecessary but this is a good check...
if let WidgetPosition::Process = self.current_widget_selected { if let WidgetPosition::Process = self.current_widget_selected {
if let Some(current_selected_processes) = &(self.to_delete_process_list) { if let Some(current_selected_processes) = &self.to_delete_process_list {
for pid in &current_selected_processes.1 { for pid in &current_selected_processes.1 {
process_killer::kill_process_given_pid(*pid)?; process_killer::kill_process_given_pid(*pid)?;
} }

28
src/canvas.rs
View File

@ -622,12 +622,12 @@ impl Painter {
fn draw_cpu_legend<B: backend::Backend>( fn draw_cpu_legend<B: backend::Backend>(
&self, f: &mut Frame<'_, B>, app_state: &mut app::App, draw_loc: Rect, &self, f: &mut Frame<'_, B>, app_state: &mut app::App, draw_loc: Rect,
) { ) {
let cpu_data: &[ConvertedCpuData] = &(app_state.canvas_data.cpu_data); let cpu_data: &[ConvertedCpuData] = &app_state.canvas_data.cpu_data;
let num_rows = max(0, i64::from(draw_loc.height) - 5) as u64; let num_rows = max(0, i64::from(draw_loc.height) - 5) as u64;
let start_position = get_start_position( let start_position = get_start_position(
num_rows, num_rows,
&(app_state.app_scroll_positions.scroll_direction), &app_state.app_scroll_positions.scroll_direction,
&mut app_state &mut app_state
.app_scroll_positions .app_scroll_positions
.cpu_scroll_state .cpu_scroll_state
@ -768,8 +768,8 @@ impl Painter {
fn draw_memory_graph<B: backend::Backend>( fn draw_memory_graph<B: backend::Backend>(
&self, f: &mut Frame<'_, B>, app_state: &app::App, draw_loc: Rect, &self, f: &mut Frame<'_, B>, app_state: &app::App, draw_loc: Rect,
) { ) {
let mem_data: &[(f64, f64)] = &(app_state.canvas_data.mem_data); let mem_data: &[(f64, f64)] = &app_state.canvas_data.mem_data;
let swap_data: &[(f64, f64)] = &(app_state.canvas_data.swap_data); let swap_data: &[(f64, f64)] = &app_state.canvas_data.swap_data;
let x_axis: Axis<'_, String> = Axis::default().bounds([0.0, TIME_STARTS_FROM as f64]); let x_axis: Axis<'_, String> = Axis::default().bounds([0.0, TIME_STARTS_FROM as f64]);
@ -841,8 +841,8 @@ impl Painter {
fn draw_network_graph<B: backend::Backend>( fn draw_network_graph<B: backend::Backend>(
&self, f: &mut Frame<'_, B>, app_state: &app::App, draw_loc: Rect, &self, f: &mut Frame<'_, B>, app_state: &app::App, draw_loc: Rect,
) { ) {
let network_data_rx: &[(f64, f64)] = &(app_state.canvas_data.network_data_rx); let network_data_rx: &[(f64, f64)] = &app_state.canvas_data.network_data_rx;
let network_data_tx: &[(f64, f64)] = &(app_state.canvas_data.network_data_tx); let network_data_tx: &[(f64, f64)] = &app_state.canvas_data.network_data_tx;
let x_axis: Axis<'_, String> = Axis::default().bounds([0.0, 60_000.0]); let x_axis: Axis<'_, String> = Axis::default().bounds([0.0, 60_000.0]);
let y_axis: Axis<'_, &str> = Axis::default() let y_axis: Axis<'_, &str> = Axis::default()
@ -940,7 +940,7 @@ impl Painter {
// Calculate widths // Calculate widths
let width_ratios: Vec<f64> = vec![0.25, 0.25, 0.25, 0.25]; let width_ratios: Vec<f64> = vec![0.25, 0.25, 0.25, 0.25];
let lens: &Vec<usize> = &NETWORK_HEADERS_LENS; let lens: &[usize] = &NETWORK_HEADERS_LENS;
let width = f64::from(draw_loc.width); let width = f64::from(draw_loc.width);
let variable_intrinsic_results = let variable_intrinsic_results =
@ -969,12 +969,12 @@ impl Painter {
fn draw_temp_table<B: backend::Backend>( fn draw_temp_table<B: backend::Backend>(
&self, f: &mut Frame<'_, B>, app_state: &mut app::App, draw_loc: Rect, &self, f: &mut Frame<'_, B>, app_state: &mut app::App, draw_loc: Rect,
) { ) {
let temp_sensor_data: &[Vec<String>] = &(app_state.canvas_data.temp_sensor_data); let temp_sensor_data: &[Vec<String>] = &app_state.canvas_data.temp_sensor_data;
let num_rows = max(0, i64::from(draw_loc.height) - 5) as u64; let num_rows = max(0, i64::from(draw_loc.height) - 5) as u64;
let start_position = get_start_position( let start_position = get_start_position(
num_rows, num_rows,
&(app_state.app_scroll_positions.scroll_direction), &app_state.app_scroll_positions.scroll_direction,
&mut app_state &mut app_state
.app_scroll_positions .app_scroll_positions
.temp_scroll_state .temp_scroll_state
@ -986,7 +986,7 @@ impl Painter {
app_state.is_resized, app_state.is_resized,
); );
let sliced_vec = &(temp_sensor_data[start_position as usize..]); let sliced_vec = &temp_sensor_data[start_position as usize..];
let mut temp_row_counter: i64 = 0; let mut temp_row_counter: i64 = 0;
let temperature_rows = sliced_vec.iter().map(|temp_row| { let temperature_rows = sliced_vec.iter().map(|temp_row| {
@ -1066,11 +1066,11 @@ impl Painter {
fn draw_disk_table<B: backend::Backend>( fn draw_disk_table<B: backend::Backend>(
&self, f: &mut Frame<'_, B>, app_state: &mut app::App, draw_loc: Rect, &self, f: &mut Frame<'_, B>, app_state: &mut app::App, draw_loc: Rect,
) { ) {
let disk_data: &[Vec<String>] = &(app_state.canvas_data.disk_data); let disk_data: &[Vec<String>] = &app_state.canvas_data.disk_data;
let num_rows = max(0, i64::from(draw_loc.height) - 5) as u64; let num_rows = max(0, i64::from(draw_loc.height) - 5) as u64;
let start_position = get_start_position( let start_position = get_start_position(
num_rows, num_rows,
&(app_state.app_scroll_positions.scroll_direction), &app_state.app_scroll_positions.scroll_direction,
&mut app_state &mut app_state
.app_scroll_positions .app_scroll_positions
.disk_scroll_state .disk_scroll_state
@ -1352,7 +1352,7 @@ impl Painter {
let position = get_start_position( let position = get_start_position(
num_rows, num_rows,
&(app_state.app_scroll_positions.scroll_direction), &app_state.app_scroll_positions.scroll_direction,
&mut app_state &mut app_state
.app_scroll_positions .app_scroll_positions
.process_scroll_state .process_scroll_state
@ -1371,7 +1371,7 @@ impl Painter {
position position
}; };
let sliced_vec = &(process_data[start_position as usize..]); let sliced_vec = &process_data[start_position as usize..];
let mut process_counter: i64 = 0; let mut process_counter: i64 = 0;
// Draw! // Draw!

14
src/main.rs
View File

@ -494,20 +494,20 @@ fn get_temperature_option(
} else if let Some(flags) = &config.flags { } else if let Some(flags) = &config.flags {
if let Some(temp_type) = &flags.temperature_type { if let Some(temp_type) = &flags.temperature_type {
// Give lowest priority to config. // Give lowest priority to config.
match temp_type.as_str() { return match temp_type.as_str() {
"fahrenheit" | "f" => { "fahrenheit" | "f" => {
return Ok(data_harvester::temperature::TemperatureType::Fahrenheit); Ok(data_harvester::temperature::TemperatureType::Fahrenheit)
} }
"kelvin" | "k" => { "kelvin" | "k" => {
return Ok(data_harvester::temperature::TemperatureType::Kelvin); Ok(data_harvester::temperature::TemperatureType::Kelvin)
} }
"celsius" | "c" => { "celsius" | "c" => {
return Ok(data_harvester::temperature::TemperatureType::Celsius); Ok(data_harvester::temperature::TemperatureType::Celsius)
} }
_ => { _ => {
return Err(BottomError::ConfigError( Err(BottomError::ConfigError(
"Invalid temperature type. Please have the value be of the form <kelvin|k|celsius|c|fahrenheit|f>".to_string() "Invalid temperature type. Please have the value be of the form <kelvin|k|celsius|c|fahrenheit|f>".to_string()
)); ))
} }
} }
} }
@ -713,7 +713,7 @@ fn generate_config_colours(config: &Config, painter: &mut canvas::Painter) -> er
painter.colours.set_avg_cpu_colour(avg_cpu_color)?; painter.colours.set_avg_cpu_colour(avg_cpu_color)?;
} }
if let Some(cpu_core_colors) = &(colours.cpu_core_colors) { if let Some(cpu_core_colors) = &colours.cpu_core_colors {
painter.colours.set_cpu_colours(cpu_core_colors)?; painter.colours.set_cpu_colours(cpu_core_colors)?;
} }