From: bors <bors@rust-lang.org>
Date: Wed, 19 Feb 2014 12:41:45 +0000 (-0800)
Subject: auto merge of #12370 : rcxdude/rust/macro_fix, r=alexcrichton
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=99f838012b58f869dff5292f83a9e9628a8ec436;p=rust.git

auto merge of #12370 : rcxdude/rust/macro_fix, r=alexcrichton

Closes #11692. Instead of returning the original expression, a dummy expression
(with identical span) is returned. This prevents infinite loops of failed
expansions as well as odd double error messages in certain situations.

This is a slightly better fix than #12197, because it does not produce a double error and also fixes a few other cases where an infinite loop could happen.

This does not fix the other issue in #11692 (non-builtin macros not being recognised when expanded inside macros), which I think should be moved into a separate issue.
---

99f838012b58f869dff5292f83a9e9628a8ec436