Skip to content

Work around invalid spans in imported FileMaps#23489

Merged
bors merged 2 commits into
rust-lang:masterfrom
michaelwoerister:span-artihmetic-overflow-bug
Mar 20, 2015
Merged

Work around invalid spans in imported FileMaps#23489
bors merged 2 commits into
rust-lang:masterfrom
michaelwoerister:span-artihmetic-overflow-bug

Conversation

@michaelwoerister

Copy link
Copy Markdown
Member

This should solve issues #23115, #23469, and #23407.

As the title says, this is just a workaround. The underlying problem is that macro expansion can produce invalid spans. I've opened issue #23480 so we don't forget about that.

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @nrc

(rust_highfive has picked a reviewer for you, use r? to override)

@alexcrichton

Copy link
Copy Markdown
Member

@bors: r+ 90b8b4d p=1

@alexcrichton

Copy link
Copy Markdown
Member

Nice!

@bors

bors commented Mar 18, 2015

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 90b8b4d with merge a8379a4...

@bors

bors commented Mar 19, 2015

Copy link
Copy Markdown
Collaborator

💔 Test failed - auto-mac-64-opt

@michaelwoerister

Copy link
Copy Markdown
Member Author

💔 indeed. I'll fix this when I come home after work today.

On March 19, 2015 1:17:12 AM CET, bors notifications@github.com wrote:

💔 Test failed -
auto-mac-64-opt


Reply to this email directly or view it on GitHub:
#23489 (comment)

Sent from my Android device with K-9 Mail. Please excuse my brevity.

@michaelwoerister michaelwoerister force-pushed the span-artihmetic-overflow-bug branch from 90b8b4d to 1ea971f Compare March 19, 2015 17:52
@michaelwoerister

Copy link
Copy Markdown
Member Author

@bors: r=alexcrichton 1ea971f p=1

@bors

bors commented Mar 19, 2015

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 1ea971f with merge f4e0ce6...

bors added a commit that referenced this pull request Mar 19, 2015
… r=alexcrichton

This should solve issues #23115, #23469, and #23407.

As the title says, this is just a workaround. The underlying problem is that macro expansion can produce invalid spans. I've opened issue #23480 so we don't forget about that.
Manishearth added a commit to Manishearth/rust that referenced this pull request Mar 20, 2015
…erflow-bug, r=alexcrichton

 This should solve issues rust-lang#23115, rust-lang#23469, and rust-lang#23407.

As the title says, this is just a workaround. The underlying problem is that macro expansion can produce invalid spans. I've opened issue rust-lang#23480 so we don't forget about that.
@bors

bors commented Mar 20, 2015

Copy link
Copy Markdown
Collaborator

@bors bors merged commit 1ea971f into rust-lang:master Mar 20, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants