pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-04-24 22:47:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/v0.6.x'

Browse Source 
# Conflicts:
#	serde_codegen/Cargo.toml
This commit is contained in:
Erick Tryzelaar
2015-11-28 21:16:51 -08:00
parent 2c0a4e7669 f3f098e7f5
commit b858cd9e18
13 changed files with 112 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde_codegen/Cargo.toml
+8 -8
View File
@@ -1,6 +1,6 @@
[package]
name = "serde_codegen"
version = "0.6.2"
version = "0.6.5"
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
license = "MIT/Apache-2.0"
description = "Macros to auto-generate implementations for the serde framework"
@@ -15,12 +15,12 @@ nightly = ["quasi_macros"]
with-syntex = ["quasi/with-syntex", "quasi_codegen", "quasi_codegen/with-syntex", "syntex", "syntex_syntax"]
[build-dependencies]
quasi_codegen = { version = "^0.3.6", optional = true }
syntex = { version = "^0.17.0", optional = true }
quasi_codegen = { verision = "^0.3.8", optional = true }
syntex = { version = "^0.22.0", optional = true }
[dependencies]
aster = { version = "^0.6.0", default-features = false }
quasi = { version = "^0.3.5", default-features = false }
quasi_macros = { version = "^0.3.5", optional = true }
syntex = { version = "^0.17.0", optional = true }
syntex_syntax = { version = "^0.19.1", optional = true }
aster = { version = "^0.8.0", default-features = false }
quasi = { verision = "^0.3.8", default-features = false }
quasi_macros = { version = "^0.3.8", optional = true }
syntex = { version = "^0.22.0", optional = true }
syntex_syntax = { version = "^0.22.0", optional = true }
serde_codegen/src/de.rs
-1
View File
@@ -65,7 +65,6 @@ pub fn expand_derive_deserialize(
let where_clause = &impl_generics.where_clause;
let impl_item = quote_item!(cx,
#[automatically_derived]
impl $impl_generics ::serde::de::Deserialize for $ty $where_clause {
fn deserialize<__D>(deserializer: &mut __D) -> ::std::result::Result<$ty, __D::Error>
where __D: ::serde::de::Deserializer,
serde_codegen/src/lib.rs
+2 -2
View File
@@ -14,7 +14,7 @@ extern crate syntex_syntax as syntax;
extern crate syntax;
#[cfg(not(feature = "with-syntex"))]
extern crate rustc;
extern crate rustc_plugin;
#[cfg(feature = "with-syntex")]
include!(concat!(env!("OUT_DIR"), "/lib.rs"));
@@ -60,7 +60,7 @@ pub fn register(reg: &mut syntex::Registry) {
}
#[cfg(not(feature = "with-syntex"))]
pub fn register(reg: &mut rustc::plugin::Registry) {
pub fn register(reg: &mut rustc_plugin::Registry) {
reg.register_syntax_extension(
syntax::parse::token::intern("derive_Serialize"),
syntax::ext::base::MultiDecorator(
serde_codegen/src/ser.rs
-1
View File
@@ -60,7 +60,6 @@ pub fn expand_derive_serialize(
let where_clause = &impl_generics.where_clause;
let impl_item = quote_item!(cx,
#[automatically_derived]
impl $impl_generics ::serde::ser::Serialize for $ty $where_clause {
fn serialize<__S>(&self, serializer: &mut __S) -> ::std::result::Result<(), __S::Error>
where __S: ::serde::ser::Serializer,