Skip to content

Commit 27e7025

Browse files
committed
Switch serde dependency to serde_core
1 parent 94af9c3 commit 27e7025

File tree

17 files changed

+41
-31
lines changed

17 files changed

+41
-31
lines changed

Cargo.lock

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

axum-extra/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ http-body-util = "0.1.0"
9595
mime = "0.3"
9696
pin-project-lite = "0.2"
9797
rustversion = "1.0.9"
98-
serde = "1.0"
98+
serde_core = "1.0.221"
9999
tower = { version = "0.5.2", default-features = false, features = ["util"] }
100100
tower-layer = "0.3"
101101
tower-service = "0.3"
@@ -123,7 +123,7 @@ axum = { path = "../axum", features = ["macros", "__private"] }
123123
axum-macros = { path = "../axum-macros", features = ["__private"] }
124124
hyper = "1.0.0"
125125
reqwest = { version = "0.12", default-features = false, features = ["json", "stream", "multipart"] }
126-
serde = { version = "1.0", features = ["derive"] }
126+
serde = { version = "1.0.221", features = ["derive"] }
127127
serde_json = "1.0.71"
128128
tokio = { version = "1.14", features = ["full"] }
129129
tower = { version = "0.5.2", features = ["util"] }

axum-extra/src/extract/form.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use axum::{
55
};
66
use axum_core::__composite_rejection as composite_rejection;
77
use axum_core::__define_rejection as define_rejection;
8-
use serde::de::DeserializeOwned;
8+
use serde_core::de::DeserializeOwned;
99

1010
/// Extractor that deserializes `application/x-www-form-urlencoded` requests
1111
/// into some type.

axum-extra/src/extract/json_deserializer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use axum_core::__define_rejection as define_rejection;
44
use axum_core::extract::rejection::BytesRejection;
55
use bytes::Bytes;
66
use http::{header, HeaderMap};
7-
use serde::Deserialize;
7+
use serde_core::Deserialize;
88
use std::marker::PhantomData;
99

1010
/// JSON Extractor for zero-copy deserialization.

axum-extra/src/extract/optional_path.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use axum::{
22
extract::{rejection::PathRejection, FromRequestParts, Path},
33
RequestPartsExt,
44
};
5-
use serde::de::DeserializeOwned;
5+
use serde_core::de::DeserializeOwned;
66

77
/// Extractor that extracts path arguments the same way as [`Path`], except if there aren't any.
88
///

axum-extra/src/extract/query.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use axum::extract::FromRequestParts;
22
use axum_core::__composite_rejection as composite_rejection;
33
use axum_core::__define_rejection as define_rejection;
44
use http::{request::Parts, Uri};
5-
use serde::de::DeserializeOwned;
5+
use serde_core::de::DeserializeOwned;
66

77
/// Extractor that deserializes query strings into some type.
88
///

axum-extra/src/json_lines.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use bytes::{BufMut, BytesMut};
1010
use futures_core::{stream::BoxStream, Stream, TryStream};
1111
use futures_util::stream::TryStreamExt;
1212
use pin_project_lite::pin_project;
13-
use serde::{de::DeserializeOwned, Serialize};
13+
use serde_core::{de::DeserializeOwned, Serialize};
1414
use std::{
1515
convert::Infallible,
1616
io::{self, Write},
@@ -174,16 +174,16 @@ where
174174

175175
#[cfg(test)]
176176
mod tests {
177-
use super::*;
177+
use super::JsonLines;
178178
use crate::test_helpers::*;
179179
use axum::{
180180
routing::{get, post},
181181
Router,
182182
};
183183
use futures_util::StreamExt;
184184
use http::StatusCode;
185-
use serde::Deserialize;
186-
use std::error::Error;
185+
use serde::{Deserialize, Serialize};
186+
use std::{convert::Infallible, error::Error};
187187

188188
#[derive(Serialize, Deserialize, PartialEq, Eq, Debug)]
189189
struct User {

axum-extra/src/response/erased_json.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use axum::{
55
response::{IntoResponse, Response},
66
};
77
use bytes::{BufMut, Bytes, BytesMut};
8-
use serde::Serialize;
8+
use serde_core::Serialize;
99

1010
/// A response type that holds a JSON in serialized form.
1111
///

axum-extra/src/routing/typed.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::{any::type_name, fmt};
22

33
use super::sealed::Sealed;
44
use http::Uri;
5-
use serde::Serialize;
5+
use serde_core::Serialize;
66

77
/// A type safe path.
88
///
@@ -384,7 +384,6 @@ impl_second_element_is!(T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
384384

385385
#[cfg(test)]
386386
mod tests {
387-
use super::*;
388387
use crate::{
389388
extract::WithRejection,
390389
routing::{RouterExt, TypedPath},
@@ -394,7 +393,7 @@ mod tests {
394393
response::{IntoResponse, Response},
395394
Router,
396395
};
397-
use serde::Deserialize;
396+
use serde::{Deserialize, Serialize};
398397

399398
#[derive(TypedPath, Deserialize)]
400399
#[typed_path("/users/{id}")]

axum/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ memchr = "2.4.1"
100100
mime = "0.3.16"
101101
percent-encoding = "2.1"
102102
pin-project-lite = "0.2.7"
103-
serde = "1.0"
103+
serde_core = "1.0.221"
104104
sync_wrapper = "1.0.0"
105105
tower = { version = "0.5.2", default-features = false, features = ["util"] }
106106
tower-layer = "0.3.2"
@@ -165,7 +165,7 @@ hyper = { version = "1.1.0", features = ["client"] }
165165
quickcheck = "1.0"
166166
quickcheck_macros = "1.0"
167167
reqwest = { version = "0.12", default-features = false, features = ["json", "stream", "multipart"] }
168-
serde = { version = "1.0", features = ["derive"] }
168+
serde = { version = "1.0.221", features = ["derive"] }
169169
serde_json = { version = "1.0", features = ["raw_value"] }
170170
time = { version = "0.3", features = ["serde-human-readable"] }
171171
tokio = { package = "tokio", version = "1.44.2", features = ["macros", "rt", "rt-multi-thread", "net", "test-util"] }

0 commit comments

Comments
 (0)