Skip to content

Iterate over maybe_unused_trait_imports when checking dead trait imports - #97609

Merged
bors merged 1 commit into
rust-lang:masterfrom
Elliot-Roberts:unused-trait-refactor
Jun 5, 2022
Merged

Iterate over maybe_unused_trait_imports when checking dead trait imports#97609
bors merged 1 commit into
rust-lang:masterfrom
Elliot-Roberts:unused-trait-refactor

Conversation

@Elliot-Roberts

@Elliot-RobertsElliot-Roberts commented Jun 1, 2022

Copy link
Copy Markdown
Contributor

Closes#96873
r? @cjgillot

Some questions, if you have time:

  • Is there a way to shorten the rustc_data_structures::fx::FxIndexSet path in the query declaration? I wasn't sure where to put a use.
  • Was returning by reference from the query the right choice here?
  • How would I go about evaluating the importance of the is_dummy() call in check_crate? I don't see failing tests when I comment it out. Should I just try to determine whether dummy spans can ever be put into maybe_unused_trait_imports?
  • Am I doing anything silly with the various ID types?
  • Is that let-else with unreachable!() bad? (i.e is there a better idiom? Would panic!("<explanation>") be better?)
  • If I want to evaluate the perf of using a Vec as mentioned in Iterate over maybe_unused_trait_imports when checking dead trait imports #96873, is the best way to use the CI or is it feasible locally?

Thanks :)

@rustbotrustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jun 1, 2022
@rust-highfive

rust-highfive commented Jun 1, 2022

Copy link
Copy Markdown
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @cjgillot (or someone else) soon.

Please see the contribution instructions for more information.

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 1, 2022
cjgillot
cjgillot reviewed Jun 1, 2022
View reviewed changes

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

Thanks @Elliot-Roberts! This looks very good. I left a few comments.

Comment threadcompiler/rustc_middle/src/query/mod.rs Outdated
Comment threadcompiler/rustc_typeck/src/check_unused.rs Outdated
Comment threadcompiler/rustc_typeck/src/check_unused.rs Outdated

@cjgillotcjgillotJun 1, 2022

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 guess that the point of this check is to avoid reporting for use items that are injected by macros or the compiler. You can leave it as-is, it's very fast.

@Elliot-RobertsElliot-RobertsJun 1, 2022

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.

Could I add a test with a macro that injects an unused trait use? I'm not sure how to check the compiler-injected ones though.

@cjgillotcjgillotJun 1, 2022

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.

You'd need to write a proc macro for this. The proc macro would have to create a use Stuff; item, where the use and ; have a dummy span, and Stuff has a real one from the macro's input code.

@cjgillotcjgillotJun 4, 2022

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.

@Elliot-Roberts crafting the test can wait a follow-up PR. If you don't mind uncommenting this code, the PR is good to merge.

Comment threadcompiler/rustc_typeck/src/check_unused.rs Outdated
Comment threadcompiler/rustc_typeck/src/check_unused.rs Outdated
@Elliot-Roberts
Elliot-Roberts marked this pull request as ready for review June 4, 2022 19:41
@cjgillot

cjgillot commented Jun 4, 2022

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Jun 4, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 76c6845 has been approved by cjgillot

@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 Jun 4, 2022
@matthiaskrgrmatthiaskrgr mentioned this pull request Jun 4, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 4, 2022
@bors
Auto merge ofrust-lang#97742- matthiaskrgr:rollup-fr3j0t8, r=matthi…
43874a2
…askrgr
Rollup of 6 pull requests
Successful merges:
- rust-lang#97609 (Iterate over `maybe_unused_trait_imports` when checking dead trait imports)
- rust-lang#97688 (test const_copy to make sure bytewise pointer copies are working)
- rust-lang#97707 (Improve soundness of rustc_data_structures)
- rust-lang#97731 (Add regresion test for rust-lang#87142)
- rust-lang#97735 (Don't generate "Impls on Foreign Types" for std)
- rust-lang#97737 (Fix pretty printing named bound regions under -Zverbose)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 326315b into rust-lang:masterJun 5, 2022
@rustbotrustbot added this to the 1.63.0 milestone Jun 5, 2022
@Elliot-Roberts
Elliot-Roberts deleted the unused-trait-refactor branch June 6, 2022 03:52
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cjgillotcjgillotcjgillot left review comments

Assignees

@cjgillotcjgillot

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.63.0

Development

Successfully merging this pull request may close these issues.

Iterate over maybe_unused_trait_imports when checking dead trait imports

5 participants

@Elliot-Roberts@rust-highfive@cjgillot@bors@rustbot