Rollup merge of rust-lang#31607 - steveklabnik:gh31599, r=brson

steveklabnik · steveklabnik · commit 6a625f89277a · 2016-02-13T13:54:33.000-05:00
Fixes rust-lang#31599
diff --git a/src/libcore/ptr.rs b/src/libcore/ptr.rs
@@ -127,8 +127,6 @@ pub unsafe fn read<T>(src: *const T) -> T {
     tmp
 }
 
-/// Variant of read_and_zero that writes the specific drop-flag byte
-/// (which may be more appropriate than zero).
 #[inline(always)]
 #[unstable(feature = "filling_drop",
            reason = "may play a larger role in std::ptr future extensions",

Original file line number	Diff line number	Diff line change
`@@ -127,8 +127,6 @@ pub unsafe fn read<T>(src: *const T) -> T {`
`127`	`127`	`tmp`
`128`	`128`	`}`
`129`	`129`
`130`		`-/// Variant of read_and_zero that writes the specific drop-flag byte`
`131`		`-/// (which may be more appropriate than zero).`
`132`	`130`	`#[inline(always)]`
`133`	`131`	`#[unstable(feature = "filling_drop",`
`134`	`132`	`reason = "may play a larger role in std::ptr future extensions",`