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 leftover chalk types #71758

Merged
merged 1 commit into from
May 2, 2020
Merged

Remove leftover chalk types #71758

merged 1 commit into from
May 2, 2020

Conversation

jackh726
Copy link
Member

@jackh726 jackh726 commented May 1, 2020

Split out from #69406

Since the other PR is having memory problems with parallel-compiler = true, figured I should split this out. Surprisingly, this actually changes some errors, and I'm not quite sure why.

r? @nikomatsakis

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 1, 2020
@nikomatsakis
Copy link
Contributor

@bors delegate=jackh725

I approve, but we should wait until CI is happy. @jackh726 you should be able to r+

@bors
Copy link
Contributor

bors commented May 1, 2020

✌️ @jackh725 can now approve this pull request

@jackh726
Copy link
Member Author

jackh726 commented May 1, 2020

@nikomatsakis Are the error changes okay? Do you know why they changed?

(also you delegated to wrong user)

@nikomatsakis
Copy link
Contributor

lol, so I did

@bors delegate=jackh726

@bors
Copy link
Contributor

bors commented May 1, 2020

✌️ @jackh726 can now approve this pull request

Copy link
Contributor

@nikomatsakis nikomatsakis left a comment

Choose a reason for hiding this comment

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

It's true, I don't know what's causing the errors -- skimming the diff, I only found one thing that might be a problem.

src/librustc_infer/infer/nll_relate/mod.rs Outdated Show resolved Hide resolved
@jackh726
Copy link
Member Author

jackh726 commented May 1, 2020

Looks like overflow error changes might be related to parallel-compiler = true See #67362 and #67379

I'm gonna try to run test locally with parallel-compiler = false

@jackh726
Copy link
Member Author

jackh726 commented May 1, 2020

Indeed, setting parallel-compiler = false makes the errors be as they are on master. Gonna wait for CI to finish to see what it says. I'm curious if it'll be different between mingw-check and x86_64-gnu-llvm-8.

@jackh726
Copy link
Member Author

jackh726 commented May 1, 2020

@bors r+

@bors
Copy link
Contributor

bors commented May 1, 2020

📌 Commit ef0da3b has been approved by jackh726

@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 May 1, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request May 2, 2020
Rollup of 5 pull requests

Successful merges:

 - rust-lang#71018 (handle ConstValue::ByRef in relate)
 - rust-lang#71758 (Remove leftover chalk types)
 - rust-lang#71760 (Document unsafety for `*const T` and `*mut T`)
 - rust-lang#71761 (doc: reference does not exist, probably a typo)
 - rust-lang#71762 (doc: this resulted in a link pointing to a non-existent target)

Failed merges:

 - rust-lang#71726 (Suggest deref when coercing `ty::Ref` to `ty::RawPtr` with arbitrary mutability)

r? @ghost
@bors bors merged commit 8aad12b into rust-lang:master May 2, 2020
@jackh726 jackh726 deleted the chalk-remove branch May 2, 2020 04:06
@jackh726 jackh726 restored the chalk-remove branch December 15, 2020 19:38
@jackh726 jackh726 deleted the chalk-remove branch March 31, 2021 20:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants