fix building cable docs

kanidm · Mar 29, 2023 · 98eca71 · 98eca71
1 parent fcbaeab
commit 98eca71
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -40,7 +40,6 @@ cable-tunnel-server-common = { path = "./cable-tunnel-server/common" }
 clap = { version = "^3.2", features = ["derive", "env"] }
 futures = "^0.3.25"
 hex = { version = "0.4.3" }
-http = "^0.2.9"
 http-body = "=1.0.0-rc.2"
 http-body-util = "=0.1.0-rc.2"
 hyper = { version = "=1.0.0-rc.3", default-features = false, features = ["http1"] }

diff --git a/webauthn-authenticator-rs/Cargo.toml b/webauthn-authenticator-rs/Cargo.toml
@@ -17,7 +17,7 @@ bluetooth = ["btleplug"]
 
 # caBLE / hybrid authenticator
 cable-localhost-tunnel = []
-cable = ["bluetooth", "hex", "http", "tokio", "tokio-tungstenite", "qrcode"]
+cable = ["bluetooth", "hex", "tokio", "tokio-tungstenite", "qrcode"]
 nfc = ["pcsc"]
 usb = ["hidapi"]
 win10 = ["windows"]
@@ -57,7 +57,6 @@ num-traits = "0.2"
 num-derive = "0.3"
 async-trait = "0.1.58"
 futures.workspace = true
-http = { workspace = true, optional = true }
 
 qrcode = { version = "^0.12.0", optional = true }
 # btleplug pinned due to https://github.com/deviceplug/btleplug/issues/289

diff --git a/webauthn-authenticator-rs/src/cable/discovery.rs b/webauthn-authenticator-rs/src/cable/discovery.rs
@@ -2,7 +2,6 @@
 #[cfg(doc)]
 use crate::stubs::*;
 
-use http::uri::Builder;
 use num_traits::ToPrimitive;
 use openssl::{
     ec::EcKey,
@@ -12,7 +11,7 @@ use openssl::{
     sign::Signer,
 };
 use std::mem::size_of;
-use tokio_tungstenite::tungstenite::http::Uri;
+use tokio_tungstenite::tungstenite::http::{uri::Builder, Uri};
 
 use crate::{
     cable::{btle::*, handshake::*, tunnel::get_domain, CableRequestType, Psk},

diff --git a/webauthn-authenticator-rs/src/cable/tunnel.rs b/webauthn-authenticator-rs/src/cable/tunnel.rs
@@ -7,7 +7,6 @@ use std::fmt::Debug;
 
 use async_trait::async_trait;
 use futures::{SinkExt, StreamExt};
-use http::{uri::Builder, Uri};
 use openssl::{
     ec::EcKeyRef,
     pkey::{Private, Public},
@@ -20,7 +19,10 @@ use tokio_tungstenite::{
     connect_async,
     tungstenite::{client::IntoClientRequest, http::HeaderValue, Message},
 };
-use tokio_tungstenite::{MaybeTlsStream, WebSocketStream};
+use tokio_tungstenite::{
+    tungstenite::http::{uri::Builder, Uri},
+    MaybeTlsStream, WebSocketStream,
+};
 use webauthn_rs_proto::AuthenticatorTransport;
 
 use crate::{

diff --git a/webauthn-authenticator-rs/src/stubs.rs b/webauthn-authenticator-rs/src/stubs.rs
@@ -49,6 +49,9 @@ pub mod tokio_tungstenite {
     pub mod tungstenite {
         pub mod http {
             pub struct Uri {}
+            pub mod uri {
+                pub struct Builder {}
+            }
         }
     }
     pub struct MaybeTlsStream<T> {}