diff options
| author | Jon Gjengset <jon@thesquareplanet.com> | 2019-05-24 13:52:06 -0400 |
|---|---|---|
| committer | Jon Gjengset <jon@thesquareplanet.com> | 2019-05-29 18:14:55 -0400 |
| commit | 5a01b547078e45cc1a96a062334d8571f129ddc2 (patch) | |
| tree | 1b46c86a04500d3a5159a6f366b7bfc96a01a08b | |
| parent | 37d001e4deb206ed954fde5d91690221e8306fc3 (diff) | |
| download | rust-5a01b547078e45cc1a96a062334d8571f129ddc2.tar.gz rust-5a01b547078e45cc1a96a062334d8571f129ddc2.zip | |
Add std::mem::take as suggested in #61129
The name `swap_default` was suggested but rejected. @SimonSapin observed that this operation isn't really a `swap` in the same sense as `mem::swap`; it is a `replace`. Since `replace_default` is a bit misleading, the "correct" name would be `replace_with_default`, which is quite verbose. @czipperz observed that we have precedence for using `take` to refer to methods that replace with `Default` in `Cell::take` and `Option::take`, so this reverts commit 99c00591c29b472c8a87c4a9342d0e0c508647a3 to return to the original `take` method name. The name `replace_with_default` was suggested, but was deemed too verbose, especially given that we use `take` for methods that replace with `Default` elsewhere.
| -rw-r--r-- | src/libcore/mem/mod.rs | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/src/libcore/mem/mod.rs b/src/libcore/mem/mod.rs index 91449f09936..c4d8e40a5e6 100644 --- a/src/libcore/mem/mod.rs +++ b/src/libcore/mem/mod.rs @@ -503,6 +503,61 @@ pub fn swap<T>(x: &mut T, y: &mut T) { } } +/// Replace `dest` with the default value of `T`, and return the previous `dest` value. +/// +/// # Examples +/// +/// A simple example: +/// +/// ``` +/// use std::mem; +/// +/// let mut v: Vec<i32> = vec![1, 2]; +/// +/// let old_v = mem::take(&mut v); +/// assert_eq!(vec![1, 2], old_v); +/// assert!(v.is_empty()); +/// ``` +/// +/// `take` allows taking ownership of a struct field by replacing it with an "empty" value. +/// Without `take` you can run into issues like these: +/// +/// ```compile_fail,E0507 +/// struct Buffer<T> { buf: Vec<T> } +/// +/// impl<T> Buffer<T> { +/// fn get_and_reset(&mut self) -> Vec<T> { +/// // error: cannot move out of dereference of `&mut`-pointer +/// let buf = self.buf; +/// self.buf = Vec::new(); +/// buf +/// } +/// } +/// ``` +/// +/// Note that `T` does not necessarily implement [`Clone`], so it can't even clone and reset +/// `self.buf`. But `take` can be used to disassociate the original value of `self.buf` from +/// `self`, allowing it to be returned: +/// +/// ``` +/// # #![allow(dead_code)] +/// use std::mem; +/// +/// # struct Buffer<T> { buf: Vec<T> } +/// impl<T> Buffer<T> { +/// fn get_and_reset(&mut self) -> Vec<T> { +/// mem::take(&mut self.buf) +/// } +/// } +/// ``` +/// +/// [`Clone`]: ../../std/clone/trait.Clone.html +#[inline] +#[unstable(feature = "mem_take", issue = "61129")] +pub fn take<T: Default>(dest: &mut T) -> T { + replace(dest, T::default()) +} + /// Moves `src` into the referenced `dest`, returning the previous `dest` value. /// /// Neither value is dropped. |
