auto merge of #6982 : Aatch/rust/better-foreign-error, r=pcwalton

I encountered this. A straight fail is not useful and most people aren't going to happily spelunk in `parser.rs`
rust-lang · Jun 6, 2013 · d6b4fde · d6b4fde
2 parents 6a09b6f + 9c8d0e3
commit d6b4fde
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
@@ -4503,9 +4503,9 @@ impl Parser {
                     self.span_err(view_item.span,
                                   "`use` and `extern mod` declarations must precede items");
                 }
-                iovi_item(_) => {
+                iovi_item(item) => {
                     // FIXME #5668: this will occur for a macro invocation:
-                    fail!();
+                    self.span_fatal(item.span, "macros cannot expand to foreign items");
                 }
                 iovi_foreign_item(foreign_item) => {
                     foreign_items.push(foreign_item);