From 96a59422b1c12a3ed030f0c7c0de0da3f52d45ee Mon Sep 17 00:00:00 2001 From: nworbnhoj Date: Tue, 19 Dec 2023 06:18:08 +1100 Subject: [PATCH] fix use Tls --- apps/sigchat/src/lib.rs | 3 ++- services/shellchat/src/cmds/net_cmd.rs | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/sigchat/src/lib.rs b/apps/sigchat/src/lib.rs index 46793d67b..db37bb433 100644 --- a/apps/sigchat/src/lib.rs +++ b/apps/sigchat/src/lib.rs @@ -9,6 +9,7 @@ use chat::Chat; use locales::t; use modals::Modals; use std::io::{Error, ErrorKind}; +use tls::Tls; /// PDDB Dict for sigchat keys const SIGCHAT_ACCOUNT: &str = "sigchat.account"; @@ -263,7 +264,7 @@ impl<'a> SigChat<'a> { /// /// # Returns /// the name provided by the user - /// + /// fn name_modal(&self, default_name: &str, prompt: &str) -> String { match self .modals diff --git a/services/shellchat/src/cmds/net_cmd.rs b/services/shellchat/src/cmds/net_cmd.rs index c859ad721..8c74e736e 100644 --- a/services/shellchat/src/cmds/net_cmd.rs +++ b/services/shellchat/src/cmds/net_cmd.rs @@ -8,7 +8,6 @@ use std::sync::mpsc; use std::sync::{Arc, Mutex}; use std::thread; use std::time::{Duration, Instant}; -use tls::Tls; use xous::MessageEnvelope; use xous_ipc::String; @@ -22,7 +21,10 @@ use net::XousServerId; use perflib::*; #[cfg(feature = "websocket")] -use tungstenite::{stream::MaybeTlsStream, WebSocket}; +use { + tls::Tls, + tungstenite::{stream::MaybeTlsStream, WebSocket}, +}; pub struct NetCmd { callback_id: Option,