Skip to content

Follow-up to #68848 #69150

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 2 commits into from
Feb 15, 2020
Merged

Follow-up to #68848 #69150

merged 2 commits into from
Feb 15, 2020

Conversation

nnethercote
Copy link
Contributor

This PR contains some late changes to #68848 that somehow didn't get included when that PR was merged in a roll-up.

r? @petrochenkov

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 14, 2020
@nnethercote
Copy link
Contributor Author

@bors rollup=always

@Mark-Simulacrum
Copy link
Member

Copying over approval, with quick review on this PR done by myself as well.

@bors r=petrochenkov

@bors
Copy link
Collaborator

bors commented Feb 14, 2020

📌 Commit 88b0912 has been approved by petrochenkov

@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 Feb 14, 2020
@petrochenkov
Copy link
Contributor

r? @Mark-Simulacrum

JohnTitor added a commit to JohnTitor/rust that referenced this pull request Feb 14, 2020
…ochenkov

Follow-up to rust-lang#68848

This PR contains some late changes to rust-lang#68848 that somehow didn't get included when that PR was merged in a roll-up.

r? @petrochenkov
bors added a commit that referenced this pull request Feb 14, 2020
Rollup of 7 pull requests

Successful merges:

 - #68129 (Correct inference of primitive operand type behind binary operation)
 - #68475 (Use a `ParamEnvAnd<Predicate>` for caching in `ObligationForest`)
 - #68856 (typeck: clarify def_bm adjustments & add tests for or-patterns)
 - #69051 (simplify_try: address some of eddyb's comments)
 - #69128 (Fix extra subslice lowering)
 - #69150 (Follow-up to #68848)
 - #69164 (Update pulldown-cmark dependency)

Failed merges:

r? @ghost
@bors bors merged commit 88b0912 into rust-lang:master Feb 15, 2020
@nnethercote nnethercote deleted the 68848-follow-up branch February 16, 2020 21:21
# for free to join this conversation on GitHub. Already have an account? # 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