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

Improve wording of map_or_else docs #89400

Merged
merged 1 commit into from
Oct 4, 2021
Merged

Improve wording of map_or_else docs #89400

merged 1 commit into from
Oct 4, 2021

Conversation

Nitepone
Copy link
Contributor

Changes doc text to refer to the "default" parameter as the "default"
function.

Previously, the doc text referred to the "f" parameter as the "default" function; and the "default" parameter as the "fallback" function.

@Nitepone
Improve wording of map_or_else docs
35b0015 
Changes doc text to refer to the "default" parameter as the "default"
function.
@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @yaahc (or someone else) soon.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 30, 2021
@dtolnay dtolnay assigned dtolnay and unassigned yaahc Oct 3, 2021
dtolnay
dtolnay approved these changes Oct 3, 2021
View reviewed changes
Copy link
Member

@dtolnay dtolnay left a comment

Choose a reason for hiding this comment

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

Thanks! Indeed this was written in a very confusing way before.

@dtolnay
Copy link
Member

dtolnay commented Oct 3, 2021

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Oct 3, 2021

📌 Commit 35b0015 has been approved by dtolnay

@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 3, 2021
Manishearth added a commit to Manishearth/rust that referenced this pull request Oct 4, 2021
@Manishearth
Rollup merge of rust-lang#89400 - Nitepone:nitepone/map-or-else-docfi…
fd4974b 
…x, r=dtolnay

Improve wording of `map_or_else` docs

Changes doc text to refer to the "default" parameter as the "default"
function.

Previously, the doc text referred to the "f" parameter as the "default" function; and the "default" parameter as the "fallback" function.
@Manishearth Manishearth mentioned this pull request Oct 4, 2021
Closed
Manishearth added a commit to Manishearth/rust that referenced this pull request Oct 4, 2021
@Manishearth
Rollup merge of rust-lang#89400 - Nitepone:nitepone/map-or-else-docfi…
4f15b55 
…x, r=dtolnay

Improve wording of `map_or_else` docs

Changes doc text to refer to the "default" parameter as the "default"
function.

Previously, the doc text referred to the "f" parameter as the "default" function; and the "default" parameter as the "fallback" function.
@Manishearth Manishearth mentioned this pull request Oct 4, 2021
Closed
@workingjubilee workingjubilee mentioned this pull request Oct 4, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 4, 2021
@bors
Auto merge of rust-lang#89530 - workingjubilee:rollup-ua14iq6, r=work…
003d8d3 
…ingjubilee

Rollup of 13 pull requests

Successful merges:

 - rust-lang#83655 ([aarch64] add target feature outline-atomics)
 - rust-lang#87091 (implement advance_(back_)_by on more iterators)
 - rust-lang#88451 (Fix an ICE caused by type mismatch errors being ignored)
 - rust-lang#88452 (VecDeque: improve performance for From<[T; N]>)
 - rust-lang#89400 (Improve wording of `map_or_else` docs)
 - rust-lang#89407 (Recommend running `cargo clean` in E0514 output)
 - rust-lang#89443 (Include the length in BTree hashes)
 - rust-lang#89444 (rustdoc: use slice::contains instead of open-coding it)
 - rust-lang#89447 (Improve error message for missing angle brackets in `[_]::method`)
 - rust-lang#89453 (Consistently use 'supertrait'.)
 - rust-lang#89483 (Practice diagnostic message convention)
 - rust-lang#89500 (Fix ICE with buffered lint referring to AST node deleted by everybody_loops)
 - rust-lang#89508 (Stabilize `const_panic`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 9e387cf into rust-lang:master Oct 4, 2021
@rustbot rustbot added this to the 1.57.0 milestone Oct 4, 2021
@orlp
Copy link
Contributor

orlp commented Oct 5, 2021

I'm sorry but I feel a bit robbed? I made a pull request a month ago #88772 =/

@Nitepone
Copy link
Contributor Author

Nitepone commented Oct 5, 2021

Geez, sincere apologies on that. I clearly didn't look around much before making this; I should have searched through open PRs and issues.

I was tunnel visioned on the contributing docs as I had not contributed to this project before. This entire PR was made the morning after a rough experience last Wednesday from a doc misunderstanding.

@yaahc
Copy link
Member

yaahc commented Oct 5, 2021 •
edited
Loading

I'm sorry but I feel a bit robbed? I made a pull request a month ago #88772 =/

I'm sorry about that. We split up our reviews across the team and different members have different availability. The end result is most of us are only aware of a subset of active PRs and those PRs get reviewed in fairly random order, so I assure you it wasn't intentional 😅 . If you want to update your PR to add the additional context ontop of this one I'd be happy to review and merge your additions as well.

orlp added a commit to orlp/rust that referenced this pull request Oct 6, 2021
@orlp
Rebase Result::map_or_else doc wording on top of rust-lang#89400.
c3dfda0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dtolnay dtolnay dtolnay approved these changes

Assignees

@dtolnay dtolnay

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.57.0
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@Nitepone @rust-highfive @dtolnay @bors @orlp @yaahc @rustbot