From e711b62c7efd2bb1a2cdb48160bf65b9ae0f3355 Mon Sep 17 00:00:00 2001
From: KodrAus <kodraus@hey.com>
Date: Wed, 31 Jan 2024 12:28:02 +1000
Subject: [PATCH] fix up some warnings

---
 src/kv/error.rs | 20 +++++++++++---------
 src/kv/value.rs | 17 +----------------
 2 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/src/kv/error.rs b/src/kv/error.rs
index a6f48d0c6..d654be780 100644
--- a/src/kv/error.rs
+++ b/src/kv/error.rs
@@ -1,7 +1,5 @@
 use std::fmt;
 
-use crate::kv::value;
-
 /// An error encountered while working with structured data.
 #[derive(Debug)]
 pub struct Error {
@@ -13,7 +11,8 @@ enum Inner {
     #[cfg(feature = "std")]
     Boxed(std_support::BoxedError),
     Msg(&'static str),
-    Value(value::inner::Error),
+    #[cfg(feature = "value-bag")]
+    Value(crate::kv::value::inner::Error),
     Fmt,
 }
 
@@ -25,21 +24,23 @@ impl Error {
         }
     }
 
-    // Not public so we don't leak the `value::inner` API
-    pub(super) fn from_value(err: value::inner::Error) -> Self {
+    // Not public so we don't leak the `crate::kv::value::inner` API
+    #[cfg(feature = "value-bag")]
+    pub(super) fn from_value(err: crate::kv::value::inner::Error) -> Self {
         Error {
             inner: Inner::Value(err),
         }
     }
 
-    // Not public so we don't leak the `value::inner` API
-    pub(super) fn into_value(self) -> value::inner::Error {
+    // Not public so we don't leak the `crate::kv::value::inner` API
+    #[cfg(feature = "value-bag")]
+    pub(super) fn into_value(self) -> crate::kv::value::inner::Error {
         match self.inner {
             Inner::Value(err) => err,
             #[cfg(feature = "kv_unstable_std")]
-            _ => value::inner::Error::boxed(self),
+            _ => crate::kv::value::inner::Error::boxed(self),
             #[cfg(not(feature = "kv_unstable_std"))]
-            _ => value::inner::Error::msg("error inspecting a value"),
+            _ => crate::kv::value::inner::Error::msg("error inspecting a value"),
         }
     }
 }
@@ -50,6 +51,7 @@ impl fmt::Display for Error {
         match &self.inner {
             #[cfg(feature = "std")]
             Boxed(err) => err.fmt(f),
+            #[cfg(feature = "value-bag")]
             Value(err) => err.fmt(f),
             Msg(msg) => msg.fmt(f),
             Fmt => fmt::Error.fmt(f),
diff --git a/src/kv/value.rs b/src/kv/value.rs
index 2a16f192c..60828a27a 100644
--- a/src/kv/value.rs
+++ b/src/kv/value.rs
@@ -716,7 +716,7 @@ pub(in crate::kv) mod inner {
     }
 
     impl<'v> From<()> for Inner<'v> {
-        fn from(v: ()) -> Self {
+        fn from(_: ()) -> Self {
             Inner::None
         }
     }
@@ -994,21 +994,6 @@ pub(in crate::kv) mod inner {
         U64(u64),
     }
 
-    #[derive(Debug)]
-    pub struct Error {}
-
-    impl Error {
-        pub fn msg(msg: &'static str) -> Self {
-            todo!()
-        }
-    }
-
-    impl fmt::Display for Error {
-        fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-            todo!()
-        }
-    }
-
     pub fn visit<'v>(inner: &Inner<'v>, mut visitor: impl Visitor<'v>) -> Result<(), crate::kv::Error> {
         match inner {
             Inner::None => visitor.visit_null(),