ExternalVendorCode/chirpstack
1
0
Fork 0
mirror of https://github.com/chirpstack/chirpstack.git synced 2025-02-21 01:21:21 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix cargo clippy warnings.

Browse Source
This commit is contained in:
Orne Brocaar 2024-05-08 11:53:34 +01:00
parent 66d0ec2f6f
commit 057aed7f50
9 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
backend/src/lib.rs
View File

@ -160,7 +160,7 @@ impl Client {
pl: &mut JoinReqPayload,
async_resp: Option<Receiver<Vec<u8>>>,
) -> Result<JoinAnsPayload> {
pl.base.sender_id = self.config.sender_id.clone();
pl.base.sender_id.clone_from(&self.config.sender_id);
pl.base.receiver_id = receiver_id;
pl.base.message_type = MessageType::JoinReq;
@ -174,8 +174,8 @@ impl Client {
pl: &mut RejoinReqPayload,
async_resp: Option<Receiver<Vec<u8>>>,
) -> Result<RejoinAnsPayload> {
pl.base.sender_id = self.config.sender_id.clone();
pl.base.receiver_id = self.config.receiver_id.clone();
pl.base.sender_id.clone_from(&self.config.sender_id);
pl.base.receiver_id.clone_from(&self.config.receiver_id);
pl.base.message_type = MessageType::RejoinReq;
let mut ans: RejoinAnsPayload = Default::default();
@ -188,8 +188,8 @@ impl Client {
pl: &mut AppSKeyReqPayload,
async_resp: Option<Receiver<Vec<u8>>>,
) -> Result<AppSKeyAnsPayload> {
pl.base.sender_id = self.config.sender_id.clone();
pl.base.receiver_id = self.config.receiver_id.clone();
pl.base.sender_id.clone_from(&self.config.sender_id);
pl.base.receiver_id.clone_from(&self.config.receiver_id);
pl.base.message_type = MessageType::AppSKeyReq;
let mut ans: AppSKeyAnsPayload = Default::default();
@ -203,8 +203,8 @@ impl Client {
pl: &mut PRStartReqPayload,
async_resp: Option<Receiver<Vec<u8>>>,
) -> Result<PRStartAnsPayload> {
pl.base.sender_id = self.config.sender_id.clone();
pl.base.receiver_id = self.config.receiver_id.clone();
pl.base.sender_id.clone_from(&self.config.sender_id);
pl.base.receiver_id.clone_from(&self.config.receiver_id);
pl.base.message_type = MessageType::PRStartReq;
let mut ans: PRStartAnsPayload = Default::default();
@ -223,8 +223,8 @@ impl Client {
pl: &mut PRStopReqPayload,
async_resp: Option<Receiver<Vec<u8>>>,
) -> Result<PRStopAnsPayload> {
pl.base.sender_id = self.config.sender_id.clone();
pl.base.receiver_id = self.config.receiver_id.clone();
pl.base.sender_id.clone_from(&self.config.sender_id);
pl.base.receiver_id.clone_from(&self.config.receiver_id);
pl.base.message_type = MessageType::PRStopReq;
let mut ans: PRStopAnsPayload = Default::default();
@ -243,7 +243,7 @@ impl Client {
pl: &mut HomeNSReqPayload,
async_resp: Option<Receiver<Vec<u8>>>,
) -> Result<HomeNSAnsPayload> {
pl.base.sender_id = self.config.sender_id.clone();
pl.base.sender_id.clone_from(&self.config.sender_id);
pl.base.receiver_id = receiver_id;
pl.base.message_type = MessageType::HomeNSReq;
@ -262,8 +262,8 @@ impl Client {
pl: &mut XmitDataReqPayload,
async_resp: Option<Receiver<Vec<u8>>>,
) -> Result<XmitDataAnsPayload> {
pl.base.sender_id = self.config.sender_id.clone();
pl.base.receiver_id = self.config.receiver_id.clone();
pl.base.sender_id.clone_from(&self.config.sender_id);
pl.base.receiver_id.clone_from(&self.config.receiver_id);
pl.base.message_type = MessageType::XmitDataReq;
let mut ans: XmitDataAnsPayload = Default::default();
@ -376,7 +376,7 @@ impl Client {
};
let body = serde_json::to_string(&pl)?;
be_req_log.request_body = body.clone();
be_req_log.request_body.clone_from(&body);
info!(server = %server, async_interface = %async_resp.is_some(), "Making request");
@ -407,7 +407,7 @@ impl Client {
None => res.text().await?,
};
be_req_log.response_body = resp_json.clone();
be_req_log.response_body.clone_from(&resp_json);
let base: BasePayloadResult = serde_json::from_str(&resp_json)?;
be_req_log.result_code = format!("{:?}", base.result.result_code);

6
chirpstack/src/api/internal.rs
View File

@ -583,7 +583,7 @@ impl InternalService for Internal {
// update the user
// in case it was fetched using the external id, this will make sure we sync with any
// possible email change.
u.email = oauth_user.email.clone();
u.email.clone_from(&oauth_user.email);
u.email_verified = email_verified;
let u = user::update(u).await.map_err(|e| e.status())?;
@ -933,14 +933,14 @@ impl InternalService for Internal {
for region_conf in &conf.regions {
if req.id == region_conf.id {
out.id = region_conf.id.clone();
out.id.clone_from(&region_conf.id);
out.description = if region_conf.description.is_empty() {
region_conf.id.clone()
} else {
region_conf.description.clone()
};
out.region = region_conf.common_name.to_proto().into();
out.user_info = region_conf.user_info.clone();
out.user_info.clone_from(&region_conf.user_info);
out.rx1_delay = region_conf.network.rx1_delay as u32;
out.rx1_dr_offset = region_conf.network.rx1_dr_offset as u32;
out.rx2_dr = region_conf.network.rx2_dr as u32;

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

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

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

@ -452,7 +452,7 @@ impl JoinAccept<'_> {
let phy_b = self.join_accept.to_vec()?;
for i in &mut self.downlink_frame.items {
i.phy_payload = phy_b.clone();
i.phy_payload.clone_from(&phy_b);
}
Ok(())
@ -507,7 +507,7 @@ impl JoinAccept<'_> {
let relay_phy_b = relay_phy.to_vec()?;
for i in &mut self.downlink_frame.items {
i.phy_payload = relay_phy_b.clone();
i.phy_payload.clone_from(&relay_phy_b);
}
Ok(())

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

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

2
chirpstack/src/stream/event.rs
View File

@ -81,7 +81,7 @@ pub async fn get_event_logs(
for stream_key in &srr.keys {
for stream_id in &stream_key.ids {
last_id = stream_id.id.clone();
last_id.clone_from(&stream_id.id);
for (k, v) in &stream_id.map {
let res = handle_stream(&last_id, &channel, k, v).await;

2
chirpstack/src/stream/frame.rs
View File

@ -245,7 +245,7 @@ pub async fn get_frame_logs(
for stream_key in &srr.keys {
for stream_id in &stream_key.ids {
last_id = stream_id.id.clone();
last_id.clone_from(&stream_id.id);
for (k, v) in &stream_id.map {
let res = handle_stream(&last_id, &channel, k, v).await;

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

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

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

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