Use ManuallyDrop in examples for {Vec,String}::from_raw_parts

This commit is contained in:
Jake Goulding
2019-10-22 15:40:22 -04:00
parent 0d21d257c9
commit dce8fabc62
2 changed files with 14 additions and 12 deletions

View File

@@ -194,7 +194,10 @@ use crate::vec::Vec;
/// ``` /// ```
/// use std::mem; /// use std::mem;
/// ///
/// let mut story = String::from("Once upon a time..."); /// let story = String::from("Once upon a time...");
///
/// // Prevent automatically dropping the String's data
/// let mut story = mem::ManuallyDrop::new(story);
/// ///
/// let ptr = story.as_mut_ptr(); /// let ptr = story.as_mut_ptr();
/// let len = story.len(); /// let len = story.len();
@@ -203,9 +206,6 @@ use crate::vec::Vec;
/// // story has nineteen bytes /// // story has nineteen bytes
/// assert_eq!(19, len); /// assert_eq!(19, len);
/// ///
/// // Now that we have our parts, we throw the story away.
/// mem::forget(story);
///
/// // We can re-build a String out of ptr, len, and capacity. This is all /// // We can re-build a String out of ptr, len, and capacity. This is all
/// // unsafe because we are responsible for making sure the components are /// // unsafe because we are responsible for making sure the components are
/// // valid: /// // valid:
@@ -676,13 +676,15 @@ impl String {
/// use std::mem; /// use std::mem;
/// ///
/// unsafe { /// unsafe {
/// let mut s = String::from("hello"); /// let s = String::from("hello");
///
/// // Prevent automatically dropping the String's data
/// let mut s = mem::ManuallyDrop::new(s);
///
/// let ptr = s.as_mut_ptr(); /// let ptr = s.as_mut_ptr();
/// let len = s.len(); /// let len = s.len();
/// let capacity = s.capacity(); /// let capacity = s.capacity();
/// ///
/// mem::forget(s);
///
/// let s = String::from_raw_parts(ptr, len, capacity); /// let s = String::from_raw_parts(ptr, len, capacity);
/// ///
/// assert_eq!(String::from("hello"), s); /// assert_eq!(String::from("hello"), s);

View File

@@ -389,7 +389,11 @@ impl<T> Vec<T> {
/// use std::ptr; /// use std::ptr;
/// use std::mem; /// use std::mem;
/// ///
/// let mut v = vec![1, 2, 3]; /// let v = vec![1, 2, 3];
///
/// // Prevent running `v`'s destructor so we are in complete control
/// // of the allocation.
/// let mut v = mem::ManuallyDrop::new(v);
/// ///
/// // Pull out the various important pieces of information about `v` /// // Pull out the various important pieces of information about `v`
/// let p = v.as_mut_ptr(); /// let p = v.as_mut_ptr();
@@ -397,10 +401,6 @@ impl<T> Vec<T> {
/// let cap = v.capacity(); /// let cap = v.capacity();
/// ///
/// unsafe { /// unsafe {
/// // Cast `v` into the void: no destructor run, so we are in
/// // complete control of the allocation to which `p` points.
/// mem::forget(v);
///
/// // Overwrite memory with 4, 5, 6 /// // Overwrite memory with 4, 5, 6
/// for i in 0..len as isize { /// for i in 0..len as isize {
/// ptr::write(p.offset(i), 4 + i); /// ptr::write(p.offset(i), 4 + i);