diff --git a/worker/src/http/request.rs b/worker/src/http/request.rs index e27fbbbc..0785a11a 100644 --- a/worker/src/http/request.rs +++ b/worker/src/http/request.rs @@ -45,7 +45,7 @@ pub fn from_wasm(req: web_sys::Request) -> Result> { }) } -/// **Requires** `http` feature. Convert [`worker::HttpRequest`](crate::HttpRequest) +/// **Requires** `http` feature. Convert [`http::Request`](http::Request) /// to [`web_sys::Request`](web_sys::Request) pub fn to_wasm + 'static>( mut req: http::Request, diff --git a/worker/src/http/response.rs b/worker/src/http/response.rs index ccba2938..755bcc3d 100644 --- a/worker/src/http/response.rs +++ b/worker/src/http/response.rs @@ -41,7 +41,7 @@ where )?) } -/// **Requires** `http` feature. Convert [`web_sys::Resopnse`](web_sys::Response) +/// **Requires** `http` feature. Convert [`web_sys::Response`](web_sys::Response) /// to [`worker::HttpResponse`](crate::HttpResponse) pub fn from_wasm(res: web_sys::Response) -> Result { let mut builder = diff --git a/worker/src/lib.rs b/worker/src/lib.rs index 239640bb..dca00a50 100644 --- a/worker/src/lib.rs +++ b/worker/src/lib.rs @@ -136,7 +136,6 @@ pub use crate::env::{Env, EnvBinding, Secret, Var}; pub use crate::error::Error; pub use crate::fetcher::Fetcher; pub use crate::formdata::*; -// #[cfg(not(feature="http"))] pub use crate::global::Fetch; pub use crate::headers::Headers; pub use crate::http::Method; @@ -166,11 +165,8 @@ pub mod durable; mod dynamic_dispatch; mod env; mod error; -// #[cfg(feature = "http")] -// mod fetch; mod fetcher; mod formdata; -// #[cfg(not(feature="http"))] mod global; mod headers; mod http; @@ -203,26 +199,3 @@ pub type HttpRequest = ::http::Request; #[cfg(feature = "http")] /// **Requires** `http` feature. Type alias for `http::Response`. pub type HttpResponse = ::http::Response; - -struct SendJsFuture(wasm_bindgen_futures::JsFuture); - -unsafe impl Send for SendJsFuture {} -unsafe impl Sync for SendJsFuture {} - -impl futures_util::Future for SendJsFuture { - type Output = std::result::Result; - fn poll( - self: std::pin::Pin<&mut Self>, - cx: &mut std::task::Context<'_>, - ) -> std::task::Poll { - use futures_util::FutureExt; - let inner = &mut self.get_mut().0; - inner.poll_unpin(cx) - } -} - -impl From for SendJsFuture { - fn from(value: js_sys::Promise) -> Self { - SendJsFuture(wasm_bindgen_futures::JsFuture::from(value)) - } -} diff --git a/worker/src/websocket.rs b/worker/src/websocket.rs index 555ffe90..aeddb37d 100644 --- a/worker/src/websocket.rs +++ b/worker/src/websocket.rs @@ -454,7 +454,7 @@ async fn fetch_with_request_raw(request: crate::Request) -> Result