From ac0d0b22156fb0f502736f16eb0285a7692b4f1c Mon Sep 17 00:00:00 2001 From: TylerBloom Date: Thu, 21 Dec 2023 13:19:41 -0500 Subject: [PATCH] Clean up --- squire_core/src/tests/utils.rs | 2 ++ squire_sdk/src/client/network.rs | 14 -------------- squire_sdk/src/compat/native.rs | 3 +-- squire_sdk/src/compat/wasm.rs | 4 ++-- squire_sdk/tests/server/utils.rs | 2 +- 5 files changed, 6 insertions(+), 19 deletions(-) diff --git a/squire_core/src/tests/utils.rs b/squire_core/src/tests/utils.rs index 285e9ad8..3b051489 100644 --- a/squire_core/src/tests/utils.rs +++ b/squire_core/src/tests/utils.rs @@ -1,3 +1,4 @@ +/* use axum::{body::HttpBody, http::Request, response::Response}; use headers::HeaderValue; use http::{ @@ -53,3 +54,4 @@ where .body(serde_json::to_string(&body).unwrap().into()) .unwrap() } +*/ diff --git a/squire_sdk/src/client/network.rs b/squire_sdk/src/client/network.rs index 9184f071..74351682 100644 --- a/squire_sdk/src/client/network.rs +++ b/squire_sdk/src/client/network.rs @@ -212,17 +212,3 @@ impl From<((), OneshotSender)> for NetworkCommand { NetworkCommand::GuestLogin(send) } } - -impl TryFrom<&HeaderMap> for SessionToken { - type Error = TokenParseError; - - fn try_from(headers: &HeaderMap) -> Result { - match headers - .get(Self::HEADER_NAME.as_str()) - .and_then(|h| h.to_str().ok()) - { - Some(header) => header.parse(), - None => Err(TokenParseError::NoAuthHeader), - } - } -} diff --git a/squire_sdk/src/compat/native.rs b/squire_sdk/src/compat/native.rs index 0934b06e..73d506ec 100644 --- a/squire_sdk/src/compat/native.rs +++ b/squire_sdk/src/compat/native.rs @@ -107,8 +107,7 @@ mod client { use cookie::Cookie; use derive_more::From; use futures::{FutureExt, Sink, Stream, TryFutureExt}; - use http::Method; - use reqwest::Url; + use reqwest::{Url, Method}; use serde::{de::DeserializeOwned, Serialize}; use tokio::net::TcpStream; use tokio_tungstenite::{ diff --git a/squire_sdk/src/compat/wasm.rs b/squire_sdk/src/compat/wasm.rs index 30afba57..6affcdcc 100644 --- a/squire_sdk/src/compat/wasm.rs +++ b/squire_sdk/src/compat/wasm.rs @@ -37,8 +37,8 @@ pub fn sleep_until(deadline: Instant) -> Sleep { ))) } -pub fn log(msg: &str) { - web_sys::console::log_1(&msg.into()); +pub fn log(_msg: &str) { + // web_sys::console::log_1(&msg.into()); } #[cfg(feature = "client")] diff --git a/squire_sdk/tests/server/utils.rs b/squire_sdk/tests/server/utils.rs index 296af2a2..cdc0dbdc 100644 --- a/squire_sdk/tests/server/utils.rs +++ b/squire_sdk/tests/server/utils.rs @@ -1,3 +1,4 @@ +/* use axum::{body::HttpBody, http::Request, response::Response}; use headers::HeaderValue; use http::{ @@ -8,7 +9,6 @@ use hyper::Body; use serde::{de::DeserializeOwned, Serialize}; use tower::Service; -/* use super::init::get_app; pub use crate::utils::*;