Reduce unsafe code

taiki-e · cramertj · commit 572a3f6ef76c · 2019-04-26T10:21:27.000-07:00
diff --git a/futures-util/src/sink/buffer.rs b/futures-util/src/sink/buffer.rs
@@ -43,7 +43,7 @@ impl<Si: Sink<Item>, Item> Buffer<Si, Item> {
 
     /// Get a pinned mutable reference to the inner sink.
     pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut Si> {
-        unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }
+        self.sink()
     }
 
     /// Consumes this combinator, returning the underlying sink.
diff --git a/futures-util/src/sink/err_into.rs b/futures-util/src/sink/err_into.rs
@@ -36,7 +36,7 @@ impl<Si, E, Item> SinkErrInto<Si, Item, E>
 
     /// Get a pinned mutable reference to the inner sink.
     pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut Si> {
-        unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }
+        self.sink().get_pin_mut()
     }
 
     /// Consumes this combinator, returning the underlying sink.
diff --git a/futures-util/src/sink/map_err.rs b/futures-util/src/sink/map_err.rs
@@ -34,7 +34,7 @@ impl<Si, F> SinkMapErr<Si, F> {
 
     /// Get a pinned mutable reference to the inner sink.
     pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut Si> {
-        unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }
+        self.sink()
     }
 
     /// Consumes this combinator, returning the underlying sink.
diff --git a/futures-util/src/sink/with.rs b/futures-util/src/sink/with.rs
@@ -109,7 +109,7 @@ impl<Si, Item, U, Fut, F, E> With<Si, Item, U, Fut, F>
 
     /// Get a pinned mutable reference to the inner sink.
     pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut Si> {
-        unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }
+        self.sink()
     }
 
     /// Consumes this combinator, returning the underlying sink.
diff --git a/futures-util/src/sink/with_flat_map.rs b/futures-util/src/sink/with_flat_map.rs
@@ -60,7 +60,7 @@ where
 
     /// Get a pinned mutable reference to the inner sink.
     pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut Si> {
-        unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }
+        self.sink()
     }
 
     /// Consumes this combinator, returning the underlying sink.
diff --git a/futures-util/src/stream/buffer_unordered.rs b/futures-util/src/stream/buffer_unordered.rs
@@ -81,7 +81,7 @@ where
     /// Note that care must be taken to avoid tampering with the state of the
     /// stream which may otherwise confuse this combinator.
     pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut St> {
-        unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }
+        self.stream().get_pin_mut()
     }
 
     /// Consumes this combinator, returning the underlying stream.
diff --git a/futures-util/src/stream/buffered.rs b/futures-util/src/stream/buffered.rs
@@ -76,7 +76,7 @@ where
     /// Note that care must be taken to avoid tampering with the state of the
     /// stream which may otherwise confuse this combinator.
     pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut St> {
-        unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }
+        self.stream().get_pin_mut()
     }
 
     /// Consumes this combinator, returning the underlying stream.
diff --git a/futures-util/src/stream/chunks.rs b/futures-util/src/stream/chunks.rs
@@ -58,7 +58,7 @@ impl<St: Stream> Chunks<St> where St: Stream {
     /// Note that care must be taken to avoid tampering with the state of the
     /// stream which may otherwise confuse this combinator.
     pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut St> {
-        unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }
+        self.stream().get_pin_mut()
     }
 
     /// Consumes this combinator, returning the underlying stream.
diff --git a/futures-util/src/stream/enumerate.rs b/futures-util/src/stream/enumerate.rs
@@ -46,7 +46,7 @@ impl<St: Stream> Enumerate<St> {
     /// Note that care must be taken to avoid tampering with the state of the
     /// stream which may otherwise confuse this combinator.
     pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut St> {
-        unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }
+        self.stream()
     }
 
     /// Consumes this combinator, returning the underlying stream.
diff --git a/futures-util/src/stream/filter.rs b/futures-util/src/stream/filter.rs
@@ -59,7 +59,7 @@ where St: Stream,
     /// Note that care must be taken to avoid tampering with the state of the
     /// stream which may otherwise confuse this combinator.
     pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut St> {
-        unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }
+        self.stream()
     }
 
     /// Consumes this combinator, returning the underlying stream.
diff --git a/futures-util/src/stream/filter_map.rs b/futures-util/src/stream/filter_map.rs
@@ -58,7 +58,7 @@ impl<St, Fut, F> FilterMap<St, Fut, F>
     /// Note that care must be taken to avoid tampering with the state of the
     /// stream which may otherwise confuse this combinator.
     pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut St> {
-        unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }
+        self.stream()
     }
 
     /// Consumes this combinator, returning the underlying stream.
diff --git a/futures-util/src/stream/flatten.rs b/futures-util/src/stream/flatten.rs
@@ -51,7 +51,7 @@ where St: Stream,
     /// Note that care must be taken to avoid tampering with the state of the
     /// stream which may otherwise confuse this combinator.
     pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut St> {
-        unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }
+        self.stream()
     }
 
     /// Consumes this combinator, returning the underlying stream.
diff --git a/futures-util/src/stream/fuse.rs b/futures-util/src/stream/fuse.rs
@@ -52,7 +52,7 @@ impl<St> Fuse<St> {
     /// Note that care must be taken to avoid tampering with the state of the
     /// stream which may otherwise confuse this combinator.
     pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut St> {
-        unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }
+        self.stream()
     }
 
     /// Consumes this combinator, returning the underlying stream.
diff --git a/futures-util/src/stream/inspect.rs b/futures-util/src/stream/inspect.rs
@@ -46,7 +46,7 @@ impl<St, F> Inspect<St, F>
     /// Note that care must be taken to avoid tampering with the state of the
     /// stream which may otherwise confuse this combinator.
     pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut St> {
-        unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }
+        self.stream()
     }
 
     /// Consumes this combinator, returning the underlying stream.
diff --git a/futures-util/src/stream/map.rs b/futures-util/src/stream/map.rs
@@ -46,7 +46,7 @@ impl<St, T, F> Map<St, F>
     /// Note that care must be taken to avoid tampering with the state of the
     /// stream which may otherwise confuse this combinator.
     pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut St> {
-        unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }
+        self.stream()
     }
 
     /// Consumes this combinator, returning the underlying stream.
diff --git a/futures-util/src/stream/peek.rs b/futures-util/src/stream/peek.rs
@@ -51,7 +51,7 @@ impl<St: Stream> Peekable<St> {
     /// Note that care must be taken to avoid tampering with the state of the
     /// stream which may otherwise confuse this combinator.
     pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut St> {
-        unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }
+        self.stream().get_pin_mut()
     }
 
     /// Consumes this combinator, returning the underlying stream.
diff --git a/futures-util/src/stream/skip.rs b/futures-util/src/stream/skip.rs
@@ -46,7 +46,7 @@ impl<St: Stream> Skip<St> {
     /// Note that care must be taken to avoid tampering with the state of the
     /// stream which may otherwise confuse this combinator.
     pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut St> {
-        unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }
+        self.stream()
     }
 
     /// Consumes this combinator, returning the underlying stream.
diff --git a/futures-util/src/stream/skip_while.rs b/futures-util/src/stream/skip_while.rs
@@ -60,7 +60,7 @@ impl<St, Fut, F> SkipWhile<St, Fut, F>
     /// Note that care must be taken to avoid tampering with the state of the
     /// stream which may otherwise confuse this combinator.
     pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut St> {
-        unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }
+        self.stream()
     }
 
     /// Consumes this combinator, returning the underlying stream.
diff --git a/futures-util/src/stream/take.rs b/futures-util/src/stream/take.rs
@@ -46,7 +46,7 @@ impl<St: Stream> Take<St> {
     /// Note that care must be taken to avoid tampering with the state of the
     /// stream which may otherwise confuse this combinator.
     pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut St> {
-        unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }
+        self.stream()
     }
 
     /// Consumes this combinator, returning the underlying stream.
diff --git a/futures-util/src/stream/take_while.rs b/futures-util/src/stream/take_while.rs
@@ -60,7 +60,7 @@ impl<St, Fut, F> TakeWhile<St, Fut, F>
     /// Note that care must be taken to avoid tampering with the state of the
     /// stream which may otherwise confuse this combinator.
     pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut St> {
-        unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }
+        self.stream()
     }
 
     /// Consumes this combinator, returning the underlying stream.
diff --git a/futures-util/src/stream/then.rs b/futures-util/src/stream/then.rs
@@ -53,7 +53,7 @@ impl<St, Fut, F> Then<St, Fut, F>
     /// Note that care must be taken to avoid tampering with the state of the
     /// stream which may otherwise confuse this combinator.
     pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut St> {
-        unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }
+        self.stream()
     }
 
     /// Consumes this combinator, returning the underlying stream.
diff --git a/futures-util/src/try_stream/and_then.rs b/futures-util/src/try_stream/and_then.rs
@@ -50,7 +50,7 @@ impl<St, Fut, F> AndThen<St, Fut, F>
     /// Note that care must be taken to avoid tampering with the state of the
     /// stream which may otherwise confuse this combinator.
     pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut St> {
-        unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }
+        self.stream()
     }
 
     /// Consumes this combinator, returning the underlying stream.
diff --git a/futures-util/src/try_stream/err_into.rs b/futures-util/src/try_stream/err_into.rs
@@ -43,7 +43,7 @@ impl<St, E> ErrInto<St, E> {
     /// Note that care must be taken to avoid tampering with the state of the
     /// stream which may otherwise confuse this combinator.
     pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut St> {
-        unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }
+        self.stream()
     }
 
     /// Consumes this combinator, returning the underlying stream.
diff --git a/futures-util/src/try_stream/into_stream.rs b/futures-util/src/try_stream/into_stream.rs
@@ -40,7 +40,7 @@ impl<St> IntoStream<St> {
     /// Note that care must be taken to avoid tampering with the state of the
     /// stream which may otherwise confuse this combinator.
     pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut St> {
-        unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }
+        self.stream()
     }
 
     /// Consumes this combinator, returning the underlying stream.
diff --git a/futures-util/src/try_stream/map_err.rs b/futures-util/src/try_stream/map_err.rs
@@ -42,7 +42,7 @@ impl<St, F> MapErr<St, F> {
     /// Note that care must be taken to avoid tampering with the state of the
     /// stream which may otherwise confuse this combinator.
     pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut St> {
-        unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }
+        self.stream()
     }
 
     /// Consumes this combinator, returning the underlying stream.
diff --git a/futures-util/src/try_stream/map_ok.rs b/futures-util/src/try_stream/map_ok.rs
@@ -42,7 +42,7 @@ impl<St, F> MapOk<St, F> {
     /// Note that care must be taken to avoid tampering with the state of the
     /// stream which may otherwise confuse this combinator.
     pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut St> {
-        unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }
+        self.stream()
     }
 
     /// Consumes this combinator, returning the underlying stream.
diff --git a/futures-util/src/try_stream/or_else.rs b/futures-util/src/try_stream/or_else.rs
@@ -50,7 +50,7 @@ impl<St, Fut, F> OrElse<St, Fut, F>
     /// Note that care must be taken to avoid tampering with the state of the
     /// stream which may otherwise confuse this combinator.
     pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut St> {
-        unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }
+        self.stream()
     }
 
     /// Consumes this combinator, returning the underlying stream.
diff --git a/futures-util/src/try_stream/try_buffer_unordered.rs b/futures-util/src/try_stream/try_buffer_unordered.rs
@@ -60,7 +60,7 @@ impl<St> TryBufferUnordered<St>
     /// Note that care must be taken to avoid tampering with the state of the
     /// stream which may otherwise confuse this combinator.
     pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut St> {
-        unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }
+        self.stream().get_pin_mut().get_pin_mut()
     }
 
     /// Consumes this combinator, returning the underlying stream.
diff --git a/futures-util/src/try_stream/try_filter_map.rs b/futures-util/src/try_stream/try_filter_map.rs
@@ -49,7 +49,7 @@ impl<St, Fut, F> TryFilterMap<St, Fut, F> {
     /// Note that care must be taken to avoid tampering with the state of the
     /// stream which may otherwise confuse this combinator.
     pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut St> {
-        unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }
+        self.stream()
     }
 
     /// Consumes this combinator, returning the underlying stream.
diff --git a/futures-util/src/try_stream/try_skip_while.rs b/futures-util/src/try_stream/try_skip_while.rs
@@ -61,7 +61,7 @@ impl<St, Fut, F> TrySkipWhile<St, Fut, F>
     /// Note that care must be taken to avoid tampering with the state of the
     /// stream which may otherwise confuse this combinator.
     pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut St> {
-        unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }
+        self.stream()
     }
 
     /// Consumes this combinator, returning the underlying stream.

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ impl<Si: Sink<Item>, Item> Buffer<Si, Item> {`
`43`	`43`
`44`	`44`	`/// Get a pinned mutable reference to the inner sink.`
`45`	`45`	`pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut Si> {`
`46`		`- unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }`
	`46`	`+ self.sink()`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`/// Consumes this combinator, returning the underlying sink.`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ impl<Si, E, Item> SinkErrInto<Si, Item, E>`
`36`	`36`
`37`	`37`	`/// Get a pinned mutable reference to the inner sink.`
`38`	`38`	`pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut Si> {`
`39`		`- unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }`
	`39`	`+ self.sink().get_pin_mut()`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`/// Consumes this combinator, returning the underlying sink.`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ impl<Si, F> SinkMapErr<Si, F> {`
`34`	`34`
`35`	`35`	`/// Get a pinned mutable reference to the inner sink.`
`36`	`36`	`pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut Si> {`
`37`		`- unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }`
	`37`	`+ self.sink()`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`/// Consumes this combinator, returning the underlying sink.`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ impl<Si, Item, U, Fut, F, E> With<Si, Item, U, Fut, F>`
`109`	`109`
`110`	`110`	`/// Get a pinned mutable reference to the inner sink.`
`111`	`111`	`pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut Si> {`
`112`		`- unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }`
	`112`	`+ self.sink()`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`/// Consumes this combinator, returning the underlying sink.`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ where`
`60`	`60`
`61`	`61`	`/// Get a pinned mutable reference to the inner sink.`
`62`	`62`	`pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut Si> {`
`63`		`- unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }`
	`63`	`+ self.sink()`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`/// Consumes this combinator, returning the underlying sink.`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ where`
`81`	`81`	`/// Note that care must be taken to avoid tampering with the state of the`
`82`	`82`	`/// stream which may otherwise confuse this combinator.`
`83`	`83`	`pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut St> {`
`84`		`- unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }`
	`84`	`+ self.stream().get_pin_mut()`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`/// Consumes this combinator, returning the underlying stream.`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ where`
`76`	`76`	`/// Note that care must be taken to avoid tampering with the state of the`
`77`	`77`	`/// stream which may otherwise confuse this combinator.`
`78`	`78`	`pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut St> {`
`79`		`- unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }`
	`79`	`+ self.stream().get_pin_mut()`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`/// Consumes this combinator, returning the underlying stream.`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ impl<St: Stream> Chunks<St> where St: Stream {`
`58`	`58`	`/// Note that care must be taken to avoid tampering with the state of the`
`59`	`59`	`/// stream which may otherwise confuse this combinator.`
`60`	`60`	`pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut St> {`
`61`		`- unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }`
	`61`	`+ self.stream().get_pin_mut()`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`/// Consumes this combinator, returning the underlying stream.`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ impl<St: Stream> Enumerate<St> {`
`46`	`46`	`/// Note that care must be taken to avoid tampering with the state of the`
`47`	`47`	`/// stream which may otherwise confuse this combinator.`
`48`	`48`	`pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut St> {`
`49`		`- unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }`
	`49`	`+ self.stream()`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`/// Consumes this combinator, returning the underlying stream.`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ where St: Stream,`
`59`	`59`	`/// Note that care must be taken to avoid tampering with the state of the`
`60`	`60`	`/// stream which may otherwise confuse this combinator.`
`61`	`61`	`pub fn get_pin_mut<'a>(self: Pin<&'a mut Self>) -> Pin<&'a mut St> {`
`62`		`- unsafe { Pin::map_unchecked_mut(self, Self::get_mut) }`
	`62`	`+ self.stream()`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`/// Consumes this combinator, returning the underlying stream.`