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

varkor · 2019-10-08T00:16:25Z

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 · 2019-10-08T00:16:28Z

r? @zackmdavis

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

Centril · 2019-10-08T02:50:41Z

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).

src/librustc/mir/mod.rs

src/librustc/session/mod.rs

varkor · 2019-10-20T14:29:30Z

@zackmdavis seems busy. r? @Centril

src/libtest/lib.rs

src/librustc_typeck/check/upvar.rs

Centril · 2019-10-20T15:40:43Z

src/librustc_target/abi/call/sparc64.rs

-        } else {
-            None
-        }
+        valid_unit.to_option(Uniform { unit, total: arg.layout.size })


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 · 2019-10-20T15:55:07Z

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

@bors try @rust-timer queue

rust-timer · 2019-10-20T15:55:08Z

Awaiting bors try build completion

bors · 2019-10-20T15:55:18Z

⌛ Trying commit 429435c with merge 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 · 2019-10-20T19:02:03Z

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

rust-timer · 2019-10-20T19:02:04Z

Queued d998a73 with parent 857a55b, future comparison URL.

rust-timer · 2019-10-21T00:23:15Z

Finished benchmarking try commit d998a73, comparison URL.

varkor · 2019-10-21T09:26:08Z

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

Centril · 2019-12-03T04:06:20Z

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

Centril · 2019-12-06T16:11:12Z

@bors r+

bors · 2019-12-06T16:11:13Z

📌 Commit f1db60c has been approved by Centril

bors · 2019-12-06T19:14:57Z

⌛ Testing commit f1db60c with merge 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 · 2019-12-06T22:24:03Z

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

rust-highfive assigned zackmdavis Oct 8, 2019

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

This comment has been minimized.

Sign in to view

varkor force-pushed the to_option branch from ebb3e8a to 673eef7 Compare October 9, 2019 21:48

jplatte reviewed Oct 12, 2019

View reviewed changes

src/librustc/mir/mod.rs Outdated Show resolved Hide resolved

jplatte reviewed Oct 12, 2019

View reviewed changes

src/librustc/session/mod.rs Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

This was referenced Oct 15, 2019

Add methods for converting from bool to Option<T> rust-lang/rfcs#2757

Closed

Use heuristics to suggest assignment #65566

Merged

varkor force-pushed the to_option branch from 720dd0e to 429435c Compare October 20, 2019 14:28

rust-highfive assigned Centril and unassigned zackmdavis Oct 20, 2019

Centril reviewed Oct 20, 2019

View reviewed changes

varkor added S-blocked Status: 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 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: Blocked on something else such as an RFC or other implementation work. labels Dec 3, 2019

varkor added 8 commits December 6, 2019 12:20

Rename bool's then to to_option

51901ee

Use to_option in various places

e3a8ea4

Use to_option_with in several places

50985b0

Fix libcore tests

6ea4697

Use as_ref().map() rather than is_some().to_option()

8579fe6

Rename to then_some and then

9f1269f

Use Instant::now lazily

4425148

Fix rebase issues

f1db60c

varkor force-pushed the to_option branch from 27f7eeb to f1db60c Compare December 6, 2019 13:09

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 added the merged-by-bors This PR was explicitly merged by bors. label Dec 6, 2019

bors merged commit f1db60c into rust-lang:master Dec 6, 2019

This was referenced Dec 6, 2019

Remove the borrow check::nll submodule #66886

Merged

Format libcore with rustfmt (including tests and benches) #66892

Merged

Uh oh!

Conversation

varkor commented Oct 8, 2019

Uh oh!

rust-highfive commented Oct 8, 2019

Uh oh!

This comment has been minimized.

Centril commented Oct 8, 2019

Uh oh!

This comment has been minimized.

This comment has been minimized.

Uh oh!

Uh oh!

This comment has been minimized.

varkor commented Oct 20, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Centril Oct 20, 2019

Choose a reason for hiding this comment

Uh oh!

Centril commented Oct 20, 2019

Uh oh!

rust-timer commented Oct 20, 2019

Uh oh!

bors commented Oct 20, 2019

Uh oh!

bors commented Oct 20, 2019

Uh oh!

rust-timer commented Oct 20, 2019

Uh oh!

rust-timer commented Oct 21, 2019

Uh oh!

varkor commented Oct 21, 2019

Uh oh!

Centril commented Dec 3, 2019

Uh oh!

Centril commented Dec 6, 2019

Uh oh!

bors commented Dec 6, 2019

Uh oh!

bors commented Dec 6, 2019

Uh oh!

bors commented Dec 6, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants