diff options
Diffstat (limited to 'crates/turtle/src/atuin_pty_proxy')
| -rw-r--r-- | crates/turtle/src/atuin_pty_proxy/osc133.rs | 5 | ||||
| -rw-r--r-- | crates/turtle/src/atuin_pty_proxy/runtime.rs | 26 | ||||
| -rw-r--r-- | crates/turtle/src/atuin_pty_proxy/screen.rs | 6 |
3 files changed, 18 insertions, 19 deletions
diff --git a/crates/turtle/src/atuin_pty_proxy/osc133.rs b/crates/turtle/src/atuin_pty_proxy/osc133.rs index d79166a6..b0cf0f0a 100644 --- a/crates/turtle/src/atuin_pty_proxy/osc133.rs +++ b/crates/turtle/src/atuin_pty_proxy/osc133.rs @@ -1,4 +1,4 @@ -//! Streaming parser for OSC 133 (FinalTerm semantic prompt) escape sequences. +//! Streaming parser for OSC 133 ([`FinalTerm`] semantic prompt) escape sequences. //! //! OSC 133 marks four regions of a shell interaction: //! @@ -24,7 +24,7 @@ //! can ride alongside standard OSC 133 markers. /// Events emitted when an OSC 133 marker is detected. -#[derive(Debug, Clone, PartialEq, Eq)] +#[derive(Debug, Clone, PartialEq, Eq, Copy)] pub(crate) enum Event { /// `ESC ] 133 ; A ST` — the shell is about to display its prompt. PromptStart, @@ -98,7 +98,6 @@ pub(crate) struct LocatedEvent { /// The current semantic zone as determined by the most recent OSC 133 marker. #[derive(Debug, Default, Clone, Copy, PartialEq, Eq)] -#[expect(dead_code)] pub(crate) enum Zone { /// No marker seen yet, or after a `D` marker (between commands). #[default] diff --git a/crates/turtle/src/atuin_pty_proxy/runtime.rs b/crates/turtle/src/atuin_pty_proxy/runtime.rs index 37c77eef..69b3a075 100644 --- a/crates/turtle/src/atuin_pty_proxy/runtime.rs +++ b/crates/turtle/src/atuin_pty_proxy/runtime.rs @@ -13,7 +13,7 @@ use crate::atuin_pty_proxy::screen::{self, Msg}; pub(crate) fn main(options: RuntimeOptions) { if let Err(e) = run(options) { - let _ = terminal::disable_raw_mode(); + drop(terminal::disable_raw_mode()); eprintln!("atuin pty-proxy: {e:#}"); std::process::exit(1); } @@ -33,7 +33,7 @@ fn run(options: RuntimeOptions) -> eyre::Result<()> { .map_err(|e| eyre::eyre!("{e:#}"))?; let sock_path = screen::socket_path(); - let _ = std::fs::remove_file(&sock_path); + drop(std::fs::remove_file(&sock_path)); let mut cmd = CommandBuilder::new_default_prog(); cmd.cwd(std::env::current_dir()?); @@ -87,26 +87,26 @@ fn run(options: RuntimeOptions) -> eyre::Result<()> { if let Some(highlighter) = highlighter.as_mut() { let rendered = highlighter.render(&buf[..n]); - let _ = msg_tx.try_send(Msg::Data(rendered.clone())); + drop(msg_tx.try_send(Msg::Data(rendered.clone()))); if stdout.write_all(&rendered).is_err() { break; } } else { - let _ = msg_tx.try_send(Msg::Data(buf[..n].to_vec())); + drop(msg_tx.try_send(Msg::Data(buf[..n].to_vec()))); if stdout.write_all(&buf[..n]).is_err() { break; } } - let _ = stdout.flush(); + drop(stdout.flush()); } } } if highlighter.is_some() { - let _ = stdout.write_all(RESET); - let _ = stdout.flush(); + drop(stdout.write_all(RESET)); + drop(stdout.flush()); } }); @@ -126,10 +126,10 @@ fn run(options: RuntimeOptions) -> eyre::Result<()> { }); let status = child.wait()?; - let _ = stdout_thread.join(); + drop(stdout_thread.join()); - let _ = terminal::disable_raw_mode(); - let _ = std::fs::remove_file(&sock_path); + drop(terminal::disable_raw_mode()); + drop(std::fs::remove_file(&sock_path)); std::process::exit(process_exit_code(status.exit_code())); } @@ -148,13 +148,13 @@ fn spawn_resize_handler( for _ in signals.forever() { if let Ok((cols, rows)) = terminal::size() { current_cols.store(cols.max(1), Ordering::Relaxed); - let _ = master.resize(PtySize { + drop(master.resize(PtySize { rows, cols, pixel_width: 0, pixel_height: 0, - }); - let _ = resize_tx.try_send(Msg::Resize { rows, cols }); + })); + drop(resize_tx.try_send(Msg::Resize { rows, cols })); } } }); diff --git a/crates/turtle/src/atuin_pty_proxy/screen.rs b/crates/turtle/src/atuin_pty_proxy/screen.rs index 5b892e21..c51a0c7d 100644 --- a/crates/turtle/src/atuin_pty_proxy/screen.rs +++ b/crates/turtle/src/atuin_pty_proxy/screen.rs @@ -54,8 +54,8 @@ pub(crate) fn spawn_socket_server(sock_path: PathBuf, screen_tx: SyncSender<Msg> break; } if let Ok(data) = reply_rx.recv() { - let _ = stream.write_all(&data); - let _ = stream.flush(); + drop(stream.write_all(&data)); + drop(stream.flush()); } } }); @@ -98,7 +98,7 @@ fn handle_parser_msg(parser: &mut vt100::Parser, msg: Msg) { Msg::Data(data) => parser.process(&data), Msg::Resize { rows, cols } => parser.screen_mut().set_size(rows, cols), Msg::ScreenRequest(reply_tx) => { - let _ = reply_tx.send(encode_screen(parser)); + drop(reply_tx.send(encode_screen(parser))); } } } |