Skip to content

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

Merged
bors merged 1 commit into
rust-lang:masterfrom
nrc:opt-cfg-mod
Jan 24, 2017
Merged

Add an option to the parser so cfg'ed out modules can still be parsed#39145
bors merged 1 commit into
rust-lang:masterfrom
nrc:opt-cfg-mod

Conversation

@nrc

@nrc nrc commented Jan 18, 2017

Copy link
Copy Markdown
Member

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

nrc commented Jan 18, 2017

Copy link
Copy Markdown
Member Author

cc #36482

@jseyfried

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Jan 18, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit ac2c1da has been approved by jseyfried

@dtolnay

dtolnay commented Jan 18, 2017

Copy link
Copy Markdown
Member

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

@dtolnay

dtolnay commented Jan 18, 2017

Copy link
Copy Markdown
Member

I released Syntex 0.56.0 based on ac2c1da48631bc183e07a89d73c88bae25af1fb9.

@nrc

nrc commented Jan 18, 2017

Copy link
Copy Markdown
Member Author

@dtolnay Awesome, thank you!

@nrc

nrc commented Jan 19, 2017

Copy link
Copy Markdown
Member Author

@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

bors commented Jan 19, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit bd9c240 has been approved by @jseyfried

@dtolnay

dtolnay commented Jan 19, 2017

Copy link
Copy Markdown
Member

@nrc

nrc commented Jan 19, 2017

Copy link
Copy Markdown
Member Author

thanks!

@nrc

nrc commented Jan 19, 2017

Copy link
Copy Markdown
Member Author

@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

bors commented Jan 19, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit e0163a9 has been approved by @jseyfried

@dtolnay

dtolnay commented Jan 19, 2017

Copy link
Copy Markdown
Member

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

bors commented Jan 21, 2017

Copy link
Copy Markdown
Collaborator

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

@bors

bors commented Jan 23, 2017

Copy link
Copy Markdown
Collaborator

🔒 Merge conflict

@nrc

nrc commented Jan 23, 2017

Copy link
Copy Markdown
Member Author

@bors: r=@jseyfried

@bors

bors commented Jan 23, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 44180c8 has been approved by @jseyfried

@bors

bors commented Jan 24, 2017

Copy link
Copy Markdown
Collaborator

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

@bors

bors commented Jan 24, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@nrc

nrc commented Jan 24, 2017

Copy link
Copy Markdown
Member Author

@bors: retry

@alexcrichton

alexcrichton commented Jan 24, 2017 via email

Copy link
Copy Markdown
Member

@bors

bors commented Jan 24, 2017

Copy link
Copy Markdown
Collaborator

⌛ 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

bors commented Jan 24, 2017

Copy link
Copy Markdown
Collaborator

☀️ 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
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