Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add test for "malformed macro lhs" and change back span_bug to span_fatal #30708

Merged
merged 1 commit into from
Jan 5, 2016
Merged

Add test for "malformed macro lhs" and change back span_bug to span_fatal #30708

merged 1 commit into from
Jan 5, 2016

Conversation

GuillaumeGomez
Copy link
Member

Part of #30669

@rust-highfive
Copy link
Collaborator

r? @brson

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

@sanxiyn
Copy link
Member

sanxiyn commented Jan 5, 2016

The intention in #29828 was that macro validity is checked in compile, so invalid macro never gets to generic_extension. This also has an advantage of providing better span. That's why span_bug was used.

Alas, it seems I missed some cases and caused regression. I think this is a good fix in the meantime.

@sanxiyn
Copy link
Member

sanxiyn commented Jan 5, 2016

@bors r+

@bors
Copy link
Contributor

bors commented Jan 5, 2016

📌 Commit 6e68cdf has been approved by sanxiyn

@bors
Copy link
Contributor

bors commented Jan 5, 2016

⌛ Testing commit 6e68cdf with merge dbacacd...

bors added a commit that referenced this pull request Jan 5, 2016
@bors
Auto merge of #30708 - GuillaumeGomez:malformed_macro, r=sanxiyn
dbacacd 
Part of #30669
@bors
Copy link
Contributor

bors commented Jan 5, 2016

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-opt

@bors bors merged commit 6e68cdf into rust-lang:master Jan 5, 2016
@GuillaumeGomez GuillaumeGomez deleted the malformed_macro branch January 5, 2016 07:43
@brson brson added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 8, 2016
@brson
Copy link
Contributor

brson commented Jan 8, 2016

Backport to fix #30669

@nikomatsakis nikomatsakis added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jan 12, 2016
@brson brson mentioned this pull request Jan 12, 2016
Merged
@alexcrichton alexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 12, 2016
@nikomatsakis nikomatsakis mentioned this pull request Feb 4, 2016
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@brson brson

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@GuillaumeGomez @rust-highfive @sanxiyn @bors @brson @alexcrichton @nikomatsakis