aljaz/notedeck
1
0
Fork 0
mirror of https://github.com/aljazceru/notedeck.git synced 2025-12-19 01:24:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge clippy fixes from Dimitris

Browse Source 
Dimitris Apostolou (1):
      Fix clippy warnings
This commit is contained in:
William Casarin
2025-01-25 16:15:06 -08:00
parent 8a87791594 2c8f6298b8
commit 8ad9ad20ba
4 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/enostr/src/relay/message.rs
View File

@@ -9,9 +9,7 @@ pub struct CommandResult<'a> {
}
pub fn calculate_command_result_size(result: &CommandResult) -> usize {
std::mem::size_of_val(result)
+ result.event_id.as_bytes().len()
+ result.message.as_bytes().len()
std::mem::size_of_val(result) + result.event_id.len() + result.message.len()
}
#[derive(Debug, Eq, PartialEq)]

18
crates/enostr/src/relay/subs_debug.rs
View File

@@ -188,13 +188,13 @@ fn calculate_client_message_size(message: &ClientMessage) -> usize {
ClientMessage::Req { sub_id, filters } => {
mem::size_of_val(message)
+ mem::size_of_val(sub_id)
+ sub_id.as_bytes().len()
+ sub_id.len()
+ filters.iter().map(mem::size_of_val).sum::<usize>()
}
ClientMessage::Close { sub_id } => {
mem::size_of_val(message) + mem::size_of_val(sub_id) + sub_id.as_bytes().len()
mem::size_of_val(message) + mem::size_of_val(sub_id) + sub_id.len()
}
ClientMessage::Raw(data) => mem::size_of_val(message) + data.as_bytes().len(),
ClientMessage::Raw(data) => mem::size_of_val(message) + data.len(),
}
}
@@ -217,7 +217,7 @@ fn calculate_ws_message_size(message: &WsMessage) -> usize {
mem::size_of_val(message) + vec.len()
}
WsMessage::Text(string) | WsMessage::Unknown(string) => {
mem::size_of_val(message) + string.as_bytes().len()
mem::size_of_val(message) + string.len()
}
}
}
@@ -233,13 +233,11 @@ fn calculate_error_size(error: &Error) -> usize {
| Error::Io(_)
| Error::InvalidPublicKey => mem::size_of_val(error), // No heap usage
Error::Json(json_err) => mem::size_of_val(error) + json_err.to_string().as_bytes().len(),
Error::Json(json_err) => mem::size_of_val(error) + json_err.to_string().len(),
Error::Nostrdb(nostrdb_err) => {
mem::size_of_val(error) + nostrdb_err.to_string().as_bytes().len()
}
Error::Nostrdb(nostrdb_err) => mem::size_of_val(error) + nostrdb_err.to_string().len(),
Error::Generic(string) => mem::size_of_val(error) + string.as_bytes().len(),
Error::Generic(string) => mem::size_of_val(error) + string.len(),
}
}
@@ -248,7 +246,7 @@ fn calculate_relay_message_size(message: &RelayMessage) -> usize {
RelayMessage::OK(result) => calculate_command_result_size(result),
RelayMessage::Eose(str_ref)
| RelayMessage::Event(str_ref, _)
| RelayMessage::Notice(str_ref) => mem::size_of_val(message) + str_ref.as_bytes().len(),
| RelayMessage::Notice(str_ref) => mem::size_of_val(message) + str_ref.len(),
}
}