Skip to content

remove KEEP_IN_LOCAL_TCX flag - #70860

Merged
bors merged 3 commits into
rust-lang:masterfrom
lcnr:has_local_value
Apr 9, 2020
Merged

remove KEEP_IN_LOCAL_TCX flag#70860
bors merged 3 commits into
rust-lang:masterfrom
lcnr:has_local_value

Conversation

@lcnr

@lcnrlcnr commented Apr 6, 2020•
edited
Loading

Copy link
Copy Markdown
Contributor

closes#70285

I did not rename needs_infer here as this complex enough as is.
Will probably open a followup for that.

r? @eddyb

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 6, 2020
eddyb
eddyb reviewed Apr 6, 2020
View reviewed changes
Comment threadsrc/librustc_infer/infer/canonical/canonicalizer.rs Outdated
eddyb
eddyb reviewed Apr 6, 2020
View reviewed changes
Comment threadsrc/librustc_typeck/check/writeback.rs Outdated
eddyb
eddyb reviewed Apr 6, 2020
View reviewed changes
Comment threadsrc/librustc_typeck/check/writeback.rs Outdated
eddyb
eddyb reviewed Apr 6, 2020
View reviewed changes
Comment threadsrc/librustc_trait_selection/traits/select.rs Outdated
eddyb
eddyb reviewed Apr 6, 2020
View reviewed changes
Comment threadsrc/librustc_trait_selection/traits/mod.rs Outdated
Comment on lines 262 to 264

@eddybeddybApr 6, 2020•
edited
Loading

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.

cc @nikomatsakis This is a scary FIXME comment 😮. Should we add a delay_span_bug?

@lcnrlcnrApr 6, 2020

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

added a delay_span_bug. Should be a relevant error msg afaik

encountered inference variables after fully_resolve

@lcnr
lcnrforce-pushed the has_local_value branch 2 times, most recently from 9f5ebff to bc5d6adCompareApril 6, 2020 22:23
eddyb
eddyb reviewed Apr 6, 2020
View reviewed changes
Comment threadsrc/librustc_middle/ty/relate.rs Outdated
Comment on lines 513 to 514

@eddybeddybApr 6, 2020

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.

cc @oli-obk@varkor This seems unnecessary, ty::Const::eval handles needs_infer itself.

eddyb
eddyb reviewed Apr 6, 2020
View reviewed changes
Comment threadsrc/librustc_middle/ty/sty.rs Outdated
eddyb
eddyb reviewed Apr 6, 2020
View reviewed changes
Comment threadsrc/librustc_middle/ty/sty.rs Outdated
eddyb
eddyb approved these changes Apr 6, 2020
View reviewed changes

@eddybeddyb 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.

LGTM

@eddyb

eddyb commented Apr 6, 2020

Copy link
Copy Markdown
Contributor

r? @nikomatsakis

@lcnr
lcnrforce-pushed the has_local_value branch 3 times, most recently from 1fadf31 to 3358803CompareApril 7, 2020 08:49
@nikomatsakis

nikomatsakis commented Apr 7, 2020

Copy link
Copy Markdown
Contributor

@bors r+ rollup=never

@bors

bors commented Apr 7, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 3358803b44e40b97eb7f8c8e00ad00c8824ab73a has been approved by nikomatsakis

@borsbors 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 Apr 7, 2020
@Dylan-DPC-zz

Dylan-DPC-zz commented Apr 8, 2020

Copy link
Copy Markdown

@bors p=1

@bors

bors commented Apr 8, 2020

Copy link
Copy Markdown
Collaborator

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

@borsbors 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 Apr 8, 2020
@lcnr

lcnr commented Apr 8, 2020

Copy link
Copy Markdown
ContributorAuthor

should once again be ready

@varkor

varkor commented Apr 8, 2020

Copy link
Copy Markdown
Contributor

@bors r=nikomatsakis

@bors

bors commented Apr 8, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit fca7d16 has been approved by nikomatsakis

@borsbors 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 Apr 8, 2020
@bors

bors commented Apr 9, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit fca7d16 with merge 11f6096...

@bors

bors commented Apr 9, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: nikomatsakis
Pushing 11f6096 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Apr 9, 2020
@bors
bors merged commit 11f6096 into rust-lang:masterApr 9, 2020
@borsbors mentioned this pull request Apr 9, 2020
Merged
@lcnr
lcnr deleted the has_local_value branch April 9, 2020 06:56
@jyn514jyn514 mentioned this pull request Nov 1, 2020
Closed
@SNCPlay42SNCPlay42 mentioned this pull request Apr 22, 2021
Closed
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 approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@nikomatsakisnikomatsakis

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Replace calls to has_local_value with needs_infer.

7 participants

@lcnr@eddyb@nikomatsakis@bors@Dylan-DPC-zz@varkor@rust-highfive