Mark .remove_alias() as unsafe fn

myrrlyn · myrrlyn · commit ee0be42a0f37 · 2020-10-30T18:08:34.000-05:00
diff --git a/src/field/io.rs b/src/field/io.rs
@@ -91,9 +91,7 @@ where
 {
 	fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
 		let mut idx = 0;
-		for (slot, byte) in self
-			.chunks_exact_mut(8)
-			.remove_alias()
+		for (slot, byte) in unsafe { self.chunks_exact_mut(8).remove_alias() }
 			.zip(buf.iter().copied())
 		{
 			slot.store_be(byte);
diff --git a/src/slice.rs b/src/slice.rs
@@ -1248,8 +1248,8 @@ where
 			}
 		}
 		else {
-			for (to, from) in
-				self.iter_mut().remove_alias().zip(src.iter().copied())
+			for (to, from) in unsafe { self.iter_mut().remove_alias() }
+				.zip(src.iter().copied())
 			{
 				to.set(from);
 			}
@@ -1425,8 +1425,8 @@ where
 			this.sp_copy_from_bitslice(that);
 		}
 		else {
-			for (to, from) in
-				self.iter_mut().remove_alias().zip(src.iter().copied())
+			for (to, from) in unsafe { self.iter_mut().remove_alias() }
+				.zip(src.iter().copied())
 			{
 				to.set(from);
 			}
diff --git a/src/slice/api.rs b/src/slice/api.rs
@@ -2169,7 +2169,7 @@ where
 		//  write into it.
 		let mut out = BitVec::repeat(false, total);
 
-		for chunk in out.chunks_exact_mut(len).remove_alias() {
+		for chunk in unsafe { out.chunks_exact_mut(len).remove_alias() } {
 			//  TODO(myrrlyn): Specialize for `BitField` access
 			chunk.clone_from_bitslice(self);
 		}
diff --git a/src/slice/iter.rs b/src/slice/iter.rs
@@ -2636,7 +2636,7 @@ macro_rules! noalias {
 			///
 			/// [`T::Alias`]: crate::store::BitStore::Alias
 			/// [`T::Mem`]: crate::store::BitStore::Mem
-			pub fn remove_alias(self) -> $to <'a, O, T $( , $p )? > {
+			pub unsafe fn remove_alias(self) -> $to <'a, O, T $( , $p )? > {
 				$to ::new(self)
 			}
 		}
diff --git a/src/slice/specialization.rs b/src/slice/specialization.rs
@@ -43,9 +43,7 @@ where T: BitStore
 		);
 
 		let chunk_size = <usize as BitMemory>::BITS as usize;
-		for (to, from) in self
-			.chunks_mut(chunk_size)
-			.remove_alias()
+		for (to, from) in unsafe { self.chunks_mut(chunk_size).remove_alias() }
 			.zip(src.chunks(chunk_size))
 		{
 			to.store_le::<usize>(from.load_le::<usize>())
@@ -139,9 +137,7 @@ where T: BitStore
 		);
 
 		let chunk_size = <usize as BitMemory>::BITS as usize;
-		for (to, from) in self
-			.chunks_mut(chunk_size)
-			.remove_alias()
+		for (to, from) in unsafe { self.chunks_mut(chunk_size).remove_alias() }
 			.zip(src.chunks(chunk_size))
 		{
 			to.store_be::<usize>(from.load_be::<usize>())
diff --git a/src/vec/iter.rs b/src/vec/iter.rs
@@ -59,7 +59,7 @@ where
 				let new = unsafe { self.get_unchecked_mut(len .. new_len) };
 				let mut pulled = 0;
 				for (slot, bit) in
-					new.iter_mut().remove_alias().zip(iter.by_ref())
+					unsafe { new.iter_mut().remove_alias() }.zip(iter.by_ref())
 				{
 					slot.set(bit);
 					pulled += 1;

Original file line number	Diff line number	Diff line change
`@@ -91,9 +91,7 @@ where`
`91`	`91`	`{`
`92`	`92`	`fn write(&mut self, buf: &[u8]) -> io::Result<usize> {`
`93`	`93`	`let mut idx = 0;`
`94`		`- for (slot, byte) in self`
`95`		`- .chunks_exact_mut(8)`
`96`		`- .remove_alias()`
	`94`	`+ for (slot, byte) in unsafe { self.chunks_exact_mut(8).remove_alias() }`
`97`	`95`	`.zip(buf.iter().copied())`
`98`	`96`	`{`
`99`	`97`	`slot.store_be(byte);`
Original file line number	Diff line number	Diff line change
`@@ -1248,8 +1248,8 @@ where`
`1248`	`1248`	`}`
`1249`	`1249`	`}`
`1250`	`1250`	`else {`
`1251`		`- for (to, from) in`
`1252`		`- self.iter_mut().remove_alias().zip(src.iter().copied())`
	`1251`	`+ for (to, from) in unsafe { self.iter_mut().remove_alias() }`
	`1252`	`+ .zip(src.iter().copied())`
`1253`	`1253`	`{`
`1254`	`1254`	`to.set(from);`
`1255`	`1255`	`}`
`@@ -1425,8 +1425,8 @@ where`
`1425`	`1425`	`this.sp_copy_from_bitslice(that);`
`1426`	`1426`	`}`
`1427`	`1427`	`else {`
`1428`		`- for (to, from) in`
`1429`		`- self.iter_mut().remove_alias().zip(src.iter().copied())`
	`1428`	`+ for (to, from) in unsafe { self.iter_mut().remove_alias() }`
	`1429`	`+ .zip(src.iter().copied())`
`1430`	`1430`	`{`
`1431`	`1431`	`to.set(from);`
`1432`	`1432`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2169,7 +2169,7 @@ where`
`2169`	`2169`	`// write into it.`
`2170`	`2170`	`let mut out = BitVec::repeat(false, total);`
`2171`	`2171`
`2172`		`- for chunk in out.chunks_exact_mut(len).remove_alias() {`
	`2172`	`+ for chunk in unsafe { out.chunks_exact_mut(len).remove_alias() } {`
`2173`	`2173`	// TODO(myrrlyn): Specialize for `BitField` access
`2174`	`2174`	`chunk.clone_from_bitslice(self);`
`2175`	`2175`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2636,7 +2636,7 @@ macro_rules! noalias {`
`2636`	`2636`	`///`
`2637`	`2637`	/// [`T::Alias`]: crate::store::BitStore::Alias
`2638`	`2638`	/// [`T::Mem`]: crate::store::BitStore::Mem
`2639`		`- pub fn remove_alias(self) -> $to <'a, O, T $( , $p )? > {`
	`2639`	`+ pub unsafe fn remove_alias(self) -> $to <'a, O, T $( , $p )? > {`
`2640`	`2640`	`$to ::new(self)`
`2641`	`2641`	`}`
`2642`	`2642`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ where`
`59`	`59`	`let new = unsafe { self.get_unchecked_mut(len .. new_len) };`
`60`	`60`	`let mut pulled = 0;`
`61`	`61`	`for (slot, bit) in`
`62`		`- new.iter_mut().remove_alias().zip(iter.by_ref())`
	`62`	`+ unsafe { new.iter_mut().remove_alias() }.zip(iter.by_ref())`
`63`	`63`	`{`
`64`	`64`	`slot.set(bit);`
`65`	`65`	`pulled += 1;`