Skip to content

Fixed confusing wording on Result::map_or_else. - #88772

Merged
bors merged 1 commit into
rust-lang:masterfrom
orlp:result-map-or-else-docfix
Oct 8, 2021
Merged

Fixed confusing wording on Result::map_or_else.#88772
bors merged 1 commit into
rust-lang:masterfrom
orlp:result-map-or-else-docfix

Conversation

@orlp

@orlporlp commented Sep 9, 2021

Copy link
Copy Markdown
Contributor

Fixes#88195.

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @scottmcm

(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 9, 2021
@the8472the8472 added the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Sep 21, 2021
@bors

bors commented Oct 5, 2021

Copy link
Copy Markdown
Collaborator

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

@yaahc

yaahc commented Oct 5, 2021

Copy link
Copy Markdown
Member

r? @yaahc

@rust-highfiverust-highfive assigned yaahc and unassigned scottmcmOct 5, 2021
@orlp
orlpforce-pushed the result-map-or-else-docfix branch from eaa53eb to c3dfda0CompareOctober 6, 2021 07:19
@yaahc

yaahc commented Oct 7, 2021

Copy link
Copy Markdown
Member

Thanks and sorry again about the confusion!

@bors r+ rollup

@bors

bors commented Oct 7, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit c3dfda0 has been approved by yaahc

@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 7, 2021
Manishearth added a commit to Manishearth/rust that referenced this pull request Oct 7, 2021
…aahc
Fixed confusing wording on Result::map_or_else.
Fixesrust-lang#88195.
Manishearth added a commit to Manishearth/rust that referenced this pull request Oct 8, 2021
…aahc
Fixed confusing wording on Result::map_or_else.
Fixesrust-lang#88195.
@ManishearthManishearth mentioned this pull request Oct 8, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 8, 2021
…ingjubilee
Rollup of 8 pull requests
Successful merges:
- rust-lang#87918 (Enable AutoFDO.)
- rust-lang#88137 (On macOS, make strip="symbols" not pass any options to strip)
- rust-lang#88772 (Fixed confusing wording on Result::map_or_else.)
- rust-lang#89025 (Implement `#[link_ordinal(n)]`)
- rust-lang#89082 (Implement rust-lang#85440 (Random test ordering))
- rust-lang#89288 (Wrapper for `-Z gcc-ld=lld` to invoke rust-lld with the correct flavor)
- rust-lang#89476 (Correct decoding of foreign expansions during incr. comp.)
- rust-lang#89622 (Use correct edition for panic in [debug_]assert!().)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 2b6d7f7 into rust-lang:masterOct 8, 2021
@rustbotrustbot added this to the 1.57.0 milestone Oct 8, 2021
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-libsRelevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Documentation on Result::map_or_else uses very unfortunate wording

7 participants

@orlp@rust-highfive@bors@yaahc@the8472@scottmcm@rustbot