Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove NodeState::{Waiting,Done} #66405

Merged
merged 5 commits into from
Dec 13, 2019

Conversation

nnethercote
Copy link
Contributor

@nnethercote nnethercote commented Nov 14, 2019

An optimization, and then some clean-ups.

r? @nikomatsakis

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 14, 2019
@JohnCSimon
Copy link
Member

Ping from triage
@nikomatsakis can you please review this PR?
Thanks

@nikomatsakis
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Dec 2, 2019

📌 Commit c45fc6b has been approved by nikomatsakis

@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 Dec 2, 2019
Centril added a commit to Centril/rust that referenced this pull request Dec 3, 2019
…tates, r=nikomatsakis

Tweak `ObligationForest` `NodeState`s

These two commits improve comments and function names.

r? @nikomatsakis
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Dec 5, 2019
…tates, r=nikomatsakis

Tweak `ObligationForest` `NodeState`s

These two commits improve comments and function names.

r? @nikomatsakis
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Dec 5, 2019
…tates, r=nikomatsakis

Tweak `ObligationForest` `NodeState`s

These two commits improve comments and function names.

r? @nikomatsakis
RalfJung added a commit to RalfJung/rust that referenced this pull request Dec 5, 2019
…tates, r=nikomatsakis

Tweak `ObligationForest` `NodeState`s

These two commits improve comments and function names.

r? @nikomatsakis
bors added a commit that referenced this pull request Dec 5, 2019
Rollup of 13 pull requests

Successful merges:

 - #66405 (Tweak `ObligationForest` `NodeState`s)
 - #66730 (remove dependency from libhermit)
 - #66764 (Tweak wording of `collect()` on bad target type)
 - #66899 (Standard library support for riscv64gc-unknown-linux-gnu)
 - #66900 (Clean up error codes)
 - #66974 ([CI] fix the `! isCI` check in src/ci/run.sh)
 - #66979 (Add long error for E0631 and update ui tests.)
 - #67005 (capitalize Rust)
 - #67010 (Accurately portray raw identifiers in error messages)
 - #67011 (Include a span in more `expected...found` notes)
 - #67017 (cleanup long error explanations)
 - #67021 (Fix docs for formatting delegations)
 - #67041 (add ExitStatusExt into prelude)

Failed merges:

r? @ghost
@nnethercote
Copy link
Contributor Author

Actually, I'm going to do some more changes here.

@bors r-

@bors 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 Dec 6, 2019
@nnethercote
Copy link
Contributor Author

The new commits subsume the old ones.

r? @nikomatsakis

@nnethercote
Copy link
Contributor Author

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion

@bors
Copy link
Contributor

bors commented Dec 6, 2019

⌛ Trying commit 3a5b4ed49bdb8848175b78b2dccdfe35a6611ac3 with merge 0e8c24186c2c99d5fc9847db42856c85a642ad3f...

@bors
Copy link
Contributor

bors commented Dec 13, 2019

☀️ Try build successful - checks-azure
Build commit: 88ae36bd20175c16667f51a71fbedcae8f933c44 (88ae36bd20175c16667f51a71fbedcae8f933c44)

@rust-timer
Copy link
Collaborator

Queued 88ae36bd20175c16667f51a71fbedcae8f933c44 with parent e9469a6, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking try commit 88ae36bd20175c16667f51a71fbedcae8f933c44, comparison URL.

@nnethercote
Copy link
Contributor Author

The new results still don't really match what I got locally, but they do show it as a small win, so I'm going to land this.

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Dec 13, 2019

📌 Commit cb21293 has been approved by nikomatsakis

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 13, 2019
@nnethercote
Copy link
Contributor Author

@bors rollup=never

(The rollup directive above was from an earlier version of this PR when the changes were much simpler.)

@bors
Copy link
Contributor

bors commented Dec 13, 2019

⌛ Testing commit cb21293 with merge 9409c20...

bors added a commit that referenced this pull request Dec 13, 2019
…komatsakis

Remove `NodeState::{Waiting,Done}`

An optimization, and then some clean-ups.

r? @nikomatsakis
@bors
Copy link
Contributor

bors commented Dec 13, 2019

☀️ Test successful - checks-azure
Approved by: nikomatsakis
Pushing 9409c20 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 13, 2019
@bors bors merged commit cb21293 into rust-lang:master Dec 13, 2019
@nnethercote nnethercote deleted the tweak-ObligForest-NodeStates branch December 15, 2019 21:53
@sdroege
Copy link
Contributor

sdroege commented Dec 20, 2019

This seems to have caused #67454, which is maybe a duplicate of #67331

Mark-Simulacrum pushed a commit to nnethercote/rust that referenced this pull request Dec 31, 2019
Because it caused major performance regressions in some cases.

That PR had five commits, two of which affected performance, and three
of which were refactorings. This change undoes the performance-affecting
changes, while keeping the refactorings in place.

Fixes rust-lang#67454.
bors added a commit that referenced this pull request Jan 1, 2020
Revert parts of #66405.

Because PR #66405 caused major performance regressions in some cases.

That PR had five commits, two of which affected performance, and three
of which were refactorings. This change undoes the performance-affecting
changes, while keeping the refactorings in place.

Fixes #67454.

r? @nikomatsakis
Marwes added a commit to Marwes/rust that referenced this pull request Jan 3, 2020
This was lost in rust-lang#66405 , perhaps
due to the added `dep_index >= min_index` check which attempts to avoid
reprocessing in a different way. Unfortunately that does not cover the
case where a node points to a higher index which can in degenerate cases
where a lot of nodes point to a lot of higher indexed nodes end up with
`O(N ^ 2)` complexity. With this fix restored it is `O(N)` again since
nodes will never be reprocessed.
Mark-Simulacrum pushed a commit to Mark-Simulacrum/rust that referenced this pull request Jan 23, 2020
Because it caused major performance regressions in some cases.

That PR had five commits, two of which affected performance, and three
of which were refactorings. This change undoes the performance-affecting
changes, while keeping the refactorings in place.

Fixes rust-lang#67454.
bors added a commit that referenced this pull request Jan 24, 2020
[beta] backports

This backports:
 * Do not ICE on malformed suggestion spans #68256
 * Distinguish between private items and hidden items in rustdoc #67875
 *  Revert parts of #66405. #67471

It also includes a few formatting commits to permit the backports to proceed cleanly (those are scoped to the relevant files, but still generate noise, of course). This was deemed easier than attempting to manually deal with the formatting.

r? @ghost
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. S-waiting-on-perf Status: Waiting on a perf run to be completed.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants