Skip to content

Conversation

eddyb
Copy link
Member

@eddyb eddyb commented Jun 16, 2019

This PR removes all lifetime-lifetime "outlives" bounds (e.g. 'tcx: 'a) bounds except a few necessary ones (see the reintroduce lifetime bounds where necessary commit).

Some of these bounds kept around otherwise-unused lifetimes (e.g. <'a, 'tcx: 'a> followed by uses of 'tcx but not 'a) - these lifetimes (i.e. 'a) were then removed.
(maybe they should be considered unused by the lint? cc @matthewjasper @zackmdavis)

r? @oli-obk cc @rust-lang/compiler

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

This comment has been minimized.

@eddyb eddyb force-pushed the lifetime-cleanups branch from 521e62a to efd924d Compare June 16, 2019 14:11
@bors

This comment has been minimized.

@@ -1,4 +1,4 @@
thread 'rustc' panicked at 'assertion failed: rows.iter().all(|r| r.len() == v.len())', src/librustc_mir/hair/pattern/_match.rs:1084:5
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm... I could make compiletest detect ICEs automatically and filter the line/col info

@eddyb eddyb force-pushed the lifetime-cleanups branch from efd924d to 2be847b Compare June 18, 2019 15:53
@oli-obk
Copy link
Contributor

oli-obk commented Jun 18, 2019

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 18, 2019

📌 Commit 2be847b has been approved by oli-obk

@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 Jun 18, 2019
@oli-obk
Copy link
Contributor

oli-obk commented Jun 18, 2019

@bors p=1 bitrotty

@bors
Copy link
Collaborator

bors commented Jun 18, 2019

⌛ Testing commit 2be847b with merge 04a3dd8...

bors added a commit that referenced this pull request Jun 18, 2019
rustc: remove 'x: 'y bounds (except where necessary or from comments/strings).

This PR removes all lifetime-lifetime "outlives" bounds (e.g. `'tcx: 'a`) bounds except a few necessary ones (see the `reintroduce lifetime bounds where necessary` commit).

Some of these bounds kept around otherwise-unused lifetimes (e.g. `<'a, 'tcx: 'a>` followed by uses of `'tcx` but not `'a`) - these lifetimes (i.e. `'a`) were then removed.
(maybe they should be considered unused by the lint? cc @matthewjasper @zackmdavis)

r? @oli-obk cc @rust-lang/compiler
@bors
Copy link
Collaborator

bors commented Jun 18, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: oli-obk
Pushing 04a3dd8 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 18, 2019
@bors bors merged commit 2be847b into rust-lang:master Jun 18, 2019
@rust-highfive
Copy link
Contributor

📣 Toolstate changed by #61891!

Tested on commit 04a3dd8.
Direct link to PR: #61891

💔 rls on windows: test-pass → test-fail (cc @Xanewok, @rust-lang/infra).
🎉 rls on linux: test-fail → test-pass (cc @Xanewok, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jun 18, 2019
Tested on commit rust-lang/rust@04a3dd8.
Direct link to PR: <rust-lang/rust#61891>

💔 rls on windows: test-pass → test-fail (cc @Xanewok, @rust-lang/infra).
🎉 rls on linux: test-fail → test-pass (cc @Xanewok, @rust-lang/infra).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants