Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Better trace-macro and less span_err_fatal
  • Loading branch information
bjorn3 committed Sep 2, 2017
1 parent 8bb7dba commit 8b71e0b
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 41 deletions.
4 changes: 3 additions & 1 deletion src/libsyntax/ext/base.rs
Expand Up @@ -792,14 +792,16 @@ impl<'a> ExtCtxt<'a> {
pub fn span_bug(&self, sp: Span, msg: &str) -> ! {
self.parse_sess.span_diagnostic.span_bug(sp, msg);
}
pub fn trace_macros_diag(&self) {
pub fn trace_macros_diag(&mut self) {
for (sp, notes) in self.expansions.iter() {
let mut db = self.parse_sess.span_diagnostic.span_note_diag(*sp, "trace_macro");
for note in notes {
db.note(note);
}
db.emit();
}
// Fixme: does this result in errors?
self.expansions.clear();
}
pub fn bug(&self, msg: &str) -> ! {
self.parse_sess.span_diagnostic.bug(msg);
Expand Down
3 changes: 2 additions & 1 deletion src/libsyntax/ext/expand.rs
Expand Up @@ -384,7 +384,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
if self.cx.current_expansion.depth > self.cx.ecfg.recursion_limit {
let info = self.cx.current_expansion.mark.expn_info().unwrap();
let suggested_limit = self.cx.ecfg.recursion_limit * 2;
let mut err = self.cx.struct_span_fatal(info.call_site,
let mut err = self.cx.struct_span_err(info.call_site,
&format!("recursion limit reached while expanding the macro `{}`",
info.callee.name()));
err.help(&format!(
Expand Down Expand Up @@ -640,6 +640,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
Ok(expansion) => expansion,
Err(mut err) => {
err.emit();
self.cx.trace_macros_diag();
return kind.dummy(span);
}
};
Expand Down
12 changes: 6 additions & 6 deletions src/test/ui/macros/trace_faulty_macros.rs
Expand Up @@ -18,13 +18,13 @@ macro_rules! my_faulty_macro {
};
}

macro_rules! nested_pat_macro {
macro_rules! pat_macro {
() => {
nested_pat_macro!(inner);
pat_macro!(A{a:a, b:0, c:_, ..});
};
($a:pat) => {
$a
};
(inner) => {
a | b | 1 ... 3 | _
}
}

macro_rules! my_recursive_macro {
Expand All @@ -41,11 +41,11 @@ macro_rules! my_macro {

fn main() {
my_faulty_macro!();
nested_pat_macro!();
my_recursive_macro!();
test!();
non_exisiting!();
derive!(Debug);
let a = pat_macro!();
}

#[my_macro]
Expand Down
37 changes: 4 additions & 33 deletions src/test/ui/macros/trace_faulty_macros.stderr
Expand Up @@ -17,30 +17,21 @@ note: trace_macro
= note: to `my_faulty_macro ! ( bcd ) ;`
= note: expanding `my_faulty_macro! { bcd }`

error: expected expression, found `_`
--> $DIR/trace_faulty_macros.rs:26:27
|
26 | a | b | 1 ... 3 | _
| ^
...
44 | nested_pat_macro!();
| -------------------- in this macro invocation

error: recursion limit reached while expanding the macro `my_recursive_macro`
--> $DIR/trace_faulty_macros.rs:32:9
|
32 | my_recursive_macro!();
| ^^^^^^^^^^^^^^^^^^^^^^
...
45 | my_recursive_macro!();
44 | my_recursive_macro!();
| ---------------------- in this macro invocation
|
= help: consider adding a `#![recursion_limit="8"]` attribute to your crate

note: trace_macro
--> $DIR/trace_faulty_macros.rs:45:5
--> $DIR/trace_faulty_macros.rs:44:5
|
45 | my_recursive_macro!();
44 | my_recursive_macro!();
| ^^^^^^^^^^^^^^^^^^^^^^
|
= note: expanding `my_recursive_macro! { }`
Expand All @@ -54,24 +45,4 @@ note: trace_macro
= note: expanding `my_recursive_macro! { }`
= note: to `my_recursive_macro ! ( ) ;`

note: trace_macro
--> $DIR/trace_faulty_macros.rs:43:5
|
43 | my_faulty_macro!();
| ^^^^^^^^^^^^^^^^^^^
|
= note: expanding `my_faulty_macro! { }`
= note: to `my_faulty_macro ! ( bcd ) ;`
= note: expanding `my_faulty_macro! { bcd }`

note: trace_macro
--> $DIR/trace_faulty_macros.rs:44:5
|
44 | nested_pat_macro!();
| ^^^^^^^^^^^^^^^^^^^^
|
= note: expanding `nested_pat_macro! { }`
= note: to `nested_pat_macro ! ( inner ) ;`
= note: expanding `nested_pat_macro! { inner }`
= note: to `a | b | 1 ... 3 | _`


0 comments on commit 8b71e0b

Please sign in to comment.