Skip to content

Commit 3252dea

Browse files
reedstrmreedstrm
committed
cargo clippy fixes
1 parent 38f49a2 commit 3252dea

6 files changed

Lines changed: 33 additions & 37 deletions

File tree

‎build.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
use chrono::Utc;
2-
use protobuf_codegen;
32
use std::{fs, path::PathBuf};
43

54
fn main() {

‎src/ble.rs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ pub async fn run_bluez_advertisement_listener(
5454

5555
if interface == "org.bluez.Adapter1" {
5656
if let Some(value) = changed.get("Discovering") {
57-
if let Some(is_discovering) = value.downcast_ref::<bool>().ok() {
57+
if let Ok(is_discovering) = value.downcast_ref::<bool>() {
5858
if !is_discovering {
5959
info!("Discovery was turned off — restarting discovery.");
6060
try_start_discovery(&conn, adapter_index).await?;
@@ -71,23 +71,23 @@ pub async fn run_bluez_advertisement_listener(
7171
if let Some(path) = device_path {
7272
match get_device_properties(&conn, &path).await {
7373
Ok(props) => {
74-
debug!("Changed properties for device {}", path);
74+
debug!("Changed properties for device {path}");
7575
if log::log_enabled!(log::Level::Debug) {
7676
print_props(&props);
7777
}
7878
match build_advertisement_response(&props) {
7979
Some(msg) => {
8080
if let Err(e) = tx.send(msg) {
81-
warn!("Failed to send advertisement response: {}", e);
81+
warn!("Failed to send advertisement response: {e}");
8282
}
8383
}
8484
None => {
85-
warn!("Failed to build advertisement response for {}", path);
85+
warn!("Failed to build advertisement response for {path}");
8686
}
8787
};
8888
}
8989
Err(e) => {
90-
warn!("Failed to fetch properties for {}: {}", path, e);
90+
warn!("Failed to fetch properties for {path}: {e}");
9191
}
9292
}
9393
}
@@ -102,26 +102,26 @@ pub async fn run_bluez_advertisement_listener(
102102
HashMap<String, HashMap<String, OwnedValue>>
103103
) = body.deserialize()?;
104104

105-
debug!("InterfacesAdded at path: {}", path);
105+
debug!("InterfacesAdded at path: {path}");
106106
match interfaces.get("org.bluez.Device1") {
107107
Some(props) => {
108-
debug!("New properties for device {}", path);
108+
debug!("New properties for device {path}");
109109
if log::log_enabled!(log::Level::Debug) {
110110
print_props(props);
111111
}
112-
match build_advertisement_response(&props) {
112+
match build_advertisement_response(props) {
113113
Some(msg) => {
114114
if let Err(e) = tx.send(msg) {
115-
warn!("Failed to send advertisement response: {}", e);
115+
warn!("Failed to send advertisement response: {e}");
116116
}
117117
}
118118
None => {
119-
warn!("Failed to build advertisement response for {}", path);
119+
warn!("Failed to build advertisement response for {path}");
120120
}
121121
};
122122
}
123123
_ => {
124-
debug!("Failed to fetch properties for {}", path);
124+
debug!("Failed to fetch properties for {path}");
125125
}
126126
}
127127
}
@@ -196,12 +196,12 @@ async fn get_device_properties(
196196

197197
fn print_props(props: &HashMap<String, OwnedValue>) {
198198
for (key, value) in props {
199-
debug!(" {} => {:?}", key, value);
199+
debug!(" {key} => {value:?}");
200200
}
201201
}
202202

203203
async fn try_start_discovery(conn: &Connection, adapter_index: u16) -> zbus::Result<()> {
204-
let adapter_path = format!("/org/bluez/hci{}", adapter_index);
204+
let adapter_path = format!("/org/bluez/hci{adapter_index}");
205205
let proxy = Proxy::new(
206206
conn,
207207
"org.bluez",

‎src/main.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ async fn main() -> std::io::Result<()> {
6868
std::process::exit(1);
6969
}
7070
Err(e) => {
71-
log::error!("Error while getting MAC address: {}", e);
71+
log::error!("Error while getting MAC address: {e}");
7272
log::error!("Fatal: Could not determine MAC address.");
7373
std::process::exit(1);
7474
}
@@ -88,7 +88,7 @@ async fn main() -> std::io::Result<()> {
8888
hostname: cli.hostname,
8989
port: cli.listen.port(),
9090
net_mac: mac,
91-
bt_mac: bt_mac,
91+
bt_mac,
9292
build_time: env!("BUILD_TIME"),
9393
version: env!("CARGO_PKG_VERSION"),
9494
});
@@ -106,12 +106,12 @@ async fn main() -> std::io::Result<()> {
106106
result = &mut ble_handle => {
107107
match result {
108108
Ok(Err(e)) => {
109-
log::error!("Failed to start BLE advertisement listener: {}", e);
109+
log::error!("Failed to start BLE advertisement listener: {e}");
110110
log::error!("Fatal: Cannot connect to BlueZ D-Bus service. Check if bluetoothd is running.");
111111
std::process::exit(1);
112112
}
113113
Err(e) => {
114-
log::error!("BLE advertisement listener task panicked: {}", e);
114+
log::error!("BLE advertisement listener task panicked: {e}");
115115
log::error!("Fatal: Critical error in BLE listener.");
116116
std::process::exit(1);
117117
}
@@ -126,15 +126,15 @@ async fn main() -> std::io::Result<()> {
126126

127127
info!("Listening for ble advertisements on hci{}", cli.hci);
128128

129-
let _mdns_service = mdns::start_mdns(ctx.clone()).unwrap_or_else(|e| {
130-
warn!("Critical error: failed to register mDNS service: {}", e);
129+
mdns::start_mdns(ctx.clone()).unwrap_or_else(|e| {
130+
warn!("Critical error: failed to register mDNS service: {e}");
131131
std::process::exit(1);
132132
});
133133

134134
info!("mDNS service registered");
135135

136136
if let Err(e) = server::run_tcp_server(ctx.clone(), cli.listen, rx).await {
137-
log::error!("TCP server error: {}", e);
137+
log::error!("TCP server error: {e}");
138138
log::error!("Fatal: TCP server failed to start or crashed.");
139139
std::process::exit(1);
140140
}

‎src/proto.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use crate::api::api_options;
22
use bytes::{Bytes, BytesMut};
3-
use protobuf;
43
use protobuf::MessageFull;
54
use std::io::{Error, ErrorKind};
65

@@ -48,7 +47,7 @@ pub fn encode_varint(mut value: u64) -> Vec<u8> {
4847

4948
pub fn next_message(buf: &mut BytesMut) -> Option<(u32, Bytes)> {
5049
// Step 1: check framing byte
51-
if buf.len() < 1 || buf[0] != 0x00 {
50+
if buf.is_empty() || buf[0] != 0x00 {
5251
return None;
5352
}
5453

‎src/server.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ pub async fn run_tcp_server(
2222
rx: broadcast::Receiver<BluetoothLEAdvertisementResponse>,
2323
) -> std::io::Result<()> {
2424
let listener = TcpListener::bind(addr).await?;
25-
info!("Listening on {}", addr);
25+
info!("Listening on {addr}");
2626

2727
loop {
2828
let (stream, peer) = listener.accept().await?;
29-
info!("New connection from {}", peer);
29+
info!("New connection from {peer}");
3030
let mut client_rx = rx.resubscribe();
3131
let ctx = Arc::clone(&ctx);
3232
tokio::spawn(async move {
3333
if let Err(e) = handle_client(ctx, stream, &mut client_rx).await {
34-
warn!("Client error: {:?}", e);
34+
warn!("Client error: {e:?}");
3535
}
3636
});
3737
}
@@ -68,7 +68,7 @@ async fn handle_client(
6868
subscription_flags = sub_flags;
6969
}
7070
Err(e) => {
71-
warn!("Failed to handle BLE advertisement subscription: {}", e);
71+
warn!("Failed to handle BLE advertisement subscription: {e}");
7272
}
7373
}
7474
},
@@ -84,7 +84,7 @@ async fn handle_client(
8484
}
8585
},
8686
Err(e) => {
87-
warn!("Read Error: {}", e);
87+
warn!("Read Error: {e}");
8888
break;
8989
},
9090
}
@@ -99,7 +99,7 @@ async fn handle_client(
9999
}
100100
},
101101
Err(broadcast::error::RecvError::Lagged(n)) => {
102-
warn!("Lagged behind on BLE broadcast: {} messages dropped", n);
102+
warn!("Lagged behind on BLE broadcast: {n} messages dropped");
103103
},
104104
Err(broadcast::error::RecvError::Closed) => {
105105
warn!("BLE broadcast channel closed");

‎src/utils.rs‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ pub fn get_bt_mac(hci_index: u16) -> Option<[u8; 6]> {
1919
_padding: [u8; 84], // full size = 104
2020
}
2121

22-
log::debug!("Attempting to open HCI device hci{}", hci_index);
22+
log::debug!("Attempting to open HCI device hci{hci_index}");
2323

2424
let sock = unsafe { libc::socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI) };
2525
if sock < 0 {
26-
log::error!("Failed to open raw HCI socket: errno {}", sock);
26+
log::error!("Failed to open raw HCI socket: errno {sock}");
2727
return None;
2828
}
2929

@@ -38,9 +38,7 @@ pub fn get_bt_mac(hci_index: u16) -> Option<[u8; 6]> {
3838

3939
if ret < 0 {
4040
log::error!(
41-
"ioctl HCIGETDEVINFO failed for hci{} (ret = {})",
42-
hci_index,
43-
ret
41+
"ioctl HCIGETDEVINFO failed for hci{hci_index} (ret = {ret})"
4442
);
4543
return None;
4644
}
@@ -58,14 +56,14 @@ pub fn get_bt_mac(hci_index: u16) -> Option<[u8; 6]> {
5856
log::info!(
5957
"Retrieved MAC for hci{}: {}",
6058
hci_index,
61-
format_mac(&mac, &":")
59+
format_mac(&mac, ":")
6260
);
6361
Some(mac)
6462
}
6563

6664
pub fn format_mac(mac: &[u8], sep: &str) -> String {
6765
mac.iter()
68-
.map(|b| format!("{:02X}", b))
66+
.map(|b| format!("{b:02X}"))
6967
.collect::<Vec<_>>()
7068
.join(sep)
7169
}
@@ -79,7 +77,7 @@ pub fn parse_mac(s: &str) -> Result<[u8; 6], String> {
7977
let mut mac = [0u8; 6];
8078
for (i, part) in parts.iter().enumerate() {
8179
mac[i] =
82-
u8::from_str_radix(part, 16).map_err(|_| format!("Invalid hex byte: '{}'", part))?;
80+
u8::from_str_radix(part, 16).map_err(|_| format!("Invalid hex byte: '{part}'"))?;
8381
}
8482
Ok(mac)
8583
}

0 commit comments

Comments
 (0)