Skip to content

Add an option to the parser so cfg'ed out modules can still be parsed #39145

New issue

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

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

Already on GitHub? # to your account

Merged
merged 1 commit into from
Jan 24, 2017

Conversation

nrc
Copy link
Member

@nrc nrc commented Jan 18, 2017

r? @jseyfried

cc @dtolnay, @erickt it would be great if we could get this picked up into Syntex asap - it fixes a pretty nasty bug in Rustfmt.

@nrc
Copy link
Member Author

nrc commented Jan 18, 2017

cc #36482

@jseyfried
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Jan 18, 2017

📌 Commit ac2c1da has been approved by jseyfried

@dtolnay
Copy link
Member

dtolnay commented Jan 18, 2017

Since you said asap, I am just going to grab ac2c1da and turn it into a syntex release.

@dtolnay
Copy link
Member

dtolnay commented Jan 18, 2017

I released Syntex 0.56.0 based on ac2c1da48631bc183e07a89d73c88bae25af1fb9.

@nrc
Copy link
Member Author

nrc commented Jan 18, 2017

@dtolnay Awesome, thank you!

@nrc
Copy link
Member Author

nrc commented Jan 19, 2017

@bors r=@jseyfried

@dtolnay could you pick up the updated PR into Syntex please? Because I am a doofus who can't do basic logic :-(

@bors
Copy link
Collaborator

bors commented Jan 19, 2017

📌 Commit bd9c240 has been approved by @jseyfried

@dtolnay
Copy link
Member

dtolnay commented Jan 19, 2017

@nrc
Copy link
Member Author

nrc commented Jan 19, 2017

thanks!

@nrc
Copy link
Member Author

nrc commented Jan 19, 2017

@bors r=@jseyfried

urgh, another bug fix (at least I managed to test this one properly, so hopefully it'll be the last)

@dtolnay sorry, to keep bothering you with this, but another fix when you have a minute, thanks!

@bors
Copy link
Collaborator

bors commented Jan 19, 2017

📌 Commit e0163a9 has been approved by @jseyfried

@dtolnay
Copy link
Member

dtolnay commented Jan 19, 2017

This is your last chance! After this we're waiting for a successful nightly build. I released v0.56.2.

bors added a commit that referenced this pull request Jan 20, 2017
bors added a commit that referenced this pull request Jan 21, 2017
@bors
Copy link
Collaborator

bors commented Jan 21, 2017

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

@bors
Copy link
Collaborator

bors commented Jan 23, 2017

🔒 Merge conflict

@nrc
Copy link
Member Author

nrc commented Jan 23, 2017

@bors: r=@jseyfried

@bors
Copy link
Collaborator

bors commented Jan 23, 2017

📌 Commit 44180c8 has been approved by @jseyfried

@bors
Copy link
Collaborator

bors commented Jan 24, 2017

⌛ Testing commit 44180c8 with merge 539501e...

@bors
Copy link
Collaborator

bors commented Jan 24, 2017

💔 Test failed - status-travis

@nrc
Copy link
Member Author

nrc commented Jan 24, 2017

@bors: retry

@alexcrichton
Copy link
Member

alexcrichton commented Jan 24, 2017 via email

@bors
Copy link
Collaborator

bors commented Jan 24, 2017

⌛ Testing commit 44180c8 with merge ae47248...

bors added a commit that referenced this pull request Jan 24, 2017
Add an option to the parser so cfg'ed out modules can still be parsed

r? @jseyfried

cc @dtolnay, @erickt it would be great if we could get this picked up into Syntex asap - it fixes a pretty nasty bug in Rustfmt.
@bors
Copy link
Collaborator

bors commented Jan 24, 2017

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

@bors bors merged commit 44180c8 into rust-lang:master Jan 24, 2017
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants