Skip to content

Commit 45c9214

Browse files
committed
Fix clippy errors
1 parent 721e7a0 commit 45c9214

File tree

6 files changed

+44
-58
lines changed

6 files changed

+44
-58
lines changed

crates/bevy_reflect/src/enums/enum_trait.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,7 @@ impl EnumInfo {
150150
let variant_indices = variants
151151
.iter()
152152
.enumerate()
153-
.map(|(index, variant)| {
154-
let name = variant.name().clone();
155-
(name, index)
156-
})
153+
.map(|(index, variant)| (variant.name(), index))
157154
.collect::<HashMap<_, _>>();
158155

159156
let variant_names = variants

crates/bevy_reflect/src/enums/variants.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,7 @@ impl StructVariantInfo {
137137
fields
138138
.iter()
139139
.enumerate()
140-
.map(|(index, field)| {
141-
let name = field.name().clone();
142-
(name, index)
143-
})
140+
.map(|(index, field)| (field.name(), index))
144141
.collect()
145142
}
146143
}

crates/bevy_reflect/src/fields.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ impl NamedField {
2121

2222
/// The name of the field.
2323
pub fn name(&self) -> &'static str {
24-
&self.name
24+
self.name
2525
}
2626

2727
/// The [type name] of the field.

crates/bevy_reflect/src/serde/de.rs

Lines changed: 35 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -579,47 +579,44 @@ impl<'a, 'de> Visitor<'de> for EnumVisitor<'a> {
579579
A: EnumAccess<'de>,
580580
{
581581
let mut dynamic_enum = DynamicEnum::default();
582-
match data.variant().unwrap() {
583-
(Ident(variant_name), variant) => {
584-
let variant_info = self.enum_info.variant(&variant_name).ok_or_else(|| {
585-
Error::unknown_variant(&variant_name, self.enum_info.variant_names())
582+
let (Ident(variant_name), variant) = data.variant().unwrap();
583+
let variant_info = self
584+
.enum_info
585+
.variant(&variant_name)
586+
.ok_or_else(|| Error::unknown_variant(&variant_name, self.enum_info.variant_names()))?;
587+
let value: DynamicVariant = match variant_info {
588+
VariantInfo::Unit(..) => variant.unit_variant()?.into(),
589+
VariantInfo::Struct(struct_info) => variant
590+
.struct_variant(
591+
struct_info.field_names(),
592+
StructVariantVisitor {
593+
struct_info,
594+
registry: self.registry,
595+
},
596+
)?
597+
.into(),
598+
VariantInfo::Tuple(tuple_info) if tuple_info.field_len() == 1 => {
599+
let type_info = get_newtype_info(tuple_info, self.registry)?;
600+
let value = variant.newtype_variant_seed(TypedReflectDeserializer {
601+
type_info,
602+
registry: self.registry,
586603
})?;
587-
let value: DynamicVariant = match variant_info {
588-
VariantInfo::Unit(..) => variant.unit_variant()?.into(),
589-
VariantInfo::Struct(struct_info) => variant
590-
.struct_variant(
591-
struct_info.field_names(),
592-
StructVariantVisitor {
593-
struct_info,
594-
registry: self.registry,
595-
},
596-
)?
597-
.into(),
598-
VariantInfo::Tuple(tuple_info) if tuple_info.field_len() == 1 => {
599-
let type_info = get_newtype_info(tuple_info, self.registry)?;
600-
let value = variant.newtype_variant_seed(TypedReflectDeserializer {
601-
type_info,
602-
registry: self.registry,
603-
})?;
604-
let mut dynamic_tuple = DynamicTuple::default();
605-
dynamic_tuple.insert_boxed(value);
606-
dynamic_tuple.into()
607-
}
608-
VariantInfo::Tuple(tuple_info) => variant
609-
.tuple_variant(
610-
tuple_info.field_len(),
611-
TupleVariantVisitor {
612-
tuple_info,
613-
registry: self.registry,
614-
},
615-
)?
616-
.into(),
617-
};
618-
619-
dynamic_enum.set_variant(variant_name, value);
604+
let mut dynamic_tuple = DynamicTuple::default();
605+
dynamic_tuple.insert_boxed(value);
606+
dynamic_tuple.into()
620607
}
621-
}
608+
VariantInfo::Tuple(tuple_info) => variant
609+
.tuple_variant(
610+
tuple_info.field_len(),
611+
TupleVariantVisitor {
612+
tuple_info,
613+
registry: self.registry,
614+
},
615+
)?
616+
.into(),
617+
};
622618

619+
dynamic_enum.set_variant(variant_name, value);
623620
Ok(dynamic_enum)
624621
}
625622
}

crates/bevy_reflect/src/serde/ser.rs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,10 @@ fn get_type_info<E: Error>(
5353
match type_info {
5454
TypeInfo::Dynamic(..) => match registry.get_with_name(type_name) {
5555
Some(registration) => Ok(registration.type_info()),
56-
None => {
57-
return Err(Error::custom(format_args!(
58-
"no registration found for dynamic type with name {}",
59-
type_name
60-
)))
61-
}
56+
None => Err(Error::custom(format_args!(
57+
"no registration found for dynamic type with name {}",
58+
type_name
59+
))),
6260
},
6361
info => Ok(info),
6462
}
@@ -207,7 +205,7 @@ impl<'a> Serialize for StructSerializer<'a> {
207205
serializer.serialize_struct(struct_info.name(), self.struct_value.field_len())?;
208206
for (index, value) in self.struct_value.iter_fields().enumerate() {
209207
let key = struct_info.field_at(index).unwrap().name();
210-
state.serialize_field(&key, &TypedReflectSerializer::new(value, self.registry))?;
208+
state.serialize_field(key, &TypedReflectSerializer::new(value, self.registry))?;
211209
}
212210
state.end()
213211
}

crates/bevy_reflect/src/struct_trait.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,7 @@ impl StructInfo {
8989
let field_indices = fields
9090
.iter()
9191
.enumerate()
92-
.map(|(index, field)| {
93-
let name = field.name().clone();
94-
(name, index)
95-
})
92+
.map(|(index, field)| (field.name(), index))
9693
.collect::<HashMap<_, _>>();
9794
let field_names = fields.iter().map(|field| field.name()).collect::<Vec<_>>();
9895

0 commit comments

Comments
 (0)