Skip to content

Commit e97b16e

Browse files
MrGVSVMrGVSV
committed
Fix clippy and formatting and docs and typos
1 parent b3b5147 commit e97b16e

File tree

9 files changed

+63
-44
lines changed

9 files changed

+63
-44
lines changed

‎crates/bevy_reflect/derive/src/derive_data.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ impl<'a> ReflectStruct<'a> {
705705
let field_id = field.field_id(bevy_reflect_path);
706706

707707
quote! {
708-
return #FQResult::Err(#bevy_reflect_path::ReflectCloneError::FieldNotClonable {
708+
return #FQResult::Err(#bevy_reflect_path::ReflectCloneError::FieldNotCloneable {
709709
field: #field_id,
710710
variant: #FQOption::None,
711711
container_type_path: #bevy_reflect_path::__macro_exports::alloc_utils::Cow::Borrowed(

‎crates/bevy_reflect/derive/src/enum_utility.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ impl<'a> VariantBuilder for ReflectCloneVariantBuilder<'a> {
379379

380380
quote! {
381381
return #FQResult::Err(
382-
#bevy_reflect_path::ReflectCloneError::FieldNotClonable {
382+
#bevy_reflect_path::ReflectCloneError::FieldNotCloneable {
383383
field: #field_id,
384384
variant: #FQOption::Some(#bevy_reflect_path::__macro_exports::alloc_utils::Cow::Borrowed(#variant_name)),
385385
container_type_path: #bevy_reflect_path::__macro_exports::alloc_utils::Cow::Borrowed(<Self as #bevy_reflect_path::TypePath>::type_path())

‎crates/bevy_reflect/derive/src/impls/enums.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ pub(crate) fn impl_enum(reflect_enum: &ReflectEnum) -> proc_macro2::TokenStream
262262
}
263263

264264
#common_methods
265-
265+
266266
#clone_fn
267267
}
268268
}

‎crates/bevy_reflect/src/error.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ pub enum ReflectCloneError {
1717
/// This type should be returned when a type is intentionally opting out of reflection cloning.
1818
///
1919
/// [`Reflect::reflect_clone`]: crate::Reflect::reflect_clone
20-
#[error("`{type_path}` cannot be made clonable for `Reflect::reflect_clone`")]
21-
NotClonable { type_path: Cow<'static, str> },
20+
#[error("`{type_path}` cannot be made cloneable for `Reflect::reflect_clone`")]
21+
NotCloneable { type_path: Cow<'static, str> },
2222
/// The field cannot be cloned via [`Reflect::reflect_clone`].
2323
///
2424
/// When [deriving `Reflect`], this usually means that a field marked with `#[reflect(ignore)]`
@@ -29,10 +29,10 @@ pub enum ReflectCloneError {
2929
/// [`Reflect::reflect_clone`]: crate::Reflect::reflect_clone
3030
/// [deriving `Reflect`]: derive@crate::Reflect
3131
#[error(
32-
"field `{}` cannot be made clonable for `Reflect::reflect_clone` (are you missing a `#[reflect(clone)]` attribute?)",
32+
"field `{}` cannot be made cloneable for `Reflect::reflect_clone` (are you missing a `#[reflect(clone)]` attribute?)",
3333
full_path(.field, .variant.as_deref(), .container_type_path)
3434
)]
35-
FieldNotClonable {
35+
FieldNotCloneable {
3636
field: FieldId,
3737
variant: Option<Cow<'static, str>>,
3838
container_type_path: Cow<'static, str>,

‎crates/bevy_reflect/src/impls/glam.rs

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -491,8 +491,20 @@ reflect_enum!(
491491
}
492492
);
493493

494-
impl_reflect_opaque!(::glam::BVec3A(Clone, Debug, Default, Deserialize, Serialize));
495-
impl_reflect_opaque!(::glam::BVec4A(Clone, Debug, Default, Deserialize, Serialize));
494+
impl_reflect_opaque!(::glam::BVec3A(
495+
Clone,
496+
Debug,
497+
Default,
498+
Deserialize,
499+
Serialize
500+
));
501+
impl_reflect_opaque!(::glam::BVec4A(
502+
Clone,
503+
Debug,
504+
Default,
505+
Deserialize,
506+
Serialize
507+
));
496508

497509
#[cfg(test)]
498510
mod tests {

‎crates/bevy_reflect/src/impls/smallvec.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,12 +142,13 @@ where
142142
Ok(Box::new(
143143
self.iter()
144144
.map(|value| {
145-
value.reflect_clone()?.take().or_else(|_| {
146-
Err(ReflectCloneError::FailedDowncast {
145+
value
146+
.reflect_clone()?
147+
.take()
148+
.map_err(|_| ReflectCloneError::FailedDowncast {
147149
expected: Cow::Borrowed(<T::Item as TypePath>::type_path()),
148150
received: Cow::Owned(value.reflect_type_path().to_string()),
149151
})
150-
})
151152
})
152153
.collect::<Result<Self, ReflectCloneError>>()?,
153154
))

‎crates/bevy_reflect/src/impls/std.rs

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -634,11 +634,11 @@ macro_rules! impl_reflect_for_veclike {
634634
Ok(Box::new(
635635
self.iter()
636636
.map(|value| {
637-
value.reflect_clone()?.take().or_else(|_| {
638-
Err(ReflectCloneError::FailedDowncast {
637+
value.reflect_clone()?.take().map_err(|_| {
638+
ReflectCloneError::FailedDowncast {
639639
expected: Cow::Borrowed(<T as TypePath>::type_path()),
640640
received: Cow::Owned(value.reflect_type_path().to_string()),
641-
})
641+
}
642642
})
643643
})
644644
.collect::<Result<Self, ReflectCloneError>>()?,
@@ -887,17 +887,17 @@ macro_rules! impl_reflect_for_hashmap {
887887
fn reflect_clone(&self) -> Result<Box<dyn Reflect>, ReflectCloneError> {
888888
let mut map = Self::with_capacity_and_hasher(self.len(), S::default());
889889
for (key, value) in self.iter() {
890-
let key = key.reflect_clone()?.take().or_else(|_| {
891-
Err(ReflectCloneError::FailedDowncast {
890+
let key = key.reflect_clone()?.take().map_err(|_| {
891+
ReflectCloneError::FailedDowncast {
892892
expected: Cow::Borrowed(<K as TypePath>::type_path()),
893893
received: Cow::Owned(key.reflect_type_path().to_string()),
894-
})
894+
}
895895
})?;
896-
let value = value.reflect_clone()?.take().or_else(|_| {
897-
Err(ReflectCloneError::FailedDowncast {
896+
let value = value.reflect_clone()?.take().map_err(|_| {
897+
ReflectCloneError::FailedDowncast {
898898
expected: Cow::Borrowed(<V as TypePath>::type_path()),
899899
received: Cow::Owned(value.reflect_type_path().to_string()),
900-
})
900+
}
901901
})?;
902902
map.insert(key, value);
903903
}
@@ -1153,11 +1153,11 @@ macro_rules! impl_reflect_for_hashset {
11531153
fn reflect_clone(&self) -> Result<Box<dyn Reflect>, ReflectCloneError> {
11541154
let mut set = Self::with_capacity_and_hasher(self.len(), S::default());
11551155
for value in self.iter() {
1156-
let value = value.reflect_clone()?.take().or_else(|_| {
1157-
Err(ReflectCloneError::FailedDowncast {
1156+
let value = value.reflect_clone()?.take().map_err(|_| {
1157+
ReflectCloneError::FailedDowncast {
11581158
expected: Cow::Borrowed(<V as TypePath>::type_path()),
11591159
received: Cow::Owned(value.reflect_type_path().to_string()),
1160-
})
1160+
}
11611161
})?;
11621162
set.insert(value);
11631163
}
@@ -1414,18 +1414,21 @@ where
14141414
fn reflect_clone(&self) -> Result<Box<dyn Reflect>, ReflectCloneError> {
14151415
let mut map = Self::new();
14161416
for (key, value) in self.iter() {
1417-
let key = key.reflect_clone()?.take().or_else(|_| {
1418-
Err(ReflectCloneError::FailedDowncast {
1419-
expected: Cow::Borrowed(<K as TypePath>::type_path()),
1420-
received: Cow::Owned(key.reflect_type_path().to_string()),
1421-
})
1422-
})?;
1423-
let value = value.reflect_clone()?.take().or_else(|_| {
1424-
Err(ReflectCloneError::FailedDowncast {
1425-
expected: Cow::Borrowed(<V as TypePath>::type_path()),
1426-
received: Cow::Owned(value.reflect_type_path().to_string()),
1427-
})
1428-
})?;
1417+
let key =
1418+
key.reflect_clone()?
1419+
.take()
1420+
.map_err(|_| ReflectCloneError::FailedDowncast {
1421+
expected: Cow::Borrowed(<K as TypePath>::type_path()),
1422+
received: Cow::Owned(key.reflect_type_path().to_string()),
1423+
})?;
1424+
let value =
1425+
value
1426+
.reflect_clone()?
1427+
.take()
1428+
.map_err(|_| ReflectCloneError::FailedDowncast {
1429+
expected: Cow::Borrowed(<V as TypePath>::type_path()),
1430+
received: Cow::Owned(value.reflect_type_path().to_string()),
1431+
})?;
14291432
map.insert(key, value);
14301433
}
14311434

‎crates/bevy_reflect/src/lib.rs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,8 +1024,11 @@ mod tests {
10241024
fn should_reflect_clone_with_clone() {
10251025
// A custom clone function to verify that the `#[reflect(Clone)]` container attribute
10261026
// takes precedence over the `#[reflect(clone)]` field attribute.
1027-
#[allow(dead_code, unused_variables)]
1028-
fn custom_clone(value: &usize) -> usize {
1027+
#[expect(
1028+
dead_code,
1029+
reason = "if things are working correctly, this function should never be called"
1030+
)]
1031+
fn custom_clone(_value: &usize) -> usize {
10291032
panic!("should not be called");
10301033
}
10311034

@@ -1108,7 +1111,7 @@ mod tests {
11081111
let clone = foo.reflect_clone();
11091112
assert_eq!(
11101113
clone.unwrap_err(),
1111-
ReflectCloneError::FieldNotClonable {
1114+
ReflectCloneError::FieldNotCloneable {
11121115
field: FieldId::Unnamed(0),
11131116
variant: None,
11141117
container_type_path: Cow::Borrowed(Foo::type_path()),
@@ -1126,7 +1129,7 @@ mod tests {
11261129
let clone = bar.reflect_clone();
11271130
assert_eq!(
11281131
clone.unwrap_err(),
1129-
ReflectCloneError::FieldNotClonable {
1132+
ReflectCloneError::FieldNotCloneable {
11301133
field: FieldId::Named(Cow::Borrowed("value")),
11311134
variant: None,
11321135
container_type_path: Cow::Borrowed(Bar::type_path()),
@@ -1147,7 +1150,7 @@ mod tests {
11471150
let clone = baz.reflect_clone();
11481151
assert_eq!(
11491152
clone.unwrap_err(),
1150-
ReflectCloneError::FieldNotClonable {
1153+
ReflectCloneError::FieldNotCloneable {
11511154
field: FieldId::Unnamed(0),
11521155
variant: Some(Cow::Borrowed("Tuple")),
11531156
container_type_path: Cow::Borrowed(Baz::type_path()),
@@ -1158,7 +1161,7 @@ mod tests {
11581161
let clone = baz.reflect_clone();
11591162
assert_eq!(
11601163
clone.unwrap_err(),
1161-
ReflectCloneError::FieldNotClonable {
1164+
ReflectCloneError::FieldNotCloneable {
11621165
field: FieldId::Named(Cow::Borrowed("value")),
11631166
variant: Some(Cow::Borrowed("Struct")),
11641167
container_type_path: Cow::Borrowed(Baz::type_path()),

‎crates/bevy_reflect/src/reflect.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ where
234234
/// # Example
235235
///
236236
/// ```
237-
/// # use bevy_reflect::{Reflect, DynamicTuple};
237+
/// # use bevy_reflect::{PartialReflect, DynamicTuple};
238238
/// let value = (1, true, 3.14);
239239
/// let cloned = value.clone_value();
240240
/// assert!(cloned.is::<DynamicTuple>())
@@ -258,7 +258,7 @@ where
258258
/// # Example
259259
///
260260
/// ```
261-
/// # use bevy_reflect::Reflect;
261+
/// # use bevy_reflect::PartialReflect;
262262
/// let value = (1, true, 3.14);
263263
/// let cloned = value.reflect_clone().unwrap();
264264
/// assert!(cloned.is::<(i32, bool, f64)>())

0 commit comments

Comments
 (0)