Skip to content

Commit

Permalink
Use ManuallyDrop in examples for {Vec,String}::from_raw_parts
Browse files Browse the repository at this point in the history
  • Loading branch information
shepmaster committed Oct 25, 2019
1 parent 0d21d25 commit dce8fab
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 12 deletions.
16 changes: 9 additions & 7 deletions src/liballoc/string.rs
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,10 @@ use crate::vec::Vec;
/// ```
/// 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 len = story.len();
Expand All @@ -203,9 +206,6 @@ use crate::vec::Vec;
/// // story has nineteen bytes
/// 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
/// // unsafe because we are responsible for making sure the components are
/// // valid:
Expand Down Expand Up @@ -676,13 +676,15 @@ impl String {
/// use std::mem;
///
/// 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 len = s.len();
/// let capacity = s.capacity();
///
/// mem::forget(s);
///
/// let s = String::from_raw_parts(ptr, len, capacity);
///
/// assert_eq!(String::from("hello"), s);
Expand Down
10 changes: 5 additions & 5 deletions src/liballoc/vec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -389,18 +389,18 @@ impl<T> Vec<T> {
/// use std::ptr;
/// 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`
/// let p = v.as_mut_ptr();
/// let len = v.len();
/// let cap = v.capacity();
///
/// 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
/// for i in 0..len as isize {
/// ptr::write(p.offset(i), 4 + i);
Expand Down

0 comments on commit dce8fab

Please sign in to comment.