Skip to content

Commit

Permalink
sources: fix clippy warnings
Browse files Browse the repository at this point in the history 
Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com>
  • Loading branch information
@arnaldo2792
arnaldo2792 committed Jun 17, 2024
1 parent 617b044 commit e143ce1
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 25 deletions.
28 changes: 14 additions & 14 deletions sources/api/schnauzer/src/helpers.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2979,7 +2979,7 @@ mod test_any_enabled {
#[test]
fn test_any_enabled_with_enabled_elements() {
let result =
setup_and_render_template(TEMPLATE, &json!([{"foo": [], "enabled": true}])).unwrap();
setup_and_render_template(TEMPLATE, json!([{"foo": [], "enabled": true}])).unwrap();
let expected = "enabled";
assert_eq!(result, expected);
}
Expand All @@ -2988,7 +2988,7 @@ mod test_any_enabled {
fn test_any_enabled_with_enabled_elements_from_map() {
let result = setup_and_render_template(
TEMPLATE,
&json!({"foo": {"enabled": false}, "bar": {"enabled": true}}),
json!({"foo": {"enabled": false}, "bar": {"enabled": true}}),
)
.unwrap();
let expected = "enabled";
Expand All @@ -2997,7 +2997,7 @@ mod test_any_enabled {

#[test]
fn test_any_enabled_without_enabled_elements() {
let result = setup_and_render_template(TEMPLATE, &json!([{"enabled": false}])).unwrap();
let result = setup_and_render_template(TEMPLATE, json!([{"enabled": false}])).unwrap();
let expected = "disabled";
assert_eq!(result, expected);
}
Expand All @@ -3006,7 +3006,7 @@ mod test_any_enabled {
fn test_any_enabled_without_enabled_elements_from_map() {
let result = setup_and_render_template(
TEMPLATE,
&json!({"foo": {"enabled": false}, "bar": {"enabled": false}}),
json!({"foo": {"enabled": false}, "bar": {"enabled": false}}),
)
.unwrap();
let expected = "disabled";
Expand All @@ -3015,30 +3015,30 @@ mod test_any_enabled {

#[test]
fn test_any_enabled_with_empty_elements() {
let result = setup_and_render_template(TEMPLATE, &json!([])).unwrap();
let result = setup_and_render_template(TEMPLATE, json!([])).unwrap();
let expected = "disabled";
assert_eq!(result, expected);
}

#[test]
fn test_any_enabled_with_empty_map() {
let result = setup_and_render_template(TEMPLATE, &json!({})).unwrap();
let result = setup_and_render_template(TEMPLATE, json!({})).unwrap();
let expected = "disabled";
assert_eq!(result, expected);
}

#[test]
fn test_any_enabled_with_bool_flag_as_string() {
// Helper is only expected to work with boolean values
let result = setup_and_render_template(TEMPLATE, &json!([{"enabled": "true"}])).unwrap();
let result = setup_and_render_template(TEMPLATE, json!([{"enabled": "true"}])).unwrap();
let expected = "disabled";
assert_eq!(result, expected);
}

#[test]
fn test_any_enabled_with_different_type_array() {
// Validates no errors if a different kind of struct is passed in
let result = setup_and_render_template(TEMPLATE, &json!([{"name": "fred"}])).unwrap();
let result = setup_and_render_template(TEMPLATE, json!([{"name": "fred"}])).unwrap();
let expected = "disabled";
assert_eq!(result, expected);
}
Expand All @@ -3047,15 +3047,15 @@ mod test_any_enabled {
fn test_any_enabled_with_different_type_map() {
// Validates no errors if a different kind of struct is passed in
let result =
setup_and_render_template(TEMPLATE, &json!({"test": {"name": "fred"}})).unwrap();
setup_and_render_template(TEMPLATE, json!({"test": {"name": "fred"}})).unwrap();
let expected = "disabled";
assert_eq!(result, expected);
}

#[test]
fn test_any_enabled_with_different_type() {
// Validates no errors when a completely different JSON struct is passed
let result = setup_and_render_template(TEMPLATE, &json!({"state": "enabled"})).unwrap();
let result = setup_and_render_template(TEMPLATE, json!({"state": "enabled"})).unwrap();
let expected = "disabled";
assert_eq!(result, expected);
}
Expand Down Expand Up @@ -3228,7 +3228,7 @@ mod test_negate_or_else {
fn test_negated_values() {
let template: &str = r#"{{negate_or_else false settings.value}}"#;

let test_cases = vec![
let test_cases = [
(json!({"settings": {"value": true}}), "false"),
(json!({"settings": {"value": false}}), "true"),
(json!({"settings": {"value": None::<bool>}}), "false"),
Expand All @@ -3243,7 +3243,7 @@ mod test_negate_or_else {

#[test]
fn test_fails_when_not_booleans() {
let test_cases = vec![
let test_cases = [
json!({"settings": {"value": []}}),
json!({"settings": {"value": {}}}),
json!({"settings": {"value": ""}}),
Expand Down Expand Up @@ -3282,7 +3282,7 @@ mod test_ecs_metadata_service_limits {

#[test]
fn test_valid_ecs_metadata_service_limits() {
let test_cases = vec![
let test_cases = [
(json!({"settings": {"rps": 1, "burst": 1}}), r#"1,1"#),
(json!({"settings": {"rps": 1}}), r#"1,60"#),
(json!({"settings": {"burst": 1}}), r#"40,1"#),
Expand All @@ -3298,7 +3298,7 @@ mod test_ecs_metadata_service_limits {

#[test]
fn test_invalid_ecs_metadata_service_limits() {
let test_cases = vec![
let test_cases = [
json!({"settings": {"rps": [], "burst": 1}}),
json!({"settings": {"rps": 1, "burst": []}}),
json!({"settings": {"rps": [], "burst": []}}),
Expand Down
4 changes: 2 additions & 2 deletions sources/api/schnauzer/src/v2/cli/clirequirements.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ mod test {
),
];

for (requirement_string, expected) in test_cases.into_iter() {
for (requirement_string, expected) in test_cases.iter() {
let parsed: ExtensionRequirement = requirement_string
.parse::<CLIExtensionRequirement>()
.unwrap()
Expand All @@ -181,7 +181,7 @@ mod test {
"needs-named-params@v1(helper1, helper2, helper3)",
];

for requirement_string in test_cases.into_iter() {
for requirement_string in test_cases.iter() {
assert!(requirement_string
.parse::<CLIExtensionRequirement>()
.is_err());
Expand Down
6 changes: 3 additions & 3 deletions sources/api/schnauzer/src/v2/import/helpers.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ mod test {
("kubernetes", "v1", vec!["pause-prefix"]),
];

for (setting_name, version, helpers) in fail_cases.into_iter() {
for (setting_name, version, helpers) in fail_cases.iter() {
println!(
"Checking {}@{}.{}",
setting_name,
Expand All @@ -299,7 +299,7 @@ mod test {
assert!(StaticHelperResolver::ensure_helpers_exist(&extension_requirement).is_err());
}

for (setting_name, version, helpers) in success_cases.into_iter() {
for (setting_name, version, helpers) in success_cases.iter() {
println!(
"Checking {}@{}.{}",
setting_name,
Expand Down Expand Up @@ -337,7 +337,7 @@ mod test {
),
];

for (extension_name, version, expected_helpers) in test_cases.into_iter() {
for (extension_name, version, expected_helpers) in test_cases.iter() {
assert_eq!(
StaticHelperResolver::fetch_helper_names_for_extension(extension_name, version)
.unwrap()
Expand Down
2 changes: 1 addition & 1 deletion sources/api/schnauzer/src/v2/import/settings.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ mod test {

for (all_settings, extension_requirements, expected_settings) in test_cases.into_iter() {
let minimized_settings = BottlerocketSettingsResolver::minimize_settings(
&all_settings.as_object().unwrap(),
all_settings.as_object().unwrap(),
extension_requirements.into_iter(),
);
assert_eq!(
Expand Down
6 changes: 4 additions & 2 deletions sources/models/modeled-types/src/kubernetes.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,8 @@ mod test_kubernetes_cloud_provider {

#[test]
fn disallowed_providers() {
for err in &["internal"] {
{
let err = &"internal";
KubernetesCloudProvider::try_from(*err).unwrap_err();
}
}
Expand Down Expand Up @@ -1327,7 +1328,8 @@ mod test_kubernetes_cpu_manager_policy_option {

#[test]
fn good_cpu_manager_policy_option() {
for ok in &["full-pcpus-only"] {
{
let ok = &"full-pcpus-only";
KubernetesCPUManagerPolicyOption::try_from(*ok).unwrap();
}
}
Expand Down
4 changes: 2 additions & 2 deletions sources/models/scalar-derive/tests/tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ fn simple_string() {
let s = SimpleString::new("foo").unwrap();
// Check that a few dereferencing conveniences compile
let eq1 = "foo" == s;
let eq2 = String::from("foo") == s;
let eq2 = *"foo" == s;
let eq3 = "foo" == &s;
// Assert these in a way that doesn't use assert_eq and doesn't make my IDE mad
assert!(eq1);
Expand All @@ -43,7 +43,7 @@ impl Validate for UnnamedFields {
let input = input.into();
// Contrived weirdness
if input == 0 {
return Err(ValidationError::new("never zero"));
Err(ValidationError::new("never zero"))
} else if input == 1 {
Ok(Self(2, "it was 1 but I changed it to 2".to_string()))
} else {
Expand Down
2 changes: 1 addition & 1 deletion sources/retry-read/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ mod test {
let mut output = vec![0; data.len()];
let count = (&data[..]).retry_read(&mut output).unwrap();
assert_eq!(count, data.len());
assert_eq!(&data[..], &output);
assert_eq!(data, &output);
}

#[test]
Expand Down

0 comments on commit e143ce1

Please sign in to comment.