Skip to content

Fix an issue with const inference variables sticking around under Chalk + NLL - #65696

Merged
bors merged 5 commits into
rust-lang:masterfrom
varkor:nll-chalk-const-generics-issue
Oct 24, 2019
Merged

Fix an issue with const inference variables sticking around under Chalk + NLL#65696
bors merged 5 commits into
rust-lang:masterfrom
varkor:nll-chalk-const-generics-issue

Conversation

@varkor

@varkorvarkor commented Oct 22, 2019

Copy link
Copy Markdown
Contributor

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 22, 2019
@varkorvarkor added the F-const_generics `#![feature(const_generics)]` label Oct 22, 2019
Comment threadsrc/librustc/infer/nll_relate/mod.rs Outdated
Comment threadsrc/librustc/infer/nll_relate/mod.rs Outdated
@varkor
varkorforce-pushed the nll-chalk-const-generics-issue branch from 63d4efa to 51c6874CompareOctober 22, 2019 14:49
Comment threadsrc/librustc/infer/nll_relate/mod.rs
Comment threadsrc/librustc/infer/combine.rs Outdated
@eddyb

Copy link
Copy Markdown
Contributor

cc @nikomatsakis @rust-lang/wg-traits

@bors r+

@bors

bors commented Oct 23, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 624e34a has been approved by eddyb

@borsbors 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 23, 2019
@varkor

Copy link
Copy Markdown
ContributorAuthor

@bors rollup

Centril added a commit to Centril/rust that referenced this pull request Oct 23, 2019
…ue, r=eddyb
Fix an issue with const inference variables sticking around under Chalk + NLL
Fixesrust-lang#65675.
Fixesrust-lang#62579.
r? @eddyb
cc @LukasKalbertodt@Skinny121
@CentrilCentril mentioned this pull request Oct 23, 2019
bors added a commit that referenced this pull request Oct 24, 2019
Rollup of 12 pull requests
Successful merges:
- #64178 (More Clippy fixes for alloc, core and std)
- #65144 (Add Cow::is_borrowed and Cow::is_owned)
- #65193 (Lockless LintStore)
- #65479 (Add the `matches!( $expr, $pat ) -> bool` macro)
- #65518 (Avoid ICE when checking `Destination` of `break` inside a closure)
- #65583 (rustc_metadata: use a table for super_predicates, fn_sig, impl_trait_ref.)
- #65641 (Derive `Rustc{En,De}codable` for `TokenStream`.)
- #65648 (Eliminate `intersect_opt`.)
- #65657 (Remove `InternedString`)
- #65691 (Update E0659 error code long explanation to 2018 edition)
- #65696 (Fix an issue with const inference variables sticking around under Chalk + NLL)
- #65704 (relax ExactSizeIterator bound on write_bytes)
Failed merges:
r? @ghost
@bors
bors merged commit 624e34a into rust-lang:masterOct 24, 2019
@bors

bors commented Oct 24, 2019

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #65733) made this pull request unmergeable. Please resolve the merge conflicts.

@borsbors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 24, 2019
@varkor
varkor deleted the nll-chalk-const-generics-issue branch January 2, 2020 11:57
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

F-const_generics`#![feature(const_generics)]`S-waiting-on-authorStatus: This is awaiting some action (such as code changes or more information) from the author.

Projects

None yet

5 participants

@varkor@eddyb@bors@Centril@rust-highfive