hodasemi/HomeServer
1
0
Fork 0
Code Issues 1 Pull requests 8 Projects Releases Wiki Activity Actions

Update Rust crate futures to 0.3.29 #13

Merged
hodasemi merged 2 commits from renovate/rust-futures-monorepo into master 2023-10-31 10:17:53 +00:00
Conversation 1 Commits 2 Files changed 2 +15 -1
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 47aab2fc75 - Show all commits

16
src/action.rs
View file

@ -44,7 +44,7 @@ impl FromStr for ActionType {
#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)] #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
pub struct ActionID(pub(crate) i64); pub struct ActionID(pub(crate) i64);
#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize)] #[derive(Debug, Clone, Eq, PartialOrd, Ord, Serialize)]
pub struct Action { pub struct Action {
#[serde(skip)] #[serde(skip)]
pub(crate) id: Option<ActionID>, 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)] #[derive(Debug, Default, Clone, PartialEq, Eq, Serialize)]
pub struct ActionSet { pub struct ActionSet {
actions: Vec<Action>, actions: Vec<Action>,