Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add lifetime container attribute for user-provided lifetime #2744

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions serde_derive/src/de.rs
Original file line number Diff line number Diff line change
Expand Up @@ -225,13 +225,15 @@ fn requires_default(field: &attr::Field, _variant: Option<&attr::Variant>) -> bo
enum BorrowedLifetimes {
Borrowed(BTreeSet<syn::Lifetime>),
Static,
User(syn::Lifetime),
}

impl BorrowedLifetimes {
fn de_lifetime(&self) -> syn::Lifetime {
match *self {
match self {
BorrowedLifetimes::Borrowed(_) => syn::Lifetime::new("'de", Span::call_site()),
BorrowedLifetimes::Static => syn::Lifetime::new("'static", Span::call_site()),
BorrowedLifetimes::User(a) => a.clone(),
}
}

Expand All @@ -244,6 +246,7 @@ impl BorrowedLifetimes {
bounds: bounds.iter().cloned().collect(),
}),
BorrowedLifetimes::Static => None,
BorrowedLifetimes::User(_) => None,
}
}
}
Expand All @@ -264,7 +267,9 @@ fn borrowed_lifetimes(cont: &Container) -> BorrowedLifetimes {
lifetimes.extend(field.attrs.borrowed_lifetimes().iter().cloned());
}
}
if lifetimes.iter().any(|b| b.to_string() == "'static") {
if let Some(a) = cont.attrs.lifetime() {
BorrowedLifetimes::User(a.clone())
} else if lifetimes.iter().any(|b| b.to_string() == "'static") {
BorrowedLifetimes::Static
} else {
BorrowedLifetimes::Borrowed(lifetimes)
Expand Down
11 changes: 11 additions & 0 deletions serde_derive/src/internals/attr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ pub struct Container {
default: Default,
rename_all_rules: RenameAllRules,
rename_all_fields_rules: RenameAllRules,
lifetime: Option<syn::Lifetime>,
ser_bound: Option<Vec<syn::WherePredicate>>,
de_bound: Option<Vec<syn::WherePredicate>>,
tag: TagType,
Expand Down Expand Up @@ -294,6 +295,7 @@ impl Container {
let mut rename_all_de_rule = Attr::none(cx, RENAME_ALL);
let mut rename_all_fields_ser_rule = Attr::none(cx, RENAME_ALL_FIELDS);
let mut rename_all_fields_de_rule = Attr::none(cx, RENAME_ALL_FIELDS);
let mut lifetime = Attr::none(cx, LIFETIME);
let mut ser_bound = Attr::none(cx, BOUND);
let mut de_bound = Attr::none(cx, BOUND);
let mut untagged = BoolAttr::none(cx, UNTAGGED);
Expand Down Expand Up @@ -440,6 +442,10 @@ impl Container {
}
}
}
} else if meta.path == LIFETIME {
// #[serde(lifetime = 'a)]
let a: syn::Lifetime = meta.value()?.parse()?;
lifetime.set(&meta.path, a);
} else if meta.path == BOUND {
// #[serde(bound = "T: SomeBound")]
// #[serde(bound(serialize = "...", deserialize = "..."))]
Expand Down Expand Up @@ -579,6 +585,7 @@ impl Container {
serialize: rename_all_fields_ser_rule.get().unwrap_or(RenameRule::None),
deserialize: rename_all_fields_de_rule.get().unwrap_or(RenameRule::None),
},
lifetime: lifetime.get(),
ser_bound: ser_bound.get(),
de_bound: de_bound.get(),
tag: decide_tag(cx, item, untagged, internal_tag, content),
Expand Down Expand Up @@ -619,6 +626,10 @@ impl Container {
&self.default
}

pub fn lifetime(&self) -> Option<&syn::Lifetime> {
self.lifetime.as_ref()
}

pub fn ser_bound(&self) -> Option<&[syn::WherePredicate]> {
self.ser_bound.as_ref().map(|vec| &vec[..])
}
Expand Down
1 change: 1 addition & 0 deletions serde_derive/src/internals/symbol.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ pub const FLATTEN: Symbol = Symbol("flatten");
pub const FROM: Symbol = Symbol("from");
pub const GETTER: Symbol = Symbol("getter");
pub const INTO: Symbol = Symbol("into");
pub const LIFETIME: Symbol = Symbol("lifetime");
pub const NON_EXHAUSTIVE: Symbol = Symbol("non_exhaustive");
pub const OTHER: Symbol = Symbol("other");
pub const REMOTE: Symbol = Symbol("remote");
Expand Down