Code tweaks

This commit is contained in:
Marcin Kulik
2025-04-10 11:25:09 +02:00
parent 8114f61886
commit 02ad03f815
3 changed files with 8 additions and 7 deletions

View File

@@ -267,6 +267,7 @@ pub enum Format {
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
#[allow(dead_code)]
pub enum RelayTarget { pub enum RelayTarget {
StreamId(String), StreamId(String),
WsProducerUrl(url::Url), WsProducerUrl(url::Url),

View File

@@ -39,21 +39,21 @@ impl cli::Session {
locale::check_utf8_locale()?; locale::check_utf8_locale()?;
let runtime = Runtime::new()?; let runtime = Runtime::new()?;
let command = self.get_command(&cmd_config); let command = self.get_command(cmd_config);
let keys = get_key_bindings(&cmd_config)?; let keys = get_key_bindings(cmd_config)?;
let notifier = notifier::threaded(get_notifier(config)); let notifier = notifier::threaded(get_notifier(config));
let record_input = self.input || cmd_config.input; let record_input = self.input || cmd_config.input;
let env = capture_env(self.env.clone(), &cmd_config); let env = capture_env(self.env.clone(), cmd_config);
let path = self let path = self
.output .output
.take() .take()
.map(|path| self.ensure_filename(path, &cmd_config)) .map(|path| self.ensure_filename(path, cmd_config))
.transpose()?; .transpose()?;
let file_writer = path let file_writer = path
.as_ref() .as_ref()
.map(|path| self.get_file_writer(path, &cmd_config, &env, notifier.clone())) .map(|path| self.get_file_writer(path, cmd_config, &env, notifier.clone()))
.transpose()?; .transpose()?;
let mut listener = self let mut listener = self

View File

@@ -132,13 +132,13 @@ impl Tty for DevTty {
let mut got_da_response = false; let mut got_da_response = false;
if let Some(b'c') = reversed.next() { if let Some(b'c') = reversed.next() {
while let Some(b) = reversed.next() { for b in reversed {
if *b == b'[' { if *b == b'[' {
got_da_response = true; got_da_response = true;
break; break;
} }
if *b != b';' && *b != b'?' && !(b'0'..=b'9').contains(b) { if *b != b';' && *b != b'?' && !b.is_ascii_digit() {
break; break;
} }
} }