Skip to content

[beta] Rollup backports #54821

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
Merged
merged 3 commits into from
Oct 5, 2018
Merged

[beta] Rollup backports #54821

merged 3 commits into from
Oct 5, 2018

Conversation

pietroalbini
Copy link
Member

@pietroalbini pietroalbini commented Oct 4, 2018 •
edited
Loading

Merged and approved:

Closes #54759
r? @ghost

@pietroalbini
Copy link
Member Author

@bors r+ p=10

@bors
Copy link
Collaborator

bors commented Oct 4, 2018

📌 Commit 310a921 has been approved by pietroalbini

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 4, 2018
@pietroalbini
Copy link
Member Author

Also added #54759.

@bors r+ p=10

@bors
Copy link
Collaborator

bors commented Oct 4, 2018

📌 Commit e3f6931 has been approved by pietroalbini

@pietroalbini pietroalbini mentioned this pull request Oct 4, 2018
Closed
@bors
Copy link
Collaborator

bors commented Oct 4, 2018

⌛ Testing commit e3f6931 with merge cc9e348cf8d17cddbab5ebe8ebfa44062fa7d248...

@bors
Copy link
Collaborator

bors commented Oct 4, 2018

💔 Test failed - status-appveyor

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 4, 2018
@pietroalbini
Copy link
Member Author

@bors retry

@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 Oct 4, 2018
@bors
Copy link
Collaborator

bors commented Oct 4, 2018

⌛ Testing commit e3f6931 with merge 96a2298...

bors added a commit that referenced this pull request Oct 4, 2018
@bors
Auto merge of #54821 - pietroalbini:beta-backports, r=pietroalbini
96a2298 
[beta] Rollup backports

Merged and approved:

* #54605: resolve: Disambiguate a subset of conflicts "macro_rules" vs "macro name in module"
* #54557: incr.comp.: Don't automatically enable -Zshare-generics for incr. comp. builds.
* #54759: do not normalize non-scalar constants to a ConstValue::ScalarPair

Closes #54759
r? @ghost
@bors
Copy link
Collaborator

bors commented Oct 5, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: pietroalbini
Pushing 96a2298 to beta...

@bors bors merged commit e3f6931 into rust-lang:beta Oct 5, 2018
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@pietroalbini @bors @Centril @petrochenkov @michaelwoerister @RalfJung