Skip to content

Simplify ExprUseVisitor - #64874

Merged
bors merged 2 commits into
rust-lang:masterfrom
matthewjasper:simplify-euv
Oct 4, 2019
Merged

Simplify ExprUseVisitor#64874
bors merged 2 commits into
rust-lang:masterfrom
matthewjasper:simplify-euv

Conversation

@matthewjasper

@matthewjaspermatthewjasper commented Sep 28, 2019

Copy link
Copy Markdown
Contributor
  • Remove HIR const qualification
  • Remove parts of ExprUseVisitor that aren't being used

r? @eddyb

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 28, 2019
@eddyb

eddyb commented Sep 28, 2019

Copy link
Copy Markdown
Contributor

I just noticed the old regionck is still around - do we have a timeline for removing it?

eddyb
eddyb reviewed Sep 28, 2019
View reviewed changes
Comment threadsrc/librustc/middle/mem_categorization.rs Outdated
oli-obk
oli-obk reviewed Sep 28, 2019
View reviewed changes
Comment threadsrc/librustc/middle/expr_use_visitor.rs Outdated

@oli-obkoli-obkSep 28, 2019

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.

can you check whether clippy still works after your PR? We use this visitor a lot.

@eddybeddybSep 28, 2019

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.

Oh... anything using EUV should've transitioned a long time ago to being based on MIR, IMO. I wish I brought this up to clippy people earlier :/

eddyb
eddyb reviewed Sep 28, 2019
View reviewed changes
Comment threadsrc/test/ui/issues/issue-23302-3.stderr Outdated
eddyb
eddyb reviewed Sep 28, 2019
View reviewed changes
Comment threadsrc/librustc_passes/lib.rs Outdated

@eddybeddybSep 28, 2019

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.

Feels like this crate is becoming quite pointless.

@CentrilCentrilSep 28, 2019

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.

We could split them out to a crate for each pass. :)

@eddybeddybSep 29, 2019

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.

They are tiny though... a bunch of them belong in rustc::hir which could become a crate (with only the data types remaining in rustc).

@CentrilCentrilSep 29, 2019

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.

Whatever we do, let's please not inflate the size of the rustc crate. :)

eddyb
eddyb reviewed Sep 28, 2019
View reviewed changes
Comment threadsrc/librustc_typeck/check/upvar.rs Outdated

@eddybeddybSep 28, 2019•
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.

Is this the only user left? Can its reliance on MC be simplified too?

@matthewjasper

matthewjasper commented Sep 28, 2019

Copy link
Copy Markdown
ContributorAuthor

The old regionck is still used for items. A lot of it can be removed now, but that's another PR.

Notes for anyone trying to update Clippy after this lands:

  • utils/usage.rs - doesn't use anything removed here
  • loops.rs - needs to change from the span passed in to the span of the cmt.
  • escape.rs - consume and consume_pat will need to be merged
  • needless_pass_by_value - should probably use borrow instead of matched_pat

@bors

bors commented Sep 30, 2019

Copy link
Copy Markdown
Collaborator

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

eddyb
eddyb approved these changes Oct 3, 2019
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, r=me if you don't want to change more due to #64874 (comment)

@matthewjasper

matthewjasper commented Oct 3, 2019

Copy link
Copy Markdown
ContributorAuthor

@bors r=eddyb

@bors

bors commented Oct 3, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit b4ad612 has been approved by eddyb

@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 Oct 3, 2019
nikomatsakis
nikomatsakis approved these changes Oct 3, 2019
View reviewed changes

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

Nice cleanup, @matthewjasper!

Centril added a commit to Centril/rust that referenced this pull request Oct 4, 2019
@Centril
Rollup merge ofrust-lang#64874- matthewjasper:simplify-euv, r=eddyb
cb4145e
Simplify ExprUseVisitor
* Remove HIR const qualification
* Remove parts of ExprUseVisitor that aren't being used
r? @eddyb
@CentrilCentril mentioned this pull request Oct 4, 2019
Merged
bors added a commit that referenced this pull request Oct 4, 2019
@bors
Auto merge of#65087- Centril:rollup-skxq0zr, r=Centril
9e35a28
Rollup of 5 pull requests
Successful merges:
- #64749 (Fix most remaining Polonius test differences)
- #64817 (Replace ClosureSubsts with SubstsRef)
- #64874 (Simplify ExprUseVisitor)
- #65026 (metadata: Some crate loading cleanup)
- #65073 (Remove `borrowck_graphviz_postflow` from test)
Failed merges:
r? @ghost
@bors
bors merged commit b4ad612 into rust-lang:masterOct 4, 2019
@JohnTitorJohnTitor mentioned this pull request Oct 4, 2019
Closed
@matthewjasper
matthewjasper deleted the simplify-euv branch October 4, 2019 12:03
flip1995 added a commit to flip1995/rust-clippy that referenced this pull request Oct 4, 2019
@flip1995
Rustup torust-lang/rust#64874
f3cdee4
Episode 1 - The simple cases
flip1995 added a commit to flip1995/rust-clippy that referenced this pull request Oct 4, 2019
@flip1995
Rustup torust-lang/rust#64874
b46f5b4
Episode 1 - The simple cases
@flip1995flip1995 mentioned this pull request Oct 4, 2019
Merged
3 tasks
bors added a commit to rust-lang/rust-clippy that referenced this pull request Oct 8, 2019
@bors
Auto merge of#4628- flip1995:rustup, r=phansch
df80193
Rustup to rust-lang/rust#64874
TODO:
- [x] replace `rvalue_promotable_map` in [1]
- [ ] ~~fix [2] according to this comment rust-lang/rust#64874 (comment) this should be merged with `consume`, but I didn't figure out how to merge them, yet.~~
- [ ] ~~fix [3]; What to do with `LoanCause`?~~
[2]+[3] probably have to be resolved by a rewrite of the lint. #4628 (comment)
[1]
https://github.com/rust-lang/rust-clippy/blob/54bf4ffd626970e831bb80c037f804a3b3450835/clippy_lints/src/methods/mod.rs#L1292-L1299
[2]
https://github.com/rust-lang/rust-clippy/blob/54bf4ffd626970e831bb80c037f804a3b3450835/clippy_lints/src/escape.rs#L126
[3]
https://github.com/rust-lang/rust-clippy/blob/54bf4ffd626970e831bb80c037f804a3b3450835/clippy_lints/src/escape.rs#L166-L176
I could need some help with [1]. The purpose of this is to "don't lint for constant values". cc @matthewjasper
For now I see what I can do with [2].
changelog: Temporary break `boxed_local` lint.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@oli-obkoli-obkoli-obk left review comments
@nikomatsakisnikomatsakisnikomatsakis approved these changes
+2 more reviewers
@CentrilCentrilCentril left review comments
@eddybeddybeddyb approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@eddybeddyb

Labels

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.

7 participants

@matthewjasper@eddyb@bors@nikomatsakis@oli-obk@Centril@rust-highfive