Skip to content

Commit cd60088

Browse files
committed
refactor: adjust expect messages
All expect messages are adjusted or replaced with unwrap following the guidelines here: rust-lang/project-error-handling#50 rust-lang/rust#96033
1 parent 2007321 commit cd60088

File tree

7 files changed

+22
-30
lines changed

7 files changed

+22
-30
lines changed

example_tcp_client/src/main.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ fn main() {
3131
&SocketAddr::from(([127, 0, 0, 1], args.port)),
3232
Duration::from_secs(5),
3333
)
34-
.expect("could not connect to kanata");
34+
.expect("connect to kanata");
3535
log::info!("successfully connected");
3636
let writer_stream = kanata_conn
3737
.try_clone()
38-
.expect("failed to clone socket handle");
38+
.unwrap();
3939
let reader_stream = kanata_conn;
4040
std::thread::spawn(move || write_to_kanata(writer_stream));
4141
read_from_kanata(reader_stream);
@@ -57,7 +57,7 @@ fn init_logger(args: &Args) {
5757
TerminalMode::Mixed,
5858
ColorChoice::AlwaysAnsi,
5959
)])
60-
.expect("failed to initialize logger");
60+
.unwrap();
6161
log::info!(
6262
"kanata_example_tcp_client v{} starting",
6363
env!("CARGO_PKG_VERSION")
@@ -87,13 +87,13 @@ fn write_to_kanata(mut s: TcpStream) {
8787
log::info!("writer: type layer name then press enter to send a change layer request to kanata");
8888
let mut layer = String::new();
8989
loop {
90-
stdin().read_line(&mut layer).expect("failed to read stdin");
90+
stdin().read_line(&mut layer).expect("stdin is readable");
9191
let new = layer.trim_end().to_owned();
9292
log::info!("writer: telling kanata to change layer to \"{new}\"");
9393
let msg =
94-
serde_json::to_string(&ClientMessage::ChangeLayer { new }).expect("deserialize failed");
94+
serde_json::to_string(&ClientMessage::ChangeLayer { new }).expect("deserializable");
9595
let expected_wsz = msg.len();
96-
let wsz = s.write(msg.as_bytes()).expect("write failed");
96+
let wsz = s.write(msg.as_bytes()).expect("stream writable");
9797
if wsz != expected_wsz {
9898
panic!("failed to write entire message {wsz} {expected_wsz}");
9999
}
@@ -105,9 +105,9 @@ fn read_from_kanata(mut s: TcpStream) {
105105
log::info!("reader starting");
106106
let mut buf = vec![0; 256];
107107
loop {
108-
let sz = s.read(&mut buf).expect("read failed");
108+
let sz = s.read(&mut buf).expect("stream readable");
109109
let msg = String::from_utf8_lossy(&buf[..sz]);
110-
let parsed_msg = ServerMessage::from_str(&msg).expect("invalid msg from kanata");
110+
let parsed_msg = ServerMessage::from_str(&msg).expect("kanata sends valid message");
111111
match parsed_msg {
112112
ServerMessage::LayerChange { new } => {
113113
log::info!("reader: kanata changed layers to \"{new}\"");

src/cfg.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -448,9 +448,7 @@ fn parse_expr(expr: &str) -> Result<Vec<SExpr>> {
448448
expr
449449
)
450450
} else if token.starts_with('"') {
451-
let mut token = token
452-
.strip_prefix('"')
453-
.expect("Dquote prefix was checked. Cosmic ray?");
451+
let mut token = token.strip_prefix('"').unwrap();
454452
let mut quoted_tokens = vec![];
455453
loop {
456454
let num_dquotes = token.matches('"').count();
@@ -469,11 +467,7 @@ fn parse_expr(expr: &str) -> Result<Vec<SExpr>> {
469467
if !token.ends_with('"') {
470468
bail!("Invalid end of quoted string {}", token);
471469
}
472-
quoted_tokens.push(
473-
token
474-
.strip_suffix('"')
475-
.expect("Dquote suffix was checked. Cosmic ray?"),
476-
);
470+
quoted_tokens.push(token.strip_suffix('"').unwrap());
477471
break;
478472
}
479473
_ => bail!(

src/kanata/mod.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! Implements the glue between OS input/output and keyberon state management.
22
3-
use anyhow::{bail, Result};
3+
use anyhow::{anyhow, bail, Result};
44
use log::{error, info};
55

66
use crossbeam_channel::{Receiver, Sender, TryRecvError};
@@ -80,7 +80,7 @@ impl Kanata {
8080
.items
8181
.get("linux-dev")
8282
.cloned()
83-
.expect("linux-dev required in defcfg");
83+
.ok_or_else(|| anyhow!("A linux-dev entry is required in defcfg"))?;
8484
#[cfg(target_os = "windows")]
8585
let kbd_in_paths = "unused".into();
8686

@@ -488,9 +488,7 @@ impl Kanata {
488488
if kev.value == KeyValue::Release {
489489
let mut k = kanata.lock();
490490
info!("Init: releasing {:?}", kev.code);
491-
k.kbd_out
492-
.release_key(kev.code)
493-
.expect("could not release key");
491+
k.kbd_out.release_key(kev.code).expect("key released");
494492
}
495493
}
496494
std::thread::sleep(time::Duration::from_millis(1));
@@ -537,7 +535,7 @@ fn run_cmd(cmd_and_args: &'static [String]) -> std::thread::JoinHandle<()> {
537535
let mut args = cmd_and_args.iter().cloned();
538536
let mut cmd = std::process::Command::new(
539537
args.next()
540-
.expect("Parsing should have forbidden empty cmd"),
538+
.expect("parsing should have forbidden empty cmd"),
541539
);
542540
for arg in args {
543541
cmd.arg(arg);

src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ fn cli_init() -> Result<ValidatedArgs> {
7171
TerminalMode::Mixed,
7272
ColorChoice::AlwaysAnsi,
7373
)])
74-
.expect("Couldn't initialize the logger");
74+
.expect("logger can init");
7575
log::info!("kanata v{} starting", env!("CARGO_PKG_VERSION"));
7676

7777
if !cfg_path.exists() {

src/oskbd/linux.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ impl KbdOut {
179179
let mut s = String::new();
180180
for c in hex.chars() {
181181
s.push(c);
182-
let osc = str_to_oscode(&s).expect("invalid char in unicode output");
182+
let osc = str_to_oscode(&s).expect("valid keycodes for unicode");
183183
s.clear();
184184
self.press_key(osc)?;
185185
self.release_key(osc)?;

src/oskbd/windows.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ impl<'a> KeyboardHook<'a> {
6363
handle: unsafe {
6464
SetWindowsHookExW(WH_KEYBOARD_LL, Some(hook_proc), ptr::null_mut(), 0)
6565
.as_mut()
66-
.expect("Failed to install low-level keyboard hook.")
66+
.expect("install low-level keyboard hook successfully")
6767
},
6868
lifetime: PhantomData,
6969
}

src/tcp_server.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ impl TcpServer {
4848
}
4949

5050
pub fn start(&mut self, kanata: Arc<Mutex<Kanata>>) {
51-
let listener = TcpListener::bind(format!("0.0.0.0:{}", self.port))
52-
.expect("could not start the tcp server");
51+
let listener =
52+
TcpListener::bind(format!("0.0.0.0:{}", self.port)).expect("TCP server starts");
5353

5454
let connections = self.connections.clone();
5555

@@ -59,16 +59,16 @@ impl TcpServer {
5959
Ok(mut stream) => {
6060
stream
6161
.set_keepalive(Some(Duration::from_secs(30)))
62-
.expect("could not set tcp connection keepalive");
62+
.expect("TCP keepalive is set");
6363

6464
let addr = stream
6565
.peer_addr()
66-
.expect("could not find peer address")
66+
.expect("incoming conn has known address")
6767
.to_string();
6868

6969
connections.lock().insert(
7070
addr.clone(),
71-
stream.try_clone().expect("could not clone stream"),
71+
stream.try_clone().expect("stream is clonable"),
7272
);
7373

7474
log::info!("listening for incoming messages {}", &addr);

0 commit comments

Comments
 (0)