chore: Fix new warnings
This commit is contained in:
parent
bbc0fe875f
commit
d6c4533b7d
@ -22,7 +22,7 @@ pub fn system_time_to_http_date(
|
|||||||
date_header::format(duration.as_secs(), &mut buffer)
|
date_header::format(duration.as_secs(), &mut buffer)
|
||||||
.map_err(|_| HeaderSerializationError::InvalidHttpDate)?;
|
.map_err(|_| HeaderSerializationError::InvalidHttpDate)?;
|
||||||
|
|
||||||
Ok(http::HeaderValue::from_bytes(&buffer)
|
Ok(HeaderValue::from_bytes(&buffer)
|
||||||
.expect("date_header should produce a valid header value"))
|
.expect("date_header should produce a valid header value"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -148,7 +148,7 @@ pub mod v3 {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let (scope, kind, rule_id): (RuleScope, RuleKind, String) =
|
let (scope, kind, rule_id): (RuleScope, RuleKind, String) =
|
||||||
serde::Deserialize::deserialize(serde::de::value::SeqDeserializer::<
|
Deserialize::deserialize(serde::de::value::SeqDeserializer::<
|
||||||
_,
|
_,
|
||||||
serde::de::value::Error,
|
serde::de::value::Error,
|
||||||
>::new(
|
>::new(
|
||||||
|
@ -145,7 +145,7 @@ impl<C: HttpClient> Client<C> {
|
|||||||
.send_request(assign!(register::v3::Request::new(), { kind: RegistrationKind::Guest }))
|
.send_request(assign!(register::v3::Request::new(), { kind: RegistrationKind::Guest }))
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
*self.0.access_token.lock().unwrap() = response.access_token.clone();
|
self.0.access_token.lock().unwrap().clone_from(&response.access_token);
|
||||||
|
|
||||||
Ok(response)
|
Ok(response)
|
||||||
}
|
}
|
||||||
@ -169,7 +169,7 @@ impl<C: HttpClient> Client<C> {
|
|||||||
}))
|
}))
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
*self.0.access_token.lock().unwrap() = response.access_token.clone();
|
self.0.access_token.lock().unwrap().clone_from(&response.access_token);
|
||||||
|
|
||||||
Ok(response)
|
Ok(response)
|
||||||
}
|
}
|
||||||
@ -221,7 +221,7 @@ impl<C: HttpClient> Client<C> {
|
|||||||
}))
|
}))
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
since = response.next_batch.clone();
|
since.clone_from(&response.next_batch);
|
||||||
yield response;
|
yield response;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -58,10 +58,7 @@ impl<'de> Visitor<'de> for RoomNetworkVisitor {
|
|||||||
while let Some((key, value)) = access.next_entry::<String, JsonValue>()? {
|
while let Some((key, value)) = access.next_entry::<String, JsonValue>()? {
|
||||||
match key.as_str() {
|
match key.as_str() {
|
||||||
"include_all_networks" => {
|
"include_all_networks" => {
|
||||||
include_all_networks = match value.as_bool() {
|
include_all_networks = value.as_bool().unwrap_or(false);
|
||||||
Some(b) => b,
|
|
||||||
_ => false,
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
"third_party_instance_id" => {
|
"third_party_instance_id" => {
|
||||||
third_party_instance_id = value.as_str().map(|v| v.to_owned());
|
third_party_instance_id = value.as_str().map(|v| v.to_owned());
|
||||||
|
@ -153,7 +153,7 @@ impl<T> Raw<T> {
|
|||||||
{
|
{
|
||||||
type Value = Option<T>;
|
type Value = Option<T>;
|
||||||
|
|
||||||
fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> std::fmt::Result {
|
fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
formatter.write_str("a string")
|
formatter.write_str("a string")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -79,7 +79,7 @@ impl IncomingRequest for Request {
|
|||||||
B: AsRef<[u8]>,
|
B: AsRef<[u8]>,
|
||||||
S: AsRef<str>,
|
S: AsRef<str>,
|
||||||
{
|
{
|
||||||
let (room_alias,) = serde::Deserialize::deserialize(serde::de::value::SeqDeserializer::<
|
let (room_alias,) = Deserialize::deserialize(serde::de::value::SeqDeserializer::<
|
||||||
_,
|
_,
|
||||||
serde::de::value::Error,
|
serde::de::value::Error,
|
||||||
>::new(
|
>::new(
|
||||||
|
@ -141,7 +141,7 @@ impl<'de> Deserialize<'de> for JoinRule {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let join_rule = serde_json::from_str::<ExtractType<'_>>(json.get())
|
let join_rule = serde_json::from_str::<ExtractType<'_>>(json.get())
|
||||||
.map_err(serde::de::Error::custom)?
|
.map_err(Error::custom)?
|
||||||
.join_rule
|
.join_rule
|
||||||
.ok_or_else(|| D::Error::missing_field("join_rule"))?;
|
.ok_or_else(|| D::Error::missing_field("join_rule"))?;
|
||||||
|
|
||||||
@ -238,9 +238,8 @@ impl<'de> Deserialize<'de> for AllowRule {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Get the value of `type` if present.
|
// Get the value of `type` if present.
|
||||||
let rule_type = serde_json::from_str::<ExtractType<'_>>(json.get())
|
let rule_type =
|
||||||
.map_err(serde::de::Error::custom)?
|
serde_json::from_str::<ExtractType<'_>>(json.get()).map_err(Error::custom)?.rule_type;
|
||||||
.rule_type;
|
|
||||||
|
|
||||||
match rule_type.as_deref() {
|
match rule_type.as_deref() {
|
||||||
Some("m.room_membership") => from_raw_json_value(&json).map(Self::RoomMembership),
|
Some("m.room_membership") => from_raw_json_value(&json).map(Self::RoomMembership),
|
||||||
|
@ -686,6 +686,8 @@ impl MessageType {
|
|||||||
if let Some(formatted) = formatted {
|
if let Some(formatted) = formatted {
|
||||||
formatted.sanitize_html(mode, remove_reply_fallback);
|
formatted.sanitize_html(mode, remove_reply_fallback);
|
||||||
}
|
}
|
||||||
|
// This is a false positive, see <https://github.com/rust-lang/rust-clippy/issues/12444>
|
||||||
|
#[allow(clippy::assigning_clones)]
|
||||||
if remove_reply_fallback == RemoveReplyFallback::Yes {
|
if remove_reply_fallback == RemoveReplyFallback::Yes {
|
||||||
*body = remove_plain_reply_fallback(body).to_owned();
|
*body = remove_plain_reply_fallback(body).to_owned();
|
||||||
}
|
}
|
||||||
|
@ -53,9 +53,8 @@ impl Response {
|
|||||||
}
|
}
|
||||||
ResponseFieldKind::Header(header_name) => {
|
ResponseFieldKind::Header(header_name) => {
|
||||||
let optional_header = match &field.ty {
|
let optional_header = match &field.ty {
|
||||||
syn::Type::Path(syn::TypePath {
|
Type::Path(syn::TypePath {
|
||||||
path: syn::Path { segments, .. },
|
path: syn::Path { segments, .. }, ..
|
||||||
..
|
|
||||||
}) if segments.last().unwrap().ident == "Option" => {
|
}) if segments.last().unwrap().ident == "Option" => {
|
||||||
quote! {
|
quote! {
|
||||||
#( #cfg_attrs )*
|
#( #cfg_attrs )*
|
||||||
|
Loading…
x
Reference in New Issue
Block a user