Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

INFRA - Fix clippy warnings on pre-existing code #13

Merged
merged 1 commit into from
Sep 11, 2024
Merged

INFRA - Fix clippy warnings on pre-existing code #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions config/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
use serde::{Deserialize, Serialize};
use serde_yml;
use std::collections::HashMap;

#[derive(Debug, Serialize, Deserialize, PartialEq)]
Expand Down Expand Up @@ -47,7 +46,7 @@ pub struct PodConfig {

impl PodConfig {
fn new(raw_config: &str) -> Result<Self, serde_yml::Error> {
let config = match serde_yml::from_str::<PodConfig>(&raw_config) {
let config = match serde_yml::from_str::<PodConfig>(raw_config) {
Ok(mut config) => {
config.pod_ids = config.pods.keys().cloned().collect();
Ok(config)
Expand Down Expand Up @@ -142,9 +141,10 @@ mod tests {
min: -150
max: 150
"#;
let mut config = PodConfig::new(raw_config).unwrap();
let config = PodConfig::new(raw_config).unwrap();
assert!(config.pod_ids.len() == 2);
assert!(config.pod_ids.sort() == vec!["pod_1", "pod_2"].sort());
assert!(config.pod_ids[0] == "pod_1" || config.pod_ids[1] == "pod_1");
assert!(config.pod_ids[0] == "pod_2" || config.pod_ids[1] == "pod_2");
let pod1 = config.pods.get("pod_1").unwrap();
let pod2 = config.pods.get("pod_2").unwrap();
assert_eq!(pod1.name, "Pod 1");
Expand Down
6 changes: 3 additions & 3 deletions lib/core/src/mqtt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ impl<'a> HypedMqttClient<'a, TcpSocket<'a>, CountingRng> {
}

/// Initialise the MQTT client configuration with the given client ID
pub fn initialise_mqtt_config<'a>(client_id: &'a str) -> ClientConfig<'a, 5, CountingRng> {
pub fn initialise_mqtt_config(client_id: &str) -> ClientConfig<'_, 5, CountingRng> {
let mut config = ClientConfig::new(
rust_mqtt::client::client_config::MqttVersion::MQTTv5,
CountingRng(20000),
Expand Down Expand Up @@ -119,11 +119,11 @@ impl<'a, T: embedded_io_async::Read + embedded_io_async::Write, R: rand_core::Rn
Err(mqtt_error) => match mqtt_error {
ReasonCode::NetworkError => {
info!("MQTT Network Error");
return Err(ReasonCode::NetworkError);
Err(ReasonCode::NetworkError)
}
_ => {
warn!("Other MQTT Error: {:?}", mqtt_error);
return Err(mqtt_error);
Err(mqtt_error)
}
},
}
Expand Down