Merge pull request #662 from rust-lang/fix/cargo-features

Revert loosening of kv cargo features

Cargo.toml

@@ -44,7 +44,7 @@ release_max_level_info  = []
 release_max_level_debug = []
 release_max_level_trace = []
 
-std = ["value-bag?/std"]
+std = []
 
 kv = []
 kv_sval = ["kv", "value-bag/sval", "sval", "sval_ref"]

src/kv/value.rs

@@ -385,7 +385,7 @@ impl<'v> Value<'v> {
     }
 }
 
-#[cfg(feature = "std")]
+#[cfg(feature = "kv_std")]
 mod std_support {
     use std::borrow::Cow;
     use std::rc::Rc;
@@ -432,29 +432,20 @@ mod std_support {
         }
     }
 
+    impl<'v> Value<'v> {
+        /// Try convert this value into a string.
+        pub fn to_cow_str(&self) -> Option<Cow<'v, str>> {
+            self.inner.to_str()
+        }
+    }
+
     impl<'v> From<&'v String> for Value<'v> {
         fn from(v: &'v String) -> Self {
             Value::from(&**v)
         }
     }
 }
 
-#[cfg(all(feature = "std", feature = "value-bag"))]
-impl<'v> Value<'v> {
-    /// Try to convert this value into a string.
-    pub fn to_cow_str(&self) -> Option<std::borrow::Cow<'v, str>> {
-        self.inner.to_str()
-    }
-}
-
-#[cfg(all(feature = "std", not(feature = "value-bag")))]
-impl<'v> Value<'v> {
-    /// Try to convert this value into a string.
-    pub fn to_cow_str(&self) -> Option<std::borrow::Cow<'v, str>> {
-        self.inner.to_borrowed_str().map(std::borrow::Cow::Borrowed)
-    }
-}
-
 /// A visitor for a [`Value`].
 ///
 /// Also see [`Value`'s documentation on seralization]. Value visitors are a simple alternative