Skip to content

On-demandify the typechecking of item bodies - #40540

Merged
bors merged 1 commit into
rust-lang:masterfrom
cramertj:check-bodies-as-query
Mar 29, 2017
Merged

On-demandify the typechecking of item bodies#40540
bors merged 1 commit into
rust-lang:masterfrom
cramertj:check-bodies-as-query

Conversation

@cramertj

@cramertjcramertj commented Mar 15, 2017

Copy link
Copy Markdown
Member

nikomatsakis
nikomatsakis requested changes Mar 16, 2017
View reviewed changes

@nikomatsakisnikomatsakis left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

looking good, one minor quibble

Comment threadsrc/librustc_typeck/check/mod.rs Outdated

@nikomatsakisnikomatsakisMar 16, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

probably a good idea to have assert that the CrateNum is indeed LOCAL_CRATE

@cramertj
cramertjforce-pushed the check-bodies-as-query branch from 6b59aeb to ee584acCompareMarch 18, 2017 04:28
@nikomatsakis

nikomatsakis commented Mar 20, 2017

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Mar 20, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit ee584ac has been approved by nikomatsakis

@bors

bors commented Mar 20, 2017

Copy link
Copy Markdown
Collaborator

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

eddyb
eddyb reviewed Mar 21, 2017
View reviewed changes
Comment threadsrc/librustc_typeck/check/mod.rs Outdated

@eddybeddybMar 21, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Does the separate DepNode::TypeckBodiesKrate task even need to exist?

@cramertjcramertjMar 21, 2017•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

For the moment, yes, because otherwise it causes and ICE with "read/write of Some(TypeckBodiesKrate) but no current task".

Should I try and fix this here somehow or just add a FIXME?

cc @nikomatsakis

@nikomatsakisnikomatsakisMar 21, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I think a FIXME is a good idea.

@cramertj
cramertjforce-pushed the check-bodies-as-query branch from ee584ac to eacd2daCompareMarch 21, 2017 10:07
@nikomatsakisnikomatsakis mentioned this pull request Mar 22, 2017
Closed
63 tasks
@cramertj
cramertjforce-pushed the check-bodies-as-query branch from eacd2da to 8c92044CompareMarch 23, 2017 03:18
@cramertj

cramertj commented Mar 23, 2017

Copy link
Copy Markdown
MemberAuthor

@nikomatsakis Added the FIXME. Anything else I should do to this?

@nikomatsakis

nikomatsakis commented Mar 23, 2017

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Mar 23, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 8c92044 has been approved by nikomatsakis

alexcrichton added a commit to alexcrichton/rust that referenced this pull request Mar 25, 2017
@alexcrichton
Rollup merge ofrust-lang#40540- cramertj:check-bodies-as-query, r=n…
593b535
…ikomatsakis
On-demandify the typechecking of item bodies
r? @nikomatsakis
@alexcrichtonalexcrichton mentioned this pull request Mar 25, 2017
Closed
bors added a commit that referenced this pull request Mar 25, 2017
@bors
Auto merge of#40810- alexcrichton:rollup, r=alexcrichton
40ae49a
Rollup of 11 pull requests
- Successful merges: #40347, #40501, #40516, #40524, #40540, #40642, #40683, #40764, #40778, #40807, #40809
- Failed merges: #40771
bors added a commit that referenced this pull request Mar 25, 2017
@bors
Auto merge of#40810- alexcrichton:rollup, r=alexcrichton
ed9108d
Rollup of 11 pull requests
- Successful merges: #40347, #40501, #40516, #40524, #40540, #40642, #40683, #40764, #40778, #40807, #40809
- Failed merges: #40771
@bors

bors commented Mar 25, 2017

Copy link
Copy Markdown
Collaborator

🔒 Merge conflict

@bors

bors commented Mar 26, 2017

Copy link
Copy Markdown
Collaborator

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

@cramertj
cramertjforce-pushed the check-bodies-as-query branch from 8c92044 to 61cd190CompareMarch 26, 2017 20:45
@nikomatsakis

nikomatsakis commented Mar 27, 2017

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Mar 27, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 61cd190 has been approved by nikomatsakis

@cramertj
cramertjforce-pushed the check-bodies-as-query branch from 61cd190 to 8a27a51CompareMarch 27, 2017 21:49
@nikomatsakis

nikomatsakis commented Mar 27, 2017

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Mar 27, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 8a27a51 has been approved by nikomatsakis

@bors

bors commented Mar 29, 2017

Copy link
Copy Markdown
Collaborator

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

@frewsxcvfrewsxcv mentioned this pull request Mar 29, 2017
Closed
@cramertj
cramertjforce-pushed the check-bodies-as-query branch from 8a27a51 to 3b10b4eCompareMarch 29, 2017 03:36
@nikomatsakis

nikomatsakis commented Mar 29, 2017

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Mar 29, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 3b10b4e has been approved by nikomatsakis

@bors

bors commented Mar 29, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 3b10b4e with merge cf69238...

bors added a commit that referenced this pull request Mar 29, 2017
@bors
Auto merge of#40540- cramertj:check-bodies-as-query, r=nikomatsakis
cf69238
On-demandify the typechecking of item bodies
r? @nikomatsakis
@bors

bors commented Mar 29, 2017

Copy link
Copy Markdown
Collaborator

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

@bors
bors merged commit 3b10b4e into rust-lang:masterMar 29, 2017
This was referenced Mar 29, 2017
Merged
Merged
@cramertj
cramertj deleted the check-bodies-as-query branch September 21, 2017 16:10
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nikomatsakisnikomatsakisnikomatsakis approved these changes
+1 more reviewer
@eddybeddybeddyb left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@nikomatsakisnikomatsakis

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@cramertj@nikomatsakis@bors@eddyb