mikros/serde
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Auto merge of #354 - dtolnay:attr, r=oli-obk

Browse Source 
Fix attributes canceling each other

Fixes #353.
This commit is contained in:
Homu 2016-06-06 18:08:20 +09:00
commit bf33daf124
3 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
serde_codegen/src/attr.rs
View File

@ -82,7 +82,6 @@ impl ContainerAttrs {
// Parse `#[serde(rename="foo")]` // Parse `#[serde(rename="foo")]`
ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"rename" => { ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"rename" => {
let s = try!(get_str_from_lit(cx, name, lit)); let s = try!(get_str_from_lit(cx, name, lit));
container_attrs.name.serialize_name = Some(s.clone()); container_attrs.name.serialize_name = Some(s.clone());
container_attrs.name.deserialize_name = Some(s); container_attrs.name.deserialize_name = Some(s);
} }
@ -90,9 +89,12 @@ impl ContainerAttrs {
// Parse `#[serde(rename(serialize="foo", deserialize="bar"))]` // Parse `#[serde(rename(serialize="foo", deserialize="bar"))]`
ast::MetaItemKind::List(ref name, ref meta_items) if name == &"rename" => { ast::MetaItemKind::List(ref name, ref meta_items) if name == &"rename" => {
let (ser_name, de_name) = try!(get_renames(cx, meta_items)); let (ser_name, de_name) = try!(get_renames(cx, meta_items));
if ser_name.is_some() {
container_attrs.name.serialize_name = ser_name; container_attrs.name.serialize_name = ser_name;
container_attrs.name.deserialize_name = de_name; }
if de_name.is_some() {
container_attrs.name.deserialize_name = de_name;
}
} }
// Parse `#[serde(deny_unknown_fields)]` // Parse `#[serde(deny_unknown_fields)]`
@ -110,8 +112,12 @@ impl ContainerAttrs {
// Parse `#[serde(bound(serialize="D: Serialize", deserialize="D: Deserialize"))]` // Parse `#[serde(bound(serialize="D: Serialize", deserialize="D: Deserialize"))]`
ast::MetaItemKind::List(ref name, ref meta_items) if name == &"bound" => { ast::MetaItemKind::List(ref name, ref meta_items) if name == &"bound" => {
let (ser_bound, de_bound) = try!(get_where_predicates(cx, meta_items)); let (ser_bound, de_bound) = try!(get_where_predicates(cx, meta_items));
container_attrs.ser_bound = ser_bound; if ser_bound.is_some() {
container_attrs.de_bound = de_bound; container_attrs.ser_bound = ser_bound;
}
if de_bound.is_some() {
container_attrs.de_bound = de_bound;
}
} }
_ => { _ => {
@ -164,7 +170,6 @@ impl VariantAttrs {
// Parse `#[serde(rename="foo")]` // Parse `#[serde(rename="foo")]`
ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"rename" => { ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"rename" => {
let s = try!(get_str_from_lit(cx, name, lit)); let s = try!(get_str_from_lit(cx, name, lit));
variant_attrs.name.serialize_name = Some(s.clone()); variant_attrs.name.serialize_name = Some(s.clone());
variant_attrs.name.deserialize_name = Some(s); variant_attrs.name.deserialize_name = Some(s);
} }
@ -172,9 +177,12 @@ impl VariantAttrs {
// Parse `#[serde(rename(serialize="foo", deserialize="bar"))]` // Parse `#[serde(rename(serialize="foo", deserialize="bar"))]`
ast::MetaItemKind::List(ref name, ref meta_items) if name == &"rename" => { ast::MetaItemKind::List(ref name, ref meta_items) if name == &"rename" => {
let (ser_name, de_name) = try!(get_renames(cx, meta_items)); let (ser_name, de_name) = try!(get_renames(cx, meta_items));
if ser_name.is_some() {
variant_attrs.name.serialize_name = ser_name; variant_attrs.name.serialize_name = ser_name;
variant_attrs.name.deserialize_name = de_name; }
if de_name.is_some() {
variant_attrs.name.deserialize_name = de_name;
}
} }
_ => { _ => {
@ -241,7 +249,6 @@ impl FieldAttrs {
// Parse `#[serde(rename="foo")]` // Parse `#[serde(rename="foo")]`
ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"rename" => { ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"rename" => {
let s = try!(get_str_from_lit(cx, name, lit)); let s = try!(get_str_from_lit(cx, name, lit));
field_attrs.name.serialize_name = Some(s.clone()); field_attrs.name.serialize_name = Some(s.clone());
field_attrs.name.deserialize_name = Some(s); field_attrs.name.deserialize_name = Some(s);
} }
@ -249,9 +256,12 @@ impl FieldAttrs {
// Parse `#[serde(rename(serialize="foo", deserialize="bar"))]` // Parse `#[serde(rename(serialize="foo", deserialize="bar"))]`
ast::MetaItemKind::List(ref name, ref meta_items) if name == &"rename" => { ast::MetaItemKind::List(ref name, ref meta_items) if name == &"rename" => {
let (ser_name, de_name) = try!(get_renames(cx, meta_items)); let (ser_name, de_name) = try!(get_renames(cx, meta_items));
if ser_name.is_some() {
field_attrs.name.serialize_name = ser_name; field_attrs.name.serialize_name = ser_name;
field_attrs.name.deserialize_name = de_name; }
if de_name.is_some() {
field_attrs.name.deserialize_name = de_name;
}
} }
// Parse `#[serde(default)]` // Parse `#[serde(default)]`
@ -314,8 +324,12 @@ impl FieldAttrs {
// Parse `#[serde(bound(serialize="D: Serialize", deserialize="D: Deserialize"))]` // Parse `#[serde(bound(serialize="D: Serialize", deserialize="D: Deserialize"))]`
ast::MetaItemKind::List(ref name, ref meta_items) if name == &"bound" => { ast::MetaItemKind::List(ref name, ref meta_items) if name == &"bound" => {
let (ser_bound, de_bound) = try!(get_where_predicates(cx, meta_items)); let (ser_bound, de_bound) = try!(get_where_predicates(cx, meta_items));
field_attrs.ser_bound = ser_bound; if ser_bound.is_some() {
field_attrs.de_bound = de_bound; field_attrs.ser_bound = ser_bound;
}
if de_bound.is_some() {
field_attrs.de_bound = de_bound;
}
} }
_ => { _ => {

3
serde_tests/tests/test_annotations.rs
View File

@ -441,7 +441,8 @@ enum RenameEnumSerializeDeserialize<A> {
#[serde(rename(serialize="dick_grayson", deserialize="jason_todd"))] #[serde(rename(serialize="dick_grayson", deserialize="jason_todd"))]
Robin { Robin {
a: i8, a: i8,
#[serde(rename(serialize="c", deserialize="d"))] #[serde(rename(serialize="c"))]
#[serde(rename(deserialize="d"))]
b: A, b: A,
}, },
} }

6
serde_tests/tests/test_gen.rs
View File

@ -111,9 +111,9 @@ struct WithTraits2<D, E> {
deserialize_with="DeserializeWith::deserialize_with")] deserialize_with="DeserializeWith::deserialize_with")]
d: D, d: D,
#[serde(serialize_with="SerializeWith::serialize_with", #[serde(serialize_with="SerializeWith::serialize_with",
deserialize_with="DeserializeWith::deserialize_with", bound(serialize="E: SerializeWith"))]
bound(serialize="E: SerializeWith", #[serde(deserialize_with="DeserializeWith::deserialize_with",
deserialize="E: DeserializeWith"))] bound(deserialize="E: DeserializeWith"))]
e: E, e: E,
} }