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

crates/websocket/src/proxy.rs

@@ -10,7 +10,8 @@ use std::env;
 use std::time::Duration;
 
 use anyhow::{bail, Context};
-use base64::{engine::general_purpose::STANDARD as BASE64, Engine as _};
+use base64::engine::general_purpose::STANDARD as BASE64;
+use base64::Engine as _;
 use http_body_util::Empty;
 use hyper::body::Bytes;
 use hyper_util::rt::TokioIo;