Skip to content

Rollup of 5 pull requests #46904

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 12 commits into from
Dec 21, 2017
Merged

Rollup of 5 pull requests #46904

merged 12 commits into from
Dec 21, 2017

Conversation

estebank and others added 12 commits December 19, 2017 15:36
syntax: Follow-up to the incorrect qpath recovery PR

cc rust-lang#46788

Add tests checking that "priority" of qpath recovery is higher than priority of unary and binary operators
Fix regressed parsing of paths with fn-like generic arguments
r? @estebank
…henkov

Use def span for associated function suggestions
…m-assignments-to-locals, r=arielb1

Ensure separate activations only occur for assignments to locals

Ensure separate activations only occur for assignments to locals, not projections.

Fix rust-lang#46746.

(I didn't make a regression test because we do not really have a good way to directly express the case that we are trying to catch, because we cannot write MIR directly.)
@rust-highfive
Copy link
Contributor

Some changes occurred in HTML/CSS.

cc @GuillaumeGomez

@GuillaumeGomez
Copy link
Member Author

@bors: r+ p=1

@rust-highfive
Copy link
Contributor

r? @pnkfelix

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

@bors
Copy link
Collaborator

bors commented Dec 21, 2017

📌 Commit bdd3f5b has been approved by GuillaumeGomez

@bors
Copy link
Collaborator

bors commented Dec 21, 2017

⌛ Testing commit bdd3f5b with merge eff3de0...

bors added a commit that referenced this pull request Dec 21, 2017
Rollup of 5 pull requests

- Successful merges: #46827, #46853, #46860, #46861, #46887
- Failed merges:
@bors
Copy link
Collaborator

bors commented Dec 21, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: GuillaumeGomez
Pushing eff3de0 to master...

@bors bors merged commit bdd3f5b into rust-lang:master Dec 21, 2017
@GuillaumeGomez GuillaumeGomez deleted the rollup branch December 22, 2017 10:56
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants