Merge branch 'master' into ci-smaller-matrix2

Author: KodrAus

.github/workflows/main.yml

@@ -35,12 +35,11 @@ jobs:
             rust: stable-x86_64-pc-windows-gnu
     steps:
     - uses: actions/checkout@v4
-    - name: Install toolchain
-      run: |
-        rustup update ${{ matrix.rust }} --no-self-update
-        rustup default ${{ matrix.rust }}
-        cargo +stable install cargo-hack --locked
-    - run: cargo hack test --feature-powerset --exclude-features max_level_off,max_level_error,max_level_warn,max_level_info,max_level_debug,max_level_trace,release_max_level_off,release_max_level_error,release_max_level_warn,release_max_level_info,release_max_level_debug,release_max_level_trace,kv_unstable,kv_unstable_sval,kv_unstable_std,kv_unstable_serde
+    - uses: dtolnay/rust-toolchain@master
+      with:
+        toolchain: ${{ matrix.rust }}
+    - uses: taiki-e/install-action@cargo-hack
+    - run: cargo hack test --feature-powerset --exclude-features max_level_off,max_level_error,max_level_warn,max_level_info,max_level_debug,max_level_trace,release_max_level_off,release_max_level_error,release_max_level_warn,release_max_level_info,release_max_level_debug,release_max_level_trace
     - run: cargo run --verbose --manifest-path test_max_level_features/Cargo.toml
     - run: cargo run --verbose --manifest-path test_max_level_features/Cargo.toml --release
 
@@ -49,11 +48,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - name: Install toolchain
-      run: |
-        rustup update stable --no-self-update
-        rustup default stable
-        rustup component add clippy rustfmt
+    - uses: dtolnay/rust-toolchain@stable
+      with:
+        components: clippy
     - run: cargo fmt -- --check
     - run: cargo fmt --manifest-path test_max_level_features/Cargo.toml -- --check
     - run: cargo clippy --verbose
@@ -64,25 +61,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - name: Install toolchain
-      run: |
-        rustup update stable --no-self-update
-        rustup default stable
-        rustup component add rust-docs
+    - uses: dtolnay/rust-toolchain@stable
     - name: Run rustdoc
       env:
         RUSTDOCFLAGS: "-D warnings"
-      run: cargo doc --verbose --features std,serde,sval,sval_ref,value-bag,kv,kv_std,kv_sval,kv_serde
+      run: cargo doc --verbose --features std,kv,kv_std,kv_sval,kv_serde
 
   features:
     name: Feature check
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Install toolchain
-        run: |
-          rustup update nightly --no-self-update
-          rustup default nightly
+      - uses: dtolnay/rust-toolchain@nightly
       - run: cargo build --verbose -Z avoid-dev-deps --features kv
       - run: cargo build --verbose -Z avoid-dev-deps --features "kv std"
       - run: cargo build --verbose -Z avoid-dev-deps --features "kv kv_sval"
@@ -95,10 +85,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Install toolchain
-        run: |
-          rustup update nightly --no-self-update
-          rustup default nightly
+      - uses: dtolnay/rust-toolchain@nightly
       - run: cargo build --verbose -Z minimal-versions --features kv
       - run: cargo build --verbose -Z minimal-versions --features "kv std"
       - run: cargo build --verbose -Z minimal-versions --features "kv kv_sval"
@@ -111,12 +98,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Install toolchain
-        run: |
-          rustup update 1.61.0 --no-self-update
-          rustup default 1.61.0
-          cargo +stable install cargo-hack --locked
-      - run: cargo hack test --feature-powerset --exclude-features max_level_off,max_level_error,max_level_warn,max_level_info,max_level_debug,max_level_trace,release_max_level_off,release_max_level_error,release_max_level_warn,release_max_level_info,release_max_level_debug,release_max_level_trace,kv_unstable,kv_unstable_sval,kv_unstable_std,kv_unstable_serde
+      - uses: dtolnay/rust-toolchain@1.61.0
+        with:
+          components: clippy
+      - uses: taiki-e/install-action@cargo-hack
+      - run: cargo hack test --feature-powerset --exclude-features max_level_off,max_level_error,max_level_warn,max_level_info,max_level_debug,max_level_trace,release_max_level_off,release_max_level_error,release_max_level_warn,release_max_level_info,release_max_level_debug,release_max_level_trace
       - run: cargo run --verbose --manifest-path test_max_level_features/Cargo.toml
       - run: cargo run --verbose --manifest-path test_max_level_features/Cargo.toml --release
 
@@ -125,10 +111,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Install toolchain
-        run: |
-          rustup update stable --no-self-update
-          rustup default stable
+      - uses: dtolnay/rust-toolchain@stable
       - run: rustup target add thumbv6m-none-eabi riscv32imc-unknown-none-elf
       - run: cargo build --verbose --target=thumbv6m-none-eabi
       - run: cargo build --verbose --target=riscv32imc-unknown-none-elf

Cargo.toml

@@ -39,7 +39,12 @@ std = []
 kv = []
 kv_sval = ["kv", "value-bag/sval", "sval", "sval_ref"]
 kv_std = ["std", "kv", "value-bag/error"]
-kv_serde = ["kv_std", "value-bag/serde", "serde"]
+kv_serde = ["kv_std", "value-bag/serde", "serde_core"]
+
+# This is here to not break backwards compatibility with the implicit feature
+# that enables support for serde based on the dependency name. Since we're now
+# using serde_core, the implicit feature was renamed, this adds back an alias.
+serde = ["serde_core"]
 
 # Deprecated: use `kv_*` instead
 # These `*_unstable` features will be removed in a future release
@@ -49,7 +54,7 @@ kv_unstable_std = ["kv_std", "kv_unstable"]
 kv_unstable_serde = ["kv_serde", "kv_unstable_std"]
 
 [dependencies]
-serde = { version = "1.0", optional = true, default-features = false }
+serde_core = { version = "1.0", optional = true, default-features = false }
 sval = { version = "2.14.1", optional = true, default-features = false }
 sval_ref = { version = "2.1", optional = true, default-features = false }
 value-bag = { version = "1.7", optional = true, default-features = false, features = ["inline-i128"] }

src/__private_api.rs

@@ -142,7 +142,7 @@ mod kv_support {
     }
 
     #[cfg(feature = "kv_serde")]
-    pub fn capture_serde<'a, V: serde::Serialize + ?Sized>(v: &'a &'a V) -> Value<'a> {
+    pub fn capture_serde<'a, V: serde_core::Serialize + ?Sized>(v: &'a &'a V) -> Value<'a> {
         Value::from_serde(v)
     }
 }

src/kv/key.rs

@@ -6,26 +6,26 @@ use std::fmt;
 /// A type that can be converted into a [`Key`](struct.Key.html).
 pub trait ToKey {
     /// Perform the conversion.
-    fn to_key(&self) -> Key;
+    fn to_key(&self) -> Key<'_>;
 }
 
-impl<'a, T> ToKey for &'a T
+impl<T> ToKey for &T
 where
     T: ToKey + ?Sized,
 {
-    fn to_key(&self) -> Key {
+    fn to_key(&self) -> Key<'_> {
         (**self).to_key()
     }
 }
 
 impl<'k> ToKey for Key<'k> {
-    fn to_key(&self) -> Key {
+    fn to_key(&self) -> Key<'_> {
         Key { key: self.key }
     }
 }
 
 impl ToKey for str {
-    fn to_key(&self) -> Key {
+    fn to_key(&self) -> Key<'_> {
         Key::from_str(self)
     }
 }
@@ -41,6 +41,7 @@ pub struct Key<'k> {
 
 impl<'k> Key<'k> {
     /// Get a key from a borrowed string.
+    #[allow(clippy::should_implement_trait)] // Part of the public API now.
     pub fn from_str(key: &'k str) -> Self {
         Key { key }
     }
@@ -96,13 +97,13 @@ mod std_support {
     use std::borrow::Cow;
 
     impl ToKey for String {
-        fn to_key(&self) -> Key {
+        fn to_key(&self) -> Key<'_> {
             Key::from_str(self)
         }
     }
 
     impl<'a> ToKey for Cow<'a, str> {
-        fn to_key(&self) -> Key {
+        fn to_key(&self) -> Key<'_> {
             Key::from_str(self)
         }
     }
@@ -135,7 +136,7 @@ mod sval_support {
 mod serde_support {
     use super::*;
 
-    use serde::{Serialize, Serializer};
+    use serde_core::{Serialize, Serializer};
 
     impl<'a> Serialize for Key<'a> {
         fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>

src/kv/source.rs

@@ -127,7 +127,7 @@ fn count_default(source: impl Source) -> usize {
     count.0
 }
 
-impl<'a, T> Source for &'a T
+impl<T> Source for &T
 where
     T: Source + ?Sized,
 {
@@ -237,6 +237,7 @@ pub trait VisitSource<'kvs> {
     fn visit_pair(&mut self, key: Key<'kvs>, value: Value<'kvs>) -> Result<(), Error>;
 }
 
+#[allow(clippy::needless_lifetimes)] // Not needless.
 impl<'a, 'kvs, T> VisitSource<'kvs> for &'a mut T
 where
     T: VisitSource<'kvs> + ?Sized,

src/kv/value.rs

@@ -10,20 +10,20 @@ pub use crate::kv::Error;
 /// A type that can be converted into a [`Value`](struct.Value.html).
 pub trait ToValue {
     /// Perform the conversion.
-    fn to_value(&self) -> Value;
+    fn to_value(&self) -> Value<'_>;
 }
 
-impl<'a, T> ToValue for &'a T
+impl<T> ToValue for &T
 where
     T: ToValue + ?Sized,
 {
-    fn to_value(&self) -> Value {
+    fn to_value(&self) -> Value<'_> {
         (**self).to_value()
     }
 }
 
 impl<'v> ToValue for Value<'v> {
-    fn to_value(&self) -> Value {
+    fn to_value(&self) -> Value<'_> {
         Value {
             inner: self.inner.clone(),
         }
@@ -153,7 +153,7 @@ impl<'v> Value<'v> {
     #[cfg(feature = "kv_serde")]
     pub fn from_serde<T>(value: &'v T) -> Self
     where
-        T: serde::Serialize,
+        T: serde_core::Serialize,
     {
         Value {
             inner: inner::Inner::from_serde1(value),
@@ -232,10 +232,10 @@ impl<'v> fmt::Display for Value<'v> {
 }
 
 #[cfg(feature = "kv_serde")]
-impl<'v> serde::Serialize for Value<'v> {
+impl<'v> serde_core::Serialize for Value<'v> {
     fn serialize<S>(&self, s: S) -> Result<S::Ok, S::Error>
     where
-        S: serde::Serializer,
+        S: serde_core::Serializer,
     {
         self.inner.serialize(s)
     }
@@ -256,7 +256,7 @@ impl<'v> sval_ref::ValueRef<'v> for Value<'v> {
 }
 
 impl ToValue for str {
-    fn to_value(&self) -> Value {
+    fn to_value(&self) -> Value<'_> {
         Value::from(self)
     }
 }
@@ -268,7 +268,7 @@ impl<'v> From<&'v str> for Value<'v> {
 }
 
 impl ToValue for () {
-    fn to_value(&self) -> Value {
+    fn to_value(&self) -> Value<'_> {
         Value::from_inner(())
     }
 }
@@ -277,7 +277,7 @@ impl<T> ToValue for Option<T>
 where
     T: ToValue,
 {
-    fn to_value(&self) -> Value {
+    fn to_value(&self) -> Value<'_> {
         match *self {
             Some(ref value) => value.to_value(),
             None => Value::from_inner(()),
@@ -289,7 +289,7 @@ macro_rules! impl_to_value_primitive {
     ($($into_ty:ty,)*) => {
         $(
             impl ToValue for $into_ty {
-                fn to_value(&self) -> Value {
+                fn to_value(&self) -> Value<'_> {
                     Value::from(*self)
                 }
             }
@@ -313,7 +313,7 @@ macro_rules! impl_to_value_nonzero_primitive {
     ($($into_ty:ident,)*) => {
         $(
             impl ToValue for std::num::$into_ty {
-                fn to_value(&self) -> Value {
+                fn to_value(&self) -> Value<'_> {
                     Value::from(self.get())
                 }
             }
@@ -398,7 +398,7 @@ mod std_support {
     where
         T: ToValue + ?Sized,
     {
-        fn to_value(&self) -> Value {
+        fn to_value(&self) -> Value<'_> {
             (**self).to_value()
         }
     }
@@ -407,7 +407,7 @@ mod std_support {
     where
         T: ToValue + ?Sized,
     {
-        fn to_value(&self) -> Value {
+        fn to_value(&self) -> Value<'_> {
             (**self).to_value()
         }
     }
@@ -416,19 +416,19 @@ mod std_support {
     where
         T: ToValue + ?Sized,
     {
-        fn to_value(&self) -> Value {
+        fn to_value(&self) -> Value<'_> {
             (**self).to_value()
         }
     }
 
     impl ToValue for String {
-        fn to_value(&self) -> Value {
+        fn to_value(&self) -> Value<'_> {
             Value::from(&**self)
         }
     }
 
     impl<'v> ToValue for Cow<'v, str> {
-        fn to_value(&self) -> Value {
+        fn to_value(&self) -> Value<'_> {
             Value::from(&**self)
         }
     }
@@ -535,6 +535,7 @@ pub trait VisitValue<'v> {
     }
 }
 
+#[allow(clippy::needless_lifetimes)] // Not needless.
 impl<'a, 'v, T: ?Sized> VisitValue<'v> for &'a mut T
 where
     T: VisitValue<'v>,
@@ -1083,7 +1084,7 @@ impl<'v> Value<'v> {
     #[deprecated(note = "use `from_serde` instead")]
     pub fn capture_serde<T>(value: &'v T) -> Self
     where
-        T: serde::Serialize + 'static,
+        T: serde_core::Serialize + 'static,
     {
         Value::from_serde(value)
     }