From 054a4fa351d96d4f8bf416a3bff763869bb19e48 Mon Sep 17 00:00:00 2001 From: Daniel Burgener Date: Fri, 19 Apr 2024 16:36:12 -0400 Subject: [PATCH] Fix nightly clippy issues in tests --- src/compile.rs | 2 +- src/internal_rep.rs | 2 +- src/test.rs | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/compile.rs b/src/compile.rs index b911cf6..e1cde01 100644 --- a/src/compile.rs +++ b/src/compile.rs @@ -2673,7 +2673,7 @@ mod tests { parents: vec![types.get("domain").unwrap()], }, InheritedAnnotation { - annotation: AnnotationInfo::Alias(CascadeString::from("alias").into()), + annotation: AnnotationInfo::Alias(CascadeString::from("alias")), parents: vec![types.get("domain").unwrap()], }, // Not deduped, because derive doesn't dedup by design diff --git a/src/internal_rep.rs b/src/internal_rep.rs index 38c6363..62c3dca 100644 --- a/src/internal_rep.rs +++ b/src/internal_rep.rs @@ -1722,7 +1722,7 @@ mod tests { ); let rules = generate_sid_rules(vec![&sid1, &sid2]); - let cil_expected = vec![ + let cil_expected = [ "(sid foo)", "(sidcontext foo (system_u system_r foo_t ((s0) (s0))))", "(sid bar)", diff --git a/src/test.rs b/src/test.rs index 513fd6f..9c3b304 100644 --- a/src/test.rs +++ b/src/test.rs @@ -415,7 +415,7 @@ fn makelist_test() { fn multifiles_test() { // valid_policy_test() is somewhat tightly wound to the one file case, so we'll code our // own copy here - let policy_files = vec![ + let policy_files = [ [POLICIES_DIR, "multifile1.cas"].concat(), [POLICIES_DIR, "multifile2.cas"].concat(), ]; @@ -442,7 +442,7 @@ fn multifiles_test() { #[test] fn compile_machine_policies_test() { - let policy_files = vec![ + let policy_files = [ [POLICIES_DIR, "machine_building1.cas"].concat(), [POLICIES_DIR, "machine_building2.cas"].concat(), [POLICIES_DIR, "machine_building3.cas"].concat(), @@ -489,7 +489,7 @@ fn compile_machine_policies_test() { #[test] fn compile_machine_policies_all_test() { - let policy_files = vec![ + let policy_files = [ [POLICIES_DIR, "machine_building1.cas"].concat(), [POLICIES_DIR, "machine_building2.cas"].concat(), [POLICIES_DIR, "machine_building3.cas"].concat(), @@ -938,7 +938,7 @@ fn extend_double_declaration_error() { #[test] fn machine_building_error() { - let policy_files = vec![ + let policy_files = [ [POLICIES_DIR, "machine_building1.cas"].concat(), [POLICIES_DIR, "machine_building2.cas"].concat(), [POLICIES_DIR, "machine_building3.cas"].concat(), @@ -1332,7 +1332,7 @@ fn valid_nested_alias() { #[test] fn invalid_default_test() { - let policy_files = vec![ + let policy_files = [ [ERROR_POLICIES_DIR, "invalid_default1.cas"].concat(), [ERROR_POLICIES_DIR, "invalid_default2.cas"].concat(), ];