Add support for bound types #55330

scalexm · 2018-10-24T22:38:09Z

This PR may have some slight performance impacts, I don't know how hot is the code I touched.

Also, this breaks clippy and miri.

r? @nikomatsakis

estebank · 2018-10-24T22:40:38Z

@bors try

bors · 2018-10-24T22:41:05Z

⌛ Trying commit 235c848 with merge 2b86a36d9530d0a26855c5a8ec6759e21fce2efc...

bors · 2018-10-25T00:51:36Z

☀️ Test successful - status-travis
State: approved= try=True

estebank · 2018-10-25T01:01:30Z

@rust-timer build 2b86a36

rust-timer · 2018-10-25T01:01:31Z

Insufficient permissions to issue commands to rust-timer.

Mark-Simulacrum · 2018-10-25T02:03:09Z

@rust-timer build 2b86a36

rust-timer · 2018-10-25T02:03:10Z

Please provide the full 40 character commit hash.

Mark-Simulacrum · 2018-10-25T02:03:32Z

@rust-timer build 2b86a36d9530d0a26855c5a8ec6759e21fce2efc

rust-timer · 2018-10-25T02:03:33Z

Success: Queued 2b86a36d9530d0a26855c5a8ec6759e21fce2efc with parent f99911a, comparison URL.

rust-timer · 2018-10-25T03:44:13Z

Finished benchmarking try commit 2b86a36d9530d0a26855c5a8ec6759e21fce2efc

nikomatsakis

Looks great! Left some nits.

nikomatsakis · 2018-10-25T13:09:30Z

src/librustc/infer/canonical/query_response.rs

-                let r2 = substitute_value(self.tcx, &result_subst, &r2);
-                if k1 != r2.into() {
-                    Some(ty::Binder::bind(ty::OutlivesPredicate(k1, r2)))
+                let ty::OutlivesPredicate(k1, r2) = r_c.skip_binder(); // reconstructed below


All this binder shuffling feels a bit complex. I think I micro-optimized this, though not necessarily for very good reason. Mostly I think I was trying to avoid allocating a whole vector of substituted results and instead substitute them lazilly. I wonder if it'd be simpler to do:

let r_c = substitute_value(self.tcx, &result_substs, r_c); // Screen out `'a: 'a` cases -- we skip the binder here but // only care the inner values to one another, so they are still at // consistent binding levels. let ty::OutlivesPredicate(k1, r2) = r_c.skip_binder(); if k1 != r2.into() { Some(r_c) } else { None }

nikomatsakis · 2018-10-25T13:11:24Z

src/librustc/ty/sty.rs

+    /// regions with anonymous late bound regions. This method asserts that
+    /// we have an anonymous late bound region, which hence may refer to
+    /// a canonical variable.
+    pub fn as_bound_var(&self) -> BoundVar {


Can we call this assert_bound_var()? I forget how consistently we use this convention, but I like it (since you are not returning an Option here...)

nikomatsakis · 2018-10-25T18:42:05Z

@bors r+

bors · 2018-10-25T18:42:06Z

📌 Commit 2b205dc has been approved by nikomatsakis

@nikomatsakis

Add support for bound types This PR may have some slight performance impacts, I don't know how hot is the code I touched. Also, this breaks clippy and miri. r? @nikomatsakis

bors · 2018-11-02T04:22:40Z

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

scalexm · 2018-11-02T11:10:44Z

@bors r=nikomatsakis

bors · 2018-11-02T11:10:44Z

📌 Commit a38a6d09b101dfe0afa1ef9475ed71cd78a9e203 has been approved by nikomatsakis

Use the new `BoundVarReplacer` to perform canonical substitutions.

scalexm · 2018-11-03T10:42:41Z

@bors r=nikomatsakis p=1

bors · 2018-11-03T10:42:42Z

📌 Commit c5ed72f has been approved by nikomatsakis

scalexm · 2018-11-03T10:47:45Z

The failure above comes from a renaming that I made in this PR. It went unnoticed because my branch was not even with rust's master, hence some recently added commits were still using the "old" name.

I'm setting p=1 to prevent this from happening again

bors · 2018-11-03T12:11:30Z

⌛ Testing commit c5ed72f with merge 2ad8c7b...

@nikomatsakis

Add support for bound types This PR may have some slight performance impacts, I don't know how hot is the code I touched. Also, this breaks clippy and miri. r? @nikomatsakis

bors · 2018-11-03T14:51:00Z

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing 2ad8c7b to master...

rust-highfive · 2018-11-03T14:52:29Z

📣 Toolstate changed by #55330!

Tested on commit 2ad8c7b.
Direct link to PR: #55330

💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra).
💔 rls on windows: test-pass → build-fail (cc @nrc, @rust-lang/infra).
💔 rls on linux: test-pass → build-fail (cc @nrc, @rust-lang/infra).

@Manishearth

Tested on commit rust-lang/rust@2ad8c7b. Direct link to PR: <rust-lang/rust#55330> 💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra). 💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra). 💔 rls on windows: test-pass → build-fail (cc @nrc, @rust-lang/infra). 💔 rls on linux: test-pass → build-fail (cc @nrc, @rust-lang/infra).

scalexm · 2018-11-03T15:17:07Z

📣 Toolstate changed by #55330!

Tested on commit 2ad8c7b.
Direct link to PR: #55330

💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra).
💔 rls on windows: test-pass → build-fail (cc @nrc, @rust-lang/infra).
💔 rls on linux: test-pass → build-fail (cc @nrc, @rust-lang/infra).

I'll open PRs to fix what I broke :p

3404: rustup rust-lang/rust#55330 r=phansch a=matthiaskrgr Co-authored-by: Matthias Krüger <matthias.krueger@famsik.de>

rustup rust-lang/rust#55330

Should fix clippy toolstat. Changes: ```` rustup rust-lang#55330 Update stderr Rename test files Also lint cfg_attr(.., rustfmt::skip) Add tests from rustfmt::skip test file Run update_lints.py script Add test for non-crate-level inner attributes Differ between inner and outer attributes Add tests Add cfg_attr(rustfmt) lint Addressed comments. Fix dogfood error. Added lints `into_iter_on_ref` and `into_iter_on_array`. Fix rust-lang#1565. Allow single_match_else Update stderr Add copyright statement© Fix typos Fix dogfood error Fix typo and indentation run update_lints script Add tests for unknwon_clippy_lints lint Add new lint: unknwon_clippy_lintsg clippy: fix pedantic warnings and run clippy::pedantic lints on the codebase. Fix a false-positive of needless_borrow UI test cleanup: Extract match_overlapping_arm tests UI test cleanup: Extract expect_fun_call tests Add missing code of conduct file Use slice patterns instead of padding Fix dogfood and pedantic lints ci: when installing rust-toolchain-installer-master, install it in debug mode to save some time in ci. RIIR update lints: Generate deprecated lints Replace big if/else expression with match ````

submodules: update clippy from a20599a to 71ec4ff Should fix clippy toolstat. Changes: ```` rustup #55330 Update stderr Rename test files Also lint cfg_attr(.., rustfmt::skip) Add tests from rustfmt::skip test file Run update_lints.py script Add test for non-crate-level inner attributes Differ between inner and outer attributes Add tests Add cfg_attr(rustfmt) lint Addressed comments. Fix dogfood error. Added lints `into_iter_on_ref` and `into_iter_on_array`. Fix #1565. Allow single_match_else Update stderr Add copyright statement© Fix typos Fix dogfood error Fix typo and indentation run update_lints script Add tests for unknwon_clippy_lints lint Add new lint: unknwon_clippy_lintsg clippy: fix pedantic warnings and run clippy::pedantic lints on the codebase. Fix a false-positive of needless_borrow UI test cleanup: Extract match_overlapping_arm tests UI test cleanup: Extract expect_fun_call tests Add missing code of conduct file Use slice patterns instead of padding Fix dogfood and pedantic lints ci: when installing rust-toolchain-installer-master, install it in debug mode to save some time in ci. RIIR update lints: Generate deprecated lints Replace big if/else expression with match ````

Should fix clippy toolstat. Changes: ```` rustup rust-lang/rust#55330 Update stderr Rename test files Also lint cfg_attr(.., rustfmt::skip) Add tests from rustfmt::skip test file Run update_lints.py script Add test for non-crate-level inner attributes Differ between inner and outer attributes Add tests Add cfg_attr(rustfmt) lint Addressed comments. Fix dogfood error. Added lints `into_iter_on_ref` and `into_iter_on_array`. Fix rust-lang#1565. Allow single_match_else Update stderr Add copyright statement© Fix typos Fix dogfood error Fix typo and indentation run update_lints script Add tests for unknwon_clippy_lints lint Add new lint: unknwon_clippy_lintsg clippy: fix pedantic warnings and run clippy::pedantic lints on the codebase. Fix a false-positive of needless_borrow UI test cleanup: Extract match_overlapping_arm tests UI test cleanup: Extract expect_fun_call tests Add missing code of conduct file Use slice patterns instead of padding Fix dogfood and pedantic lints ci: when installing rust-toolchain-installer-master, install it in debug mode to save some time in ci. RIIR update lints: Generate deprecated lints Replace big if/else expression with match ````

rust-highfive assigned nikomatsakis Oct 24, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 24, 2018

nikomatsakis requested changes Oct 25, 2018

View reviewed changes

nikomatsakis approved these changes Oct 25, 2018

View reviewed changes

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 Oct 25, 2018

Mark-Simulacrum mentioned this pull request Oct 27, 2018

Rollup of 13 pull requests #55425

Closed

bors 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 Nov 2, 2018

scalexm force-pushed the bound-ty branch from 2b205dc to a38a6d0 Compare November 2, 2018 11:09

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 2, 2018

scalexm added 5 commits November 3, 2018 11:41

Rename Binder::no_late_bound_regions to Binder::no_bound_vars

d99195a

Extend ty::fold::RegionReplacer to ty::fold::BoundVarReplacer

142359c

Use the new `BoundVarReplacer` to perform canonical substitutions.

Fix doc comment

af8196b

Rename as_bound_var to assert_bound_var

0751997

Substitute binders directly

c5ed72f

scalexm force-pushed the bound-ty branch from a38a6d0 to c5ed72f Compare November 3, 2018 10:42

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 3, 2018

bors merged commit c5ed72f into rust-lang:master Nov 3, 2018

bors mentioned this pull request Nov 3, 2018

Do not check outlives when explicit bound contains escaping regions #53736

Closed

scalexm deleted the bound-ty branch November 3, 2018 15:15

matthiaskrgr added a commit to matthiaskrgr/rust-clippy that referenced this pull request Nov 3, 2018

rustup rust-lang/rust#55330

b59b60c

bors bot added a commit to rust-lang/rust-clippy that referenced this pull request Nov 3, 2018

Merge #3404

539dca8

3404: rustup rust-lang/rust#55330 r=phansch a=matthiaskrgr Co-authored-by: Matthias Krüger <matthias.krueger@famsik.de>

bors bot added a commit to rust-lang/rust-clippy that referenced this pull request Nov 3, 2018

Merge #3404

f82f62b

3404: rustup rust-lang/rust#55330 r=phansch a=matthiaskrgr Co-authored-by: Matthias Krüger <matthias.krueger@famsik.de>

phansch added a commit to rust-lang/rust-clippy that referenced this pull request Nov 3, 2018

Merge pull request #3404 from matthiaskrgr/rustup

71ec4ff

rustup rust-lang/rust#55330

scalexm mentioned this pull request Nov 13, 2018

chalk lowering rule: ProjectionEq-Normalize #52153

Merged

scalexm mentioned this pull request Nov 25, 2018

support higher-ranked types for chalk #49810

Closed

4 tasks

varkor mentioned this pull request Oct 21, 2019

Replace ConstValue::Infer(InferConst::Canonical(..)) with ConstValue::Bound #65655

Closed

Add support for bound types #55330

Add support for bound types #55330

Uh oh!

Conversation

scalexm commented Oct 24, 2018

Uh oh!

estebank commented Oct 24, 2018

Uh oh!

bors commented Oct 24, 2018

Uh oh!

bors commented Oct 25, 2018

Uh oh!

estebank commented Oct 25, 2018

Uh oh!

rust-timer commented Oct 25, 2018

Uh oh!

Mark-Simulacrum commented Oct 25, 2018

Uh oh!

rust-timer commented Oct 25, 2018

Uh oh!

Mark-Simulacrum commented Oct 25, 2018

Uh oh!

rust-timer commented Oct 25, 2018

Uh oh!

rust-timer commented Oct 25, 2018

Uh oh!

nikomatsakis left a comment

Choose a reason for hiding this comment

Uh oh!

nikomatsakis Oct 25, 2018

Choose a reason for hiding this comment

Uh oh!

nikomatsakis Oct 25, 2018

Choose a reason for hiding this comment

Uh oh!

nikomatsakis commented Oct 25, 2018

Uh oh!

bors commented Oct 25, 2018

Uh oh!

bors commented Nov 2, 2018

Uh oh!

scalexm commented Nov 2, 2018

Uh oh!

bors commented Nov 2, 2018

Uh oh!

scalexm commented Nov 3, 2018

Uh oh!

bors commented Nov 3, 2018

Uh oh!

scalexm commented Nov 3, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bors commented Nov 3, 2018

Uh oh!

bors commented Nov 3, 2018

Uh oh!

rust-highfive commented Nov 3, 2018

Uh oh!

scalexm commented Nov 3, 2018

Uh oh!

Uh oh!

scalexm commented Nov 3, 2018 •

edited

Loading