summary refs log tree commit diff
path: root/rust/src
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2023-12-04 09:58:38 +0000
committerErik Johnston <erik@matrix.org>2023-12-04 09:58:38 +0000
commitafc82ecb44db1c7497defc9bb370a1b99f88fea6 (patch)
tree3bcfb88b3345febe49d8d3e6fc474d4cb76c32ae /rust/src
parentMerge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff)
parentModuleAPI SSO auth callbacks (#15207) (diff)
downloadsynapse-afc82ecb44db1c7497defc9bb370a1b99f88fea6.tar.xz
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'rust/src')
-rw-r--r--rust/src/push/mod.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/rust/src/push/mod.rs b/rust/src/push/mod.rs

index 5e1e8e1abb..68d4227baa 100644 --- a/rust/src/push/mod.rs +++ b/rust/src/push/mod.rs
@@ -296,8 +296,7 @@ impl<'source> FromPyObject<'source> for JsonValue { match l.iter().map(SimpleJsonValue::extract).collect() { Ok(a) => Ok(JsonValue::Array(a)), Err(e) => Err(PyTypeError::new_err(format!( - "Can't convert to JsonValue::Array: {}", - e + "Can't convert to JsonValue::Array: {e}" ))), } } else if let Ok(v) = SimpleJsonValue::extract(ob) {