formatting (#1698)

libs/models/src/action_id.rs

@@ -1,10 +1,10 @@
-use std::{str::FromStr, path::Path};
+use std::path::Path;
+use std::str::FromStr;
 
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 use crate::{Id, InvalidId};
 
-
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize)]
 pub struct ActionId<S: AsRef<str> = String>(Id<S>);
 impl FromStr for ActionId {

libs/models/src/health_check_id.rs

@@ -1,6 +1,6 @@
 use std::path::Path;
 
-use serde::{Serialize, Deserialize, Deserializer};
+use serde::{Deserialize, Deserializer, Serialize};
 
 use crate::Id;
 
@@ -32,4 +32,4 @@ impl<S: AsRef<str>> AsRef<Path> for HealthCheckId<S> {
     fn as_ref(&self) -> &Path {
         self.0.as_ref().as_ref()
     }
-}
+}

libs/models/src/id.rs

@@ -2,7 +2,8 @@ use std::borrow::Borrow;
 
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
-use crate::{invalid_id::InvalidId, id_unchecked::IdUnchecked};
+use crate::id_unchecked::IdUnchecked;
+use crate::invalid_id::InvalidId;
 
 pub const SYSTEM_ID: Id<&'static str> = Id("x_system");
 
@@ -72,4 +73,4 @@ impl<S: AsRef<str>> Serialize for Id<S> {
     {
         serializer.serialize_str(self.as_ref())
     }
-}
+}

libs/models/src/id_unchecked.rs

@@ -2,7 +2,6 @@ use std::borrow::Cow;
 
 use serde::{Deserialize, Deserializer};
 
-
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
 pub struct IdUnchecked<S: AsRef<str>>(pub S);
 impl<'de> Deserialize<'de> for IdUnchecked<Cow<'de, str>> {
@@ -53,4 +52,4 @@ impl<'de> Deserialize<'de> for IdUnchecked<&'de str> {
     {
         Ok(IdUnchecked(<&'de str>::deserialize(deserializer)?))
     }
-}
+}

libs/models/src/interface_id.rs

@@ -1,10 +1,9 @@
 use std::path::Path;
 
-use serde::{Serialize, Deserialize, Deserializer};
+use serde::{Deserialize, Deserializer, Serialize};
 
 use crate::Id;
 
-
 #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize)]
 pub struct InterfaceId<S: AsRef<str> = String>(Id<S>);
 impl<S: AsRef<str>> From<Id<S>> for InterfaceId<S> {
@@ -44,4 +43,4 @@ impl<S: AsRef<str>> AsRef<Path> for InterfaceId<S> {
     fn as_ref(&self) -> &Path {
         self.0.as_ref().as_ref()
     }
-}
+}

libs/models/src/invalid_id.rs

@@ -1,4 +1,3 @@
-
 #[derive(Debug, thiserror::Error)]
 #[error("Invalid ID")]
 pub struct InvalidId;

libs/models/src/lib.rs

@@ -1,21 +1,21 @@
- mod id;
- mod invalid_id;
- mod id_unchecked;
- mod version;
- mod volume_id;
- mod interface_id;
- mod package_id;
- mod procedure_name;
- mod health_check_id;
- mod action_id;
+mod action_id;
+mod health_check_id;
+mod id;
+mod id_unchecked;
+mod interface_id;
+mod invalid_id;
+mod package_id;
+mod procedure_name;
+mod version;
+mod volume_id;
 
- pub use id::*;
- pub use invalid_id::*;
- pub use id_unchecked::*;
- pub use version::*;
- pub use volume_id::*;
- pub use interface_id::*;
- pub use package_id::*;
- pub use procedure_name::*;
- pub use health_check_id::*;
- pub use action_id::*;
+pub use action_id::*;
+pub use health_check_id::*;
+pub use id::*;
+pub use id_unchecked::*;
+pub use interface_id::*;
+pub use invalid_id::*;
+pub use package_id::*;
+pub use procedure_name::*;
+pub use version::*;
+pub use volume_id::*;

libs/models/src/package_id.rs

@@ -1,10 +1,11 @@
-use std::{str::FromStr, borrow::Borrow, path::Path};
+use std::borrow::Borrow;
+use std::path::Path;
+use std::str::FromStr;
 
 use serde::{Deserialize, Serialize, Serializer};
 
 use crate::{Id, InvalidId, SYSTEM_ID};
 
-
 pub const SYSTEM_PACKAGE_ID: PackageId<&'static str> = PackageId(SYSTEM_ID);
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct PackageId<S: AsRef<str> = String>(Id<S>);
@@ -82,4 +83,4 @@ where
     {
         Serialize::serialize(&self.0, serializer)
     }
-}
+}

libs/models/src/procedure_name.rs

@@ -1,5 +1,4 @@
-use crate::{PackageId, HealthCheckId, ActionId};
-
+use crate::{ActionId, HealthCheckId, PackageId};
 
 #[derive(Debug, Clone)]
 pub enum ProcedureName {
@@ -47,4 +46,4 @@ impl ProcedureName {
             ProcedureName::AutoConfig(id) => format!("/dependencies/{}/autoConfigure", id),
         }
     }
-}
+}

libs/models/src/version.rs

@@ -1,10 +1,10 @@
-use std::{str::FromStr, ops::Deref};
 use std::hash::{Hash, Hasher};
+use std::ops::Deref;
+use std::str::FromStr;
 
 use patch_db::{HasModel, Model};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
-
 #[derive(Debug, Clone)]
 pub struct Version {
     version: emver::Version,
@@ -107,4 +107,4 @@ impl Serialize for Version {
 }
 impl HasModel for Version {
     type Model = Model<Version>;
-}
+}

libs/models/src/volume_id.rs

@@ -1,10 +1,10 @@
-use std::{borrow::Borrow, path::Path};
+use std::borrow::Borrow;
+use std::path::Path;
 
-use serde::{Deserialize, Serialize, Deserializer};
+use serde::{Deserialize, Deserializer, Serialize};
 
 use crate::{Id, IdUnchecked};
 
-
 #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub enum VolumeId<S: AsRef<str> = String> {
     Backup,