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.

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

Implement RefCell::replace and RefCell::swap #43574

Merged
merged 3 commits into from
Aug 14, 2017
Merged

Conversation

notriddle
Copy link
Contributor

Tracking issue: #43570

@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 @BurntSushi (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@frewsxcv frewsxcv added the T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. label Aug 2, 2017
///
/// This function corresponds to [`std::mem::replace`](../mem/fn.replace.html).
///
/// # Example
Copy link
Member

Choose a reason for hiding this comment

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

///
/// This function corresponds to [`std::mem::swap`](../mem/fn.swap.html).
///
/// # Example
Copy link
Member

Choose a reason for hiding this comment

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

s/Example/Examples

@notriddle
Copy link
Contributor Author

Those problems are fixed now.

@aidanhs aidanhs added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 3, 2017
@arielb1
Copy link
Contributor

arielb1 commented Aug 8, 2017

r? @sfackler

@arielb1 arielb1 assigned sfackler and unassigned BurntSushi Aug 8, 2017
///
/// # Panics
///
/// This function will panic if the `RefCell` has any outstanding borrows,
Copy link
Member

Choose a reason for hiding this comment

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

"either RefCell", right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There is only one RefCell involved in a RefCell::replace. This is different from RefCell::swap, which does actually involve two of them.

Copy link
Member

Choose a reason for hiding this comment

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

Oops, yeah, I thought this was below.

@@ -543,6 +543,59 @@ impl<T> RefCell<T> {
debug_assert!(self.borrow.get() == UNUSED);
unsafe { self.value.into_inner() }
}

/// Replaces the wrapped value with a new one, returning the old value,
Copy link
Member

Choose a reason for hiding this comment

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

I wonder if the docs should mention that these are simply convenience functions for their one-liner implementations? I wouldn't want people thinking that they're more "magical" than they really are. Thoughts @steveklabnik? Not sure if we do something similar elsewhere.

@carols10cents
Copy link
Member

ping @sfackler, looks like this is ready for your rereview!

@sfackler
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Aug 14, 2017

📌 Commit 846d373 has been approved by sfackler

@bors
Copy link
Contributor

bors commented Aug 14, 2017

⌛ Testing commit 846d373 with merge f1ca76c...

bors added a commit that referenced this pull request Aug 14, 2017
Implement `RefCell::replace` and `RefCell::swap`

Tracking issue: #43570
@bors
Copy link
Contributor

bors commented Aug 14, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: sfackler
Pushing f1ca76c to master...

@bors bors merged commit 846d373 into rust-lang:master Aug 14, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants