mirror of
https://gitlab.computer.surgery/matrix/grapevine.git
synced 2025-12-17 07:41:23 +01:00
enable items_after_statements lint
This commit is contained in:
parent
5c9967f89c
commit
c51e87ec9a
3 changed files with 23 additions and 20 deletions
|
|
@ -41,6 +41,7 @@ ignored_unit_patterns = "warn"
|
||||||
impl_trait_in_params = "warn"
|
impl_trait_in_params = "warn"
|
||||||
implicit_clone = "warn"
|
implicit_clone = "warn"
|
||||||
inconsistent_struct_constructor = "warn"
|
inconsistent_struct_constructor = "warn"
|
||||||
|
items_after_statements = "warn"
|
||||||
let_underscore_must_use = "warn"
|
let_underscore_must_use = "warn"
|
||||||
lossy_float_literal = "warn"
|
lossy_float_literal = "warn"
|
||||||
mem_forget = "warn"
|
mem_forget = "warn"
|
||||||
|
|
|
||||||
|
|
@ -504,21 +504,6 @@ impl Service {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update Relationships
|
// Update Relationships
|
||||||
#[derive(Deserialize)]
|
|
||||||
struct ExtractRelatesTo {
|
|
||||||
#[serde(rename = "m.relates_to")]
|
|
||||||
relates_to: Relation,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Clone, Debug, Deserialize)]
|
|
||||||
struct ExtractEventId {
|
|
||||||
event_id: OwnedEventId,
|
|
||||||
}
|
|
||||||
#[derive(Clone, Debug, Deserialize)]
|
|
||||||
struct ExtractRelatesToEventId {
|
|
||||||
#[serde(rename = "m.relates_to")]
|
|
||||||
relates_to: ExtractEventId,
|
|
||||||
}
|
|
||||||
|
|
||||||
if let Ok(content) = serde_json::from_str::<ExtractRelatesToEventId>(pdu.content.get()) {
|
if let Ok(content) = serde_json::from_str::<ExtractRelatesToEventId>(pdu.content.get()) {
|
||||||
if let Some(related_pducount) = services()
|
if let Some(related_pducount) = services()
|
||||||
|
|
@ -1250,6 +1235,22 @@ impl Service {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
struct ExtractRelatesTo {
|
||||||
|
#[serde(rename = "m.relates_to")]
|
||||||
|
relates_to: Relation,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Debug, Deserialize)]
|
||||||
|
struct ExtractEventId {
|
||||||
|
event_id: OwnedEventId,
|
||||||
|
}
|
||||||
|
#[derive(Clone, Debug, Deserialize)]
|
||||||
|
struct ExtractRelatesToEventId {
|
||||||
|
#[serde(rename = "m.relates_to")]
|
||||||
|
relates_to: ExtractEventId,
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
|
||||||
|
|
@ -89,6 +89,12 @@ impl Error {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn to_response(&self) -> RumaResponse<UiaaResponse> {
|
pub(crate) fn to_response(&self) -> RumaResponse<UiaaResponse> {
|
||||||
|
use ErrorKind::{
|
||||||
|
Forbidden, GuestAccessForbidden, LimitExceeded, MissingToken, NotFound,
|
||||||
|
ThreepidAuthFailed, ThreepidDenied, TooLarge, Unauthorized, Unknown, UnknownToken,
|
||||||
|
Unrecognized, UserDeactivated, WrongRoomKeysVersion,
|
||||||
|
};
|
||||||
|
|
||||||
if let Self::Uiaa(uiaainfo) = self {
|
if let Self::Uiaa(uiaainfo) = self {
|
||||||
return RumaResponse(UiaaResponse::AuthResponse(uiaainfo.clone()));
|
return RumaResponse(UiaaResponse::AuthResponse(uiaainfo.clone()));
|
||||||
}
|
}
|
||||||
|
|
@ -104,11 +110,6 @@ impl Error {
|
||||||
|
|
||||||
let message = format!("{self}");
|
let message = format!("{self}");
|
||||||
|
|
||||||
use ErrorKind::{
|
|
||||||
Forbidden, GuestAccessForbidden, LimitExceeded, MissingToken, NotFound,
|
|
||||||
ThreepidAuthFailed, ThreepidDenied, TooLarge, Unauthorized, Unknown, UnknownToken,
|
|
||||||
Unrecognized, UserDeactivated, WrongRoomKeysVersion,
|
|
||||||
};
|
|
||||||
let (kind, status_code) = match self {
|
let (kind, status_code) = match self {
|
||||||
Self::BadRequest(kind, _) => (
|
Self::BadRequest(kind, _) => (
|
||||||
kind.clone(),
|
kind.clone(),
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue