chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

client-api: Fix up previous botched PRs

Browse Source
This commit is contained in:
Jonas Platte 2021-11-03 18:31:38 +01:00
parent 347ae72531
commit 21d3d75172
No known key found for this signature in database
GPG Key ID: CC154DE0E30B7C67
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crates/ruma-client-api/src/r0/uiaa.rs
View File

@ -523,7 +523,7 @@ impl IncomingOAuth2 {
#[serde(tag = "type", rename = "m.login.email.identity")] #[serde(tag = "type", rename = "m.login.email.identity")]
pub struct EmailIdentity<'a> { pub struct EmailIdentity<'a> {
/// Thirdparty identifier credentials. /// Thirdparty identifier credentials.
#[cfg_attr(rename = "threepidCreds")] #[serde(rename = "threepidCreds")]
#[cfg_attr( #[cfg_attr(
feature = "compat", feature = "compat",
serde(alias = "threepid_creds", deserialize_with = "deserialize_thirdparty_id_creds") serde(alias = "threepid_creds", deserialize_with = "deserialize_thirdparty_id_creds")
@ -554,7 +554,7 @@ impl IncomingEmailIdentity {
#[serde(tag = "type", rename = "m.login.msisdn")] #[serde(tag = "type", rename = "m.login.msisdn")]
pub struct Msisdn<'a> { pub struct Msisdn<'a> {
/// Thirdparty identifier credentials. /// Thirdparty identifier credentials.
#[cfg_attr(rename = "threepidCreds")] #[serde(rename = "threepidCreds")]
#[cfg_attr( #[cfg_attr(
feature = "compat", feature = "compat",
serde(alias = "threepid_creds", deserialize_with = "deserialize_thirdparty_id_creds") serde(alias = "threepid_creds", deserialize_with = "deserialize_thirdparty_id_creds")
@ -861,7 +861,9 @@ impl OutgoingResponse for UiaaResponse {
} }
} }
fn deserialize_thirdparty_id_creds<'de, D>(deserializer: D) -> Vec<ThirdpartyIdCredentials> fn deserialize_thirdparty_id_creds<'de, D>(
deserializer: D,
) -> Result<Vec<ThirdpartyIdCredentials>, D::Error>
where where
D: Deserializer<'de>, D: Deserializer<'de>,
{ {
@ -891,4 +893,6 @@ where
Ok(vec![creds]) Ok(vec![creds])
} }
} }
deserializer.deserialize_any(CredsVisitor)
} }