Skip to content

Commit 53b0941

Browse files
committed
Depend on serde_core instead of serde
`time-macro` still emits code that depends on `serde` to avoid a breaking change.
1 parent 04c0ef2 commit 53b0941

File tree

15 files changed

+43
-31
lines changed

15 files changed

+43
-31
lines changed

Cargo.lock

Lines changed: 15 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ rstest = { version = "0.23.0", default-features = false }
2323
rstest_reuse = "0.7.0"
2424
# ^1.0.184 due to serde-rs/serde#2538
2525
serde = { version = "1.0.184", default-features = false }
26+
serde_core = { version = "1.0.220", default-features = false }
2627
serde_json = "1.0.68"
2728
serde_test = "1.0.126"
2829
trybuild = "1.0.102"

time/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ rustdoc-args = ["--generate-link-to-definition"]
3131

3232
[features]
3333
default = ["std"]
34-
alloc = ["serde?/alloc"]
34+
alloc = ["serde_core?/alloc"]
3535
formatting = ["dep:itoa", "std", "time-macros?/formatting"]
3636
large-dates = ["time-macros?/large-dates"]
3737
local-offset = ["std", "dep:libc", "dep:num_threads"]
@@ -41,7 +41,7 @@ quickcheck = ["dep:quickcheck", "alloc", "deranged/quickcheck"]
4141
rand = ["rand08", "rand09"]
4242
rand08 = ["dep:rand08", "deranged/rand08"]
4343
rand09 = ["dep:rand09", "deranged/rand09"]
44-
serde = ["dep:serde", "time-macros?/serde", "deranged/serde"]
44+
serde = ["dep:serde_core", "time-macros?/serde", "deranged/serde"]
4545
serde-human-readable = ["serde", "formatting", "parsing"]
4646
# Deprecated in favor of using the relevant flags directly.
4747
serde-well-known = ["serde", "formatting", "parsing"]
@@ -58,7 +58,7 @@ powerfmt = { workspace = true }
5858
quickcheck = { workspace = true, optional = true }
5959
rand08 = { workspace = true, optional = true }
6060
rand09 = { workspace = true, optional = true }
61-
serde = { workspace = true, optional = true }
61+
serde_core = { workspace = true, optional = true }
6262
time-core = { workspace = true }
6363
time-macros = { workspace = true, optional = true }
6464

time/src/error/component_range.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ impl TryFrom<crate::Error> for ComponentRange {
9999

100100
/// **This trait implementation is deprecated and will be removed in a future breaking release.**
101101
#[cfg(feature = "serde")]
102-
impl serde::de::Expected for ComponentRange {
102+
impl serde_core::de::Expected for ComponentRange {
103103
#[inline]
104104
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
105105
write!(
@@ -114,8 +114,8 @@ impl serde::de::Expected for ComponentRange {
114114
impl ComponentRange {
115115
/// Convert the error to a deserialization error.
116116
#[inline]
117-
pub(crate) fn into_de_error<E: serde::de::Error>(self) -> E {
118-
E::invalid_value(serde::de::Unexpected::Signed(self.value), &self)
117+
pub(crate) fn into_de_error<E: serde_core::de::Error>(self) -> E {
118+
E::invalid_value(serde_core::de::Unexpected::Signed(self.value), &self)
119119
}
120120
}
121121

time/src/error/format.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ impl Format {
114114
/// Obtain an error type for the serializer.
115115
#[doc(hidden)] // Exposed only for the `declare_format_string` macro
116116
#[inline]
117-
pub fn into_invalid_serde_value<S: serde::Serializer>(self) -> S::Error {
118-
use serde::ser::Error;
117+
pub fn into_invalid_serde_value<S: serde_core::Serializer>(self) -> S::Error {
118+
use serde_core::ser::Error;
119119
S::Error::custom(self)
120120
}
121121
}

time/src/serde/iso8601.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
use core::marker::PhantomData;
1010

1111
#[cfg(feature = "formatting")]
12-
use serde::ser::Error as _;
12+
use serde_core::ser::Error as _;
1313
#[cfg(feature = "parsing")]
14-
use serde::Deserializer;
14+
use serde_core::Deserializer;
1515
#[cfg(feature = "formatting")]
16-
use serde::{Serialize, Serializer};
16+
use serde_core::{Serialize, Serializer};
1717

1818
#[cfg(feature = "parsing")]
1919
use super::Visitor;

time/src/serde/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
macro_rules! item {
1010
($seq:expr, $name:literal) => {
1111
$seq.next_element()?
12-
.ok_or_else(|| <A::Error as serde::de::Error>::custom(concat!("expected ", $name)))
12+
.ok_or_else(|| <A::Error as serde_core::de::Error>::custom(concat!("expected ", $name)))
1313
};
1414
}
1515

@@ -27,8 +27,8 @@ use alloc::string::ToString;
2727
use core::marker::PhantomData;
2828

2929
#[cfg(feature = "serde-human-readable")]
30-
use serde::ser::Error as _;
31-
use serde::{Deserialize, Deserializer, Serialize, Serializer};
30+
use serde_core::ser::Error as _;
31+
use serde_core::{Deserialize, Deserializer, Serialize, Serializer};
3232
/// Generate a custom serializer and deserializer from a format string or an existing format.
3333
///
3434
/// The syntax accepted by this macro is the same as [`format_description::parse()`], which can

time/src/serde/rfc2822.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
use core::marker::PhantomData;
1010

1111
#[cfg(feature = "formatting")]
12-
use serde::ser::Error as _;
12+
use serde_core::ser::Error as _;
1313
#[cfg(feature = "parsing")]
14-
use serde::Deserializer;
14+
use serde_core::Deserializer;
1515
#[cfg(feature = "formatting")]
16-
use serde::{Serialize, Serializer};
16+
use serde_core::{Serialize, Serializer};
1717

1818
#[cfg(feature = "parsing")]
1919
use super::Visitor;

time/src/serde/rfc3339.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
use core::marker::PhantomData;
1010

1111
#[cfg(feature = "formatting")]
12-
use serde::ser::Error as _;
12+
use serde_core::ser::Error as _;
1313
#[cfg(feature = "parsing")]
14-
use serde::Deserializer;
14+
use serde_core::Deserializer;
1515
#[cfg(feature = "formatting")]
16-
use serde::{Serialize, Serializer};
16+
use serde_core::{Serialize, Serializer};
1717

1818
#[cfg(feature = "parsing")]
1919
use super::Visitor;

time/src/serde/timestamp/microseconds.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
//! [Unix timestamp]: https://en.wikipedia.org/wiki/Unix_time
99
//! [with]: https://serde.rs/field-attrs.html#with
1010
11-
use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
11+
use serde_core::{de, Deserialize, Deserializer, Serialize, Serializer};
1212

1313
use crate::OffsetDateTime;
1414

0 commit comments

Comments
 (0)