mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix proc_macro output with struct parse error

Browse Source
This commit is contained in:
Esteban Küber 2017-11-25 08:48:11 -08:00
parent 0e241d0059
commit cf9283ea93
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libsyntax_ext/deriving/custom.rs
View File

@ -96,12 +96,18 @@ impl MultiItemModifier for ProcMacroDerive {
} }
}; };
let error_count_before = ecx.parse_sess.span_diagnostic.err_count();
__internal::set_sess(ecx, || { __internal::set_sess(ecx, || {
let msg = "proc-macro derive produced unparseable tokens";
match __internal::token_stream_parse_items(stream) { match __internal::token_stream_parse_items(stream) {
// fail if there have been errors emitted
Ok(_) if ecx.parse_sess.span_diagnostic.err_count() > error_count_before => {
ecx.struct_span_fatal(span, msg).emit();
panic!(FatalError);
}
Ok(new_items) => new_items.into_iter().map(Annotatable::Item).collect(), Ok(new_items) => new_items.into_iter().map(Annotatable::Item).collect(),
Err(_) => { Err(_) => {
// FIXME: handle this better // FIXME: handle this better
let msg = "proc-macro derive produced unparseable tokens";
ecx.struct_span_fatal(span, msg).emit(); ecx.struct_span_fatal(span, msg).emit();
panic!(FatalError); panic!(FatalError);
} }

3
src/test/compile-fail-fulldeps/proc-macro/derive-bad.rs
View File

@ -17,7 +17,8 @@ extern crate derive_bad;
#[derive( #[derive(
A A
)] )]
//~^^ ERROR: proc-macro derive produced unparseable tokens //~^^ ERROR proc-macro derive produced unparseable tokens
//~| ERROR expected `:`, found `}`
struct A; struct A;
fn main() {} fn main() {}