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

resolve: Fix two issues in fresh binding disambiguation #70006

Merged
merged 1 commit into from Mar 15, 2020

Conversation

@petrochenkov
Copy link
Contributor

petrochenkov commented Mar 14, 2020

Prevent fresh bindings from shadowing ambiguity items.
Fixes #46079

Correctly treat const generic parameters in fresh binding disambiguation.
Fixes #68853

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Mar 14, 2020

r? @ecstatic-morse

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

@ecstatic-morse

This comment has been minimized.

Copy link
Contributor

ecstatic-morse commented Mar 14, 2020

Reassigning to the first suggested reviewer.

r? @Centril

@Centril

This comment has been minimized.

Copy link
Member

Centril commented Mar 14, 2020

The diff seems sensible from what I can tell (though I am not an expert on this code), modulo the one comment I left. :)

Correctly treat const generic parameters in fresh binding disambiguation
@Centril

This comment has been minimized.

Copy link
Member

Centril commented Mar 15, 2020

@bors r+

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Mar 15, 2020

📌 Commit 78f01ec has been approved by Centril

bors added a commit that referenced this pull request Mar 15, 2020
Rollup of 8 pull requests

Successful merges:

 - #69528 (Add undo_leak to reset RefCell borrow state)
 - #69589 (ast: `Mac`/`Macro` -> `MacCall`)
 - #69661 (Implement From<&mut str> for String)
 - #69988 (rustc_metadata: Remove `rmeta::MacroDef`)
 - #70006 (resolve: Fix two issues in fresh binding disambiguation)
 - #70011 (def_collector: Fully visit async functions)
 - #70013 (Return feature gate as a `Symbol` )
 - #70018 (Fix "since" field for `Once::is_complete`'s `#[stable]` attribute)

Failed merges:

r? @ghost
@bors bors merged commit d986a70 into rust-lang:master Mar 15, 2020
4 checks passed
4 checks passed
pr Build #20200315.13 succeeded
Details
pr (Linux mingw-check) Linux mingw-check succeeded
Details
pr (Linux x86_64-gnu-llvm-7) Linux x86_64-gnu-llvm-7 succeeded
Details
pr (Linux x86_64-gnu-tools) Linux x86_64-gnu-tools succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.