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

Update Attr structs to hold symbols

Browse Source
This commit is contained in:
David Tolnay 2019-07-31 21:02:49 -07:00
parent 735e56c26f
commit fb1cacc10e
2 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
serde_derive/src/internals/attr.rs
View File

@ -24,13 +24,13 @@ pub use internals::case::RenameRule;
struct Attr<'c, T> { struct Attr<'c, T> {
cx: &'c Ctxt, cx: &'c Ctxt,
name: &'static str, name: Symbol,
tokens: TokenStream, tokens: TokenStream,
value: Option<T>, value: Option<T>,
} }
impl<'c, T> Attr<'c, T> { impl<'c, T> Attr<'c, T> {
fn none(cx: &'c Ctxt, name: &'static str) -> Self { fn none(cx: &'c Ctxt, name: Symbol) -> Self {
Attr { Attr {
cx: cx, cx: cx,
name: name, name: name,
@ -78,7 +78,7 @@ impl<'c, T> Attr<'c, T> {
struct BoolAttr<'c>(Attr<'c, ()>); struct BoolAttr<'c>(Attr<'c, ()>);
impl<'c> BoolAttr<'c> { impl<'c> BoolAttr<'c> {
fn none(cx: &'c Ctxt, name: &'static str) -> Self { fn none(cx: &'c Ctxt, name: Symbol) -> Self {
BoolAttr(Attr::none(cx, name)) BoolAttr(Attr::none(cx, name))
} }
@ -93,13 +93,13 @@ impl<'c> BoolAttr<'c> {
struct VecAttr<'c, T> { struct VecAttr<'c, T> {
cx: &'c Ctxt, cx: &'c Ctxt,
name: &'static str, name: Symbol,
first_dup_tokens: TokenStream, first_dup_tokens: TokenStream,
values: Vec<T>, values: Vec<T>,
} }
impl<'c, T> VecAttr<'c, T> { impl<'c, T> VecAttr<'c, T> {
fn none(cx: &'c Ctxt, name: &'static str) -> Self { fn none(cx: &'c Ctxt, name: Symbol) -> Self {
VecAttr { VecAttr {
cx: cx, cx: cx,
name: name, name: name,
@ -285,25 +285,25 @@ impl Identifier {
impl Container { impl Container {
/// Extract out the `#[serde(...)]` attributes from an item. /// Extract out the `#[serde(...)]` attributes from an item.
pub fn from_ast(cx: &Ctxt, item: &syn::DeriveInput) -> Self { pub fn from_ast(cx: &Ctxt, item: &syn::DeriveInput) -> Self {
let mut ser_name = Attr::none(cx, "rename"); let mut ser_name = Attr::none(cx, RENAME);
let mut de_name = Attr::none(cx, "rename"); let mut de_name = Attr::none(cx, RENAME);
let mut transparent = BoolAttr::none(cx, "transparent"); let mut transparent = BoolAttr::none(cx, TRANSPARENT);
let mut deny_unknown_fields = BoolAttr::none(cx, "deny_unknown_fields"); let mut deny_unknown_fields = BoolAttr::none(cx, DENY_UNKNOWN_FIELDS);
let mut default = Attr::none(cx, "default"); let mut default = Attr::none(cx, DEFAULT);
let mut rename_all_ser_rule = Attr::none(cx, "rename_all"); let mut rename_all_ser_rule = Attr::none(cx, RENAME_ALL);
let mut rename_all_de_rule = Attr::none(cx, "rename_all"); let mut rename_all_de_rule = Attr::none(cx, RENAME_ALL);
let mut ser_bound = Attr::none(cx, "bound"); let mut ser_bound = Attr::none(cx, BOUND);
let mut de_bound = Attr::none(cx, "bound"); let mut de_bound = Attr::none(cx, BOUND);
let mut untagged = BoolAttr::none(cx, "untagged"); let mut untagged = BoolAttr::none(cx, UNTAGGED);
let mut internal_tag = Attr::none(cx, "tag"); let mut internal_tag = Attr::none(cx, TAG);
let mut content = Attr::none(cx, "content"); let mut content = Attr::none(cx, CONTENT);
let mut type_from = Attr::none(cx, "from"); let mut type_from = Attr::none(cx, FROM);
let mut type_try_from = Attr::none(cx, "try_from"); let mut type_try_from = Attr::none(cx, TRY_FROM);
let mut type_into = Attr::none(cx, "into"); let mut type_into = Attr::none(cx, INTO);
let mut remote = Attr::none(cx, "remote"); let mut remote = Attr::none(cx, REMOTE);
let mut field_identifier = BoolAttr::none(cx, "field_identifier"); let mut field_identifier = BoolAttr::none(cx, FIELD_IDENTIFIER);
let mut variant_identifier = BoolAttr::none(cx, "variant_identifier"); let mut variant_identifier = BoolAttr::none(cx, VARIANT_IDENTIFIER);
let mut serde_path = Attr::none(cx, "crate"); let mut serde_path = Attr::none(cx, CRATE);
for meta_items in item.attrs.iter().filter_map(get_serde_meta_items) { for meta_items in item.attrs.iter().filter_map(get_serde_meta_items) {
for meta_item in meta_items { for meta_item in meta_items {
@ -890,19 +890,19 @@ pub struct Variant {
impl Variant { impl Variant {
pub fn from_ast(cx: &Ctxt, variant: &syn::Variant) -> Self { pub fn from_ast(cx: &Ctxt, variant: &syn::Variant) -> Self {
let mut ser_name = Attr::none(cx, "rename"); let mut ser_name = Attr::none(cx, RENAME);
let mut de_name = Attr::none(cx, "rename"); let mut de_name = Attr::none(cx, RENAME);
let mut de_aliases = VecAttr::none(cx, "rename"); let mut de_aliases = VecAttr::none(cx, RENAME);
let mut skip_deserializing = BoolAttr::none(cx, "skip_deserializing"); let mut skip_deserializing = BoolAttr::none(cx, SKIP_DESERIALIZING);
let mut skip_serializing = BoolAttr::none(cx, "skip_serializing"); let mut skip_serializing = BoolAttr::none(cx, SKIP_SERIALIZING);
let mut rename_all_ser_rule = Attr::none(cx, "rename_all"); let mut rename_all_ser_rule = Attr::none(cx, RENAME_ALL);
let mut rename_all_de_rule = Attr::none(cx, "rename_all"); let mut rename_all_de_rule = Attr::none(cx, RENAME_ALL);
let mut ser_bound = Attr::none(cx, "bound"); let mut ser_bound = Attr::none(cx, BOUND);
let mut de_bound = Attr::none(cx, "bound"); let mut de_bound = Attr::none(cx, BOUND);
let mut other = BoolAttr::none(cx, "other"); let mut other = BoolAttr::none(cx, OTHER);
let mut serialize_with = Attr::none(cx, "serialize_with"); let mut serialize_with = Attr::none(cx, SERIALIZE_WITH);
let mut deserialize_with = Attr::none(cx, "deserialize_with"); let mut deserialize_with = Attr::none(cx, DESERIALIZE_WITH);
let mut borrow = Attr::none(cx, "borrow"); let mut borrow = Attr::none(cx, BORROW);
for meta_items in variant.attrs.iter().filter_map(get_serde_meta_items) { for meta_items in variant.attrs.iter().filter_map(get_serde_meta_items) {
for meta_item in meta_items { for meta_item in meta_items {
@ -1200,20 +1200,20 @@ impl Field {
attrs: Option<&Variant>, attrs: Option<&Variant>,
container_default: &Default, container_default: &Default,
) -> Self { ) -> Self {
let mut ser_name = Attr::none(cx, "rename"); let mut ser_name = Attr::none(cx, RENAME);
let mut de_name = Attr::none(cx, "rename"); let mut de_name = Attr::none(cx, RENAME);
let mut de_aliases = VecAttr::none(cx, "rename"); let mut de_aliases = VecAttr::none(cx, RENAME);
let mut skip_serializing = BoolAttr::none(cx, "skip_serializing"); let mut skip_serializing = BoolAttr::none(cx, SKIP_SERIALIZING);
let mut skip_deserializing = BoolAttr::none(cx, "skip_deserializing"); let mut skip_deserializing = BoolAttr::none(cx, SKIP_DESERIALIZING);
let mut skip_serializing_if = Attr::none(cx, "skip_serializing_if"); let mut skip_serializing_if = Attr::none(cx, SKIP_SERIALIZING_IF);
let mut default = Attr::none(cx, "default"); let mut default = Attr::none(cx, DEFAULT);
let mut serialize_with = Attr::none(cx, "serialize_with"); let mut serialize_with = Attr::none(cx, SERIALIZE_WITH);
let mut deserialize_with = Attr::none(cx, "deserialize_with"); let mut deserialize_with = Attr::none(cx, DESERIALIZE_WITH);
let mut ser_bound = Attr::none(cx, "bound"); let mut ser_bound = Attr::none(cx, BOUND);
let mut de_bound = Attr::none(cx, "bound"); let mut de_bound = Attr::none(cx, BOUND);
let mut borrowed_lifetimes = Attr::none(cx, "borrow"); let mut borrowed_lifetimes = Attr::none(cx, BORROW);
let mut getter = Attr::none(cx, "getter"); let mut getter = Attr::none(cx, GETTER);
let mut flatten = BoolAttr::none(cx, "flatten"); let mut flatten = BoolAttr::none(cx, FLATTEN);
let ident = match field.ident { let ident = match field.ident {
Some(ref ident) => unraw(ident), Some(ref ident) => unraw(ident),
@ -1561,8 +1561,8 @@ where
T: 'a, T: 'a,
F: Fn(&Ctxt, Symbol, Symbol, &'a syn::Lit) -> Result<T, ()>, F: Fn(&Ctxt, Symbol, Symbol, &'a syn::Lit) -> Result<T, ()>,
{ {
let mut ser_meta = VecAttr::none(cx, attr_name.0); let mut ser_meta = VecAttr::none(cx, attr_name);
let mut de_meta = VecAttr::none(cx, attr_name.0); let mut de_meta = VecAttr::none(cx, attr_name);
for meta in metas { for meta in metas {
match *meta { match *meta {

2
serde_derive/src/internals/symbol.rs
View File

@ -2,7 +2,7 @@ use std::fmt::{self, Display};
use syn::{Ident, Path}; use syn::{Ident, Path};
#[derive(Copy, Clone)] #[derive(Copy, Clone)]
pub struct Symbol(pub &'static str); pub struct Symbol(&'static str);
pub const ALIAS: Symbol = Symbol("alias"); pub const ALIAS: Symbol = Symbol("alias");
pub const BORROW: Symbol = Symbol("borrow"); pub const BORROW: Symbol = Symbol("borrow");