From ba002e1119171f608c294eeada354a182cfd107e Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Sat, 31 Mar 2018 23:46:25 +0200 Subject: [PATCH] Update signature of Lifetime::new --- serde_derive/src/bound.rs | 4 ++-- serde_derive/src/de.rs | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/serde_derive/src/bound.rs b/serde_derive/src/bound.rs index ce401214..36526351 100644 --- a/serde_derive/src/bound.rs +++ b/serde_derive/src/bound.rs @@ -14,7 +14,7 @@ use syn::punctuated::Punctuated; use internals::ast::{Data, Container}; use internals::attr; -use proc_macro2::{Span, Term}; +use proc_macro2::Span; // Remove the default from every type parameter because in the generated impls // they look like associated types: "error: associated type bindings are not @@ -251,7 +251,7 @@ pub fn with_self_bound( } pub fn with_lifetime_bound(generics: &syn::Generics, lifetime: &str) -> syn::Generics { - let bound = syn::Lifetime::new(Term::new(lifetime, Span::call_site())); + let bound = syn::Lifetime::new(lifetime, Span::call_site()); let def = syn::LifetimeDef { attrs: Vec::new(), lifetime: bound, diff --git a/serde_derive/src/de.rs b/serde_derive/src/de.rs index 796579b7..941c624a 100644 --- a/serde_derive/src/de.rs +++ b/serde_derive/src/de.rs @@ -10,7 +10,7 @@ use syn::{self, Ident, Index, Member}; use syn::punctuated::Punctuated; use syn::spanned::Spanned; use quote::{ToTokens, Tokens}; -use proc_macro2::{Literal, Span, Term}; +use proc_macro2::{Literal, Span}; use bound; use fragment::{Expr, Fragment, Match, Stmts}; @@ -181,8 +181,8 @@ enum BorrowedLifetimes { impl BorrowedLifetimes { fn de_lifetime(&self) -> syn::Lifetime { match *self { - BorrowedLifetimes::Borrowed(_) => syn::Lifetime::new(Term::new("'de", Span::call_site())), - BorrowedLifetimes::Static => syn::Lifetime::new(Term::new("'static", Span::call_site())), + BorrowedLifetimes::Borrowed(_) => syn::Lifetime::new("'de", Span::call_site()), + BorrowedLifetimes::Static => syn::Lifetime::new("'static", Span::call_site()), } } @@ -190,7 +190,7 @@ impl BorrowedLifetimes { match *self { BorrowedLifetimes::Borrowed(ref bounds) => Some(syn::LifetimeDef { attrs: Vec::new(), - lifetime: syn::Lifetime::new(Term::new("'de", Span::call_site())), + lifetime: syn::Lifetime::new("'de", Span::call_site()), colon_token: None, bounds: bounds.iter().cloned().collect(), }), @@ -2721,7 +2721,7 @@ impl<'a> ToTokens for DeTypeGenerics<'a> { if self.0.borrowed.de_lifetime_def().is_some() { let def = syn::LifetimeDef { attrs: Vec::new(), - lifetime: syn::Lifetime::new(Term::new("'de", Span::call_site())), + lifetime: syn::Lifetime::new("'de", Span::call_site()), colon_token: None, bounds: Punctuated::new(), }; @@ -2747,7 +2747,7 @@ impl<'a> ToTokens for InPlaceTypeGenerics<'a> { if self.0.borrowed.de_lifetime_def().is_some() { let def = syn::LifetimeDef { attrs: Vec::new(), - lifetime: syn::Lifetime::new(Term::new("'de", Span::call_site())), + lifetime: syn::Lifetime::new("'de", Span::call_site()), colon_token: None, bounds: Punctuated::new(), }; @@ -2772,7 +2772,7 @@ impl<'a> DeTypeGenerics<'a> { fn place_lifetime() -> syn::LifetimeDef { syn::LifetimeDef { attrs: Vec::new(), - lifetime: syn::Lifetime::new(Term::new("'place", Span::call_site())), + lifetime: syn::Lifetime::new("'place", Span::call_site()), colon_token: None, bounds: Punctuated::new(), }