Skip to content

A few cleanups for hir - #54151

Merged
bors merged 1 commit into
rust-lang:masterfrom
ljedrz:cleanup_hir
Sep 15, 2018
Merged

A few cleanups for hir#54151
bors merged 1 commit into
rust-lang:masterfrom
ljedrz:cleanup_hir

Conversation

@ljedrz

@ljedrzljedrz commented Sep 12, 2018

Copy link
Copy Markdown
Contributor
  • prefer if let to match when only 1 branch matters
  • chain iterable items that are looped over in sequence
  • sort_by_key instead of sort_by when possible
  • change cloning maps to cloned()
  • use unwrap_or_else and ok when applicable
  • a few other minor readability improvements
  • whitespace fixes

@rust-highfive

rust-highfive commented Sep 12, 2018

Copy link
Copy Markdown
Contributor

r? @michaelwoerister

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 12, 2018
michaelwoerister
michaelwoerister reviewed Sep 12, 2018
View reviewed changes
Comment threadsrc/librustc/hir/intravisit.rs Outdated

@michaelwoeristermichaelwoeristerSep 12, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Usually we try to make match statements exhaustive in order to catch errors when new variants are added.

michaelwoerister
michaelwoerister reviewed Sep 12, 2018
View reviewed changes
Comment threadsrc/librustc/hir/print.rs Outdated

@michaelwoeristermichaelwoeristerSep 12, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I'd keep this the old way too. It's good to see all the options listed.

michaelwoerister
michaelwoerister reviewed Sep 12, 2018
View reviewed changes
Comment threadsrc/librustc/hir/print.rs Outdated

@michaelwoeristermichaelwoeristerSep 12, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The same here and constness above. It's a bit more verbose to list all variants, but also a lot more readable for someone who does not know the code base by heart.

@michaelwoerister

michaelwoerister commented Sep 12, 2018

Copy link
Copy Markdown
Member

Thanks for the PR, @ljedrz! I've lot some comments in the code.

@ljedrz

ljedrz commented Sep 12, 2018

Copy link
Copy Markdown
ContributorAuthor

@michaelwoerister thanks, comments addressed.

@ljedrz

ljedrz commented Sep 14, 2018

Copy link
Copy Markdown
ContributorAuthor

r? @michaelwoerister

@michaelwoerister

michaelwoerister commented Sep 14, 2018

Copy link
Copy Markdown
Member

Thanks, @ljedrz!

@bors r+

@bors

bors commented Sep 14, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 2919ecd has been approved by michaelwoerister

@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 Sep 14, 2018
@bors

bors commented Sep 15, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 2919ecd with merge ed45f9c...

bors added a commit that referenced this pull request Sep 15, 2018
@bors
Auto merge of#54151- ljedrz:cleanup_hir, r=michaelwoerister
ed45f9c
A few cleanups for hir
- prefer `if let` to `match` when only 1 branch matters
- `chain` iterable items that are looped over in sequence
- `sort_by_key` instead of `sort_by` when possible
- change cloning `map`s to `cloned()`
- use `unwrap_or_else` and `ok` when applicable
- a few other minor readability improvements
- whitespace fixes
@bors

bors commented Sep 15, 2018

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: michaelwoerister
Pushing ed45f9c to master...

@bors
bors merged commit 2919ecd into rust-lang:masterSep 15, 2018
@borsbors mentioned this pull request Sep 15, 2018
Merged
@ljedrz
ljedrz deleted the cleanup_hir branch September 15, 2018 06:13
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@michaelwoeristermichaelwoeristermichaelwoerister left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@michaelwoeristermichaelwoerister

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.

4 participants

@ljedrz@rust-highfive@michaelwoerister@bors