summaryrefslogtreecommitdiffstats
path: root/src/canvas
diff options
context:
space:
mode:
authorClement Tsang <34804052+ClementTsang@users.noreply.github.com>2020-10-17 18:35:21 -0400
committerGitHub <noreply@github.com>2020-10-17 18:35:21 -0400
commitb8606c41b9343173b9265c157726f15c3aaa9bbb (patch)
treed5e75374de8745aa7fe7dbdd457cd2289efc6960 /src/canvas
parent914079868f0bc5d1b709953bd8aaf0486ba32f65 (diff)
refactor: Remove redundant as_ref() calls (#268)
Minor refactor to remove redundant `as_ref()` calls.
Diffstat (limited to 'src/canvas')
-rw-r--r--src/canvas/dialogs/dd_dialog.rs26
-rw-r--r--src/canvas/screens/config_screen.rs3
-rw-r--r--src/canvas/widgets/basic_table_arrows.rs13
-rw-r--r--src/canvas/widgets/battery_display.rs17
-rw-r--r--src/canvas/widgets/cpu_basic.rs4
-rw-r--r--src/canvas/widgets/cpu_graph.rs2
-rw-r--r--src/canvas/widgets/disk_table.rs2
-rw-r--r--src/canvas/widgets/mem_basic.rs2
-rw-r--r--src/canvas/widgets/network_basic.rs8
-rw-r--r--src/canvas/widgets/network_graph.rs11
-rw-r--r--src/canvas/widgets/process_table.rs10
-rw-r--r--src/canvas/widgets/temp_table.rs2
12 files changed, 42 insertions, 58 deletions
diff --git a/src/canvas/dialogs/dd_dialog.rs b/src/canvas/dialogs/dd_dialog.rs
index 5069f309..ea7987c9 100644
--- a/src/canvas/dialogs/dd_dialog.rs
+++ b/src/canvas/dialogs/dd_dialog.rs
@@ -110,14 +110,11 @@ impl KillDialog for Painter {
// Now draw buttons if needed...
let split_draw_loc = Layout::default()
.direction(Direction::Vertical)
- .constraints(
- if app_state.dd_err.is_some() {
- vec![Constraint::Percentage(100)]
- } else {
- vec![Constraint::Min(0), Constraint::Length(3)]
- }
- .as_ref(),
- )
+ .constraints(if app_state.dd_err.is_some() {
+ vec![Constraint::Percentage(100)]
+ } else {
+ vec![Constraint::Min(0), Constraint::Length(3)]
+ })
.split(draw_loc);
// This being true implies that dd_err is none.
@@ -136,14 +133,11 @@ impl KillDialog for Painter {
let button_layout = Layout::default()
.direction(Direction::Horizontal)
- .constraints(
- [
- Constraint::Percentage(35),
- Constraint::Percentage(30),
- Constraint::Percentage(35),
- ]
- .as_ref(),
- )
+ .constraints([
+ Constraint::Percentage(35),
+ Constraint::Percentage(30),
+ Constraint::Percentage(35),
+ ])
.split(*button_draw_loc);
f.render_widget(
diff --git a/src/canvas/screens/config_screen.rs b/src/canvas/screens/config_screen.rs
index 161e6ca6..0bf82bb4 100644
--- a/src/canvas/screens/config_screen.rs
+++ b/src/canvas/screens/config_screen.rs
@@ -39,7 +39,6 @@ impl ConfigScreen for Painter {
// Constraint::Percentage(34),
// Constraint::Percentage(33),
// ]
- // .as_ref(),
// )
// .split(draw_loc)
// .into_iter()
@@ -47,7 +46,7 @@ impl ConfigScreen for Painter {
// // Required to properly margin in *between* the rectangles.
// Layout::default()
// .horizontal_margin(1)
- // .constraints([Constraint::Percentage(100)].as_ref())
+ // .constraints([Constraint::Percentage(100)])
// .split(loc)[0]
// })
// .collect::<Vec<Rect>>();
diff --git a/src/canvas/widgets/basic_table_arrows.rs b/src/canvas/widgets/basic_table_arrows.rs
index d7f79dc6..e7169099 100644
--- a/src/canvas/widgets/basic_table_arrows.rs
+++ b/src/canvas/widgets/basic_table_arrows.rs
@@ -116,14 +116,11 @@ impl BasicTableArrows for Painter {
let margined_draw_loc = Layout::default()
.direction(Direction::Horizontal)
- .constraints(
- [
- Constraint::Length(2 + left_name.len() as u16),
- Constraint::Length(num_spaces as u16),
- Constraint::Length(2 + right_name.len() as u16),
- ]
- .as_ref(),
- )
+ .constraints([
+ Constraint::Length(2 + left_name.len() as u16),
+ Constraint::Length(num_spaces as u16),
+ Constraint::Length(2 + right_name.len() as u16),
+ ])
.horizontal_margin(1)
.split(draw_loc);
diff --git a/src/canvas/widgets/battery_display.rs b/src/canvas/widgets/battery_display.rs
index 7364044b..e27c1aef 100644
--- a/src/canvas/widgets/battery_display.rs
+++ b/src/canvas/widgets/battery_display.rs
@@ -78,14 +78,11 @@ impl BatteryDisplayWidget for Painter {
.collect::<Vec<_>>();
let tab_draw_loc = Layout::default()
- .constraints(
- [
- Constraint::Length(1),
- Constraint::Length(2),
- Constraint::Min(0),
- ]
- .as_ref(),
- )
+ .constraints([
+ Constraint::Length(1),
+ Constraint::Length(2),
+ Constraint::Min(0),
+ ])
.direction(Direction::Vertical)
.split(draw_loc)[1];
@@ -105,7 +102,7 @@ impl BatteryDisplayWidget for Painter {
);
let margined_draw_loc = Layout::default()
- .constraints([Constraint::Percentage(100)].as_ref())
+ .constraints([Constraint::Percentage(100)])
.horizontal_margin(if is_on_widget || draw_border { 0 } else { 1 })
.direction(Direction::Horizontal)
.split(draw_loc)[0];
@@ -166,7 +163,7 @@ impl BatteryDisplayWidget for Painter {
Table::new([""].iter(), battery_rows)
.block(battery_block)
.header_style(self.colours.table_header_style)
- .widths([Constraint::Percentage(50), Constraint::Percentage(50)].as_ref()),
+ .widths(&[Constraint::Percentage(50), Constraint::Percentage(50)]),
margined_draw_loc,
);
} else {
diff --git a/src/canvas/widgets/cpu_basic.rs b/src/canvas/widgets/cpu_basic.rs
index 2f7574b6..f13516de 100644
--- a/src/canvas/widgets/cpu_basic.rs
+++ b/src/canvas/widgets/cpu_basic.rs
@@ -54,7 +54,7 @@ impl CpuBasicWidget for Painter {
let chunk_vec =
vec![Constraint::Percentage((100 / REQUIRED_COLUMNS) as u16); REQUIRED_COLUMNS];
let chunks = Layout::default()
- .constraints(chunk_vec.as_ref())
+ .constraints(chunk_vec)
.direction(Direction::Horizontal)
.split(draw_loc);
@@ -121,7 +121,7 @@ impl CpuBasicWidget for Painter {
let margined_loc = Layout::default()
.direction(Direction::Horizontal)
- .constraints([Constraint::Percentage(100)].as_ref())
+ .constraints([Constraint::Percentage(100)])
.horizontal_margin(1)
.split(*chunk)[0];
diff --git a/src/canvas/widgets/cpu_graph.rs b/src/canvas/widgets/cpu_graph.rs
index 07fdfaf0..7c5c8de0 100644
--- a/src/canvas/widgets/cpu_graph.rs
+++ b/src/canvas/widgets/cpu_graph.rs
@@ -90,7 +90,7 @@ impl CpuGraphWidget for Painter {
let partitioned_draw_loc = Layout::default()
.margin(0)
.direction(Direction::Horizontal)
- .constraints(constraints.as_ref())
+ .constraints(constraints)
.split(draw_loc);
self.draw_cpu_graph(f, app_state, partitioned_draw_loc[graph_index], widget_id);
diff --git a/src/canvas/widgets/disk_table.rs b/src/canvas/widgets/disk_table.rs
index 091b58c9..c52062b5 100644
--- a/src/canvas/widgets/disk_table.rs
+++ b/src/canvas/widgets/disk_table.rs
@@ -196,7 +196,7 @@ impl DiskTableWidget for Painter {
};
let margined_draw_loc = Layout::default()
- .constraints([Constraint::Percentage(100)].as_ref())
+ .constraints([Constraint::Percentage(100)])
.horizontal_margin(if is_on_widget || draw_border { 0 } else { 1 })
.direction(Direction::Horizontal)
.split(draw_loc)[0];
diff --git a/src/canvas/widgets/mem_basic.rs b/src/canvas/widgets/mem_basic.rs
index 38ce9dfc..7c9de191 100644
--- a/src/canvas/widgets/mem_basic.rs
+++ b/src/canvas/widgets/mem_basic.rs
@@ -27,7 +27,7 @@ impl MemBasicWidget for Painter {
let swap_data: &[(f64, f64)] = &app_state.canvas_data.swap_data;
let margined_loc = Layout::default()
- .constraints([Constraint::Percentage(100)].as_ref())
+ .constraints([Constraint::Percentage(100)])
.horizontal_margin(1)
.split(draw_loc);
diff --git a/src/canvas/widgets/network_basic.rs b/src/canvas/widgets/network_basic.rs
index e96d2cf6..7f0e393e 100644
--- a/src/canvas/widgets/network_basic.rs
+++ b/src/canvas/widgets/network_basic.rs
@@ -4,7 +4,7 @@ use tui::{
backend::Backend,
layout::{Constraint, Direction, Layout, Rect},
terminal::Frame,
- text::{Span, Spans, },
+ text::{Span, Spans},
widgets::{Block, Paragraph},
};
@@ -20,18 +20,18 @@ impl NetworkBasicWidget for Painter {
) {
let divided_loc = Layout::default()
.direction(Direction::Horizontal)
- .constraints([Constraint::Percentage(50), Constraint::Percentage(50)].as_ref())
+ .constraints([Constraint::Percentage(50), Constraint::Percentage(50)])
.split(draw_loc);
let net_loc = Layout::default()
.direction(Direction::Horizontal)
- .constraints([Constraint::Percentage(100)].as_ref())
+ .constraints([Constraint::Percentage(100)])
.horizontal_margin(1)
.split(divided_loc[0]);
let total_loc = Layout::default()
.direction(Direction::Horizontal)
- .constraints([Constraint::Percentage(100)].as_ref())
+ .constraints([Constraint::Percentage(100)])
.horizontal_margin(1)
.split(divided_loc[1]);
diff --git a/src/canvas/widgets/network_graph.rs b/src/canvas/widgets/network_graph.rs
index 95dfe304..d2840a96 100644
--- a/src/canvas/widgets/network_graph.rs
+++ b/src/canvas/widgets/network_graph.rs
@@ -51,13 +51,10 @@ impl NetworkGraphWidget for Painter {
let network_chunk = Layout::default()
.direction(Direction::Vertical)
.margin(0)
- .constraints(
- [
- Constraint::Length(max(draw_loc.height as i64 - 5, 0) as u16),
- Constraint::Length(5),
- ]
- .as_ref(),
- )
+ .constraints([
+ Constraint::Length(max(draw_loc.height as i64 - 5, 0) as u16),
+ Constraint::Length(5),
+ ])
.split(draw_loc);
self.draw_network_graph(f, app_state, network_chunk[0], widget_id, true);
diff --git a/src/canvas/widgets/process_table.rs b/src/canvas/widgets/process_table.rs
index 970dcda1..727abb94 100644
--- a/src/canvas/widgets/process_table.rs
+++ b/src/canvas/widgets/process_table.rs
@@ -71,7 +71,7 @@ impl ProcessTableWidget for Painter {
if process_widget_state.is_search_enabled() {
let processes_chunk = Layout::default()
.direction(Direction::Vertical)
- .constraints([Constraint::Min(0), Constraint::Length(search_height)].as_ref())
+ .constraints([Constraint::Min(0), Constraint::Length(search_height)])
.split(draw_loc);
proc_draw_loc = processes_chunk[0];
@@ -87,7 +87,7 @@ impl ProcessTableWidget for Painter {
if is_sort_open {
let processes_chunk = Layout::default()
.direction(Direction::Horizontal)
- .constraints([Constraint::Length(header_len + 4), Constraint::Min(0)].as_ref())
+ .constraints([Constraint::Length(header_len + 4), Constraint::Min(0)])
.split(proc_draw_loc);
proc_draw_loc = processes_chunk[1];
@@ -118,7 +118,7 @@ impl ProcessTableWidget for Painter {
let is_on_widget = widget_id == app_state.current_widget.widget_id;
let margined_draw_loc = Layout::default()
- .constraints([Constraint::Percentage(100)].as_ref())
+ .constraints([Constraint::Percentage(100)])
.horizontal_margin(if is_on_widget || draw_border { 0 } else { 1 })
.direction(Direction::Horizontal)
.split(draw_loc)[0];
@@ -647,7 +647,7 @@ impl ProcessTableWidget for Painter {
};
let margined_draw_loc = Layout::default()
- .constraints([Constraint::Percentage(100)].as_ref())
+ .constraints([Constraint::Percentage(100)])
.horizontal_margin(if is_on_widget || draw_border { 0 } else { 1 })
.direction(Direction::Horizontal)
.split(draw_loc)[0];
@@ -764,7 +764,7 @@ impl ProcessTableWidget for Painter {
};
let margined_draw_loc = Layout::default()
- .constraints([Constraint::Percentage(100)].as_ref())
+ .constraints([Constraint::Percentage(100)])
.horizontal_margin(if is_on_widget || draw_border { 0 } else { 1 })
.direction(Direction::Horizontal)
.split(draw_loc)[0];
diff --git a/src/canvas/widgets/temp_table.rs b/src/canvas/widgets/temp_table.rs
index 960efac6..497cb703 100644
--- a/src/canvas/widgets/temp_table.rs
+++ b/src/canvas/widgets/temp_table.rs
@@ -187,7 +187,7 @@ impl TempTableWidget for Painter {
};
let margined_draw_loc = Layout::default()
- .constraints([Constraint::Percentage(100)].as_ref())
+ .constraints([Constraint::Percentage(100)])
.horizontal_margin(if is_on_widget || draw_border { 0 } else { 1 })
.direction(Direction::Horizontal)
.split(draw_loc)[0];