Skip to content

prune some tasks and depnode variants#42576

Merged
bors merged 4 commits intorust-lang:masterfrom
nikomatsakis:incr-comp-less-tasks
Jun 13, 2017
Merged

prune some tasks and depnode variants#42576
bors merged 4 commits intorust-lang:masterfrom
nikomatsakis:incr-comp-less-tasks

Conversation

@nikomatsakis
Copy link
Copy Markdown
Contributor

@nikomatsakis nikomatsakis commented Jun 10, 2017

Pick some low-hanging fruit towards the goal of removing the older tasks.

r? @michaelwoerister

@nikomatsakis nikomatsakis force-pushed the incr-comp-less-tasks branch from c14c917 to 2e2cc82 Compare June 10, 2017 01:40
@Mark-Simulacrum
Copy link
Copy Markdown
Member

Mark-Simulacrum commented Jun 11, 2017

Looks like Travis failed:

00:39:40] ---- [compile-fail] compile-fail/dep-graph-unrelated.rs stdout ----
[00:39:40] 	
[00:39:40] error: /checkout/src/test/compile-fail/dep-graph-unrelated.rs:21: unexpected "error": '21:1: 21:46: unrecognized DepNode variant TransCrateItem(88)'
[00:39:40] 
[00:39:40] error: /checkout/src/test/compile-fail/dep-graph-unrelated.rs:21: expected error not found: no path from `main`
[00:39:40] 
[00:39:40] error: 1 unexpected errors found, 1 expected errors not found
[00:39:40] status: exit code: 101
[00:39:40] command: /checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc /checkout/src/test/compile-fail/dep-graph-unrelated.rs -L /checkout/obj/build/x86_64-unknown-linux-gnu/test/compile-fail --target=x86_64-unknown-linux-gnu --error-format json -L /checkout/obj/build/x86_64-unknown-linux-gnu/test/compile-fail/dep-graph-unrelated.stage2-x86_64-unknown-linux-gnu.compile-fail.libaux -C prefer-dynamic -o /checkout/obj/build/x86_64-unknown-linux-gnu/test/compile-fail/dep-graph-unrelated.stage2-x86_64-unknown-linux-gnu -Crpath -O -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers -Z query-dep-graph
[00:39:40] unexpected errors (from JSON output): [
[00:39:40]     Error {
[00:39:40]         line_num: 21,
[00:39:40]         kind: Some(
[00:39:40]             Error
[00:39:40]         ),
[00:39:40]         msg: "21:1: 21:46: unrecognized DepNode variant TransCrateItem(88)"
[00:39:40]     }
[00:39:40] ]
[00:39:40] 
[00:39:40] not found errors (from test file): [
[00:39:40]     Error {
[00:39:40]         line_num: 21,
[00:39:40]         kind: Some(
[00:39:40]             Error
[00:39:40]         ),
[00:39:40]         msg: "no path from `main`"
[00:39:40]     }
[00:39:40] ]
[00:39:40] 
[00:39:40] thread '[compile-fail] compile-fail/dep-graph-unrelated.rs' panicked at 'explicit panic', /checkout/src/tools/compiletest/src/runtest.rs:1129
[00:39:40] note: Run with `RUST_BACKTRACE=1` for a backtrace.

@Mark-Simulacrum Mark-Simulacrum added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 11, 2017
@michaelwoerister
Copy link
Copy Markdown
Member

michaelwoerister commented Jun 12, 2017

Looks good to me. Good to get rid of the out-dated documentation too.

@michaelwoerister michaelwoerister 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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 12, 2017
@bors
Copy link
Copy Markdown
Collaborator

bors commented Jun 12, 2017

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

@nikomatsakis
kill various tasks we no longer need and remove outdated README text
3f99118 
In the case of `TransCrateItem`, I had to tweak the tests a bit, but
it's a concept that doesn't work well under new system.
@nikomatsakis
kill various DepNode variants
03ff38e
@nikomatsakis
kill dep-graph-unrelated test
f61bee3 
Doesnt' seem to add much value, and since we don't track
`TransCrateItem` anymore, it's not clear what to translate it to.
@nikomatsakis
consider closures/ty-fn-defs when making trait selection keys
36973f7 
Fixes rust-lang#42602.
@nikomatsakis nikomatsakis force-pushed the incr-comp-less-tasks branch from 281680a to 36973f7 Compare June 12, 2017 21:23
@nikomatsakis
Copy link
Copy Markdown
Contributor Author

nikomatsakis commented Jun 12, 2017

r? @michaelwoerister -- added a few more commits, notably including a fix for #42602

michaelwoerister
michaelwoerister approved these changes Jun 13, 2017
View reviewed changes
Copy link
Copy Markdown
Member

@michaelwoerister michaelwoerister left a comment

Choose a reason for hiding this comment

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

@bors r+

Looking forward to seeing how the trait selection improvement will impact re-use on perf.rlo.

Comment thread src/test/incremental/issue-42602.rs
// typeck(foo) -> FnOnce -> typeck(bar)
//
// This was fixed by improving the resolution of the `FnOnce` trait
// selection node.
Copy link
Copy Markdown
Member

@michaelwoerister michaelwoerister Jun 13, 2017

Choose a reason for hiding this comment

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

Nice!

@michaelwoerister
Copy link
Copy Markdown
Member

michaelwoerister commented Jun 13, 2017

@bors r+

(@rust-lang/infra: It seems that bors doesn't pick up on commands in review comments)

@bors
Copy link
Copy Markdown
Collaborator

bors commented Jun 13, 2017

📌 Commit 36973f7 has been approved by michaelwoerister

@Mark-Simulacrum
Copy link
Copy Markdown
Member

Mark-Simulacrum commented Jun 13, 2017

Avoiding rolling this up.

@bors p=100

@bors
Copy link
Copy Markdown
Collaborator

bors commented Jun 13, 2017

⌛ Testing commit 36973f7 with merge 9b5b514...

bors added a commit that referenced this pull request Jun 13, 2017
@bors
Auto merge of #42576 - nikomatsakis:incr-comp-less-tasks, r=michaelwo…
9b5b514 
…erister

prune some tasks and depnode variants

Pick some low-hanging fruit towards the goal of removing the older tasks.

r? @michaelwoerister
@bors
Copy link
Copy Markdown
Collaborator

bors commented Jun 13, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: michaelwoerister
Pushing 9b5b514 to master...

@bors bors merged commit 36973f7 into rust-lang:master Jun 13, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@michaelwoerister michaelwoerister michaelwoerister approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@michaelwoerister michaelwoerister

Labels

S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@nikomatsakis @Mark-Simulacrum @michaelwoerister @bors