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

Fix clippy warnings #577

Merged
merged 1 commit into from
Jul 25, 2020
Merged

Fix clippy warnings #577

merged 1 commit into from
Jul 25, 2020

Conversation

detrumi
Copy link
Member

@detrumi detrumi commented Jul 20, 2020

No description provided.

Copy link
Member

@jackh726 jackh726 left a comment

Choose a reason for hiding this comment

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

Needs a format. But otherwise looks good. I wonder if it's worth maybe having a separate check like the format check for clippy.

@detrumi
Copy link
Member Author

detrumi commented Jul 22, 2020

Woah, ICE on the nightly build:

   Compiling chalk-integration v0.19.0-dev.0 (/home/runner/work/chalk/chalk/chalk-integration)
error: internal compiler error: src/librustc_middle/ty/subst.rs:554:17: type parameter `S/#2` (S/2) out of range when substituting (root type=Some(for<'r> fn(&'r std::iter::Chain<std::iter::Map<std::vec::IntoIter<chalk_ir::Ty<interner::ChalkIr>>, [closure@chalk_solve::wf::WfSolver::<'db, I, S, SC>::verify_adt_decl::{{closure}}#1::{{closure}}#1::{{closure}}#0::{{closure}}#0 0:&&interner::ChalkIr]>, std::option::IntoIter<chalk_ir::Goal<interner::ChalkIr>>>) -> (usize, std::option::Option<usize>) {<std::iter::Chain<std::iter::Map<std::vec::IntoIter<chalk_ir::Ty<interner::ChalkIr>>, [closure@chalk_solve::wf::WfSolver::<'db, I, S, SC>::verify_adt_decl::{{closure}}#1::{{closure}}#1::{{closure}}#0::{{closure}}#0 0:&&interner::ChalkIr]>, std::option::IntoIter<chalk_ir::Goal<interner::ChalkIr>>> as std::iter::Iterator>::size_hint})) substs=[for<'r> fn(&'r std::iter::Chain<std::iter::Map<std::vec::IntoIter<chalk_ir::Ty<interner::ChalkIr>>, [closure@chalk_solve::wf::WfSolver::<'db, I, S, SC>::verify_adt_decl::{{closure}}#1::{{closure}}#1::{{closure}}#0::{{closure}}#0 0:&&interner::ChalkIr]>, std::option::IntoIter<chalk_ir::Goal<interner::ChalkIr>>>) -> (usize, std::option::Option<usize>) {<std::iter::Chain<std::iter::Map<std::vec::IntoIter<chalk_ir::Ty<interner::ChalkIr>>, [closure@chalk_solve::wf::WfSolver::<'db, I, S, SC>::verify_adt_decl::{{closure}}#1::{{closure}}#1::{{closure}}#0::{{closure}}#0 0:&&interner::ChalkIr]>, std::option::IntoIter<chalk_ir::Goal<interner::ChalkIr>>> as std::iter::Iterator>::size_hint}, (&std::iter::Chain<std::iter::Map<std::vec::IntoIter<chalk_ir::Ty<interner::ChalkIr>>, [closure@chalk_solve::wf::WfSolver::<'db, I, S, SC>::verify_adt_decl::{{closure}}#1::{{closure}}#1::{{closure}}#0::{{closure}}#0 0:&&interner::ChalkIr]>, std::option::IntoIter<chalk_ir::Goal<interner::ChalkIr>>>,)]

thread 'rustc' panicked at 'Box<Any>', /rustc/8ad7bc3f428300aee6764f6e23527e19eb235e81/src/libstd/macros.rs:13:23
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

Edit: looks like a known issue: rust-lang/rust#73980

@jackh726
Copy link
Member

Actually, I think the ICE is slightly worse than the linked issue, since this isn't triggered by an associated const (at least in Chalk's code). Worse even still, the linked issue and the other issues linked from there seem to point to const eval-relatedness. And we aren't doing that. So I think we should file an issue, especially given this must have been a very recent regression.

@nathanwhit
Copy link
Member

Shoot, I forgot that resolving conflicts through Github makes a merge commit 🤦, my bad. Can you rebase @detrumi?

@jackh726
Copy link
Member

@nathanwhit you should be able to rebase too :)

@nathanwhit
Copy link
Member

I always forget that's a thing you can do 😅. I figure this is probably ready to merge now?

@nathanwhit
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jul 25, 2020

📌 Commit 4ccf7ba has been approved by nathanwhit

@bors
Copy link
Contributor

bors commented Jul 25, 2020

⌛ Testing commit 4ccf7ba with merge 5f4d08c...

@bors
Copy link
Contributor

bors commented Jul 25, 2020

☀️ Test successful - checks-actions
Approved by: nathanwhit
Pushing 5f4d08c to master...

@bors bors merged commit 5f4d08c into rust-lang:master Jul 25, 2020
@detrumi detrumi deleted the clippy-fixes branch July 25, 2020 18:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants