From f124314573f856a9d1c9fe937a1e2c8d42e0738c Mon Sep 17 00:00:00 2001 From: Gino Valente <49806985+MrGVSV@users.noreply.github.com> Date: Mon, 17 Oct 2022 14:27:53 -0700 Subject: [PATCH] Direct collect boxed slices Co-authored-by: ira --- crates/bevy_reflect/src/enums/enum_trait.rs | 7 ++----- crates/bevy_reflect/src/enums/variants.rs | 4 ++-- crates/bevy_reflect/src/struct_trait.rs | 4 ++-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/crates/bevy_reflect/src/enums/enum_trait.rs b/crates/bevy_reflect/src/enums/enum_trait.rs index 9f5c4dc6cf076a..c31d14ebe6231c 100644 --- a/crates/bevy_reflect/src/enums/enum_trait.rs +++ b/crates/bevy_reflect/src/enums/enum_trait.rs @@ -157,17 +157,14 @@ impl EnumInfo { .map(|(index, variant)| (variant.name(), index)) .collect::>(); - let variant_names = variants - .iter() - .map(|variant| variant.name()) - .collect::>(); + let variant_names = variants.iter().map(|variant| variant.name()).collect(); Self { name, type_name: std::any::type_name::(), type_id: TypeId::of::(), variants: variants.to_vec().into_boxed_slice(), - variant_names: variant_names.into_boxed_slice(), + variant_names, variant_indices, #[cfg(feature = "documentation")] docs: None, diff --git a/crates/bevy_reflect/src/enums/variants.rs b/crates/bevy_reflect/src/enums/variants.rs index 47944fc84fb71e..6901474041408f 100644 --- a/crates/bevy_reflect/src/enums/variants.rs +++ b/crates/bevy_reflect/src/enums/variants.rs @@ -99,11 +99,11 @@ impl StructVariantInfo { /// Create a new [`StructVariantInfo`]. pub fn new(name: &'static str, fields: &[NamedField]) -> Self { let field_indices = Self::collect_field_indices(fields); - let field_names = fields.iter().map(|field| field.name()).collect::>(); + let field_names = fields.iter().map(|field| field.name()).collect(); Self { name, fields: fields.to_vec().into_boxed_slice(), - field_names: field_names.into_boxed_slice(), + field_names, field_indices, #[cfg(feature = "documentation")] docs: None, diff --git a/crates/bevy_reflect/src/struct_trait.rs b/crates/bevy_reflect/src/struct_trait.rs index bfc4b815fc2866..71736d5c5ebc92 100644 --- a/crates/bevy_reflect/src/struct_trait.rs +++ b/crates/bevy_reflect/src/struct_trait.rs @@ -94,14 +94,14 @@ impl StructInfo { .map(|(index, field)| (field.name(), index)) .collect::>(); - let field_names = fields.iter().map(|field| field.name()).collect::>(); + let field_names = fields.iter().map(|field| field.name()).collect(); Self { name, type_name: std::any::type_name::(), type_id: TypeId::of::(), fields: fields.to_vec().into_boxed_slice(), - field_names: field_names.into_boxed_slice(), + field_names, field_indices, #[cfg(feature = "documentation")] docs: None,