aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToby Vincent <tobyv13@gmail.com>2022-09-27 20:04:16 -0500
committerToby Vincent <tobyv13@gmail.com>2022-09-27 20:04:16 -0500
commit745a731f0d6db97cc48a226a04f19e5b6cf4d2cd (patch)
tree61db14f12a8c031837dd4a8383edbdd7a183614d
parentc809a6c69c0dc1efbd610a21dff61a85091ff9da (diff)
fix: fix clippy warnings
-rw-r--r--zone_core/src/container.rs6
-rw-r--r--zone_core/src/container/status.rs2
-rw-r--r--zone_nspawn/src/nspawn.rs4
-rw-r--r--zone_overlay/src/config.rs2
-rw-r--r--zone_zfs/src/config.rs2
-rw-r--r--zoned/src/config.rs2
6 files changed, 9 insertions, 9 deletions
diff --git a/zone_core/src/container.rs b/zone_core/src/container.rs
index 058d7f3..8d7905f 100644
--- a/zone_core/src/container.rs
+++ b/zone_core/src/container.rs
@@ -14,13 +14,13 @@ mod status;
#[derive(Debug, PartialEq, Eq, Default, Serialize, Deserialize, Tabled, Clone, Args)]
#[serde(rename_all = "camelCase")]
pub struct Container {
- #[tabled("ID")]
+ #[tabled(rename = "ID")]
pub id: u32,
- #[tabled("Template")]
+ #[tabled(rename = "Template")]
pub template: String,
- #[tabled("User")]
+ #[tabled(rename = "User")]
pub owner: String,
}
diff --git a/zone_core/src/container/status.rs b/zone_core/src/container/status.rs
index 7647e6f..7794cd0 100644
--- a/zone_core/src/container/status.rs
+++ b/zone_core/src/container/status.rs
@@ -1,7 +1,7 @@
use serde::{Deserialize, Serialize};
use tabled::Tabled;
-#[derive(Debug, Serialize, Deserialize, Tabled, PartialEq, Clone)]
+#[derive(Debug, Serialize, Deserialize, Tabled, PartialEq, Eq, Clone)]
#[serde(rename_all = "camelCase")]
pub enum Status {
Running,
diff --git a/zone_nspawn/src/nspawn.rs b/zone_nspawn/src/nspawn.rs
index d0683c8..3b49f11 100644
--- a/zone_nspawn/src/nspawn.rs
+++ b/zone_nspawn/src/nspawn.rs
@@ -70,7 +70,7 @@ impl Runtime for NSpawn {
.status()
.map_err(Error::from)?
.success()
- .then(|| ())
+ .then_some(())
.ok_or_else(|| Error::Initialization(container.to_owned()))
.map_err(Error::from)
}
@@ -115,7 +115,7 @@ impl Runtime for NSpawn {
.arg(container.to_string())
.status()?
.success()
- .then(|| ())
+ .then_some(())
.ok_or(Error::Shutdown(container))
}
}
diff --git a/zone_overlay/src/config.rs b/zone_overlay/src/config.rs
index b7a7821..7385a27 100644
--- a/zone_overlay/src/config.rs
+++ b/zone_overlay/src/config.rs
@@ -7,7 +7,7 @@ use figment::{
use serde::{Deserialize, Serialize};
use std::path::PathBuf;
-#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+#[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
pub struct Config {
pub volumes: PathBuf,
pub templates: PathBuf,
diff --git a/zone_zfs/src/config.rs b/zone_zfs/src/config.rs
index 7178fff..f11c5f5 100644
--- a/zone_zfs/src/config.rs
+++ b/zone_zfs/src/config.rs
@@ -8,7 +8,7 @@ use figment::{
use serde::{Deserialize, Serialize};
use std::path::PathBuf;
-#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+#[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
pub struct Config {
pub quota: Byte,
pub pool_name: PathBuf,
diff --git a/zoned/src/config.rs b/zoned/src/config.rs
index 3f754d4..53c0bfc 100644
--- a/zoned/src/config.rs
+++ b/zoned/src/config.rs
@@ -8,7 +8,7 @@ use std::{
use crate::{Error, Result};
-#[derive(Debug, PartialEq, Serialize, Deserialize, Clone)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Clone)]
pub struct Config {
pub ip_address: IpAddr,
pub port: u16,