refactor: Switch to serde_core (#691)

Author: epage

Cargo.lock

@@ -132,7 +132,7 @@ async = ["async-trait"]
 toml = ["dep:toml"]
 
 [dependencies]
-serde = "1.0"
+serde_core = "1.0"
 
 async-trait = { version = "0.1", optional = true }
 toml = { version = "0.9", optional = true, default-features = false, features = ["parse", "serde"] }
@@ -148,7 +148,7 @@ winnow = "0.7.0"
 serde-untagged = { version = "0.1.8", optional = true }
 
 [dev-dependencies]
-serde_derive = "1.0"
+serde = { version = "1.0", features = ["derive"] }
 float-cmp = "0.10"
 chrono = { version = "0.4", features = ["serde"] }
 tokio = { version = "1", features = ["rt-multi-thread", "macros", "fs", "io-util", "time"]}

Cargo.toml

@@ -3,7 +3,7 @@ use std::io::{Error, ErrorKind};
 use config::{Config, File, FileStoredFormat, Format, Map, Value, ValueKind};
 
 /// The private and public key sources will be read into their associated variable:
-#[derive(serde_derive::Deserialize, Clone, Debug)]
+#[derive(serde::Deserialize, Clone, Debug)]
 pub struct Settings {
     pub private_key: Option<String>,
     pub public_key: Option<String>,

examples/custom_file_format/main.rs

@@ -1,5 +1,5 @@
 use config::Config;
-#[derive(Debug, Default, serde_derive::Deserialize, PartialEq, Eq)]
+#[derive(Debug, Default, serde::Deserialize, PartialEq, Eq)]
 struct AppConfig {
     list: Vec<String>,
 }

examples/env-list/main.rs

@@ -1,7 +1,7 @@
 use std::env;
 
 use config::{Config, ConfigError, Environment, File};
-use serde_derive::Deserialize;
+use serde::Deserialize;
 
 #[derive(Debug, Deserialize)]
 #[allow(unused)]

examples/hierarchical-env/settings.rs

@@ -1,7 +1,7 @@
 use std::fmt::Debug;
 
-use serde::de::Deserialize;
-use serde::ser::Serialize;
+use serde_core::de::Deserialize;
+use serde_core::ser::Serialize;
 
 use crate::builder::{ConfigBuilder, DefaultState};
 use crate::error::{ConfigError, Result};

src/config.rs

@@ -2,7 +2,7 @@ use std::collections::VecDeque;
 use std::convert::TryInto;
 use std::iter::Enumerate;
 
-use serde::de;
+use serde_core::de;
 
 use crate::config::Config;
 use crate::error::{ConfigError, Result, Unexpected};
@@ -164,7 +164,7 @@ impl<'de> de::Deserializer<'de> for Value {
         })
     }
 
-    serde::forward_to_deserialize_any! {
+    serde_core::forward_to_deserialize_any! {
         char seq
         bytes byte_buf map struct unit
         identifier ignored_any unit_struct tuple_struct tuple
@@ -181,7 +181,7 @@ impl<'de> de::Deserializer<'de> for StrDeserializer<'_> {
         visitor.visit_str(self.0)
     }
 
-    serde::forward_to_deserialize_any! {
+    serde_core::forward_to_deserialize_any! {
         bool u8 u16 u32 u64 i8 i16 i32 i64 f32 f64 char str string seq
         bytes byte_buf map struct unit enum newtype_struct
         identifier ignored_any unit_struct tuple_struct tuple option

src/de.rs

@@ -2,8 +2,8 @@ use std::error::Error;
 use std::fmt;
 use std::result;
 
-use serde::de;
-use serde::ser;
+use serde_core::de;
+use serde_core::ser;
 
 #[allow(unnameable_types)] // Unsure if/how to expose this
 #[derive(Debug)]

src/error.rs

@@ -15,10 +15,10 @@ pub(crate) enum Val {
     Object(Map<String, Self>),
 }
 
-impl<'de> serde::de::Deserialize<'de> for Val {
+impl<'de> serde_core::de::Deserialize<'de> for Val {
     fn deserialize<D>(d: D) -> Result<Self, D::Error>
     where
-        D: serde::de::Deserializer<'de>,
+        D: serde_core::de::Deserializer<'de>,
     {
         serde_untagged::UntaggedEnumVisitor::new()
             .bool(|value| Ok(Self::Boolean(value)))

src/file/format/json5.rs

@@ -1,7 +1,7 @@
 use std::fmt::Display;
 use std::fmt::Write as _;
 
-use serde::ser;
+use serde_core::ser;
 
 use crate::error::{ConfigError, Result};
 use crate::value::{Value, ValueKind};
@@ -149,7 +149,7 @@ impl<'a> ser::Serializer for &'a mut ConfigSerializer {
     }
 
     fn serialize_bytes(self, v: &[u8]) -> Result<Self::Ok> {
-        use serde::ser::SerializeSeq;
+        use serde_core::ser::SerializeSeq;
         let mut seq = self.serialize_seq(Some(v.len()))?;
         for byte in v {
             seq.serialize_element(byte)?;
@@ -676,7 +676,7 @@ impl ser::SerializeStructVariant for Unreachable {
 
 #[cfg(test)]
 mod test {
-    use serde_derive::{Deserialize, Serialize};
+    use serde::{Deserialize, Serialize};
 
     use super::*;