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.

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

Partially revert 674a5db "Fix undesirable fallout [from macro modularization]" #54209

Merged
merged 1 commit into from
Sep 16, 2018

Conversation

petrochenkov
Copy link
Contributor

@petrochenkov petrochenkov commented Sep 13, 2018

Partially revert 674a5db

Closes (see pnkfelix comments below) #53675

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 13, 2018
@pnkfelix
Copy link
Member

@petrochenkov um, none of those tests appear to be named panic

Was this meant to be tagged as fixing a different issue? Or am I missing something?

@pnkfelix
Copy link
Member

pnkfelix commented Sep 14, 2018

(okay, I am starting to see a connection, in that this PR moves a bunch of macros in various tests from statement back to expression position, which was identified as the root cause here: #53675 (comment) )

@pnkfelix
Copy link
Member

pnkfelix commented Sep 14, 2018

In any case this PR seems like it is worth landing, but I don't think it should be tagged as "fixing" #53675 since it doesn't have a test of the original regression. (I'll just make a PR with that trivial test now.)

@pnkfelix
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Sep 14, 2018

📌 Commit 0a0d642 has been approved by pnkfelix

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 14, 2018
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Sep 16, 2018
Partially revert 674a5db "Fix undesirable fallout [from macro modularization]"

Partially revert rust-lang@674a5db

~~Closes~~ (see pnkfelix comments below) rust-lang#53675
bors added a commit that referenced this pull request Sep 16, 2018
Rollup of 5 pull requests

Successful merges:

 - #53941 (rustdoc: Sort implementors)
 - #54181 (Suggest && and || instead of 'and' and 'or')
 - #54209 (Partially revert 674a5db "Fix undesirable fallout [from macro modularization]")
 - #54213 (De-overlap the lifetimes of `flow_inits` and `flow_{un,ever_}inits`.)
 - #54244 (Add a small search box to seach Rust's standary library)

Failed merges:

r? @ghost
@bors bors merged commit 0a0d642 into rust-lang:master Sep 16, 2018
@petrochenkov petrochenkov deleted the mexpr branch June 5, 2019 16:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants