Fix new clippy lints

pull/28/head
Dominik Nakamura 2 years ago
parent 71274bf72e
commit 7948d30d67
No known key found for this signature in database
GPG Key ID: E4C6A749B2491910

@ -56,7 +56,7 @@ impl<'a> General<'a> {
.send_message(Request::CallVendorRequest(CallVendorRequestInternal { .send_message(Request::CallVendorRequest(CallVendorRequestInternal {
vendor_name: request.vendor_name, vendor_name: request.vendor_name,
request_type: request.request_type, request_type: request.request_type,
request_data: serde_json::to_value(&request.request_data) request_data: serde_json::to_value(request.request_data)
.map_err(Error::SerializeCustomData)?, .map_err(Error::SerializeCustomData)?,
})) }))
.await .await

@ -70,7 +70,7 @@ impl<'a> Inputs<'a> {
self.client self.client
.send_message(Request::SetSettings(SetSettingsInternal { .send_message(Request::SetSettings(SetSettingsInternal {
input: settings.input, input: settings.input,
settings: serde_json::to_value(&settings.settings) settings: serde_json::to_value(settings.settings)
.map_err(Error::SerializeCustomData)?, .map_err(Error::SerializeCustomData)?,
overlay: settings.overlay, overlay: settings.overlay,
})) }))

@ -165,7 +165,7 @@ impl<'a> SceneItems<'a> {
.send_message(Request::SetPrivateSettings(SetPrivateSettingsInternal { .send_message(Request::SetPrivateSettings(SetPrivateSettingsInternal {
scene: settings.scene, scene: settings.scene,
item_id: settings.item_id, item_id: settings.item_id,
settings: serde_json::to_value(&settings.settings) settings: serde_json::to_value(settings.settings)
.map_err(Error::SerializeCustomData)?, .map_err(Error::SerializeCustomData)?,
})) }))
.await .await

@ -190,24 +190,24 @@ impl QtGeometry {
const DATA_LENGTH: usize = 66; const DATA_LENGTH: usize = 66;
fn serialize_rect(data: &mut Vec<u8>, rect: &QtRect) { fn serialize_rect(data: &mut Vec<u8>, rect: &QtRect) {
data.extend(&rect.left.to_be_bytes()); data.extend(rect.left.to_be_bytes());
data.extend(&rect.top.to_be_bytes()); data.extend(rect.top.to_be_bytes());
data.extend(&rect.right.to_be_bytes()); data.extend(rect.right.to_be_bytes());
data.extend(&rect.bottom.to_be_bytes()); data.extend(rect.bottom.to_be_bytes());
} }
let mut data = Vec::<u8>::with_capacity(DATA_LENGTH); let mut data = Vec::<u8>::with_capacity(DATA_LENGTH);
data.extend(&MAGIC_NUMBER.to_be_bytes()); data.extend(MAGIC_NUMBER.to_be_bytes());
data.extend(&MAJOR_VERSION.to_be_bytes()); data.extend(MAJOR_VERSION.to_be_bytes());
data.extend(&MINOR_VERSION.to_be_bytes()); data.extend(MINOR_VERSION.to_be_bytes());
serialize_rect(&mut data, &self.rect); // frame geometry serialize_rect(&mut data, &self.rect); // frame geometry
serialize_rect(&mut data, &self.rect); // normal geometry serialize_rect(&mut data, &self.rect); // normal geometry
data.extend(&self.screen_number.to_be_bytes()); data.extend(self.screen_number.to_be_bytes());
data.extend(&self.window_state.to_be_bytes()); data.extend(self.window_state.to_be_bytes());
data.extend(&self.screen_width.to_be_bytes()); data.extend(self.screen_width.to_be_bytes());
serialize_rect(&mut data, &self.rect); serialize_rect(&mut data, &self.rect);
@ -243,12 +243,8 @@ impl QtWindowState {
/// Convert the state into a byte array for usage in [`QtGeometry::serialize`] . /// Convert the state into a byte array for usage in [`QtGeometry::serialize`] .
fn to_be_bytes(self) -> [u8; 2] { fn to_be_bytes(self) -> [u8; 2] {
[ [
if self.contains(Self::MAXIMIZED) { 1 } else { 0 }, u8::from(self.contains(Self::MAXIMIZED)),
if self.contains(Self::FULLSCREEN) { u8::from(self.contains(Self::FULLSCREEN)),
1
} else {
0
},
] ]
} }
} }

Loading…
Cancel
Save