macros: improve `Span`'s expansion information #40597

jseyfried · 2017-03-17T09:41:24Z

This PR improves Span's expansion information. More specifically:

It refactors AST node span construction to preserve expansion information.
- Today, we only use the underlying tokens' BytePoss, throwing away the ExpnIds.
- This improves the accuracy of AST nodes' expansion information, fixing If an error is not affected by a macro, don't print macro notes #30506.
It refactors span.expn_id: ExpnId to span.ctxt: SyntaxContext and removes ExpnId.
- This gives all tokens as much hygiene information as Idents.
- This is groundwork for procedural macros 2.0 TokenStream API.
- This is also groundwork for declarative macros 2.0, which will need this hygiene information for some non-Ident tokens.
It simplifies processing of spans' expansion information throughout the compiler.
It fixes macros: The line number that panic! reports can be wrong in macro invocations #40649.
It fixes Spans for Paths can be incorrect #39450 and fixes part of Macro expansion often produces invalid Span values #23480.

jseyfried · 2017-03-17T10:46:35Z

jseyfried · 2017-03-19T10:52:48Z

src/test/run-pass/syntax-extension-source-utils.rs

@@ -22,7 +22,7 @@ macro_rules! indirect_line { () => ( line!() ) }

 pub fn main() {
    assert_eq!(line!(), 24);
-    assert_eq!(column!(), 4);
+    assert_eq!(column!(), 15);


c.f. #40649; technically a [breaking-change]

bors · 2017-03-19T14:01:22Z

☔ The latest upstream changes (presumably #40346) made this pull request unmergeable. Please resolve the merge conflicts.

bors · 2017-03-21T19:37:28Z

☔ The latest upstream changes (presumably #40693) made this pull request unmergeable. Please resolve the merge conflicts.

bors · 2017-03-22T04:39:18Z

☔ The latest upstream changes (presumably #40043) made this pull request unmergeable. Please resolve the merge conflicts.

bors · 2017-03-23T06:34:05Z

☔ The latest upstream changes (presumably #40752) made this pull request unmergeable. Please resolve the merge conflicts.

nrc

r=me, assuming losing the command line span thing is fine.

This seems a good step in the right direction. I worry a bit that to is still too easy to create malformed spans, but it is def. better than mk_sp.

nrc · 2017-03-24T04:45:23Z

src/libsyntax_pos/lib.rs

-// Generic span to be used for code originating from the command line
-pub const COMMAND_LINE_SP: Span = Span { lo: BytePos(0),
-                                         hi: BytePos(0),
-                                         expn_id: COMMAND_LINE_EXPN };


What do we do now for code from the command line?

Same as before -- DUMMY_SP. The only place COMMAND_LINE_SP was used was here, which only happens when naming a legacy plugin crate through a debugging command line option.

jseyfried · 2017-03-25T02:16:36Z

@bors r=nrc

bors · 2017-03-25T02:16:37Z

📌 Commit 8c49446 has been approved by nrc

jseyfried · 2017-03-30T02:31:57Z

@bors r=nrc

bors · 2017-03-30T02:31:58Z

📌 Commit 8ba347e has been approved by nrc

bors · 2017-03-30T04:34:22Z

⌛ Testing commit 8ba347e with merge 2731d4d...

bors · 2017-03-30T05:25:41Z

💔 Test failed - status-appveyor

bors · 2017-03-30T06:48:58Z

⌛ Testing commit 8fde04b with merge fe15119...

@nrc

macros: improve `Span`'s expansion information This PR improves `Span`'s expansion information. More specifically: - It refactors AST node span construction to preserve expansion information. - Today, we only use the underlying tokens' `BytePos`s, throwing away the `ExpnId`s. - This improves the accuracy of AST nodes' expansion information, fixing #30506. - It refactors `span.expn_id: ExpnId` to `span.ctxt: SyntaxContext` and removes `ExpnId`. - This gives all tokens as much hygiene information as `Ident`s. - This is groundwork for procedural macros 2.0 `TokenStream` API. - This is also groundwork for declarative macros 2.0, which will need this hygiene information for some non-`Ident` tokens. - It simplifies processing of spans' expansion information throughout the compiler. - It fixes #40649. - It fixes #39450 and fixes part of #23480. r? @nrc

jseyfried · 2017-03-30T06:49:19Z

@bors r=nrc

bors · 2017-03-30T06:49:20Z

📌 Commit 8fde04b has been approved by nrc

bors · 2017-03-30T09:25:01Z

☀️ Test successful - status-appveyor, status-travis
Approved by: jseyfried
Pushing fe15119 to master...

SergioBenitez · 2017-03-31T06:44:37Z

I'm seeing the following, which may be related to this:

warning: {warning message from a syntax extension}
--> /a/nice/big/file/path/here.rs:10:21
 |
 | and so on...
 |
 = note: this error originates in a macro outside of the current crate

The issue is that the "note:` refers to the warning as an "error". It should say: "this warning originates from a macro outside of the current crate".

jseyfried · 2017-03-31T07:09:17Z

@sergio This should be fixed by #40939 (as discussed on IRC).

rust-highfive assigned nrc Mar 17, 2017

jseyfried force-pushed the improve_span_expn_info branch 2 times, most recently from 0d99228 to c8a8919 Compare March 17, 2017 10:32

This was referenced Mar 17, 2017

Tracking issue for RFC 1566: Procedural macros #38356

Closed

Tracking issue: declarative macros 2.0 #39412

Open

jseyfried force-pushed the improve_span_expn_info branch 9 times, most recently from 01a7ef2 to dba83c6 Compare March 19, 2017 07:54

jseyfried mentioned this pull request Mar 19, 2017

macros: The line number that panic! reports can be wrong in macro invocations #40649

Closed

jseyfried commented Mar 19, 2017

View reviewed changes

jseyfried force-pushed the improve_span_expn_info branch 2 times, most recently from e7e0177 to 72a3d9e Compare March 20, 2017 04:29

jseyfried force-pushed the improve_span_expn_info branch from 72a3d9e to 061faa7 Compare March 21, 2017 21:50

jseyfried force-pushed the improve_span_expn_info branch from 061faa7 to a30cfc0 Compare March 22, 2017 05:06

nrc approved these changes Mar 24, 2017

View reviewed changes

jseyfried force-pushed the improve_span_expn_info branch 2 times, most recently from 81adb79 to 8c49446 Compare March 25, 2017 01:51

jseyfried force-pushed the improve_span_expn_info branch 5 times, most recently from 3618a0b to 8ba347e Compare March 30, 2017 01:17

jseyfried force-pushed the improve_span_expn_info branch from 8ba347e to cfad0fe Compare March 30, 2017 05:41

Improve Path spans.

8fde04b

jseyfried force-pushed the improve_span_expn_info branch from cfad0fe to 8fde04b Compare March 30, 2017 06:48

bors merged commit 8fde04b into rust-lang:master Mar 30, 2017

This was referenced Mar 30, 2017

Minimize single span suggestions into a label #40851

Merged

Introduce HashStable trait and base ICH implementations on it. #40878

Merged

Convert MIR BasicBlocks to ExtendedBasicBlocks #40700

Closed

jseyfried deleted the improve_span_expn_info branch March 30, 2017 09:45

jseyfried mentioned this pull request Mar 30, 2017

If an error is not affected by a macro, don't print macro notes #30506

Closed

This was referenced May 8, 2017

ICE regression: "missing expansion backtrace" #41776

Closed

Rust 1.18 regression, rustasm6502 0.1.2, no rules expected token 'main' #41803

Closed

dwrensha mentioned this pull request May 16, 2017

update for latest nightly rustc serde-deprecated/aster#134

Closed

Mark-Simulacrum mentioned this pull request May 25, 2017

macro fragment names are no longer idents #42019

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

macros: improve `Span`'s expansion information #40597

macros: improve `Span`'s expansion information #40597

jseyfried commented Mar 17, 2017 •

edited

Loading

jseyfried commented Mar 17, 2017

jseyfried Mar 19, 2017

bors commented Mar 19, 2017

bors commented Mar 21, 2017

bors commented Mar 22, 2017

bors commented Mar 23, 2017

nrc left a comment

nrc Mar 24, 2017

jseyfried Mar 24, 2017 •

edited

Loading

jseyfried commented Mar 25, 2017

bors commented Mar 25, 2017

jseyfried commented Mar 30, 2017

bors commented Mar 30, 2017

bors commented Mar 30, 2017

bors commented Mar 30, 2017

bors commented Mar 30, 2017

jseyfried commented Mar 30, 2017

bors commented Mar 30, 2017

bors commented Mar 30, 2017

SergioBenitez commented Mar 31, 2017

jseyfried commented Mar 31, 2017

macros: improve Span's expansion information #40597

macros: improve Span's expansion information #40597

Conversation

jseyfried commented Mar 17, 2017 • edited Loading

jseyfried commented Mar 17, 2017

jseyfried Mar 19, 2017

Choose a reason for hiding this comment

bors commented Mar 19, 2017

bors commented Mar 21, 2017

bors commented Mar 22, 2017

bors commented Mar 23, 2017

nrc left a comment

Choose a reason for hiding this comment

nrc Mar 24, 2017

Choose a reason for hiding this comment

jseyfried Mar 24, 2017 • edited Loading

Choose a reason for hiding this comment

jseyfried commented Mar 25, 2017

bors commented Mar 25, 2017

jseyfried commented Mar 30, 2017

bors commented Mar 30, 2017

bors commented Mar 30, 2017

bors commented Mar 30, 2017

bors commented Mar 30, 2017

jseyfried commented Mar 30, 2017

bors commented Mar 30, 2017

bors commented Mar 30, 2017

SergioBenitez commented Mar 31, 2017

jseyfried commented Mar 31, 2017

macros: improve `Span`'s expansion information #40597

macros: improve `Span`'s expansion information #40597

jseyfried commented Mar 17, 2017 •

edited

Loading

jseyfried Mar 24, 2017 •

edited

Loading