diff options
| author | Neil Kollack <nkollack@gmail.com> | 2022-02-23 15:16:50 -0600 |
|---|---|---|
| committer | Toby Vincent <tobyv13@gmail.com> | 2022-02-23 15:16:50 -0600 |
| commit | c3fe6378d8b0b26da3ff9cec6a242666d2ddc21d (patch) | |
| tree | b17d27c9dc86f41c495285ac547e3e58bc945696 | |
| parent | f35df7c1c5af8934a5f6dc6b0a495b7dcc9e19d5 (diff) | |
style: run rustfmt
| -rw-r--r-- | zone_nspawn/src/container.rs | 21 | ||||
| -rw-r--r-- | zone_nspawn/src/lib.rs | 2 | ||||
| -rw-r--r-- | zoned/src/api.rs | 2 | ||||
| -rw-r--r-- | zoned/src/config.rs | 2 |
4 files changed, 12 insertions, 15 deletions
diff --git a/zone_nspawn/src/container.rs b/zone_nspawn/src/container.rs index bfb1094..3dc23f9 100644 --- a/zone_nspawn/src/container.rs +++ b/zone_nspawn/src/container.rs @@ -94,18 +94,15 @@ impl ContainerBuilder { for entry in fs::read_dir(dir)?.flatten() { let filename = entry.file_name(); let file = File::open(entry.path())?; - let file_contents = - match from_bufread( - BufReader::new(file), - ) { - Ok(it) => it, - Err(_) => { - return Err(Error::FileError(format!( - "Failed to create container: {:?}", - self - ))) - } - }; + let file_contents = match from_bufread(BufReader::new(file)) { + Ok(it) => it, + Err(_) => { + return Err(Error::FileError(format!( + "Failed to create container: {:?}", + self + ))) + } + }; self.add_network_config((PathBuf::from(filename), file_contents)); } } diff --git a/zone_nspawn/src/lib.rs b/zone_nspawn/src/lib.rs index 0b5d256..9d04b0c 100644 --- a/zone_nspawn/src/lib.rs +++ b/zone_nspawn/src/lib.rs @@ -1,9 +1,9 @@ pub use crate::config::Config; pub use crate::container::Container; pub use crate::container::ContainerBuilder; +pub use crate::error::{Error, Result}; pub use crate::network::NetworkConfig; pub use crate::nspawn::NSpawn; -pub use crate::error::{Error, Result}; mod config; mod container; diff --git a/zoned/src/api.rs b/zoned/src/api.rs index 852f743..37f2bef 100644 --- a/zoned/src/api.rs +++ b/zoned/src/api.rs @@ -1,3 +1,4 @@ +use crate::{Config, Error, Result}; use rocket::{get, post, serde::json::Json, Build, Rocket, State}; use rocket_okapi::{ openapi, openapi_get_routes, @@ -7,7 +8,6 @@ use rocket_okapi::{ }; use zone_core::Container; use zone_nspawn::NSpawn; -use crate::{Error, Result, Config}; /// # Test endpoint /// diff --git a/zoned/src/config.rs b/zoned/src/config.rs index 7cc930a..c9cd5f3 100644 --- a/zoned/src/config.rs +++ b/zoned/src/config.rs @@ -7,4 +7,4 @@ pub struct Config { pub(crate) zfs_config: zone_zfs::Config, pub(crate) nspawn_config: zone_nspawn::Config, -}
\ No newline at end of file +} |