From 32d440a9682520def3d30c4ac7206a32c926badb Mon Sep 17 00:00:00 2001
From: Yuri Astrakhan <YuriAstrakhan@gmail.com>
Date: Sun, 20 Aug 2023 02:26:44 -0400
Subject: [PATCH] Minor clippy nits

* Fix semicolons (pedantic)
* Don't duplicate var name for instantiation if not needed
* Use `mar_or` instead of `map.unwrap_or`
---
 benches/value.rs | 8 ++++----
 src/kv/source.rs | 2 +-
 src/lib.rs       | 8 ++++----
 src/serde.rs     | 4 ++--
 tests/macros.rs  | 2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/benches/value.rs b/benches/value.rs
index 4e6960e80..5e46a928c 100644
--- a/benches/value.rs
+++ b/benches/value.rs
@@ -8,17 +8,17 @@ use log::kv::Value;
 
 #[bench]
 fn u8_to_value(b: &mut test::Bencher) {
-    b.iter(|| Value::from(1u8))
+    b.iter(|| Value::from(1u8));
 }
 
 #[bench]
 fn u8_to_value_debug(b: &mut test::Bencher) {
-    b.iter(|| Value::from_debug(&1u8))
+    b.iter(|| Value::from_debug(&1u8));
 }
 
 #[bench]
 fn str_to_value_debug(b: &mut test::Bencher) {
-    b.iter(|| Value::from_debug(&"a string"))
+    b.iter(|| Value::from_debug(&"a string"));
 }
 
 #[bench]
@@ -26,5 +26,5 @@ fn custom_to_value_debug(b: &mut test::Bencher) {
     #[derive(Debug)]
     struct A;
 
-    b.iter(|| Value::from_debug(&A))
+    b.iter(|| Value::from_debug(&A));
 }
diff --git a/src/kv/source.rs b/src/kv/source.rs
index 45fc6dce4..006e2e120 100644
--- a/src/kv/source.rs
+++ b/src/kv/source.rs
@@ -187,7 +187,7 @@ where
     }
 
     fn count(&self) -> usize {
-        self.as_ref().map(Source::count).unwrap_or(0)
+        self.as_ref().map_or(0, Source::count)
     }
 }
 
diff --git a/src/lib.rs b/src/lib.rs
index ab5cdfa4a..d9a0eb353 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1191,10 +1191,10 @@ where
     }
 
     fn log(&self, record: &Record) {
-        self.as_ref().log(record)
+        self.as_ref().log(record);
     }
     fn flush(&self) {
-        self.as_ref().flush()
+        self.as_ref().flush();
     }
 }
 
@@ -1208,10 +1208,10 @@ where
     }
 
     fn log(&self, record: &Record) {
-        self.as_ref().log(record)
+        self.as_ref().log(record);
     }
     fn flush(&self) {
-        self.as_ref().flush()
+        self.as_ref().flush();
     }
 }
 
diff --git a/src/serde.rs b/src/serde.rs
index 50128330f..1ddd2cb91 100644
--- a/src/serde.rs
+++ b/src/serde.rs
@@ -213,7 +213,7 @@ mod tests {
     fn level_token(variant: &'static str) -> Token {
         Token::UnitVariant {
             name: "Level",
-            variant: variant,
+            variant,
         }
     }
 
@@ -236,7 +236,7 @@ mod tests {
     fn level_filter_token(variant: &'static str) -> Token {
         Token::UnitVariant {
             name: "LevelFilter",
-            variant: variant,
+            variant,
         }
     }
 
diff --git a/tests/macros.rs b/tests/macros.rs
index 228f1f5d6..b978308b2 100644
--- a/tests/macros.rs
+++ b/tests/macros.rs
@@ -150,7 +150,7 @@ fn kv_named_args() {
 fn kv_expr_context() {
     match "chashu" {
         cat_1 => {
-            info!(target: "target", cat_1 = cat_1, cat_2 = "nori"; "hello {}", "cats")
+            info!(target: "target", cat_1 = cat_1, cat_2 = "nori"; "hello {}", "cats");
         }
     };
 }