ExternalVendorCode/chirpstack
1
0
Fork 0
mirror of https://github.com/chirpstack/chirpstack.git synced 2025-05-31 23:10:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix formatting after cargo clippy --fix.

Browse Source
This commit is contained in:
Orne Brocaar 2024-05-08 12:09:30 +01:00
parent 057aed7f50
commit 640a0f348e
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
chirpstack/src/downlink/data_fns.rs
View File

@ -76,7 +76,9 @@ impl Data {
.cloned() .cloned()
.ok_or_else(|| anyhow!("rx_info is empty"))?; .ok_or_else(|| anyhow!("rx_info is empty"))?;
self.downlink_frame.gateway_id.clone_from(&rx_info.gateway_id); self.downlink_frame
.gateway_id
.clone_from(&rx_info.gateway_id);
if self.dl_meta_data.dl_freq_1.is_some() if self.dl_meta_data.dl_freq_1.is_some()
&& self.dl_meta_data.data_rate_1.is_some() && self.dl_meta_data.data_rate_1.is_some()
&& self.dl_meta_data.rx_delay_1.is_some() && self.dl_meta_data.rx_delay_1.is_some()

5
chirpstack/src/storage/mod.rs
View File

@ -148,7 +148,10 @@ pub async fn setup() -> Result<()> {
if !conf.redis.key_prefix.is_empty() { if !conf.redis.key_prefix.is_empty() {
info!(prefix = %conf.redis.key_prefix, "Setting Redis prefix"); info!(prefix = %conf.redis.key_prefix, "Setting Redis prefix");
REDIS_PREFIX.write().unwrap().clone_from(&conf.redis.key_prefix); REDIS_PREFIX
.write()
.unwrap()
.clone_from(&conf.redis.key_prefix);
} }
Ok(()) Ok(())

3
chirpstack/src/uplink/data.rs
View File

@ -1106,7 +1106,8 @@ impl Data {
trace!("Setting region_config_id to device-session"); trace!("Setting region_config_id to device-session");
let d = self.device.as_mut().unwrap(); let d = self.device.as_mut().unwrap();
let ds = d.get_device_session_mut()?; let ds = d.get_device_session_mut()?;
ds.region_config_id.clone_from(&self.uplink_frame_set.region_config_id); ds.region_config_id
.clone_from(&self.uplink_frame_set.region_config_id);
Ok(()) Ok(())
} }

3
chirpstack/src/uplink/join.rs
View File

@ -576,7 +576,8 @@ impl JoinRequest {
aes_key: v.aes_key.clone(), aes_key: v.aes_key.clone(),
}); });
} }
self.js_session_key_id.clone_from(&join_ans_pl.session_key_id); self.js_session_key_id
.clone_from(&join_ans_pl.session_key_id);
if let Some(v) = &join_ans_pl.nwk_s_key { if let Some(v) = &join_ans_pl.nwk_s_key {
let key = keywrap::unwrap(v).context("Unwrap nwk_s_key")?; let key = keywrap::unwrap(v).context("Unwrap nwk_s_key")?;