diff --git a/src/database/conditions.rs b/src/database/conditions.rs index 9e777998..9ce0a71a 100644 --- a/src/database/conditions.rs +++ b/src/database/conditions.rs @@ -85,7 +85,7 @@ fn filter_files_on_conditions( files .iter() .filter_map(|file| filter_map_on_condition(file, file.condition(), state)) - .collect::, _>>() + .collect() } fn filter_cleaning_data_on_conditions( @@ -104,7 +104,7 @@ fn filter_cleaning_data_on_conditions( filter_map_on_condition(i, Some(condition.as_str()), state) }) - .collect::, _>>() + .collect() } #[cfg(test)] diff --git a/src/game.rs b/src/game.rs index a4f3d4e2..dff8dd91 100644 --- a/src/game.rs +++ b/src/game.rs @@ -618,7 +618,7 @@ fn validate_plugin_paths( let resolved_path = resolve_plugin_path(game_type, data_path, path); validate_plugin_path_and_header(game_type, &resolved_path) }) - .collect::>() + .collect() } fn find_archives( diff --git a/src/logging.rs b/src/logging.rs index db752298..8b218dd8 100644 --- a/src/logging.rs +++ b/src/logging.rs @@ -213,7 +213,7 @@ mod tests { fn should_support_a_closure_with_captured_state() { let _lock = TEST_LOCK.lock().unwrap(); - let messages = Arc::new(Mutex::new(Vec::<(LogLevel, String)>::new())); + let messages = Arc::new(Mutex::new(Vec::new())); let cloned_messages = messages.clone(); let callback = move |level, message: &str| { if let Ok(mut messages) = cloned_messages.lock() { @@ -238,7 +238,7 @@ mod tests { let callback = |_, _: &str| {}; set_logging_callback(callback); - let messages = Arc::new(Mutex::new(Vec::<(LogLevel, String)>::new())); + let messages = Arc::new(Mutex::new(Vec::new())); let cloned_messages = messages.clone(); let callback = move |level, message: &str| { if let Ok(mut messages) = cloned_messages.lock() { diff --git a/src/metadata/plugin_metadata.rs b/src/metadata/plugin_metadata.rs index 1db5dd70..bdb48856 100644 --- a/src/metadata/plugin_metadata.rs +++ b/src/metadata/plugin_metadata.rs @@ -375,14 +375,14 @@ impl TryFromYaml for PluginMetadata { let group = get_string_value(hash, "group", YamlObjectType::PluginMetadata)?; - let load_after = get_vec::(hash, "after")?; - let requirements = get_vec::(hash, "req")?; - let incompatibilities = get_vec::(hash, "inc")?; - let messages = get_vec::(hash, "msg")?; - let tags = get_vec::(hash, "tag")?; - let dirty_info = get_vec::(hash, "dirty")?; - let clean_info = get_vec::(hash, "clean")?; - let locations = get_vec::(hash, "url")?; + let load_after = get_vec(hash, "after")?; + let requirements = get_vec(hash, "req")?; + let incompatibilities = get_vec(hash, "inc")?; + let messages = get_vec(hash, "msg")?; + let tags = get_vec(hash, "tag")?; + let dirty_info = get_vec(hash, "dirty")?; + let clean_info = get_vec(hash, "clean")?; + let locations = get_vec(hash, "url")?; Ok(PluginMetadata { name, diff --git a/src/metadata/yaml/merge.rs b/src/metadata/yaml/merge.rs index f16c0b88..24b4dd02 100644 --- a/src/metadata/yaml/merge.rs +++ b/src/metadata/yaml/merge.rs @@ -51,14 +51,14 @@ fn merge_into_hash( value: MarkedYaml, ) -> Result, YamlMergeKeyError> { match value.data { - YamlData::::Array(a) => a.into_iter().try_fold(hash, |acc, e| { + YamlData::Array(a) => a.into_iter().try_fold(hash, |acc, e| { if let YamlData::Hash(h) = e.data { Ok(merge_hashes(acc, h)) } else { Err(YamlMergeKeyError::new(e)) } }), - YamlData::::Hash(h) => Ok(merge_hashes(hash, h)), + YamlData::Hash(h) => Ok(merge_hashes(hash, h)), _ => Err(YamlMergeKeyError::new(value)), } }