diff --git a/src/bin/ch-remote.rs b/src/bin/ch-remote.rs index d6234b1be..0be3aa713 100644 --- a/src/bin/ch-remote.rs +++ b/src/bin/ch-remote.rs @@ -1142,7 +1142,7 @@ mod tests { use std::cmp::Ordering; use super::*; - use crate::test_util::tests::assert_args_sorted; + use crate::test_util::assert_args_sorted; #[test] fn test_cli_args_sorted() { diff --git a/src/main.rs b/src/main.rs index 9d972bbce..ce441e264 100644 --- a/src/main.rs +++ b/src/main.rs @@ -907,7 +907,7 @@ mod unit_tests { PayloadConfig, RngConfig, VmConfig, }; - use crate::test_util::tests::assert_args_sorted; + use crate::test_util::assert_args_sorted; use crate::{create_app, get_cli_options_sorted, prepare_default_values}; fn get_vm_config_from_vec(args: &[&str]) -> VmConfig { diff --git a/src/test_util.rs b/src/test_util.rs index 6678da551..256955231 100644 --- a/src/test_util.rs +++ b/src/test_util.rs @@ -3,22 +3,22 @@ // SPDX-License-Identifier: Apache-2.0 // -#[cfg(test)] -pub mod tests { - use std::cmp::Ordering; +//! Test utilities. - use clap::Arg; +use std::cmp::Ordering; - pub fn assert_args_sorted<'a, F: Fn() -> R, R: Iterator>(get_base_iter: F) { - let iter = get_base_iter().zip(get_base_iter().skip(1)); - for (arg, next) in iter { - assert_ne!( - arg.get_id().cmp(next.get_id()), - Ordering::Greater, - "args not alphabetically sorted: arg={}, next={}", - arg.get_id(), - next.get_id() - ); - } +use clap::Arg; + +/// Ensures that all [`Arg`]s are sorted alphabetically. +pub fn assert_args_sorted<'a, F: Fn() -> R, R: Iterator>(get_base_iter: F) { + let iter = get_base_iter().zip(get_base_iter().skip(1)); + for (arg, next) in iter { + assert_ne!( + arg.get_id().cmp(next.get_id()), + Ordering::Greater, + "args not alphabetically sorted: arg={}, next={}", + arg.get_id(), + next.get_id() + ); } }