ExternalVendorCode/chirpstack
1
0
Fork 0
mirror of https://github.com/chirpstack/chirpstack.git synced 2025-04-07 11:26:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix clippy warnings.

Browse Source
This commit is contained in:
Orne Brocaar 2022-08-01 10:24:15 +01:00
parent edff985ad8
commit 54d582504f
3 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lrwn/src/lib.rs
View File

@ -72,5 +72,5 @@ pub fn get_tx_param_setup_eirp(i: u8) -> Result<f32> {
EIRP_INDEX
.get(i as usize)
.cloned()
.ok_or(anyhow!("Index does not exist"))
.ok_or_else(|| anyhow!("Index does not exist"))
}

8
lrwn/src/netid.rs
View File

@ -7,7 +7,7 @@ use serde::{Deserialize, Deserializer, Serialize, Serializer};
use crate::Error;
#[derive(PartialEq, Clone, Copy, Hash, Eq)]
#[derive(Default, PartialEq, Clone, Copy, Hash, Eq)]
pub struct NetID([u8; 3]);
impl NetID {
@ -76,12 +76,6 @@ impl NetID {
}
}
impl Default for NetID {
fn default() -> Self {
NetID([0, 0, 0])
}
}
impl fmt::Display for NetID {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "{}", hex::encode(self.0))

25
lrwn/src/region/mod.rs
View File

@ -472,7 +472,7 @@ impl RegionBaseConfig {
Ok(self
.data_rates
.get(&dr)
.ok_or(anyhow!("Unknown data-rate index"))?
.ok_or_else(|| anyhow!("Unknown data-rate index"))?
.modulation
.clone())
}
@ -488,35 +488,38 @@ impl RegionBaseConfig {
None => self
.max_payload_size_per_dr
.get(&MacVersion::Latest)
.ok_or(anyhow!("Unknown mac-version"))?,
.ok_or_else(|| anyhow!("Unknown mac-version"))?,
};
let dr_map = match reg_params_map.get(&reg_params_revision) {
Some(v) => v,
None => reg_params_map
.get(&Revision::Latest)
.ok_or(anyhow!("Unknown revision"))?,
.ok_or_else(|| anyhow!("Unknown revision"))?,
};
Ok(dr_map.get(&dr).ok_or(anyhow!("Invalid data-rate"))?.clone())
Ok(dr_map
.get(&dr)
.ok_or_else(|| anyhow!("Invalid data-rate"))?
.clone())
}
fn get_rx1_data_rate_index(&self, uplink_dr: u8, rx1_dr_offset: usize) -> Result<u8> {
let offset_vec = self
.rx1_data_rate_table
.get(&uplink_dr)
.ok_or(anyhow!("Unknown data-rate"))?;
.ok_or_else(|| anyhow!("Unknown data-rate"))?;
Ok(*offset_vec
.get(rx1_dr_offset)
.ok_or(anyhow!("Invalid rx1 data-rate offset"))?)
.ok_or_else(|| anyhow!("Invalid rx1 data-rate offset"))?)
}
fn get_tx_power_offset(&self, tx_power: usize) -> Result<isize> {
Ok(*self
.tx_power_offsets
.get(tx_power)
.ok_or(anyhow!("Invalid tx-power"))?)
.ok_or_else(|| anyhow!("Invalid tx-power"))?)
}
fn add_channel(&mut self, frequency: u32, min_dr: u8, max_dr: u8) -> Result<()> {
@ -544,7 +547,7 @@ impl RegionBaseConfig {
Ok(self
.uplink_channels
.get(channel)
.ok_or(anyhow!("Invalid channel"))?
.ok_or_else(|| anyhow!("Invalid channel"))?
.clone())
}
@ -589,7 +592,7 @@ impl RegionBaseConfig {
Ok(self
.downlink_channels
.get(channel)
.ok_or(anyhow!("Invalid channel"))?
.ok_or_else(|| anyhow!("Invalid channel"))?
.clone())
}
@ -597,7 +600,7 @@ impl RegionBaseConfig {
let mut channel = self
.uplink_channels
.get_mut(channel)
.ok_or(anyhow!("Invalid channel"))?;
.ok_or_else(|| anyhow!("Invalid channel"))?;
channel.enabled = false;
Ok(())
}
@ -606,7 +609,7 @@ impl RegionBaseConfig {
let mut channel = self
.uplink_channels
.get_mut(channel)
.ok_or(anyhow!("Invalid channel"))?;
.ok_or_else(|| anyhow!("Invalid channel"))?;
channel.enabled = true;
Ok(())
}