Skip to content

resolve: Fix two issues in fresh binding disambiguation #70006

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 1 commit into from
Mar 15, 2020

Conversation

petrochenkov
Copy link
Contributor

Prevent fresh bindings from shadowing ambiguity items.
Fixes #46079

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

@rust-highfive
Copy link
Contributor

r? @ecstatic-morse

(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 Mar 14, 2020
@varkor varkor added the F-const_generics `#![feature(const_generics)]` label Mar 14, 2020
@ecstatic-morse
Copy link
Contributor

Reassigning to the first suggested reviewer.

r? @Centril

@Centril
Copy link
Contributor

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. :)

@Centril Centril added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 14, 2020
Correctly treat const generic parameters in fresh binding disambiguation
@petrochenkov petrochenkov added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 15, 2020
@Centril
Copy link
Contributor

Centril commented Mar 15, 2020

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 15, 2020

📌 Commit 78f01ec has been approved by Centril

@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 Mar 15, 2020
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
@petrochenkov petrochenkov deleted the fresh branch February 22, 2025 18:45
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
F-const_generics `#![feature(const_generics)]` S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
6 participants