chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #15 from ruma/serde-derive-feature

Browse Source 
Replace serde_derive by re-exports in serde
This commit is contained in:
Jimmy Cuadra 2019-02-06 13:41:53 -08:00 committed by GitHub
commit 6bb5a9865f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Cargo.toml
View File

@ -27,11 +27,13 @@ features = ["nightly"]
futures = "0.1.25" futures = "0.1.25"
http = "0.1.14" http = "0.1.14"
hyper = "0.12.16" hyper = "0.12.16"
serde = "1.0.80" serde_json = "1.0.38"
serde_derive = "1.0.80"
serde_json = "1.0.33"
serde_urlencoded = "0.5.4" serde_urlencoded = "0.5.4"
url = "1.7.2" url = "1.7.2"
[dev-dependencies.serde]
version = "1.0.87"
features = ["derive"]
[lib] [lib]
proc-macro = true proc-macro = true

4
src/lib.rs
View File

@ -121,7 +121,7 @@ mod api;
/// # fn main() { /// # fn main() {
/// pub mod some_endpoint { /// pub mod some_endpoint {
/// use ruma_api_macros::ruma_api; /// use ruma_api_macros::ruma_api;
/// use serde_derive::{Deserialize, Serialize}; /// use serde::{Deserialize, Serialize};
/// ///
/// ruma_api! { /// ruma_api! {
/// metadata { /// metadata {
@ -157,7 +157,7 @@ mod api;
/// ///
/// pub mod newtype_body_endpoint { /// pub mod newtype_body_endpoint {
/// use ruma_api_macros::ruma_api; /// use ruma_api_macros::ruma_api;
/// use serde_derive::{Deserialize, Serialize}; /// use serde::{Deserialize, Serialize};
/// ///
/// #[derive(Clone, Debug, Deserialize, Serialize)] /// #[derive(Clone, Debug, Deserialize, Serialize)]
/// pub struct MyCustomType { /// pub struct MyCustomType {

2
tests/ruma_api_macros.rs
View File

@ -2,7 +2,7 @@
pub mod some_endpoint { pub mod some_endpoint {
use ruma_api_macros::ruma_api; use ruma_api_macros::ruma_api;
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
ruma_api! { ruma_api! {
metadata { metadata {