From c794f128cc944cb089e427a6befcb39026906fa5 Mon Sep 17 00:00:00 2001
From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Wed, 21 Apr 2021 17:11:47 +0300
Subject: [PATCH] Fix a few cargo clippy warnings in tui code

---
 pageserver/src/tui.rs        | 6 +++---
 pageserver/src/tui_logger.rs | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pageserver/src/tui.rs b/pageserver/src/tui.rs
index 4e35cc76c9..47609143b7 100644
--- a/pageserver/src/tui.rs
+++ b/pageserver/src/tui.rs
@@ -91,7 +91,7 @@ pub fn init_logging() -> slog_scope::GlobalLoggerGuard {
     return slog_scope::set_global_logger(logger);
 }
 
-pub fn ui_main<'b>() -> Result<(), Box<dyn Error>> {
+pub fn ui_main() -> Result<(), Box<dyn Error>> {
     // Terminal initialization
     let stdout = io::stdout().into_raw_mode()?;
     let stdout = MouseTerminal::from(stdout);
@@ -229,7 +229,7 @@ impl<'a> Widget for LogWidget<'a> {
 // Render a widget to show some metrics
 struct MetricsWidget {}
 
-fn get_metric_u64<'a>(title: &'a str, value: u64) -> Spans<'a> {
+fn get_metric_u64(title: &str, value: u64) -> Spans {
     Spans::from(vec![
         Span::styled(format!("{:<20}", title), Style::default()),
         Span::raw(": "),
@@ -240,7 +240,7 @@ fn get_metric_u64<'a>(title: &'a str, value: u64) -> Spans<'a> {
     ])
 }
 
-fn get_metric_str<'a>(title: &'a str, value: &'a str) -> Spans<'a> {
+fn get_metric_str<'a>(title: &str, value: &'a str) -> Spans<'a> {
     Spans::from(vec![
         Span::styled(format!("{:<20}", title), Style::default()),
         Span::raw(": "),
diff --git a/pageserver/src/tui_logger.rs b/pageserver/src/tui_logger.rs
index e59ce15a56..dcb4a23467 100644
--- a/pageserver/src/tui_logger.rs
+++ b/pageserver/src/tui_logger.rs
@@ -167,7 +167,7 @@ impl<'b> Widget for TuiLoggerWidget<'b> {
                         Level::Debug => (self.style_debug, "DEBUG", true),
                         Level::Trace => (self.style_trace, "TRACE", true),
                     };
-                    line.push(Span::styled(txt, lvl_style.unwrap_or(Style::default())));
+                    line.push(Span::styled(txt, lvl_style.unwrap_or_default()));
 
                     if self.show_module {
                         line.push(Span::raw(" "));