first pass of merging in warp (doesn't build)

crates/websocket/src/sink_map_err.rs

@@ -1,8 +1,9 @@
 use core::pin::Pin;
+use std::task::{Context, Poll};
+
 use futures::{Sink, Stream};
 use futures_util::stream::FusedStream;
 use pin_project::pin_project;
-use std::task::{Context, Poll};
 
 /// Maps the error returned by the [`Sink`] using the provided `err` function.
 pub fn map_err<S, I, E>(sink: S, err: impl FnMut(S::Error) -> E) -> impl Sink<I, Error = E>
@@ -13,7 +14,7 @@ where
 }
 
 /// Helper struct to map the [`Err`] of an underlying [`Sink`].
-/// This is a fork of the the `SinkMapErr` defined within `futures-util`
+/// This is a fork of the `SinkMapErr` defined within `futures-util`
 /// (https://docs.rs/futures/latest/futures/sink/struct.SinkMapErr.html) except that it does _not_
 /// panic if the caller tries to write to the sink after a previous attempt to write returned an
 /// error. See <https://github.com/rust-lang/futures-rs/issues/2108> for more details about the