From 4259fba7e6b87966099a2df04e75b678e26e0811 Mon Sep 17 00:00:00 2001
From: Jeffrey Seyfried <jeffrey.seyfried@gmail.com>
Date: Thu, 19 May 2016 11:31:41 +0000
Subject: [PATCH 1/3] Fix macro call site spans
---
src/libsyntax/ext/base.rs | 16 ----------------
src/libsyntax/ext/expand.rs | 8 +-------
2 files changed, 1 insertion(+), 23 deletions(-)
diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs
index 303187aeba8..57c7a3ddc2f 100644
--- a/src/libsyntax/ext/base.rs
+++ b/src/libsyntax/ext/base.rs
@@ -602,22 +602,6 @@ impl<'a> ExtCtxt<'a> {
}
pub fn backtrace(&self) -> ExpnId { self.backtrace }
- /// Original span that caused the current exapnsion to happen.
- pub fn original_span(&self) -> Span {
- let mut expn_id = self.backtrace;
- let mut call_site = None;
- loop {
- match self.codemap().with_expn_info(expn_id, |ei| ei.map(|ei| ei.call_site)) {
- None => break,
- Some(cs) => {
- call_site = Some(cs);
- expn_id = cs.expn_id;
- }
- }
- }
- call_site.expect("missing expansion backtrace")
- }
-
/// Returns span for the macro which originally caused the current expansion to happen.
///
/// Stops backtracing at include! boundary.
diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs
index c3202dbdbb4..3fd8f2d1e1c 100644
--- a/src/libsyntax/ext/expand.rs
+++ b/src/libsyntax/ext/expand.rs
@@ -237,14 +237,8 @@ fn expand_mac_invoc<T>(mac: ast::Mac, ident: Option<Ident>, attrs: Vec<ast::Attr
},
});
- // The span that we pass to the expanders we want to
- // be the root of the call stack. That's the most
- // relevant span and it's the actual invocation of
- // the macro.
- let mac_span = fld.cx.original_span();
-
let marked_tts = mark_tts(&tts[..], mark);
- Some(expandfun.expand(fld.cx, mac_span, &marked_tts))
+ Some(expandfun.expand(fld.cx, call_site, &marked_tts))
}
IdentTT(ref expander, tt_span, allow_internal_unstable) => {
From cc36e3827919ab08c6eb75ac12620b2269d35906 Mon Sep 17 00:00:00 2001
From: Jeffrey Seyfried <jeffrey.seyfried@gmail.com>
Date: Thu, 19 May 2016 22:28:14 +0000
Subject: [PATCH 2/3] Fix fallout in tests
---
src/test/compile-fail/bad-format-args.rs | 22 +++++++++++++++++++
src/test/compile-fail/ifmt-bad-arg.rs | 4 ----
.../compile-fail/macro-backtrace-println.rs | 8 +++----
.../compile-fail/macros-nonfatal-errors.rs | 1 -
src/test/compile-fail/trace_macros-gate.rs | 5 +++--
5 files changed, 29 insertions(+), 11 deletions(-)
create mode 100644 src/test/compile-fail/bad-format-args.rs
diff --git a/src/test/compile-fail/bad-format-args.rs b/src/test/compile-fail/bad-format-args.rs
new file mode 100644
index 00000000000..816c696a895
--- /dev/null
+++ b/src/test/compile-fail/bad-format-args.rs
@@ -0,0 +1,22 @@
+// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// error-pattern: requires at least a format string argument
+// error-pattern: bad-format-args.rs:19:5: 19:15 note: in this expansion
+
+// error-pattern: expected token: `,`
+// error-pattern: bad-format-args.rs:20:5: 20:19 note: in this expansion
+// error-pattern: bad-format-args.rs:21:5: 21:22 note: in this expansion
+
+fn main() {
+ format!();
+ format!("" 1);
+ format!("", 1 1);
+}
diff --git a/src/test/compile-fail/ifmt-bad-arg.rs b/src/test/compile-fail/ifmt-bad-arg.rs
index 7c929d2db16..1368702b160 100644
--- a/src/test/compile-fail/ifmt-bad-arg.rs
+++ b/src/test/compile-fail/ifmt-bad-arg.rs
@@ -50,8 +50,4 @@ fn main() {
format!("foo } bar"); //~ ERROR: unmatched `}` found
format!("foo }"); //~ ERROR: unmatched `}` found
-
- format!(); //~ ERROR: requires at least a format string argument
- format!("" 1); //~ ERROR: expected token: `,`
- format!("", 1 1); //~ ERROR: expected token: `,`
}
diff --git a/src/test/compile-fail/macro-backtrace-println.rs b/src/test/compile-fail/macro-backtrace-println.rs
index c2277c3e6d8..9d6da2a53a2 100644
--- a/src/test/compile-fail/macro-backtrace-println.rs
+++ b/src/test/compile-fail/macro-backtrace-println.rs
@@ -21,11 +21,11 @@ macro_rules! myprint {
}
macro_rules! myprintln {
- ($fmt:expr) => (myprint!(concat!($fmt, "\n"))); //~ NOTE in this expansion of myprint!
- //~^ NOTE in this expansion of concat!
+ ($fmt:expr) => (myprint!(concat!($fmt, "\n"))); //~ ERROR invalid reference to argument `0`
+ //~| NOTE in this expansion of concat!
+ //~| NOTE in this expansion of myprint!
}
fn main() {
- myprintln!("{}"); //~ ERROR invalid reference to argument `0`
- //~^ NOTE in this expansion of
+ myprintln!("{}"); //~ NOTE in this expansion of
}
diff --git a/src/test/compile-fail/macros-nonfatal-errors.rs b/src/test/compile-fail/macros-nonfatal-errors.rs
index 42a0f41dd97..723e936212a 100644
--- a/src/test/compile-fail/macros-nonfatal-errors.rs
+++ b/src/test/compile-fail/macros-nonfatal-errors.rs
@@ -32,7 +32,6 @@ fn main() {
foo::blah!(); //~ ERROR
- format!(); //~ ERROR
format!(invalid); //~ ERROR
include!(invalid); //~ ERROR
diff --git a/src/test/compile-fail/trace_macros-gate.rs b/src/test/compile-fail/trace_macros-gate.rs
index d627de24d67..e9b7ddf6d1c 100644
--- a/src/test/compile-fail/trace_macros-gate.rs
+++ b/src/test/compile-fail/trace_macros-gate.rs
@@ -23,8 +23,9 @@ fn main() {
// of the below being caught.
macro_rules! expando {
- ($x: ident) => { trace_macros!($x) }
+ ($x: ident) => { trace_macros!($x) } //~ ERROR `trace_macros` is not stable
}
- expando!(true); //~ ERROR `trace_macros` is not stable
+ expando!(true); //~ NOTE in this expansion
+ //~^ NOTE in this expansion
}
From 2477341d057aff05a8a009a7eb7a1168ccd4e277 Mon Sep 17 00:00:00 2001
From: Jeffrey Seyfried <jeffrey.seyfried@gmail.com>
Date: Sat, 28 May 2016 01:30:08 -0700
Subject: [PATCH 3/3] Replace `println!("");` invocations with calls to a dummy
function in debuginfo test
---
src/test/debuginfo/function-arg-initialization.rs | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/test/debuginfo/function-arg-initialization.rs b/src/test/debuginfo/function-arg-initialization.rs
index d007b507556..add09384094 100644
--- a/src/test/debuginfo/function-arg-initialization.rs
+++ b/src/test/debuginfo/function-arg-initialization.rs
@@ -228,7 +228,7 @@
#![omit_gdb_pretty_printer_section]
fn immediate_args(a: isize, b: bool, c: f64) {
- println!("") // #break
+ zzz(); // #break
}
struct BigStruct {
@@ -243,7 +243,7 @@ struct BigStruct {
}
fn non_immediate_args(a: BigStruct, b: BigStruct) {
- println!("") // #break
+ zzz(); // #break
}
fn binding(a: i64, b: u64, c: f64) {
@@ -257,7 +257,7 @@ fn assignment(mut a: u64, b: u64, c: f64) {
}
fn function_call(x: u64, y: u64, z: f64) {
- println!("Hi!") // #break
+ zzz(); // #break
}
fn identifier(x: u64, y: u64, z: f64) -> u64 {
@@ -333,3 +333,5 @@ fn main() {
while_expr(40, 41, 42);
loop_expr(43, 44, 45);
}
+
+fn zzz() {()}