Skip to content

Use correct param_env in conservative_is_privately_uninhabited#82159

Merged
bors merged 1 commit intorust-lang:masterfrom
BoxyUwU:uwu
Feb 25, 2021
Merged

Use correct param_env in conservative_is_privately_uninhabited#82159
bors merged 1 commit intorust-lang:masterfrom
BoxyUwU:uwu

Conversation

@BoxyUwU
Copy link
Member

@BoxyUwU BoxyUwU commented Feb 15, 2021

cc @lcnr
r? @varkor since this is your FIXME that was removed ^^

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 15, 2021
@varkor varkor added A-const-generics Area: const generics (parameters and arguments) F-const_generics `#![feature(const_generics)]` and removed A-const-generics Area: const generics (parameters and arguments) F-const_generics `#![feature(const_generics)]` labels Feb 15, 2021
@varkor
Copy link
Contributor

varkor commented Feb 15, 2021

Last time I tried to do this, there was an issue with hanging the compiler, so let's not roll this PR up to be on the safe side.

@bors r+ rollup=never

@bors
Copy link
Collaborator

bors commented Feb 15, 2021

📌 Commit d10e4e6 has been approved by varkor

@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 Feb 15, 2021
@lcnr lcnr added the A-const-generics Area: const generics (parameters and arguments) label Feb 15, 2021
@BoxyUwU
Copy link
Member Author

BoxyUwU commented Feb 16, 2021

Last time I tried to do this, there was an issue with hanging the compiler

Well that would explain the 370m long cancelled CI lmao

@jackh726
Copy link
Member

jackh726 commented Feb 16, 2021

@bors r-

CI did hang, let's not waste the CI time since bors queue is pretty full

@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 Feb 16, 2021
@BoxyUwU
Copy link
Member Author

BoxyUwU commented Feb 16, 2021

This PR seems to yeet itself to death on src/test/ui/limits/huge-struct.rs not sure why yet

@BoxyUwU
Copy link
Member Author

BoxyUwU commented Feb 16, 2021 •
edited
Loading

Ok I see why now and have absolutely no idea how to fix this. This is super cursed
edit: I guess there is stuff I can do to make this specific test pass but this also seems like it could be problematic perf wise in general

@varkor
Copy link
Contributor

varkor commented Feb 17, 2021

Would using the query system to memoise the result of the call to conservative_is_privately_uninhabited address this problem more elegantly?

@BoxyUwU
Copy link
Member Author

BoxyUwU commented Feb 17, 2021

Yea that might be a lot more elegant than this, I realised just as I was finishing up that it was basically DIY'ing the query caching stuff haha. Wanted to push what I had to see if it fixed the CI stalling issue (and it has!!) Will try rewriting this to a query soon :)

@BoxyUwU BoxyUwU force-pushed the uwu branch 4 times, most recently from 8141ec4 to 84d04ec Compare February 20, 2021 01:55
@varkor
Copy link
Contributor

varkor commented Feb 22, 2021

@BoxyUwU: is this ready to review now?

@BoxyUwU
Copy link
Member Author

BoxyUwU commented Feb 22, 2021

Yes I think so @varkor

varkor
varkor reviewed Feb 23, 2021
View reviewed changes
@varkor
Copy link
Contributor

varkor commented Feb 23, 2021

Thanks, this looks great! Could you squash the commits?

@BoxyUwU
Copy link
Member Author

BoxyUwU commented Feb 23, 2021

Squashed and fixed comments :)

@varkor
Copy link
Contributor

varkor commented Feb 24, 2021

Thanks for investigating this issue!

@bors r+

@bors
Copy link
Collaborator

bors commented Feb 24, 2021

📌 Commit 42cbfd6 has been approved by varkor

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 24, 2021
@bors
Copy link
Collaborator

bors commented Feb 24, 2021

⌛ Testing commit 42cbfd6 with merge 1fdadbf...

@bors
Copy link
Collaborator

bors commented Feb 25, 2021

☀️ Test successful - checks-actions
Approved by: varkor
Pushing 1fdadbf to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 25, 2021
@bors bors merged commit 1fdadbf into rust-lang:master Feb 25, 2021
@rustbot rustbot added this to the 1.52.0 milestone Feb 25, 2021
@lcnr lcnr mentioned this pull request Dec 11, 2021
Closed
16 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@varkor varkor varkor left review comments

@tesuji tesuji tesuji left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@varkor varkor

Labels

A-const-generics Area: const generics (parameters and arguments) 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

Milestone

1.52.0

Development

Successfully merging this pull request may close these issues.

8 participants

@BoxyUwU @varkor @bors @jackh726 @tesuji @rust-highfive @lcnr @rustbot