diff options
Diffstat (limited to 'crates/shirabe/src/io')
| -rw-r--r-- | crates/shirabe/src/io/base_io.rs | 2 | ||||
| -rw-r--r-- | crates/shirabe/src/io/buffer_io.rs | 4 | ||||
| -rw-r--r-- | crates/shirabe/src/io/console_io.rs | 6 |
3 files changed, 5 insertions, 7 deletions
diff --git a/crates/shirabe/src/io/base_io.rs b/crates/shirabe/src/io/base_io.rs index 1d12470..b5d4717 100644 --- a/crates/shirabe/src/io/base_io.rs +++ b/crates/shirabe/src/io/base_io.rs @@ -133,7 +133,7 @@ pub trait BaseIO: IOInterface { config.merge(&config_outer, "implicit-due-to-auth"); } - if !Preg::is_match(r"^[.A-Za-z0-9_]+$", &token_str).unwrap_or(false) { + if !Preg::is_match(r"^[.A-Za-z0-9_]+$", &token_str) { return Err(anyhow::anyhow!(UnexpectedValueException { message: format!( "Your github oauth token for {} contains invalid characters: \"{}\"", diff --git a/crates/shirabe/src/io/buffer_io.rs b/crates/shirabe/src/io/buffer_io.rs index 8c10dee..91fdac1 100644 --- a/crates/shirabe/src/io/buffer_io.rs +++ b/crates/shirabe/src/io/buffer_io.rs @@ -107,9 +107,7 @@ impl BufferIO { &output, ); - // TODO(phase-c): Preg::replace_callback returns Result<String>; PHP getOutput returns the - // string directly, so this is gated on the get_stream PhpResource model above. - output.unwrap_or_default() + output } pub fn set_user_inputs(&mut self, inputs: Vec<String>) -> Result<()> { diff --git a/crates/shirabe/src/io/console_io.rs b/crates/shirabe/src/io/console_io.rs index b2e0bb5..3afd300 100644 --- a/crates/shirabe/src/io/console_io.rs +++ b/crates/shirabe/src/io/console_io.rs @@ -296,7 +296,7 @@ impl ConsoleIO { }; if is_string(&messages) { let message = Self::ensure_valid_utf8(messages.as_string().unwrap_or("")); - return PhpMixed::String(Preg::replace(&pattern, "", &message).unwrap_or_default()); + return PhpMixed::String(Preg::replace(&pattern, "", &message)); } // PHP: $sanitized = []; foreach ($messages as $key => $message) { ... } @@ -307,7 +307,7 @@ impl ConsoleIO { let s = Self::ensure_valid_utf8(message.as_string().unwrap_or("")); sanitized.insert( key.to_string(), - PhpMixed::String(Preg::replace(&pattern, "", &s).unwrap_or_default()), + PhpMixed::String(Preg::replace(&pattern, "", &s)), ); } } @@ -316,7 +316,7 @@ impl ConsoleIO { let s = Self::ensure_valid_utf8(message.as_string().unwrap_or("")); sanitized.insert( key.clone(), - PhpMixed::String(Preg::replace(&pattern, "", &s).unwrap_or_default()), + PhpMixed::String(Preg::replace(&pattern, "", &s)), ); } } |