diff --git a/Cargo.lock b/Cargo.lock index 006bc678..10d28ae4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2635,9 +2635,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "ureq" -version = "2.7.1" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b11c96ac7ee530603dcdf68ed1557050f374ce55a5a07193ebf8cbc9f8927e9" +checksum = "d4b45063f47caea744e48f5baa99169bd8bd9b882d80a99941141327bbb00f99" dependencies = [ "base64 0.21.2", "flate2", diff --git a/Cargo.toml b/Cargo.toml index b8fc9db6..7abab101 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,4 +46,4 @@ actix-web-httpauth = "0.8.0" rand = "0.8.5" [build-dependencies] -ureq = "2.6.2" +ureq = "2.7.0" diff --git a/src/webserver/database/mod.rs b/src/webserver/database/mod.rs index 4b368aa4..c467e984 100644 --- a/src/webserver/database/mod.rs +++ b/src/webserver/database/mod.rs @@ -271,13 +271,11 @@ fn sql_nonnull_to_json<'r>(mut get_ref: impl FnMut() -> sqlx::any::AnyValueRef<' .into(), "DATE" => >::decode(raw_value) .as_ref() - .map(ToString::to_string) - .unwrap_or_else(|e| e.to_string()) + .map_or_else(std::string::ToString::to_string, ToString::to_string) .into(), "TIME" => >::decode(raw_value) .as_ref() - .map(ToString::to_string) - .unwrap_or_else(|e| e.to_string()) + .map_or_else(ToString::to_string, ToString::to_string) .into(), "DATETIME" | "DATETIME2" | "DATETIMEOFFSET" | "TIMESTAMP" | "TIMESTAMPTZ" => { try_decode_with!( @@ -285,7 +283,7 @@ fn sql_nonnull_to_json<'r>(mut get_ref: impl FnMut() -> sqlx::any::AnyValueRef<' [chrono::NaiveDateTime, chrono::DateTime], |v| dbg!(v).to_string() ) - .unwrap_or_else(|e| format!("Unable to decode date: {:?}", e)) + .unwrap_or_else(|e| format!("Unable to decode date: {e:?}")) .into() } "JSON" | "JSON[]" | "JSONB" | "JSONB[]" => {