summaryrefslogtreecommitdiffstats
path: root/src/canvas
diff options
context:
space:
mode:
authorClementTsang <cjhtsang@uwaterloo.ca>2020-08-13 02:04:53 -0400
committerClementTsang <cjhtsang@uwaterloo.ca>2020-08-13 02:04:53 -0400
commit84f63f2f8306382dbf5cab819589161bf0b7c093 (patch)
tree6cad67cb9ef7d20f856138b333ac34f7b787fb71 /src/canvas
parente1a73783861f526e65c4372ba01c95888b0b75b8 (diff)
refactor: remove redundant newlines
Diffstat (limited to 'src/canvas')
-rw-r--r--src/canvas/dialogs/dd_dialog.rs8
-rw-r--r--src/canvas/widgets/mem_basic.rs2
-rw-r--r--src/canvas/widgets/network_basic.rs4
3 files changed, 7 insertions, 7 deletions
diff --git a/src/canvas/dialogs/dd_dialog.rs b/src/canvas/dialogs/dd_dialog.rs
index 17c3371a..18f89d68 100644
--- a/src/canvas/dialogs/dd_dialog.rs
+++ b/src/canvas/dialogs/dd_dialog.rs
@@ -23,7 +23,7 @@ impl KillDialog for Painter {
fn get_dd_spans(&self, app_state: &App) -> Option<Text<'_>> {
if let Some(dd_err) = &app_state.dd_err {
return Some(Text::from(Spans::from(format!(
- "\nFailure to properly kill the process - {}",
+ "Failure to properly kill the process - {}",
dd_err
))));
} else if let Some(to_kill_processes) = app_state.get_to_delete_processes() {
@@ -34,19 +34,19 @@ impl KillDialog for Painter {
if app_state.is_grouped(app_state.current_widget.widget_id) {
if to_kill_processes.1.len() != 1 {
Span::from(format!(
- "\nKill {} processes with the name \"{}\"?",
+ "Kill {} processes with the name \"{}\"?",
to_kill_processes.1.len(),
to_kill_processes.0
))
} else {
Span::from(format!(
- "\nKill 1 process with the name \"{}\"?",
+ "Kill 1 process with the name \"{}\"?",
to_kill_processes.0
))
}
} else {
Span::from(format!(
- "\nKill process \"{}\" with PID {}?",
+ "Kill process \"{}\" with PID {}?",
to_kill_processes.0, first_pid
))
},
diff --git a/src/canvas/widgets/mem_basic.rs b/src/canvas/widgets/mem_basic.rs
index e3abe7ad..43003e86 100644
--- a/src/canvas/widgets/mem_basic.rs
+++ b/src/canvas/widgets/mem_basic.rs
@@ -54,7 +54,7 @@ impl MemBasicWidget for Painter {
let num_bars_ram = calculate_basic_use_bars(ram_use_percentage, bar_length);
let num_bars_swap = calculate_basic_use_bars(swap_use_percentage, bar_length);
let mem_label = format!(
- "RAM[{}{}{:3.0}%]\n",
+ "RAM[{}{}{:3.0}%]",
"|".repeat(num_bars_ram),
" ".repeat(bar_length - num_bars_ram),
ram_use_percentage.round(),
diff --git a/src/canvas/widgets/network_basic.rs b/src/canvas/widgets/network_basic.rs
index c5c7b6fa..891d8a1f 100644
--- a/src/canvas/widgets/network_basic.rs
+++ b/src/canvas/widgets/network_basic.rs
@@ -44,9 +44,9 @@ impl NetworkBasicWidget for Painter {
);
}
- let rx_label = format!("RX: {}\n", &app_state.canvas_data.rx_display);
+ let rx_label = format!("RX: {}", &app_state.canvas_data.rx_display);
let tx_label = format!("TX: {}", &app_state.canvas_data.tx_display);
- let total_rx_label = format!("Total RX: {}\n", &app_state.canvas_data.total_rx_display);
+ let total_rx_label = format!("Total RX: {}", &app_state.canvas_data.total_rx_display);
let total_tx_label = format!("Total TX: {}", &app_state.canvas_data.total_tx_display);
let net_text = vec![