Skip to content

Commit 79c265f

Browse files
authored
Remove direct usage of 'serde_derive' crate and redundant usage of 'serde' crate (#640)
1 parent c761d91 commit 79c265f

File tree

12 files changed

+11
-25
lines changed

12 files changed

+11
-25
lines changed

juniper/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ chrono = { version = "0.4.0", optional = true }
4040
fnv = "1.0.3"
4141
futures = "0.3.1"
4242
indexmap = { version = "1.0.0", features = ["serde-1"] }
43-
serde = { version = "1.0.8" }
44-
serde_derive = { version = "1.0.2" }
43+
serde = { version = "1.0.8", features = ["derive"] }
4544
serde_json = { version="1.0.2", optional = true }
4645
url = { version = "2", optional = true }
4746
uuid = { version = "0.8", optional = true }

juniper/src/http/mod.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ pub mod graphiql;
44
pub mod playground;
55

66
use serde::{
7-
de::Deserialize,
8-
ser::{self, Serialize, SerializeMap},
7+
ser::{self, SerializeMap},
8+
Deserialize, Serialize,
99
};
10-
use serde_derive::{Deserialize, Serialize};
1110

1211
use crate::{
1312
ast::InputValue,
@@ -218,7 +217,7 @@ where
218217
}
219218

220219
/// Simple wrapper around GraphQLRequest to allow the handling of Batch requests
221-
#[derive(Debug, serde_derive::Deserialize, PartialEq)]
220+
#[derive(Debug, Deserialize, PartialEq)]
222221
#[serde(untagged)]
223222
#[serde(bound = "InputValue<S>: Deserialize<'de>")]
224223
pub enum GraphQLBatchRequest<S = DefaultScalarValue>
@@ -308,7 +307,7 @@ where
308307
/// This struct implements Serialize, so you can simply serialize this
309308
/// to JSON and send it over the wire. use the `is_ok` to determine
310309
/// wheter to send a 200 or 400 HTTP status code.
311-
#[derive(serde_derive::Serialize)]
310+
#[derive(Serialize)]
312311
#[serde(untagged)]
313312
pub enum GraphQLBatchResponse<'a, S = DefaultScalarValue>
314313
where

juniper/src/integrations/serde.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ use indexmap::IndexMap;
22
use serde::{
33
de,
44
ser::{self, SerializeMap},
5+
Serialize,
56
};
6-
use serde_derive::Serialize;
77

88
use std::fmt;
99

juniper/src/types/scalars.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use serde_derive::{Deserialize, Serialize};
1+
use serde::{Deserialize, Serialize};
22
use std::{char, convert::From, marker::PhantomData, ops::Deref, u32};
33

44
use crate::{

juniper_actix/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@ actix-web-actors = "2.0.0"
1717
futures = { version = "0.3.1", features = ["compat"] }
1818
juniper = { version = "0.14.2", path = "../juniper", default-features = false }
1919
tokio = { version = "0.2", features = ["time"] }
20+
serde = { version = "1.0.75", features = ["derive"] }
2021
serde_json = "1.0.24"
21-
serde_derive = "1.0.75"
2222
failure = "0.1.7"
23-
serde = "1.0.75"
2423

2524
[dev-dependencies]
2625
juniper = { version = "0.14.2", path = "../juniper", features = ["expose-test-schema", "serde_json"] }

juniper_actix/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ use juniper::{
5555
};
5656
use serde::Deserialize;
5757

58-
#[serde(deny_unknown_fields)]
5958
#[derive(Deserialize, Clone, PartialEq, Debug)]
59+
#[serde(deny_unknown_fields)]
6060
struct GetGraphQLRequest {
6161
query: String,
6262
#[serde(rename = "operationName")]

juniper_hyper/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ repository = "https://github.com/graphql-rust/juniper"
99
edition = "2018"
1010

1111
[dependencies]
12-
serde = "1.0"
1312
serde_json = "1.0"
14-
serde_derive = "1.0"
1513
url = "2"
1614
juniper = { version = "0.14.2", default-features = false, path = "../juniper"}
1715
tokio = "0.2"

juniper_iron/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ repository = "https://github.com/graphql-rust/juniper"
1212
edition = "2018"
1313

1414
[dependencies]
15-
serde = { version = "1.0.2" }
1615
serde_json = { version = "1.0.2" }
17-
serde_derive = { version = "1.0.2" }
1816
juniper = { version = "0.14.2", path = "../juniper" }
1917
futures = "0.3.1"
2018

juniper_iron/examples/iron_server.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ extern crate juniper;
33
extern crate juniper_iron;
44
extern crate logger;
55
extern crate mount;
6-
extern crate serde;
76

87
use std::env;
98

juniper_rocket/Cargo.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,8 @@ repository = "https://github.com/graphql-rust/juniper"
1212
edition = "2018"
1313

1414
[dependencies]
15-
serde = { version = "1.0.2" }
1615
serde_json = { version = "1.0.2" }
17-
serde_derive = { version = "1.0.2" }
1816
juniper = { version = "0.14.2", default-features = false, path = "../juniper"}
19-
2017
rocket = { version = "0.4.2", default-features = false }
2118

2219
[dev-dependencies.juniper]

0 commit comments

Comments
 (0)