bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

unify error handling to single method

Browse source
This commit is contained in:
Esteban Küber 2019-02-05 01:35:25 -08:00
parent 7451cd8dc0
commit 99be87aac3
5 changed files with 32 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libsyntax_ext/proc_macro_server.rs
View file

@ -11,6 +11,7 @@ use syntax::ast;
use syntax::ext::base::ExtCtxt;
use syntax::parse::lexer::comments;
use syntax::parse::{self, token, ParseSess};
use syntax::parse::parser::emit_unclosed_delims;
use syntax::tokenstream::{self, DelimSpan, IsJoint::*, TokenStream, TreeAndJoint};
use syntax_pos::hygiene::{SyntaxContext, Transparency};
use syntax_pos::symbol::{keywords, Symbol};
@ -408,12 +409,14 @@ impl server::TokenStream for Rustc<'_> {
stream.is_empty()
}
fn from_str(&mut self, src: &str) -> Self::TokenStream {
parse::parse_stream_from_source_str(
let (tokens, errors) = parse::parse_stream_from_source_str(
FileName::proc_macro_source_code(src.clone()),
src.to_string(),
self.sess,
Some(self.call_site),
).0
);
emit_unclosed_delims(&errors, &self.sess.span_diagnostic);
tokens
}
fn to_string(&mut self, stream: &Self::TokenStream) -> String {
stream.to_string()