Merge pull request 'Update Rust crate futures to 0.3.29' (#13) from renovate/rust-futures-monorepo into master
Reviewed-on: #13
This commit is contained in:
commit
4c0f6ea0f3
2 changed files with 16 additions and 2 deletions
|
@ -11,7 +11,7 @@ anyhow = { version = "1.0.75", features = ["backtrace"] }
|
|||
reqwest = "0.11.22"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
serde_json = "1.0"
|
||||
futures = "0.3.28"
|
||||
futures = "0.3.29"
|
||||
tokio = { version = "1.33.0", features=["macros", "rt-multi-thread"] }
|
||||
tibber = "0.5.0"
|
||||
chrono = "0.4.31"
|
||||
|
|
|
@ -44,7 +44,7 @@ impl FromStr for ActionType {
|
|||
#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
|
||||
pub struct ActionID(pub(crate) i64);
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize)]
|
||||
#[derive(Debug, Clone, Eq, PartialOrd, Ord, Serialize)]
|
||||
pub struct Action {
|
||||
#[serde(skip)]
|
||||
pub(crate) id: Option<ActionID>,
|
||||
|
@ -70,6 +70,20 @@ impl Action {
|
|||
}
|
||||
}
|
||||
|
||||
impl PartialEq for Action {
|
||||
fn eq(&self, other: &Self) -> bool {
|
||||
let id_comp = match (self.id, other.id) {
|
||||
(Some(self_id), Some(other_id)) => self_id == other_id,
|
||||
_ => true,
|
||||
};
|
||||
|
||||
id_comp
|
||||
&& self.device_id == other.device_id
|
||||
&& self.action_type == other.action_type
|
||||
&& self.parameter == other.parameter
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Default, Clone, PartialEq, Eq, Serialize)]
|
||||
pub struct ActionSet {
|
||||
actions: Vec<Action>,
|
||||
|
|
Loading…
Reference in a new issue