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.

Sign up for GitHub

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

Jump to bottom

Rename bool::then_* to bool::to_option_* and use where appropriate #65195

Merged
merged 8 commits into from
Dec 6, 2019
Merged

Rename bool::then_* to bool::to_option_* and use where appropriate #65195

merged 8 commits into from
Dec 6, 2019

Conversation

varkor
Copy link
Member

@varkor varkor commented Oct 8, 2019

Name change following rust-lang/rfcs#2757. Also try it out throughout the compiler in places I think makes the code more readable.

@rust-highfive
Copy link
Collaborator

r? @zackmdavis

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 8, 2019
@rust-highfive

This comment has been minimized.

Sign in to view
@Centril
Copy link
Contributor

Centril commented Oct 8, 2019

I think in some places you use .to_option where .to_option_with should be used instead (e.g. in allocating or side-effecting situations).

@rust-highfive

This comment has been minimized.

Sign in to view
@bors

This comment has been minimized.

Sign in to view
jplatte
jplatte reviewed Oct 12, 2019
View reviewed changes
src/librustc/mir/mod.rs Outdated Show resolved Hide resolved
@bors

This comment has been minimized.

Sign in to view
This was referenced Oct 15, 2019
Closed
Merged
@varkor
Copy link
Member Author

varkor commented Oct 20, 2019

@zackmdavis seems busy. r? @Centril

@rust-highfive rust-highfive assigned Centril and unassigned zackmdavis Oct 20, 2019
Centril
Centril reviewed Oct 20, 2019
View reviewed changes
src/libtest/lib.rs Outdated Show resolved Hide resolved
src/libtest/lib.rs Outdated Show resolved Hide resolved
src/librustc_typeck/check/upvar.rs Outdated Show resolved Hide resolved
src/librustc_target/abi/call/sparc64.rs Outdated
} else {
None
}
valid_unit.to_option(Uniform { unit, total: arg.layout.size })
Copy link
Contributor

Choose a reason for hiding this comment

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

I've seen the same logic (up to RegKind::Vector =>) 4 times now so it might be worth de-duplicating that with a function somewhere.

@Centril
Copy link
Contributor

Centril commented Oct 20, 2019

Let's just make sure perf doesn't regress anywhere.

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion

@bors
Copy link
Contributor

bors commented Oct 20, 2019

⌛ Trying commit 429435c with merge d998a73...

bors added a commit that referenced this pull request Oct 20, 2019
@bors
Auto merge of #65195 - varkor:to_option, r=<try>
d998a73 
Rename `bool::then_*` to `bool::to_option_*` and use where appropriate

Name change following rust-lang/rfcs#2757. Also try it out throughout the compiler in places I think makes the code more readable.
@bors
Copy link
Contributor

bors commented Oct 20, 2019

☀️ Try build successful - checks-azure
Build commit: d998a73 (d998a738b8b303e27c108bc939c3765df487a753)

@rust-timer
Copy link
Collaborator

Queued d998a73 with parent 857a55b, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking try commit d998a73, comparison URL.

@varkor
Copy link
Member Author

varkor commented Oct 21, 2019

This is blocked on the discussion in rust-lang/rfcs#2757.

@varkor varkor added S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 21, 2019
@Centril Centril added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. labels Dec 3, 2019
@Centril
Copy link
Contributor

Centril commented Dec 3, 2019

@varkor Can you please implement @dtolnay's comment in rust-lang/rfcs#2757 (comment)?

@Centril
Copy link
Contributor

Centril commented Dec 6, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Dec 6, 2019

📌 Commit f1db60c has been approved by Centril

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 6, 2019
@bors
Copy link
Contributor

bors commented Dec 6, 2019

⌛ Testing commit f1db60c with merge ae1b871...

bors added a commit that referenced this pull request Dec 6, 2019
@bors
Auto merge of #65195 - varkor:to_option, r=Centril
ae1b871 
Rename `bool::then_*` to `bool::to_option_*` and use where appropriate

Name change following rust-lang/rfcs#2757. Also try it out throughout the compiler in places I think makes the code more readable.
@bors
Copy link
Contributor

bors commented Dec 6, 2019

☀️ Test successful - checks-azure
Approved by: Centril
Pushing ae1b871 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 6, 2019
@bors bors merged commit f1db60c into rust-lang:master Dec 6, 2019
This was referenced Dec 6, 2019
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Centril Centril Centril left review comments

@jplatte jplatte jplatte left review comments

Assignees

@Centril Centril

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: 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
@varkor @rust-highfive @Centril @bors @rust-timer @jplatte @zackmdavis