From e2923711c65e6f550cc3f73c7a002d3eee96275f Mon Sep 17 00:00:00 2001 From: Marc-Antoine Arnaud Date: Tue, 29 May 2018 16:39:10 +0200 Subject: [PATCH] remove deprecated methods --- yaserde_derive/src/de/expand_enum.rs | 6 +++--- yaserde_derive/src/de/expand_struct.rs | 14 +++++++------- yaserde_derive/src/ser/expand_enum.rs | 6 +++--- yaserde_derive/src/ser/expand_struct.rs | 6 +++--- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/yaserde_derive/src/de/expand_enum.rs b/yaserde_derive/src/de/expand_enum.rs index 466c0b6..585f153 100644 --- a/yaserde_derive/src/de/expand_enum.rs +++ b/yaserde_derive/src/de/expand_enum.rs @@ -127,7 +127,7 @@ pub fn parse( }) .filter(|x| x.is_some()) .map(|x| x.unwrap()) - .fold(TokenStream::empty(), |mut sum, val| { + .fold(TokenStream::new(), |mut sum, val| { sum.append_all(val); sum }); @@ -140,7 +140,7 @@ pub fn parse( }) .filter(|x| x.is_some()) .map(|x| x.unwrap()) - .fold(TokenStream::empty(), |mut sum, val| { + .fold(TokenStream::new(), |mut sum, val| { sum.append_all(val); sum }); @@ -168,7 +168,7 @@ pub fn parse( }) .filter(|x| x.is_some()) .map(|x| x.unwrap()) - .fold(TokenStream::empty(), |mut tokens, token| { + .fold(TokenStream::new(), |mut tokens, token| { tokens.append_all(token); tokens }); diff --git a/yaserde_derive/src/de/expand_struct.rs b/yaserde_derive/src/de/expand_struct.rs index 207a477..846ff17 100644 --- a/yaserde_derive/src/de/expand_struct.rs +++ b/yaserde_derive/src/de/expand_struct.rs @@ -33,7 +33,7 @@ pub fn parse( }) .filter(|x| x.is_some()) .map(|x| x.unwrap()) - .fold(TokenStream::empty(), |mut tokens, token| { + .fold(TokenStream::new(), |mut tokens, token| { tokens.append_all(token); tokens }); @@ -122,7 +122,7 @@ pub fn parse( }) .filter(|x| x.is_some()) .map(|x| x.unwrap()) - .fold(TokenStream::empty(), |mut sum, val| { + .fold(TokenStream::new(), |mut sum, val| { sum.append_all(val); sum }); @@ -299,7 +299,7 @@ pub fn parse( }) .filter(|x| x.is_some()) .map(|x| x.unwrap()) - .fold(TokenStream::empty(), |mut sum, val| { + .fold(TokenStream::new(), |mut sum, val| { sum.append_all(val); sum }); @@ -768,7 +768,7 @@ pub fn parse( }) .filter(|x| x.is_some()) .map(|x| x.unwrap()) - .fold(TokenStream::empty(), |mut sum, val| { + .fold(TokenStream::new(), |mut sum, val| { sum.append_all(val); sum }); @@ -989,7 +989,7 @@ pub fn parse( }) .filter(|x| x.is_some()) .map(|x| x.unwrap()) - .fold(TokenStream::empty(), |mut sum, val| { + .fold(TokenStream::new(), |mut sum, val| { sum.append_all(val); sum }); @@ -1069,7 +1069,7 @@ pub fn parse( }) .filter(|x| x.is_some()) .map(|x| x.unwrap()) - .fold(TokenStream::empty(), |mut tokens, token| { + .fold(TokenStream::new(), |mut tokens, token| { tokens.append_all(token); tokens }); @@ -1090,7 +1090,7 @@ pub fn parse( }) .filter(|x| x.is_some()) .map(|x| x.unwrap()) - .fold(TokenStream::empty(), |mut tokens, token| { + .fold(TokenStream::new(), |mut tokens, token| { tokens.append_all(token); tokens }); diff --git a/yaserde_derive/src/ser/expand_enum.rs b/yaserde_derive/src/ser/expand_enum.rs index 8cb369c..2b4c60f 100644 --- a/yaserde_derive/src/ser/expand_enum.rs +++ b/yaserde_derive/src/ser/expand_enum.rs @@ -116,7 +116,7 @@ pub fn serialize( }) .filter(|x| x.is_some()) .map(|x| x.unwrap()) - .fold(TokenStream::empty(), |mut tokens, token| { + .fold(TokenStream::new(), |mut tokens, token| { tokens.append_all(token); tokens }); @@ -138,7 +138,7 @@ pub fn serialize( }) .filter(|x| x.is_some()) .map(|x| x.unwrap()) - .fold(TokenStream::empty(), |mut tokens, token| { + .fold(TokenStream::new(), |mut tokens, token| { tokens.append_all(token); tokens }); @@ -152,7 +152,7 @@ pub fn serialize( }) .filter(|x| x.is_some()) .map(|x| x.unwrap()) - .fold(TokenStream::empty(), |mut tokens, token| { + .fold(TokenStream::new(), |mut tokens, token| { tokens.append_all(token); tokens }); diff --git a/yaserde_derive/src/ser/expand_struct.rs b/yaserde_derive/src/ser/expand_struct.rs index bdcc813..eaad87b 100644 --- a/yaserde_derive/src/ser/expand_struct.rs +++ b/yaserde_derive/src/ser/expand_struct.rs @@ -116,7 +116,7 @@ pub fn serialize( }) .filter(|x| x.is_some()) .map(|x| x.unwrap()) - .fold(TokenStream::empty(), |mut tokens, token| { + .fold(TokenStream::new(), |mut tokens, token| { tokens.append_all(token); tokens }); @@ -130,7 +130,7 @@ pub fn serialize( }) .filter(|x| x.is_some()) .map(|x| x.unwrap()) - .fold(TokenStream::empty(), |mut tokens, token| { + .fold(TokenStream::new(), |mut tokens, token| { tokens.append_all(token); tokens }); @@ -319,7 +319,7 @@ pub fn serialize( }) .filter(|x| x.is_some()) .map(|x| x.unwrap()) - .fold(TokenStream::empty(), |mut tokens, token| { + .fold(TokenStream::new(), |mut tokens, token| { tokens.append_all(token); tokens });