diff --git a/src/app_data/container_state.rs b/src/app_data/container_state.rs index 6e363dd..5c6f054 100644 --- a/src/app_data/container_state.rs +++ b/src/app_data/container_state.rs @@ -253,7 +253,7 @@ pub trait Stats { /// Struct for frequently updated CPU stats /// So can use custom display formatter /// Use trait Stats for use as generic in draw_chart function -#[derive(Debug, Clone, Copy)] +#[derive(Debug, Default, Clone, Copy)] pub struct CpuStats { value: f64, } @@ -306,7 +306,7 @@ impl fmt::Display for CpuStats { /// Struct for frequently updated memory usage stats /// So can use custom display formatter /// Use trait Stats for use as generic in draw_chart function -#[derive(Debug, Clone, Copy, Eq)] +#[derive(Debug, Default, Clone, Copy, Eq)] pub struct ByteStats { value: u64, } @@ -390,11 +390,11 @@ impl ContainerItem { image, last_updated: 0, logs: StatefulList::new(vec![]), - mem_limit: ByteStats::new(0), + mem_limit: ByteStats::default(), mem_stats: VecDeque::with_capacity(60), name, - rx: ByteStats::new(0), - tx: ByteStats::new(0), + rx: ByteStats::default(), + tx: ByteStats::default(), state, status, } @@ -404,7 +404,7 @@ impl ContainerItem { fn max_cpu_stats(&self) -> CpuStats { match self.cpu_stats.iter().max() { Some(value) => *value, - None => CpuStats::new(0.0), + None => CpuStats::default(), } } @@ -412,7 +412,7 @@ impl ContainerItem { fn max_mem_stats(&self) -> ByteStats { match self.mem_stats.iter().max() { Some(value) => *value, - None => ByteStats::new(0), + None => ByteStats::default(), } } diff --git a/src/app_data/mod.rs b/src/app_data/mod.rs index f1a8f7a..e99b0a7 100644 --- a/src/app_data/mod.rs +++ b/src/app_data/mod.rs @@ -328,12 +328,12 @@ impl AppData { &container .cpu_stats .back() - .unwrap_or(&CpuStats::new(0.0)) + .unwrap_or(&CpuStats::default()) .to_string(), ); let mem_count = count(&format!( "{} / {}", - container.mem_stats.back().unwrap_or(&ByteStats::new(0)), + container.mem_stats.back().unwrap_or(&ByteStats::default()), container.mem_limit )); diff --git a/src/ui/draw_blocks.rs b/src/ui/draw_blocks.rs index f4708c9..7532f6c 100644 --- a/src/ui/draw_blocks.rs +++ b/src/ui/draw_blocks.rs @@ -138,7 +138,7 @@ pub fn containers( let mems = format!( "{:>1} / {:>1}", - i.mem_stats.back().unwrap_or(&ByteStats::new(0)), + i.mem_stats.back().unwrap_or(&ByteStats::default()), i.mem_limit ); @@ -155,7 +155,7 @@ pub fn containers( format!( "{}{:>width$}", MARGIN, - i.cpu_stats.back().unwrap_or(&CpuStats::new(0.0)), + i.cpu_stats.back().unwrap_or(&CpuStats::default()), width = &widths.cpu.1 ), state_style,