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

crates/websocket/src/sink_map_err_tests.rs

@@ -1,8 +1,9 @@
-use super::*;
 use futures_test_sink::SinkMock;
 use futures_util::SinkExt;
 use thiserror::Error;
 
+use super::*;
+
 #[derive(Error, PartialEq, Debug, Copy, Clone)]
 #[error("Unable to send to sink")]
 struct UnmappedError(u8);