diff options
| author | bors <bors@rust-lang.org> | 2015-11-24 06:58:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-11-24 06:58:25 +0000 |
| commit | 561d0884e5563569e6e5c6b9a72b7b7d0bd44302 (patch) | |
| tree | 5515e586a56ff7fa5fc694c62bf16156bbac2e9d /src/libsyntax | |
| parent | 92f96b2445db675e343b8e795faecacdee0d29cc (diff) | |
| parent | 7fbcb51589a9d10a2b3ec227611b31b7384b5370 (diff) | |
| download | rust-561d0884e5563569e6e5c6b9a72b7b7d0bd44302.tar.gz rust-561d0884e5563569e6e5c6b9a72b7b7d0bd44302.zip | |
Auto merge of #30000 - Manishearth:unreachable-call, r=nrc
Fixes #1889
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ext/base.rs | 4 | ||||
| -rw-r--r-- | src/libsyntax/ext/tt/macro_rules.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs index c8db3853cc2..55f0fa5675a 100644 --- a/src/libsyntax/ext/base.rs +++ b/src/libsyntax/ext/base.rs @@ -678,9 +678,9 @@ impl<'a> ExtCtxt<'a> { pub fn bt_push(&mut self, ei: ExpnInfo) { self.recursion_count += 1; if self.recursion_count > self.ecfg.recursion_limit { - panic!(self.span_fatal(ei.call_site, + self.span_fatal(ei.call_site, &format!("recursion limit reached while expanding the macro `{}`", - ei.callee.name()))); + ei.callee.name())); } let mut call_site = ei.call_site; diff --git a/src/libsyntax/ext/tt/macro_rules.rs b/src/libsyntax/ext/tt/macro_rules.rs index 43647ea4a2e..23d6b794a72 100644 --- a/src/libsyntax/ext/tt/macro_rules.rs +++ b/src/libsyntax/ext/tt/macro_rules.rs @@ -209,12 +209,12 @@ fn generic_extension<'cx>(cx: &'cx ExtCtxt, best_fail_msg = (*msg).clone(); }, Error(err_sp, ref msg) => { - panic!(cx.span_fatal(err_sp.substitute_dummy(sp), &msg[..])) + cx.span_fatal(err_sp.substitute_dummy(sp), &msg[..]) } } } - panic!(cx.span_fatal(best_fail_spot.substitute_dummy(sp), &best_fail_msg[..])); + cx.span_fatal(best_fail_spot.substitute_dummy(sp), &best_fail_msg[..]); } // Note that macro-by-example's input is also matched against a token tree: |