From f6eaaf350ea683ae8b33b4a79422ad1a10ea0987 Mon Sep 17 00:00:00 2001 From: Jeffrey Seyfried Date: Tue, 21 Feb 2017 05:05:59 +0000 Subject: Integrate `TokenStream`. --- src/libproc_macro/lib.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/libproc_macro') diff --git a/src/libproc_macro/lib.rs b/src/libproc_macro/lib.rs index 0516e111be3..8d7fe655c23 100644 --- a/src/libproc_macro/lib.rs +++ b/src/libproc_macro/lib.rs @@ -101,7 +101,7 @@ pub mod __internal { pub fn token_stream_parse_items(stream: TokenStream) -> Result>, LexError> { with_parse_sess(move |sess| { - let mut parser = parse::new_parser_from_ts(sess, stream.inner); + let mut parser = parse::stream_to_parser(sess, stream.inner); let mut items = Vec::new(); while let Some(item) = try!(parser.parse_item().map_err(super::parse_to_lex_err)) { @@ -177,9 +177,8 @@ impl FromStr for TokenStream { __internal::with_parse_sess(|sess| { let src = src.to_string(); let name = "".to_string(); - let tts = parse::parse_tts_from_source_str(name, src, sess); - - Ok(__internal::token_stream_wrap(tts.into_iter().collect())) + let stream = parse::parse_stream_from_source_str(name, src, sess); + Ok(__internal::token_stream_wrap(stream)) }) } } -- cgit 1.4.1-3-g733a5