convert higher ranked `Predicate`s to `PredicateKind::ForAll` #73503

lcnr · 2020-06-19T12:05:05Z

implements step 2 of rust-lang/compiler-team#285
r? @nikomatsakis

src/librustc_middle/ty/mod.rs

src/librustc_traits/chalk/lowering.rs

src/librustc_infer/traits/util.rs

src/librustc_middle/ty/mod.rs

bors · 2020-06-21T21:22:59Z

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

bors · 2020-06-23T11:50:42Z

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

nikomatsakis · 2020-06-23T22:43:56Z

@bors try

(I want to do a perf run)

bors · 2020-06-23T22:44:27Z

⌛ Trying commit a4f1fcd with merge 33ea641dd70d10df2f81ff66863ce09f631b8195...

nikomatsakis · 2020-06-23T22:44:34Z

@rust-timer queue

rust-timer · 2020-06-23T22:44:35Z

Awaiting bors try build completion

bors · 2020-06-24T00:53:52Z

☀️ Try build successful - checks-azure
Build commit: 33ea641dd70d10df2f81ff66863ce09f631b8195 (33ea641dd70d10df2f81ff66863ce09f631b8195)

rust-timer · 2020-06-24T00:53:54Z

Queued 33ea641dd70d10df2f81ff66863ce09f631b8195 with parent ff5b446, future comparison URL.

rust-timer · 2020-06-24T03:36:10Z

Finished benchmarking try commit (33ea641dd70d10df2f81ff66863ce09f631b8195): comparison url.

nikomatsakis · 2020-06-24T14:41:38Z

OK, perf impact is basically neutral (maybe 1% slower on stress tests...), that's great.

bors · 2020-06-26T10:23:32Z

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

bors · 2020-07-07T01:07:00Z

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

matthewjasper · 2020-07-08T23:00:32Z

src/librustc_trait_selection/traits/fulfill.rs

                    }
-                }
+                    ty::PredicateAtom::Projection(projection) => {


I think that Projections no longer need special casing (they no longer run the leak check at the top level).

It seems like we do still need this.

Removing the specialcase for projections results in

Building stage1 std artifacts (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu) Compiling compiler_builtins v0.1.32 Compiling core v0.0.0 (/home/lcnr/rust2/src/libcore) Compiling cc v1.0.57 Compiling libc v0.2.71 Compiling autocfg v0.1.7 Compiling std v0.0.0 (/home/lcnr/rust2/src/libstd) Compiling hashbrown v0.6.2 Compiling backtrace-sys v0.1.37 Compiling unwind v0.0.0 (/home/lcnr/rust2/src/libunwind) error[E0599]: no method named `count` found for struct `iter::adapters::TakeWhile<iter::adapters::Rev<slice::Iter<'_, u32>>, [closure@src/libcore/num/bignum.rs:173:60: 173:72]>` in the current scope --> src/libcore/num/bignum.rs:173:74 | 100 | / macro_rules! define_bignum { 101 | | ($name:ident: type=$ty:ty, n=$n:expr) => { 102 | | /// Stack-allocated arbitrary-precision (up to certain limit) integer. 103 | | /// ... | 173 | | let zeros = digits.iter().rev().take_while(|&&x| x == 0).count(); | | ------------ ^^^^^ method not found in `iter::adapters::TakeWhile<iter::adapters::Rev<slice::Iter<'_, u32>>, [closure@src/libcore/num/bignum.rs:173:60: 173:72]>` | | | | | doesn't satisfy `<_ as ops::function::FnOnce<(&&u32,)>>::Output = bool` | | doesn't satisfy `_: ops::function::FnMut<(&&u32,)>` ... | 477 | | }; 478 | | } | |_- in this expansion of `define_bignum!` ... 483 | define_bignum!(Big32x40: type=Digit32, n=40); | --------------------------------------------- in this macro invocation | ::: src/libcore/iter/adapters/mod.rs:1803:1 | 1803 | pub struct TakeWhile<I, P> { | -------------------------- | | | method `count` not found for this | doesn't satisfy `_: iter::traits::iterator::Iterator` | = note: the method `count` exists but the following trait bounds were not satisfied: `<[closure@src/libcore/num/bignum.rs:173:60: 173:72] as ops::function::FnOnce<(&&u32,)>>::Output = bool` which is required by `iter::adapters::TakeWhile<iter::adapters::Rev<slice::Iter<'_, u32>>, [closure@src/libcore/num/bignum.rs:173:60: 173:72]>: iter::traits::iterator::Iterator` `[closure@src/libcore/num/bignum.rs:173:60: 173:72]: ops::function::FnMut<(&&u32,)>` which is required by `iter::adapters::TakeWhile<iter::adapters::Rev<slice::Iter<'_, u32>>, [closure@src/libcore/num/bignum.rs:173:60: 173:72]>: iter::traits::iterator::Iterator` `iter::adapters::TakeWhile<iter::adapters::Rev<slice::Iter<'_, u32>>, [closure@src/libcore/num/bignum.rs:173:60: 173:72]>: iter::traits::iterator::Iterator` which is required by `&mut iter::adapters::TakeWhile<iter::adapters::Rev<slice::Iter<'_, u32>>, [closure@src/libcore/num/bignum.rs:173:60: 173:72]>: iter::traits::iterator::Iterator` error[E0599]: no method named `count` found for struct `iter::adapters::TakeWhile<iter::adapters::Rev<slice::Iter<'_, u8>>, [closure@src/libcore/num/bignum.rs:173:60: 173:72]>` in the current scope --> src/libcore/num/bignum.rs:173:74 | 100 | / macro_rules! define_bignum { 101 | | ($name:ident: type=$ty:ty, n=$n:expr) => { 102 | | /// Stack-allocated arbitrary-precision (up to certain limit) integer. 103 | | /// ... | 173 | | let zeros = digits.iter().rev().take_while(|&&x| x == 0).count(); | | ------------ ^^^^^ method not found in `iter::adapters::TakeWhile<iter::adapters::Rev<slice::Iter<'_, u8>>, [closure@src/libcore/num/bignum.rs:173:60: 173:72]>` | | | | | doesn't satisfy `<_ as ops::function::FnOnce<(&&u8,)>>::Output = bool` | | doesn't satisfy `_: ops::function::FnMut<(&&u8,)>` ... | 477 | | }; 478 | | } | |_- in this expansion of `define_bignum!` ... 488 | define_bignum!(Big8x3: type=u8, n=3); | ------------------------------------- in this macro invocation | ::: src/libcore/iter/adapters/mod.rs:1803:1 | 1803 | pub struct TakeWhile<I, P> { | -------------------------- | | | method `count` not found for this | doesn't satisfy `_: iter::traits::iterator::Iterator` | = note: the method `count` exists but the following trait bounds were not satisfied: `<[closure@src/libcore/num/bignum.rs:173:60: 173:72] as ops::function::FnOnce<(&&u8,)>>::Output = bool` which is required by `iter::adapters::TakeWhile<iter::adapters::Rev<slice::Iter<'_, u8>>, [closure@src/libcore/num/bignum.rs:173:60: 173:72]>: iter::traits::iterator::Iterator` `[closure@src/libcore/num/bignum.rs:173:60: 173:72]: ops::function::FnMut<(&&u8,)>` which is required by `iter::adapters::TakeWhile<iter::adapters::Rev<slice::Iter<'_, u8>>, [closure@src/libcore/num/bignum.rs:173:60: 173:72]>: iter::traits::iterator::Iterator` `iter::adapters::TakeWhile<iter::adapters::Rev<slice::Iter<'_, u8>>, [closure@src/libcore/num/bignum.rs:173:60: 173:72]>: iter::traits::iterator::Iterator` which is required by `&mut iter::adapters::TakeWhile<iter::adapters::Rev<slice::Iter<'_, u8>>, [closure@src/libcore/num/bignum.rs:173:60: 173:72]>: iter::traits::iterator::Iterator` error: internal compiler error: src/librustc_middle/ich/impls_ty.rs:94:17: StableHasher: unexpected region RePlaceholder(Placeholder { universe: U1, name: BrAnon(0) })

lcnr · 2020-07-27T19:41:15Z

@bors r=nikomatsakis rollup=never

bors · 2020-07-27T19:41:16Z

📌 Commit 602ef6b has been approved by nikomatsakis

bors · 2020-07-27T20:16:43Z

⌛ Testing commit 602ef6b with merge 76e8333...

bors · 2020-07-27T22:13:45Z

☀️ Test successful - checks-actions, checks-azure
Approved by: nikomatsakis
Pushing 76e8333 to master...

Mark-Simulacrum · 2020-08-03T21:31:43Z

Perf triage:

This was a 2.5% regression on stress tests and a 1-2% loss on serde and futures (real world tests). This was expected.

See rust-lang/rust#73503

rust-highfive assigned nikomatsakis Jun 19, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 19, 2020

lcnr marked this pull request as draft June 19, 2020 12:07

matthewjasper reviewed Jun 19, 2020

View reviewed changes

src/librustc_middle/ty/mod.rs Outdated Show resolved Hide resolved

jackh726 reviewed Jun 19, 2020

View reviewed changes

src/librustc_traits/chalk/lowering.rs Show resolved Hide resolved

src/librustc_traits/chalk/lowering.rs Show resolved Hide resolved

src/librustc_traits/chalk/lowering.rs Show resolved Hide resolved

src/librustc_traits/chalk/lowering.rs Outdated Show resolved Hide resolved

matthewjasper reviewed Jun 19, 2020

View reviewed changes

src/librustc_infer/traits/util.rs Outdated Show resolved Hide resolved

src/librustc_middle/ty/mod.rs Outdated Show resolved Hide resolved

src/librustc_middle/ty/mod.rs Outdated Show resolved Hide resolved

src/librustc_middle/ty/mod.rs Show resolved Hide resolved

lcnr force-pushed the forall-predicate-what-and-why-2 branch from 66c7be0 to 9468dfb Compare June 21, 2020 09:36

lcnr marked this pull request as ready for review June 21, 2020 11:27

lcnr force-pushed the forall-predicate-what-and-why-2 branch from 641480c to f2246c7 Compare June 21, 2020 11:54

lcnr force-pushed the forall-predicate-what-and-why-2 branch from 8514396 to eaa2952 Compare June 22, 2020 06:55

lcnr force-pushed the forall-predicate-what-and-why-2 branch 3 times, most recently from 4403278 to a4f1fcd Compare June 23, 2020 17:44

lcnr force-pushed the forall-predicate-what-and-why-2 branch 2 times, most recently from 4104127 to 6d55dfa Compare July 4, 2020 14:41

matthewjasper reviewed Jul 8, 2020

View reviewed changes

lcnr force-pushed the forall-predicate-what-and-why-2 branch from cb12a23 to 105856c Compare July 9, 2020 08:11

lcnr added 5 commits July 27, 2020 21:08

directly contain PredicateAtom in PredicateKind::ForAll

cd9743b

fix rebase

825cb5b

it works again 🎉

072cc45

fix rustdoc

51cbcca

cleanup

833b1d8

lcnr force-pushed the forall-predicate-what-and-why-2 branch from 6553ad6 to 1859a2b Compare July 27, 2020 19:13

clippy

602ef6b

lcnr force-pushed the forall-predicate-what-and-why-2 branch from 1859a2b to 602ef6b Compare July 27, 2020 19:17

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 Jul 27, 2020

bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 27, 2020

bors merged commit 76e8333 into rust-lang:master Jul 27, 2020

lcnr deleted the forall-predicate-what-and-why-2 branch July 28, 2020 06:06

This was referenced Jul 28, 2020

ICE with HRTB: Broken MIR in DefId [...] could not prove Binder #59311

Closed

Broken MIR on HRTB #71546

Closed

Xanewok added a commit to Xanewok/rust-semverver that referenced this pull request Nov 17, 2020

WIP: Fix breakage due to rust-lang/rust#73503

036ed67

Xanewok added a commit to Xanewok/rust-semverver that referenced this pull request Nov 18, 2020

Fix breakage due to rust-lang/rust#73503

0438c49

See rust-lang/rust#73503

Xanewok added a commit to Xanewok/rust-semverver that referenced this pull request Nov 18, 2020

WIP: Fix breakage due to rust-lang/rust#73503

f8f4174

See rust-lang/rust#73503

Xanewok added a commit to Xanewok/rust-semverver that referenced this pull request Nov 18, 2020

WIP: Fix breakage due to rust-lang/rust#73503

3fc536f

See rust-lang/rust#73503

Xanewok added a commit to Xanewok/rust-semverver that referenced this pull request Nov 19, 2020

Fix breakage due to rust-lang/rust#73503

1f8cb2e

See rust-lang/rust#73503

Xanewok added a commit to Xanewok/rust-semverver that referenced this pull request Nov 19, 2020

Fix breakage due to rust-lang/rust#73503

6604643

See rust-lang/rust#73503

This was referenced Jan 4, 2021

Remove PredicateKind in favor of only Binder<PredicateAtom> rust-lang/compiler-team#397

Closed

Remove PredicateKind and instead only use Binder<PredicateAtom> #80679

Merged

lqd mentioned this pull request Jun 14, 2022

NLL: unsound verification of higher ranked outlives bounds #98095

Closed

cuviper added this to the 1.47.0 milestone May 2, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

convert higher ranked `Predicate`s to `PredicateKind::ForAll` #73503

convert higher ranked `Predicate`s to `PredicateKind::ForAll` #73503

lcnr commented Jun 19, 2020 •

edited

Loading

bors commented Jun 21, 2020

bors commented Jun 23, 2020

nikomatsakis commented Jun 23, 2020

bors commented Jun 23, 2020

nikomatsakis commented Jun 23, 2020

rust-timer commented Jun 23, 2020

bors commented Jun 24, 2020

rust-timer commented Jun 24, 2020

rust-timer commented Jun 24, 2020

nikomatsakis commented Jun 24, 2020

bors commented Jun 26, 2020

bors commented Jul 7, 2020

matthewjasper Jul 8, 2020

lcnr Jul 18, 2020 •

edited

Loading

lcnr commented Jul 27, 2020

bors commented Jul 27, 2020

bors commented Jul 27, 2020

bors commented Jul 27, 2020

Mark-Simulacrum commented Aug 3, 2020

convert higher ranked Predicates to PredicateKind::ForAll #73503

convert higher ranked Predicates to PredicateKind::ForAll #73503

Conversation

lcnr commented Jun 19, 2020 • edited Loading

bors commented Jun 21, 2020

bors commented Jun 23, 2020

nikomatsakis commented Jun 23, 2020

bors commented Jun 23, 2020

nikomatsakis commented Jun 23, 2020

rust-timer commented Jun 23, 2020

bors commented Jun 24, 2020

rust-timer commented Jun 24, 2020

rust-timer commented Jun 24, 2020

nikomatsakis commented Jun 24, 2020

bors commented Jun 26, 2020

bors commented Jul 7, 2020

matthewjasper Jul 8, 2020

Choose a reason for hiding this comment

lcnr Jul 18, 2020 • edited Loading

Choose a reason for hiding this comment

lcnr commented Jul 27, 2020

bors commented Jul 27, 2020

bors commented Jul 27, 2020

bors commented Jul 27, 2020

Mark-Simulacrum commented Aug 3, 2020

convert higher ranked `Predicate`s to `PredicateKind::ForAll` #73503

convert higher ranked `Predicate`s to `PredicateKind::ForAll` #73503

lcnr commented Jun 19, 2020 •

edited

Loading

lcnr Jul 18, 2020 •

edited

Loading