enable string_add lint

This commit is contained in:
Charles Hall 2024-05-12 19:01:29 -07:00
parent cc5977b4e4
commit 9abe4799db
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
5 changed files with 14 additions and 13 deletions

View file

@ -50,6 +50,7 @@ rest_pat_in_fully_bound_structs = "warn"
same_name_method = "warn" same_name_method = "warn"
semicolon_inside_block = "warn" semicolon_inside_block = "warn"
str_to_string = "warn" str_to_string = "warn"
string_add = "warn"
string_lit_chars_any = "warn" string_lit_chars_any = "warn"
string_to_string = "warn" string_to_string = "warn"
suspicious_xor_used_as_pow = "warn" suspicious_xor_used_as_pow = "warn"

View file

@ -44,7 +44,7 @@ where
}; };
parts.path_and_query = Some( parts.path_and_query = Some(
(old_path_and_query + symbol + "access_token=" + hs_token) format!("{old_path_and_query}{symbol}access_token={hs_token}")
.parse() .parse()
.unwrap(), .unwrap(),
); );

View file

@ -43,7 +43,7 @@ pub(crate) async fn create_content_route(
mxc.clone(), mxc.clone(),
body.filename body.filename
.as_ref() .as_ref()
.map(|filename| "inline; filename=".to_owned() + filename) .map(|filename| format!("inline; filename={filename}"))
.as_deref(), .as_deref(),
body.content_type.as_deref(), body.content_type.as_deref(),
&body.file, &body.file,

View file

@ -1598,15 +1598,15 @@ pub(crate) async fn sync_events_v4_route(
let name = match &*heroes { let name = match &*heroes {
[] => None, [] => None,
[only] => Some(only.0.clone()), [only] => Some(only.0.clone()),
[firsts @ .., last] => Some( [firsts @ .., last] => Some({
firsts let firsts = firsts
.iter() .iter()
.map(|h| h.0.clone()) .map(|h| h.0.clone())
.collect::<Vec<_>>() .collect::<Vec<_>>()
.join(", ") .join(", ");
+ " and "
+ &last.0, format!("{firsts} and {}", last.0)
), }),
}; };
let avatar = if let [only] = &*heroes { let avatar = if let [only] = &*heroes {

View file

@ -385,17 +385,17 @@ impl Service {
let output = format!( let output = format!(
"Rooms:\n{}", "Rooms:\n{}",
room_ids room_ids
.filter_map(|r| r.ok()) .filter_map(std::result::Result::ok)
.map(|id| id.to_string() .map(|id| format!(
+ "\tMembers: " "{id}\tMembers: {}",
+ &services() &services()
.rooms .rooms
.state_cache .state_cache
.room_joined_count(&id) .room_joined_count(&id)
.ok() .ok()
.flatten() .flatten()
.unwrap_or(0) .unwrap_or(0)
.to_string()) ))
.collect::<Vec<_>>() .collect::<Vec<_>>()
.join("\n") .join("\n")
); );