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

Clarify what Cell::replace returns #80385

Merged
merged 1 commit into from
Mar 12, 2021
Merged

Clarify what Cell::replace returns #80385

merged 1 commit into from
Mar 12, 2021

Conversation

camelid
Copy link
Member

@camelid camelid commented Dec 26, 2020

No description provided.

@camelid camelid added T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. A-docs Area: Documentation for any part of the project, including the compiler, standard library, and tools labels Dec 26, 2020
@rust-highfive
Copy link
Collaborator

r? @cramertj

(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 Dec 26, 2020
pickfire
pickfire reviewed Dec 27, 2020
View reviewed changes
library/core/src/cell.rs
@@ -374,7 +374,7 @@ impl<T> Cell<T> {
}
}

/// Replaces the contained value, and returns it.
/// Replaces the contained value with `val`, and returns the old contained value.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
/// Replaces the contained value with `val`, and returns the old contained value.
/// Replaces the wrapped value with a new one, returning the old value,
/// without deinitializing either one.
///
/// This function corresponds to [`std::mem::replace`](../mem/fn.replace.html).

Why not just use the same one as RefCell::replace?

@crlf0710 crlf0710 added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 15, 2021
@JohnCSimon JohnCSimon added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 1, 2021
@JohnCSimon
Copy link
Member

Ping from triage
@camelid - can you please address the comment from the reviewer? Thank you.

@rustbot label: -S-waiting-on-review +S-waiting-on-author

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 1, 2021
@camelid
Copy link
Member Author

camelid commented Feb 1, 2021

can you please address the comment from the reviewer? Thank you.

I was waiting for a review from @cramertj, the assignee.

@camelid camelid added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 1, 2021
@JohnCSimon JohnCSimon added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 23, 2021
@Dylan-DPC-zz
Copy link

r? @Mark-Simulacrum

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

I think this is good. I'm not convinced that reference to mem::replace or the alternative wording is better.

@bors
Copy link
Contributor

bors commented Mar 11, 2021

📌 Commit c71f523 has been approved by Mark-Simulacrum

@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 Mar 11, 2021
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Mar 11, 2021
@Dylan-DPC
Rollup merge of rust-lang#80385 - camelid:clarify-cell-replace-docs, …
fef7384 
…r=Mark-Simulacrum

Clarify what `Cell::replace` returns
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Mar 11, 2021
Closed
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Mar 11, 2021
@JohnTitor
Rollup merge of rust-lang#80385 - camelid:clarify-cell-replace-docs, …
eb714da 
…r=Mark-Simulacrum

Clarify what `Cell::replace` returns
@JohnTitor JohnTitor mentioned this pull request Mar 11, 2021
Closed
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Mar 11, 2021
@JohnTitor
Rollup merge of rust-lang#80385 - camelid:clarify-cell-replace-docs, …
eb6af16 
…r=Mark-Simulacrum

Clarify what `Cell::replace` returns
This was referenced Mar 11, 2021
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 12, 2021
@bors
Auto merge of rust-lang#83042 - JohnTitor:rollup-s8efv94, r=JohnTitor
77b996e 
Rollup of 11 pull requests

Successful merges:

 - rust-lang#80385 (Clarify what `Cell::replace` returns)
 - rust-lang#82571 (Rustdoc Json: Add tests for Reexports, and improve jsondocck)
 - rust-lang#82860 (Add `-Z unpretty` flag for the THIR)
 - rust-lang#82950 (convert slice doc link to intra-doc links)
 - rust-lang#82965 (Add spirv extension handling in compiletest)
 - rust-lang#82966 (update MSYS2 link in README)
 - rust-lang#82979 (Fix "run" button position in error index)
 - rust-lang#83001 (Ignore Vim swap files)
 - rust-lang#83003 (rustdoc: tweak the search index format)
 - rust-lang#83013 (Adjust some `#[cfg]`s to take non-Unix non-Windows operating systems into account)
 - rust-lang#83018 (Reintroduce accidentally deleted assertions.)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 2f0bbc0 into rust-lang:master Mar 12, 2021
@rustbot rustbot added this to the 1.52.0 milestone Mar 12, 2021
@camelid camelid deleted the clarify-cell-replace-docs branch March 12, 2021 04:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pickfire pickfire pickfire left review comments

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
A-docs Area: Documentation for any part of the project, including the compiler, standard library, and tools S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.52.0
Development

Successfully merging this pull request may close these issues.
10 participants
@camelid @rust-highfive @JohnCSimon @Dylan-DPC-zz @Mark-Simulacrum @bors @pickfire @crlf0710 @cramertj @rustbot