diff options
Diffstat (limited to 'crates/shirabe/src/util')
| -rw-r--r-- | crates/shirabe/src/util/auth_helper.rs | 2 | ||||
| -rw-r--r-- | crates/shirabe/src/util/http/curl_downloader.rs | 16 | ||||
| -rw-r--r-- | crates/shirabe/src/util/remote_filesystem.rs | 4 |
3 files changed, 10 insertions, 12 deletions
diff --git a/crates/shirabe/src/util/auth_helper.rs b/crates/shirabe/src/util/auth_helper.rs index d8b77ac..0b1620d 100644 --- a/crates/shirabe/src/util/auth_helper.rs +++ b/crates/shirabe/src/util/auth_helper.rs @@ -418,7 +418,7 @@ impl AuthHelper { } self.io.write_error3( - &format!(" Authentication required (<info>{}</info>):", origin,), + &format!(" Authentication required (<info>{}</info>):", origin), true, io_interface::NORMAL, ); diff --git a/crates/shirabe/src/util/http/curl_downloader.rs b/crates/shirabe/src/util/http/curl_downloader.rs index 94e703d..4b8348f 100644 --- a/crates/shirabe/src/util/http/curl_downloader.rs +++ b/crates/shirabe/src/util/http/curl_downloader.rs @@ -1548,15 +1548,13 @@ impl CurlDownloader { self.io.write_error3( &format!( "Following redirect ({}) {}", - PhpMixed::Int( - job.get("attributes") - .and_then(|v| v.as_array()) - .and_then(|a| a.get("redirects")) - .and_then(|b| b.as_int()) - .unwrap_or(0) - + 1, - ), - PhpMixed::String(Url::sanitize(target_url.clone())), + job.get("attributes") + .and_then(|v| v.as_array()) + .and_then(|a| a.get("redirects")) + .and_then(|b| b.as_int()) + .unwrap_or(0) + + 1, + Url::sanitize(target_url.clone()), ), true, crate::io::DEBUG, diff --git a/crates/shirabe/src/util/remote_filesystem.rs b/crates/shirabe/src/util/remote_filesystem.rs index e36a174..2a15cf0 100644 --- a/crates/shirabe/src/util/remote_filesystem.rs +++ b/crates/shirabe/src/util/remote_filesystem.rs @@ -951,8 +951,8 @@ impl RemoteFilesystem { self.io.write_error3( &format!( "Following redirect ({}) {}", - PhpMixed::Int(self.redirects), - PhpMixed::String(Url::sanitize(target_url.clone())), + self.redirects, + Url::sanitize(target_url.clone()), ), true, crate::io::DEBUG, |