diff --git a/device-scanner/device-scanner-daemon/src/reducers/zed.rs b/device-scanner/device-scanner-daemon/src/reducers/zed.rs index a68a1ad158..3b40041125 100644 --- a/device-scanner/device-scanner-daemon/src/reducers/zed.rs +++ b/device-scanner/device-scanner-daemon/src/reducers/zed.rs @@ -14,15 +14,21 @@ pub fn into_zed_events(xs: Vec) -> state::ZedEvents { } pub fn remove_pool(zed_events: &mut state::ZedEvents, guid: u64) -> Result { - zed_events.remove(&guid).ok_or_else(|| { - Error::LibZfsError(libzfs_types::LibZfsError::PoolNotFound(None, Some(guid))) - }) + zed_events + .remove(&guid) + .ok_or(Error::LibZfsError(libzfs_types::LibZfsError::PoolNotFound( + None, + Some(guid), + ))) } pub fn get_pool(zed_events: &mut state::ZedEvents, guid: u64) -> Result<&mut libzfs_types::Pool> { - zed_events.get_mut(&guid).ok_or_else(|| { - Error::LibZfsError(libzfs_types::LibZfsError::PoolNotFound(None, Some(guid))) - }) + zed_events + .get_mut(&guid) + .ok_or(Error::LibZfsError(libzfs_types::LibZfsError::PoolNotFound( + None, + Some(guid), + ))) } fn update_prop(name: &str, value: &str, xs: &mut Vec) { @@ -96,7 +102,9 @@ pub fn update_zed_events( pool.datasets .iter_mut() .find(|d| d.name == name) - .ok_or_else(|| Error::LibZfsError(libzfs_types::LibZfsError::ZfsNotFound(name))) + .ok_or(Error::LibZfsError(libzfs_types::LibZfsError::ZfsNotFound( + name, + ))) } let mut pool = get_pool(&mut zed_events, guid)?; diff --git a/device-scanner/mount-emitter/src/bin/swap_emitter.rs b/device-scanner/mount-emitter/src/bin/swap_emitter.rs index c628af113f..8755b6bab6 100644 --- a/device-scanner/mount-emitter/src/bin/swap_emitter.rs +++ b/device-scanner/mount-emitter/src/bin/swap_emitter.rs @@ -40,7 +40,7 @@ async fn main() -> Result<(), mount_emitter::Error> { for x in xs { let x = x.trim(); - if x == "" { + if x.is_empty() { continue; } diff --git a/device-scanner/mount-emitter/src/lib.rs b/device-scanner/mount-emitter/src/lib.rs index 1fecacac9b..e41414b600 100644 --- a/device-scanner/mount-emitter/src/lib.rs +++ b/device-scanner/mount-emitter/src/lib.rs @@ -37,21 +37,10 @@ pub fn line_to_command(x: &[u8]) -> Result { let mut x: IntermediateMap = line_to_hashmap(&x)?; let (target, source, fstype, mount_opts, old_opts, old_target) = ( - MountPoint( - x.remove("TARGET") - .ok_or_else(|| Error::Missing("TARGET"))? - .into(), - ), - DevicePath( - x.remove("SOURCE") - .ok_or_else(|| Error::Missing("SOURCE"))? - .into(), - ), - FsType(x.remove("FSTYPE").ok_or_else(|| Error::Missing("FSTYPE"))?), - MountOpts( - x.remove("OPTIONS") - .ok_or_else(|| Error::Missing("OPTIONS"))?, - ), + MountPoint(x.remove("TARGET").ok_or(Error::Missing("TARGET"))?.into()), + DevicePath(x.remove("SOURCE").ok_or(Error::Missing("SOURCE"))?.into()), + FsType(x.remove("FSTYPE").ok_or(Error::Missing("FSTYPE"))?), + MountOpts(x.remove("OPTIONS").ok_or(Error::Missing("OPTIONS"))?), x.get("OLD-OPTIONS"), x.get("OLD-TARGET"), ); @@ -64,22 +53,14 @@ pub fn line_to_command(x: &[u8]) -> Result { source, fstype, mount_opts, - MountOpts( - old_opts - .ok_or_else(|| Error::Missing("OLD-OPTIONS"))? - .to_string(), - ), + MountOpts(old_opts.ok_or(Error::Missing("OLD-OPTIONS"))?.to_string()), ), Some("move") => MountCommand::MoveMount( target, source, fstype, mount_opts, - MountPoint( - old_target - .ok_or_else(|| Error::Missing("OLD-TARGET"))? - .into(), - ), + MountPoint(old_target.ok_or(Error::Missing("OLD-TARGET"))?.into()), ), Some(x) => return Err(Error::Unexpected(x.to_string())), }; @@ -163,7 +144,7 @@ where tracing::debug!("Read line: {}", String::from_utf8_lossy(&line)); - if str::from_utf8(&line)? == "" { + if str::from_utf8(&line)?.is_empty() { break; } diff --git a/iml-gui/crate/src/components/breadcrumbs.rs b/iml-gui/crate/src/components/breadcrumbs.rs index 4cc2467b7e..37fcc43fd5 100644 --- a/iml-gui/crate/src/components/breadcrumbs.rs +++ b/iml-gui/crate/src/components/breadcrumbs.rs @@ -23,16 +23,16 @@ pub trait BreadCrumb { } impl BreadCrumbs { - pub fn iter(self: &Self) -> impl DoubleEndedIterator { + pub fn iter(&self) -> impl DoubleEndedIterator { self.crumbs.iter() } - pub fn clear(self: &mut Self) -> &mut Self { + pub fn clear(&mut self) -> &mut Self { self.crumbs.clear(); self } - pub fn push(self: &mut Self, n: Crumb) -> &mut Self { + pub fn push(&mut self, n: Crumb) -> &mut Self { let mut new_crumbs = LinkedList::new(); while let Some(c) = self.crumbs.pop_front() { diff --git a/iml-gui/crate/src/components/command_modal.rs b/iml-gui/crate/src/components/command_modal.rs index cdd1c3bc57..aca149e628 100644 --- a/iml-gui/crate/src/components/command_modal.rs +++ b/iml-gui/crate/src/components/command_modal.rs @@ -683,7 +683,7 @@ fn extract_children_from_cmd(cmd: &Arc) -> (i32, Vec) { .iter() .filter_map(|s| extract_uri_id::(s)) .collect::>(); - deps.sort(); + deps.sort_unstable(); (cmd.id, deps) } @@ -693,7 +693,7 @@ fn extract_children_from_job(job: &Arc) -> (i32, Vec) { .iter() .filter_map(|s| extract_uri_id::(s)) .collect::>(); - deps.sort(); + deps.sort_unstable(); (job.id, deps) } @@ -725,7 +725,7 @@ fn extract_wait_fors_from_job(job: &Job0, jobs: &HashMap>) -> fn extract_sorted_keys(hm: &HashMap) -> Vec { let mut ids = hm.keys().copied().collect::>(); - ids.sort(); + ids.sort_unstable(); ids } @@ -924,14 +924,14 @@ mod tests { #[test] fn test_is_subset() { let all = vec![1, 2, 3, 4, 5]; - assert_eq!(is_subset(&vec![1, 2, 3], &all), true); - assert_eq!(is_subset(&vec![1, 3, 5], &all), true); - assert_eq!(is_subset(&vec![], &all), true); + assert_eq!(is_subset(&[1, 2, 3], &all), true); + assert_eq!(is_subset(&[1, 3, 5], &all), true); + assert_eq!(is_subset(&[], &all), true); assert_eq!(is_subset(&all, &all), true); - assert_eq!(is_subset(&vec![1, 6], &all), false); + assert_eq!(is_subset(&[1, 6], &all), false); // if not sorted, the correctness is not guaranteed - assert_eq!(is_subset(&vec![5, 1], &all), false); + assert_eq!(is_subset(&[5, 1], &all), false); } #[test] @@ -1216,7 +1216,7 @@ mod tests { } } let mut sam = hs.into_iter().collect::>(); - sam.sort(); + sam.sort_unstable(); sam } (0..n) @@ -1230,9 +1230,9 @@ mod tests { let sel_step_ids = sample(rng, &step_ids, ns); let result = sel_cmd_ids .into_iter() - .map(|id| TypedId::Cmd(id)) - .chain(sel_job_ids.into_iter().map(|id| TypedId::Job(id))) - .chain(sel_step_ids.into_iter().map(|id| TypedId::Step(id))) + .map(TypedId::Cmd) + .chain(sel_job_ids.into_iter().map(TypedId::Job)) + .chain(sel_step_ids.into_iter().map(TypedId::Step)) .collect::>(); Select(result) }) @@ -1274,7 +1274,7 @@ mod tests { result } - const WELL_ORDERED_TREE: &'static str = r#"253: Stop file system fs + const WELL_ORDERED_TREE: &str = r#"253: Stop file system fs 244: Make file system fs unavailable 243: Stop target fs-OST0000 242: Stop target fs-OST0003 diff --git a/iml-gui/crate/src/components/duration_picker.rs b/iml-gui/crate/src/components/duration_picker.rs index 1046365e2a..6219b943d0 100644 --- a/iml-gui/crate/src/components/duration_picker.rs +++ b/iml-gui/crate/src/components/duration_picker.rs @@ -80,7 +80,7 @@ pub fn update(msg: Msg, model: &mut Model) { let value = input_el.value_as_number(); model.value = if value.is_nan() { None } else { Some(value as u64) }; - model.validation_message = input_el.validation_message().ok().filter(|x| x != ""); + model.validation_message = input_el.validation_message().ok().filter(|x| !x.is_empty()); } Msg::Dropdown(msg) => { dropdown::update(msg, &mut model.dropdown); diff --git a/iml-gui/crate/src/components/stratagem/scan_stratagem_modal.rs b/iml-gui/crate/src/components/stratagem/scan_stratagem_modal.rs index 47b723e0f7..37ebbe556a 100644 --- a/iml-gui/crate/src/components/stratagem/scan_stratagem_modal.rs +++ b/iml-gui/crate/src/components/stratagem/scan_stratagem_modal.rs @@ -72,7 +72,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders) let req = fetch::Request::graphql_query(&query); - orders.perform_cmd(req.fetch_json_data(|x| Msg::Scanned(x))); + orders.perform_cmd(req.fetch_json_data(Msg::Scanned)); } Msg::Scanned(x) => { match x { diff --git a/iml-gui/crate/src/dependency_tree.rs b/iml-gui/crate/src/dependency_tree.rs index 237792af13..8ae7203340 100644 --- a/iml-gui/crate/src/dependency_tree.rs +++ b/iml-gui/crate/src/dependency_tree.rs @@ -347,7 +347,7 @@ mod tests { fn test_rich_wrapper() { fn extract_from_y(y: &Y) -> (u32, Vec) { let mut deps = y.deps.iter().map(|s| s.parse::().unwrap()).collect::>(); - deps.sort(); + deps.sort_unstable(); (y.id, deps) } // the DAG built over RichDeps<_, _> must be always the same, no matter how dependencies are sorted @@ -417,7 +417,7 @@ mod tests { } } - const SMALL_TREE: &'static str = r#"48: Setup managed host oss2.local + const SMALL_TREE: &str = r#"48: Setup managed host oss2.local 39: Install packages on server oss2.local 40: Configure NTP on oss2.local 39: Install packages on server oss2.local... @@ -425,7 +425,7 @@ mod tests { 46: Configure Pacemaker on oss2.local... "#; - const TREE_DIRECT: &'static str = r#"48: Setup managed host oss2.local. + const TREE_DIRECT: &str = r#"48: Setup managed host oss2.local. 39: Install packages on server oss2.local. 40: Configure NTP on oss2.local. 41: Enable LNet on oss2.local. @@ -437,7 +437,7 @@ mod tests { 47: Start Pacemaker on oss2.local. "#; - const TREE_INVERSE: &'static str = r#"39: Install packages on server oss2.local. + const TREE_INVERSE: &str = r#"39: Install packages on server oss2.local. 40: Configure NTP on oss2.local. 48: Setup managed host oss2.local. 41: Enable LNet on oss2.local. diff --git a/iml-gui/crate/src/extensions.rs b/iml-gui/crate/src/extensions.rs index 0f5a92e820..12ba15dcbd 100644 --- a/iml-gui/crate/src/extensions.rs +++ b/iml-gui/crate/src/extensions.rs @@ -53,7 +53,7 @@ pub(crate) trait RequestExt: Sized { fn api_query(path: impl ToString, args: impl serde::Serialize) -> Result; fn api_item(path: impl ToString, item: impl ToString) -> Self; fn graphql_query(x: &T) -> Self; - fn with_auth(self: Self) -> Self; + fn with_auth(self) -> Self; } impl RequestExt for fetch::Request { diff --git a/iml-gui/crate/src/page/filesystem.rs b/iml-gui/crate/src/page/filesystem.rs index 7da228bed7..cbad7e2008 100644 --- a/iml-gui/crate/src/page/filesystem.rs +++ b/iml-gui/crate/src/page/filesystem.rs @@ -129,7 +129,7 @@ pub fn update(msg: Msg, cache: &ArcCache, model: &mut Model, orders: &mut impl O let query = client_mount::list_mount_command::build(model.fs.name.to_string()); let req = seed::fetch::Request::graphql_query(&query); - orders.perform_cmd(req.fetch_json_data(|x| Msg::MountCommandFetched(x))); + orders.perform_cmd(req.fetch_json_data(Msg::MountCommandFetched)); } Msg::MountCommandFetched(x) => { match x { @@ -538,7 +538,7 @@ pub(crate) fn standby_hosts_view(cache: &ArcCache, target: &TargetRecord) -> standby_hosts.sort_by(|a, b| natord::compare(&a.fqdn, &b.fqdn)); - if standby_hosts.len() > 0 { + if !standby_hosts.is_empty() { ul![standby_hosts .iter() .map(|x| li![resource_links::server_link(Some(&x.resource_uri), &x.fqdn)])] diff --git a/iml-gui/crate/src/page/login.rs b/iml-gui/crate/src/page/login.rs index d33548d03f..fe5ea1f460 100644 --- a/iml-gui/crate/src/page/login.rs +++ b/iml-gui/crate/src/page/login.rs @@ -111,7 +111,7 @@ pub fn view(model: &Model, branding: Branding, exa_version: &Option) -> let errs = Errors::default(); - let errs = model.errors.as_ref().unwrap_or_else(|| &errs); + let errs = model.errors.as_ref().unwrap_or(&errs); let (border_color, text_color, logo) = match branding { Branding::Whamcloud => ( C.border_teal_500, diff --git a/iml-gui/crate/src/page/logs.rs b/iml-gui/crate/src/page/logs.rs index c4e53ebebd..96392b1573 100644 --- a/iml-gui/crate/src/page/logs.rs +++ b/iml-gui/crate/src/page/logs.rs @@ -57,7 +57,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders) let query = builder.build(); let req = fetch::Request::graphql_query(&query); - orders.perform_cmd(req.fetch_json_data(|x| Msg::LogsFetched(x))); + orders.perform_cmd(req.fetch_json_data(Msg::LogsFetched)); } Msg::LogsFetched(r) => { match r { @@ -192,10 +192,7 @@ fn log_item_view(log: &LogMessage, cache: &ArcCache) -> Node { label_view("Time: "), &log.datetime.format("%H:%M:%S %Y/%m/%d").to_string() ], - div![ - class![C.grid, C.justify_end], - log_severity(LogSeverity::from(log.severity)) - ], + div![class![C.grid, C.justify_end], log_severity(log.severity)], div![class![C.col_span_4], log.message], div![ class![C.col_span_2], diff --git a/iml-gui/crate/src/page/mod.rs b/iml-gui/crate/src/page/mod.rs index f2f052468e..27fed86ef3 100644 --- a/iml-gui/crate/src/page/mod.rs +++ b/iml-gui/crate/src/page/mod.rs @@ -84,7 +84,7 @@ pub(crate) enum Page { } impl Page { - pub(crate) fn title(self: &Self) -> String { + pub(crate) fn title(&self) -> String { match self { Self::About => "About".into(), Self::AppLoading => "Loading...".into(), diff --git a/iml-gui/crate/src/page/snapshot/add_interval.rs b/iml-gui/crate/src/page/snapshot/add_interval.rs index a5afcabf1c..47d90ec847 100644 --- a/iml-gui/crate/src/page/snapshot/add_interval.rs +++ b/iml-gui/crate/src/page/snapshot/add_interval.rs @@ -115,7 +115,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders) let req = fetch::Request::graphql_query(&query); - orders.perform_cmd(req.fetch_json_data(|x| Msg::SnapshotCreateIntervalResp(x))); + orders.perform_cmd(req.fetch_json_data(Msg::SnapshotCreateIntervalResp)); } Msg::SnapshotCreateIntervalResp(x) => { model.submitting = false; diff --git a/iml-gui/crate/src/page/snapshot/create_retention.rs b/iml-gui/crate/src/page/snapshot/create_retention.rs index 4a4f8e3638..69939705a3 100644 --- a/iml-gui/crate/src/page/snapshot/create_retention.rs +++ b/iml-gui/crate/src/page/snapshot/create_retention.rs @@ -120,7 +120,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders) let req = fetch::Request::graphql_query(&query); - orders.perform_cmd(req.fetch_json_data(|x| Msg::SnapshotCreateRetentionResp(x))); + orders.perform_cmd(req.fetch_json_data(Msg::SnapshotCreateRetentionResp)); } Msg::SnapshotCreateRetentionResp(x) => { model.submitting = false; diff --git a/iml-gui/crate/src/page/snapshot/list_interval.rs b/iml-gui/crate/src/page/snapshot/list_interval.rs index 2863781b4a..f7a618855b 100644 --- a/iml-gui/crate/src/page/snapshot/list_interval.rs +++ b/iml-gui/crate/src/page/snapshot/list_interval.rs @@ -85,7 +85,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders) let req = fetch::Request::graphql_query(&query); - orders.perform_cmd(req.fetch_json_data(|x| Msg::SnapshotDeleteIntervalResp(x))); + orders.perform_cmd(req.fetch_json_data(Msg::SnapshotDeleteIntervalResp)); } } Msg::SnapshotDeleteIntervalResp(x) => match x { diff --git a/iml-gui/crate/src/page/snapshot/list_retention.rs b/iml-gui/crate/src/page/snapshot/list_retention.rs index 597b01ec3f..d2a5799079 100644 --- a/iml-gui/crate/src/page/snapshot/list_retention.rs +++ b/iml-gui/crate/src/page/snapshot/list_retention.rs @@ -31,7 +31,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders) let req = fetch::Request::graphql_query(&query); - orders.perform_cmd(req.fetch_json_data(|x| Msg::DeleteRetentionResp(x))); + orders.perform_cmd(req.fetch_json_data(Msg::DeleteRetentionResp)); } } Msg::DeleteRetentionResp(x) => match x { diff --git a/iml-gui/crate/src/page/snapshot/take.rs b/iml-gui/crate/src/page/snapshot/take.rs index 1d9eb3b7b7..fcc1a03fc4 100644 --- a/iml-gui/crate/src/page/snapshot/take.rs +++ b/iml-gui/crate/src/page/snapshot/take.rs @@ -58,7 +58,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders) let req = fetch::Request::graphql_query(&query); - orders.perform_cmd(req.fetch_json_data(|x| Msg::SnapshotCreateResp(x))); + orders.perform_cmd(req.fetch_json_data(Msg::SnapshotCreateResp)); } Msg::SnapshotCreateResp(x) => match x { Ok(Response::Data(x)) => { @@ -104,7 +104,7 @@ pub fn init(cache: &ArcCache, model: &mut Model) { let fs_name = get_fs_names(cache).into_iter().next(); if let Some(fs_name) = fs_name { - model.fs_name = fs_name.to_string(); + model.fs_name = fs_name; } } diff --git a/iml-gui/crate/src/test_utils/fixtures.rs b/iml-gui/crate/src/test_utils/fixtures.rs index 9808336fcc..68ede63ce2 100644 --- a/iml-gui/crate/src/test_utils/fixtures.rs +++ b/iml-gui/crate/src/test_utils/fixtures.rs @@ -1,7 +1,7 @@ use iml_wire_types::warp_drive::Cache; pub(crate) fn get_cache() -> Cache { - static DATA: &'static [u8] = include_bytes!("./fixture.json"); + static DATA: &[u8] = include_bytes!("./fixture.json"); serde_json::from_slice(&DATA).unwrap() } diff --git a/iml-system-docker-tests/tests/ldiskfs_test.rs b/iml-system-docker-tests/tests/ldiskfs_test.rs index e417009803..c3e1718751 100644 --- a/iml-system-docker-tests/tests/ldiskfs_test.rs +++ b/iml-system-docker-tests/tests/ldiskfs_test.rs @@ -10,8 +10,8 @@ async fn test_docker_ldiskfs_setup() -> Result<(), TestError> { let config: Config = Config::default(); let config: Config = Config { profile_map: vec![ - ("base_monitored".into(), config.storage_servers()), - ("base_client".into(), config.client_servers()), + ("base_monitored", config.storage_servers()), + ("base_client", config.client_servers()), ], test_type: TestType::Docker, ..config diff --git a/iml-system-docker-tests/tests/stratagem_test.rs b/iml-system-docker-tests/tests/stratagem_test.rs index 101b17e979..85154099b6 100644 --- a/iml-system-docker-tests/tests/stratagem_test.rs +++ b/iml-system-docker-tests/tests/stratagem_test.rs @@ -10,8 +10,8 @@ async fn test_docker_stratagem_setup() -> Result<(), TestError> { let config: Config = Config::default(); let config: Config = Config { profile_map: vec![ - ("base_monitored".into(), config.storage_servers()), - ("stratagem_client".into(), config.client_servers()), + ("base_monitored", config.storage_servers()), + ("stratagem_client", config.client_servers()), ], use_stratagem: true, branding: iml_wire_types::Branding::DDN(iml_wire_types::DdnBranding::Exascaler), diff --git a/iml-system-docker-tests/tests/zfs_test.rs b/iml-system-docker-tests/tests/zfs_test.rs index 1c6d67650a..8d81af9bdc 100644 --- a/iml-system-docker-tests/tests/zfs_test.rs +++ b/iml-system-docker-tests/tests/zfs_test.rs @@ -11,8 +11,8 @@ async fn test_docker_zfs_setup() -> Result<(), TestError> { let config: Config = Config::default(); let config: Config = Config { profile_map: vec![ - ("base_monitored".into(), config.storage_servers()), - ("base_client".into(), config.client_servers()), + ("base_monitored", config.storage_servers()), + ("base_client", config.client_servers()), ], test_type: TestType::Docker, fs_type: FsType::Zfs, diff --git a/iml-system-rpm-tests/tests/ldiskfs_test.rs b/iml-system-rpm-tests/tests/ldiskfs_test.rs index 44309c0852..2cdb8489fa 100644 --- a/iml-system-rpm-tests/tests/ldiskfs_test.rs +++ b/iml-system-rpm-tests/tests/ldiskfs_test.rs @@ -11,8 +11,8 @@ async fn test_ldiskfs_setup() -> Result<(), TestError> { let config = Config { profile_map: vec![ - ("base_monitored".into(), config.storage_servers()), - ("base_client".into(), config.client_servers()), + ("base_monitored", config.storage_servers()), + ("base_client", config.client_servers()), ], ..config }; diff --git a/iml-system-rpm-tests/tests/stratagem_test.rs b/iml-system-rpm-tests/tests/stratagem_test.rs index 05975d02cd..98ce7893fa 100644 --- a/iml-system-rpm-tests/tests/stratagem_test.rs +++ b/iml-system-rpm-tests/tests/stratagem_test.rs @@ -10,8 +10,8 @@ async fn test_stratagem_setup() -> Result<(), TestError> { let config = Config::default(); let config: Config = Config { profile_map: vec![ - ("base_monitored".into(), config.storage_servers()), - ("stratagem_client".into(), config.client_servers()), + ("base_monitored", config.storage_servers()), + ("stratagem_client", config.client_servers()), ], branding: iml_wire_types::Branding::DDN(iml_wire_types::DdnBranding::Exascaler), use_stratagem: true, diff --git a/iml-system-rpm-tests/tests/zfs_test.rs b/iml-system-rpm-tests/tests/zfs_test.rs index 0992f72e2d..107dc31784 100644 --- a/iml-system-rpm-tests/tests/zfs_test.rs +++ b/iml-system-rpm-tests/tests/zfs_test.rs @@ -11,8 +11,8 @@ async fn test_zfs_setup() -> Result<(), TestError> { let config = Config::default(); let config: Config = Config { profile_map: vec![ - ("base_monitored".into(), config.storage_servers()), - ("base_client".into(), config.client_servers()), + ("base_monitored", config.storage_servers()), + ("base_client", config.client_servers()), ], fs_type: FsType::Zfs, ..config