Skip to content

Conversation

orlp
Copy link
Contributor

@orlp orlp commented Sep 9, 2021

Fixes #88195.

@rust-highfive
Copy link
Contributor

r? @scottmcm

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

bors commented Oct 5, 2021

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

@yaahc
Copy link
Member

yaahc commented Oct 5, 2021

r? @yaahc

@rust-highfive rust-highfive assigned yaahc and unassigned scottmcm Oct 5, 2021
@orlp orlp force-pushed the result-map-or-else-docfix branch from eaa53eb to c3dfda0 Compare October 6, 2021 07:19
@yaahc
Copy link
Member

yaahc commented Oct 7, 2021

Thanks and sorry again about the confusion!

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Oct 7, 2021

📌 Commit c3dfda0 has been approved by yaahc

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

Fixes rust-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.

Fixes rust-lang#88195.
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:master Oct 8, 2021
@rustbot rustbot added this to the 1.57.0 milestone Oct 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant 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