aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKyle Sutherland-Cash <kyle.sutherlandcash@gmail.com>2021-05-08 10:55:13 -0700
committerKyle Sutherland-Cash <kyle.sutherlandcash@gmail.com>2021-05-08 10:55:13 -0700
commitce92374f8ebb3543cb5805ec81e6605e23c6ef46 (patch)
treefc32fdc3f9840a9e2d65e98316ff1e0c744d2443 /src
parentMarkups from self-review (diff)
downloadsl0ppij-ce92374f8ebb3543cb5805ec81e6605e23c6ef46.tar.gz
sl0ppij-ce92374f8ebb3543cb5805ec81e6605e23c6ef46.tar.xz
sl0ppij-ce92374f8ebb3543cb5805ec81e6605e23c6ef46.zip
cargo fmt
Diffstat (limited to 'src')
-rw-r--r--src/common/pty.rs6
-rw-r--r--src/server/mod.rs3
2 files changed, 4 insertions, 5 deletions
diff --git a/src/common/pty.rs b/src/common/pty.rs
index 191ab94d..3c471d6a 100644
--- a/src/common/pty.rs
+++ b/src/common/pty.rs
@@ -3,9 +3,9 @@ use async_std::task;
use async_std::task::*;
use std::collections::HashMap;
use std::os::unix::io::RawFd;
+use std::path::PathBuf;
use std::pin::*;
use std::time::{Duration, Instant};
-use std::path::PathBuf;
use crate::client::panes::PaneId;
use crate::common::errors::{get_current_ctx, ContextType, PtyContext};
@@ -195,9 +195,7 @@ fn stream_terminal_bytes(
task::sleep(::std::time::Duration::from_millis(10)).await;
}
}
- senders
- .send_to_screen(ScreenInstruction::Render)
- .unwrap();
+ senders.send_to_screen(ScreenInstruction::Render).unwrap();
#[cfg(not(test))]
// this is a little hacky, and is because the tests end the file as soon as
// we read everything, rather than hanging until there is new data
diff --git a/src/server/mod.rs b/src/server/mod.rs
index 96638de8..3655ed19 100644
--- a/src/server/mod.rs
+++ b/src/server/mod.rs
@@ -69,7 +69,8 @@ pub fn start_server(os_input: Box<dyn ServerOsApi>) -> thread::JoinHandle<()> {
let to_server = to_server.clone();
move || route_thread_main(sessions, os_input, to_server)
- }).unwrap();
+ })
+ .unwrap();
#[cfg(not(test))]
let _ = thread::Builder::new()
.name("server_listener".to_string())