bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

proc_macro: Update Span::def_site to use the proc macro definition location

Browse source 
Which is no longer dummy and is available from metadata now.
This commit is contained in:
Vadim Petrochenkov 2019-08-20 23:35:03 +03:00
parent 2065ee9acc
commit c476b55e52
6 changed files with 143 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libsyntax/ext/proc_macro_server.rs
View file

@ -360,12 +360,11 @@ pub(crate) struct Rustc<'a> {
impl<'a> Rustc<'a> {
pub fn new(cx: &'a ExtCtxt<'_>) -> Self {
// No way to determine def location for a proc macro right now, so use call location.
let location = cx.current_expansion.id.expn_data().call_site;
let expn_data = cx.current_expansion.id.expn_data();
Rustc {
sess: cx.parse_sess,
def_site: cx.with_def_site_ctxt(location),
call_site: cx.with_call_site_ctxt(location),
def_site: cx.with_def_site_ctxt(expn_data.def_site),
call_site: cx.with_call_site_ctxt(expn_data.call_site),
}
}

9
src/libsyntax/parse/parser.rs
View file

@ -375,10 +375,11 @@ impl<'a> Parser<'a> {
if let Some(directory) = directory {
parser.directory = directory;
} else if !parser.token.span.is_dummy() {
if let FileName::Real(mut path) =
sess.source_map().span_to_unmapped_path(parser.token.span) {
path.pop();
parser.directory.path = Cow::from(path);
if let Some(FileName::Real(path)) =
&sess.source_map().lookup_char_pos(parser.token.span.lo()).file.unmapped_path {
if let Some(directory_path) = path.parent() {
parser.directory.path = Cow::from(directory_path.to_path_buf());
}
}
}

20
src/test/ui/macros/auxiliary/proc_macro_sequence.rs
View file

@ -6,7 +6,7 @@
extern crate proc_macro;
use proc_macro::{quote, Span, TokenStream};
use proc_macro::{quote, Span, TokenStream, TokenTree};
fn assert_same_span(a: Span, b: Span) {
assert_eq!(a.start(), b.start());
@ -24,12 +24,22 @@ pub fn make_foo(_: TokenStream) -> TokenStream {
};
// Check that all spans are equal.
let mut span = None;
// FIXME: `quote!` gives def-site spans to idents and literals,
// but leaves (default) call-site spans on groups and punctuation.
let mut span_call = None;
let mut span_def = None;
for tt in result.clone() {
match span {
None => span = Some(tt.span()),
Some(span) => assert_same_span(tt.span(), span),
match tt {
TokenTree::Ident(..) | TokenTree::Literal(..) => match span_def {
None => span_def = Some(tt.span()),
Some(span) => assert_same_span(tt.span(), span),
}
TokenTree::Punct(..) | TokenTree::Group(..) => match span_call {
None => span_call = Some(tt.span()),
Some(span) => assert_same_span(tt.span(), span),
}
}
}
result

12
src/test/ui/macros/same-sequence-span.stderr
View file

@ -17,11 +17,15 @@ LL | $(= $z:tt)*
error: `$x:expr` may be followed by `$y:tt`, which is not allowed for `expr` fragments
--> $DIR/same-sequence-span.rs:20:1
|
LL | proc_macro_sequence::make_foo!();
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
LL | proc_macro_sequence::make_foo!();
| ^--------------------------------
| |
| _in this macro invocation
| |
| not allowed after `expr` fragments
| in this macro invocation
LL | |
LL | |
LL | | fn main() {}
... |
|
= note: allowed there are: `=>`, `,` or `;`

119
src/test/ui/proc-macro/multispan.stderr
View file

@ -1,8 +1,19 @@
error: hello to you, too!
--> $DIR/multispan.rs:14:5
--> $DIR/auxiliary/multispan.rs:31:1
|
LL | hello!(hi);
| ^^^^^^^^^^^ in this macro invocation
LL | / pub fn hello(input: TokenStream) -> TokenStream {
LL | | if let Err(diag) = parse(input) {
LL | | diag.emit();
LL | | }
LL | |
LL | | TokenStream::new()
LL | | }
| |_^
|
::: $DIR/multispan.rs:14:5
|
LL | hello!(hi);
| ----------- in this macro invocation
|
note: found these 'hi's
--> $DIR/multispan.rs:14:12
@ -11,10 +22,21 @@ LL | hello!(hi);
| ^^
error: hello to you, too!
--> $DIR/multispan.rs:17:5
--> $DIR/auxiliary/multispan.rs:31:1
|
LL | hello!(hi hi);
| ^^^^^^^^^^^^^^ in this macro invocation
LL | / pub fn hello(input: TokenStream) -> TokenStream {
LL | | if let Err(diag) = parse(input) {
LL | | diag.emit();
LL | | }
LL | |
LL | | TokenStream::new()
LL | | }
| |_^
|
::: $DIR/multispan.rs:17:5
|
LL | hello!(hi hi);
| -------------- in this macro invocation
|
note: found these 'hi's
--> $DIR/multispan.rs:17:12
@ -23,10 +45,21 @@ LL | hello!(hi hi);
| ^^ ^^
error: hello to you, too!
--> $DIR/multispan.rs:20:5
--> $DIR/auxiliary/multispan.rs:31:1
|
LL | hello!(hi hi hi);
| ^^^^^^^^^^^^^^^^^ in this macro invocation
LL | / pub fn hello(input: TokenStream) -> TokenStream {
LL | | if let Err(diag) = parse(input) {
LL | | diag.emit();
LL | | }
LL | |
LL | | TokenStream::new()
LL | | }
| |_^
|
::: $DIR/multispan.rs:20:5
|
LL | hello!(hi hi hi);
| ----------------- in this macro invocation
|
note: found these 'hi's
--> $DIR/multispan.rs:20:12
@ -35,10 +68,21 @@ LL | hello!(hi hi hi);
| ^^ ^^ ^^
error: hello to you, too!
--> $DIR/multispan.rs:23:5
--> $DIR/auxiliary/multispan.rs:31:1
|
LL | hello!(hi hey hi yo hi beep beep hi hi);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ in this macro invocation
LL | / pub fn hello(input: TokenStream) -> TokenStream {
LL | | if let Err(diag) = parse(input) {
LL | | diag.emit();
LL | | }
LL | |
LL | | TokenStream::new()
LL | | }
| |_^
|
::: $DIR/multispan.rs:23:5
|
LL | hello!(hi hey hi yo hi beep beep hi hi);
| ---------------------------------------- in this macro invocation
|
note: found these 'hi's
--> $DIR/multispan.rs:23:12
@ -47,10 +91,21 @@ LL | hello!(hi hey hi yo hi beep beep hi hi);
| ^^ ^^ ^^ ^^ ^^
error: hello to you, too!
--> $DIR/multispan.rs:24:5
--> $DIR/auxiliary/multispan.rs:31:1
|
LL | hello!(hi there, hi how are you? hi... hi.);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ in this macro invocation
LL | / pub fn hello(input: TokenStream) -> TokenStream {
LL | | if let Err(diag) = parse(input) {
LL | | diag.emit();
LL | | }
LL | |
LL | | TokenStream::new()
LL | | }
| |_^
|
::: $DIR/multispan.rs:24:5
|
LL | hello!(hi there, hi how are you? hi... hi.);
| -------------------------------------------- in this macro invocation
|
note: found these 'hi's
--> $DIR/multispan.rs:24:12
@ -59,10 +114,21 @@ LL | hello!(hi there, hi how are you? hi... hi.);
| ^^ ^^ ^^ ^^
error: hello to you, too!
--> $DIR/multispan.rs:25:5
--> $DIR/auxiliary/multispan.rs:31:1
|
LL | hello!(whoah. hi di hi di ho);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ in this macro invocation
LL | / pub fn hello(input: TokenStream) -> TokenStream {
LL | | if let Err(diag) = parse(input) {
LL | | diag.emit();
LL | | }
LL | |
LL | | TokenStream::new()
LL | | }
| |_^
|
::: $DIR/multispan.rs:25:5
|
LL | hello!(whoah. hi di hi di ho);
| ------------------------------ in this macro invocation
|
note: found these 'hi's
--> $DIR/multispan.rs:25:19
@ -71,10 +137,21 @@ LL | hello!(whoah. hi di hi di ho);
| ^^ ^^
error: hello to you, too!
--> $DIR/multispan.rs:26:5
--> $DIR/auxiliary/multispan.rs:31:1
|
LL | hello!(hi good hi and good bye);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ in this macro invocation
LL | / pub fn hello(input: TokenStream) -> TokenStream {
LL | | if let Err(diag) = parse(input) {
LL | | diag.emit();
LL | | }
LL | |
LL | | TokenStream::new()
LL | | }
| |_^
|
::: $DIR/multispan.rs:26:5
|
LL | hello!(hi good hi and good bye);
| -------------------------------- in this macro invocation
|
note: found these 'hi's
--> $DIR/multispan.rs:26:12

17
src/test/ui/proc-macro/three-equals.stderr
View file

@ -1,8 +1,19 @@
error: found 2 equal signs, need exactly 3
--> $DIR/three-equals.rs:15:5
--> $DIR/auxiliary/three-equals.rs:42:1
|
LL | three_equals!(==);
| ^^^^^^^^^^^^^^^^^^ in this macro invocation
LL | / pub fn three_equals(input: TokenStream) -> TokenStream {
LL | | if let Err(diag) = parse(input) {
LL | | diag.emit();
LL | | return TokenStream::new();
... |
LL | | "3".parse().unwrap()
LL | | }
| |_^
|
::: $DIR/three-equals.rs:15:5
|
LL | three_equals!(==);
| ------------------ in this macro invocation
|
= help: input must be: `===`