stabilize Result::map_or by tesuji · Pull Request #66570 · rust-lang/rust

tesuji · 2019-11-20T09:43:43Z

r? @SimonSapin
Closes#66293

Dylan-DPC-zz · 2019-11-20T16:41:47Z

r? @Dylan-DPC

Dylan-DPC-zz · 2019-11-20T16:44:15Z

r? @SimonSapin

tesuji · 2019-11-23T09:12:59Z

r? @sfackler

tesuji · 2019-11-25T12:18:56Z

r? @dtolnay

dtolnay · 2019-11-27T21:08:07Z

Thanks @lzutao!

This is a brand new API (#66292) but it is a sensible complement to Result::map_or_else which we have decided already to stabilize in 1.41.0 (#66322) and matches Option::map_or which has existed since 1.0.0.

impl<T,E>Result<T,E>{pubfnmap_or<U,F:FnOnce(T) -> U>(self,default:U,f:F) -> U{matchself{Ok(t) => f(t),Err(_) => default,}}}

@rfcbot fcp merge

rfcbot · 2019-11-27T21:08:08Z

Team member @dtolnay has proposed to merge this. The next step is review by the rest of the tagged team members:

No concerns currently listed.

Once a majority of reviewers approve (and at most 2 approvals are outstanding), this will enter its final comment period. If you spot a major issue that hasn't been raised at any point in this process, please speak up!

See this document for info about what commands tagged team members can give me.

bors · 2019-12-02T06:17:50Z

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

Dylan-DPC-zz · 2019-12-05T10:44:26Z

@Amanieu @Kimundi @withoutboats waiting for your approval on this

dtolnay · 2019-12-13T03:09:09Z

The changes in the PR look good to me as of 93438fd, r=me once the FCP is finished.

rfcbot · 2019-12-15T11:07:37Z

The final comment period, with a disposition to merge, as per the review above, is now complete.

As the automated representative of the governance process, I would like to thank the author for their work and everyone else who contributed.

The RFC will be merged soon.

Dylan-DPC-zz · 2019-12-15T14:27:44Z

@bors r+

bors · 2019-12-15T14:27:46Z

📌 Commit 93438fd has been approved by Dylan-DPC

bors · 2019-12-15T14:27:47Z

🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened

@SimonSapin

…ylan-DPC stabilize Result::map_or r? @SimonSapinClosesrust-lang#66293

@ghost

Rollup of 6 pull requests Successful merges: - #65778 (Stabilize `std::{rc,sync}::Weak::{weak_count, strong_count}`) - #66570 (stabilize Result::map_or) - #67206 (Update cargo, books) - #67285 (Indicate origin of where type parameter for uninferred types ) - #67317 (fix type_name_of_val doc comment) - #67324 (Fix repetition in matches/mod.rs) Failed merges: r? @ghost

@SimonSapin

…ylan-DPC stabilize Result::map_or r? @SimonSapinClosesrust-lang#66293

bors · 2019-12-16T07:20:47Z

⌛ Testing commit 93438fd with merge 1cf33f4049982b6f42b97edf8185b36dee0b8b56...

rust-highfive · 2019-12-16T07:26:33Z

Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

bors · 2019-12-16T07:26:39Z

💔 Test failed - checks-azure

@ghost

Rollup of 7 pull requests Successful merges: - #65778 (Stabilize `std::{rc,sync}::Weak::{weak_count, strong_count}`) - #66570 (stabilize Result::map_or) - #66735 (Add str::strip_prefix and str::strip_suffix) - #66771 (Stabilize the `core::panic` module) - #67317 (fix type_name_of_val doc comment) - #67324 (Fix repetition in matches/mod.rs) - #67325 (cleanup with push_fake_read) Failed merges: r? @ghost

Centril · 2019-12-16T07:55:30Z

@bors retry

@ghost

Rollup of 7 pull requests Successful merges: - #65778 (Stabilize `std::{rc,sync}::Weak::{weak_count, strong_count}`) - #66570 (stabilize Result::map_or) - #66735 (Add str::strip_prefix and str::strip_suffix) - #66771 (Stabilize the `core::panic` module) - #67317 (fix type_name_of_val doc comment) - #67324 (Fix repetition in matches/mod.rs) - #67325 (cleanup with push_fake_read) Failed merges: r? @ghost

rust-highfive assigned SimonSapin Nov 20, 2019

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

jonas-schievink added the relnotes Marks issues that should be documented in the release notes of the next release. label Nov 20, 2019

jonas-schievink added this to the 1.41 milestone Nov 20, 2019

jonas-schievink added the T-libs-api [DEPRECATED; DO NOT USE] label Nov 20, 2019

jfrimmel mentioned this pull request Nov 20, 2019
Add map unwrap or lint for Result rust-lang/rust-clippy#4822
Closed

rust-highfive assigned Dylan-DPC-zz and unassigned SimonSapin Nov 20, 2019

rust-highfive assigned SimonSapin and unassigned Dylan-DPC-zz Nov 20, 2019

rust-highfive assigned sfackler and unassigned SimonSapin Nov 23, 2019

tesuji closed this Nov 25, 2019

tesuji reopened this Nov 25, 2019

rust-highfive assigned dtolnay and unassigned sfackler Nov 25, 2019

tesuji force-pushed the stabilize-result-map_or branch from 7bbac33 to 1f3d350Compare November 25, 2019 13:23

rfcbot added proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. disposition-merge This issue / PR is in PFCP or FCP with a disposition to merge it. labels Nov 27, 2019

tesuji added 2 commits December 2, 2019 06:25

stabilize Result::map_or
8cae411

make use of Result::map_or
93438fd

tesuji force-pushed the stabilize-result-map_or branch from 1f3d350 to 93438fdCompare December 2, 2019 06:26

XAMPPRocky mentioned this pull request Dec 10, 2019
Update RELEASES.md for 1.40.0 #66377
Merged

rfcbot added finished-final-comment-period The final comment period is finished for this PR / Issue. and removed final-comment-period In the final comment period and will be merged soon unless new substantive objections are raised. labels Dec 15, 2019

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-review Status: Awaiting review from the assignee but also interested parties. labels Dec 15, 2019

Centril added a commit to Centril/rust that referenced this pull request Dec 15, 2019
Rollup merge ofrust-lang#66570- lzutao:stabilize-result-map_or, r=D…
c305876
…ylan-DPC stabilize Result::map_or r? @SimonSapinClosesrust-lang#66293

Centril mentioned this pull request Dec 15, 2019
Rollup of 6 pull requests #67326
Closed

Centril added a commit to Centril/rust that referenced this pull request Dec 16, 2019
Rollup merge ofrust-lang#66570- lzutao:stabilize-result-map_or, r=D…
84ef889
…ylan-DPC stabilize Result::map_or r? @SimonSapinClosesrust-lang#66293

Centril mentioned this pull request Dec 16, 2019
Rollup of 7 pull requests #67342
Merged

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 16, 2019

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-review Status: Awaiting review from the assignee but also interested parties. labels Dec 16, 2019

bors merged commit 93438fd into rust-lang:masterDec 16, 2019

tesuji deleted the stabilize-result-map_or branch December 16, 2019 15:32

Uh oh!

Uh oh!

Conversation

tesuji commented Nov 20, 2019

Uh oh!

Dylan-DPC-zz commented Nov 20, 2019

Uh oh!

Dylan-DPC-zz commented Nov 20, 2019

Uh oh!

tesuji commented Nov 23, 2019

Uh oh!

tesuji commented Nov 25, 2019

Uh oh!

dtolnay commented Nov 27, 2019

Uh oh!

rfcbot commented Nov 27, 2019• edited by Amanieu Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bors commented Dec 2, 2019

Uh oh!

Dylan-DPC-zz commented Dec 5, 2019

Uh oh!

dtolnay commented Dec 13, 2019

Uh oh!

rfcbot commented Dec 15, 2019

Uh oh!

Dylan-DPC-zz commented Dec 15, 2019

Uh oh!

bors commented Dec 15, 2019

Uh oh!

bors commented Dec 15, 2019

Uh oh!

bors commented Dec 16, 2019

Uh oh!

rust-highfive commented Dec 16, 2019

Uh oh!

bors commented Dec 16, 2019

Uh oh!

Centril commented Dec 16, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

rfcbot commented Nov 27, 2019•
edited by Amanieu
Loading