FyroxEngine/Fyrox
1
0
Fork 0
mirror of https://github.com/FyroxEngine/Fyrox.git synced 2026-10-12 02:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

renamed field -> find_field + field_mut -> find_field_mut

Browse Source
This commit is contained in:
Dmitry Stepanov
2026-05-06 23:49:46 +03:00
parent 9df3443a24
commit 660bcd709a
11 changed files with 61 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/src/plugins/animation/track.rs
+1 -1
View File
@@ -868,7 +868,7 @@ impl TrackList {
adder.add(values)
}
}
ValueBinding::Property { name, .. } => node_ref.field(name, &mut |value| {
ValueBinding::Property { name, .. } => node_ref.find_field(name, &mut |value| {
if let Some(value) = value {
value.as_any(&mut |any| {
let curves = track.data_container().curves_ref();
fyrox-core-derive/src/reflect.rs
+2 -2
View File
@@ -200,7 +200,7 @@ fn struct_set_field_body(ty_args: &args::TypeArgs) -> Option<TokenStream2> {
}
Err(current) => {
let mut field_type_name = "(none)";
self.field_mut(name, &mut |field| { field_type_name = field.unwrap().type_name() });
self.find_field_mut(name, &mut |field| { field_type_name = field.unwrap().type_name() });
Err(SetFieldError::InvalidValue{field_type_name, value: current})
}
})
@@ -214,7 +214,7 @@ fn struct_set_field_body(ty_args: &args::TypeArgs) -> Option<TokenStream2> {
)*
_ => {
let mut opt_value = Some(value);
self.field_mut(name, &mut move |field| {
self.find_field_mut(name, &mut move |field| {
let value = opt_value.take().unwrap();
match field {
Some(f) => func(f.set(value).map_err(|value| SetFieldError::InvalidValue {
fyrox-core/src/reflect/impls.rs
+4 -4
View File
@@ -220,14 +220,14 @@ macro_rules! impl_reflect_inner_mutability {
guard.set_field(field, value, func)
}
fn field(&$self, name: &str, func: &mut dyn FnMut(Option<&dyn Reflect>)) {
fn find_field(&$self, name: &str, func: &mut dyn FnMut(Option<&dyn Reflect>)) {
let guard = $acquire_lock_guard;
guard.field(name, func)
guard.find_field(name, func)
}
fn field_mut(&mut $self, name: &str, func: &mut dyn FnMut(Option<&mut dyn Reflect>)) {
fn find_field_mut(&mut $self, name: &str, func: &mut dyn FnMut(Option<&mut dyn Reflect>)) {
let mut guard = $acquire_lock_guard;
guard.field_mut(name, func)
guard.find_field_mut(name, func)
}
fn as_array(&$self, func: &mut dyn FnMut(Option<&dyn ReflectArray>)) {
fyrox-core/src/reflect/macros.rs
+22 -10
View File
@@ -60,16 +60,20 @@ macro_rules! newtype_reflect {
self.0.set(value)
}
fn field(&self, name: &str, func: &mut dyn FnMut(Option<&dyn $crate::reflect::Reflect>)) {
self.0.field(name, func)
fn find_field(
&self,
name: &str,
func: &mut dyn FnMut(Option<&dyn $crate::reflect::Reflect>),
) {
self.0.find_field(name, func)
}
fn field_mut(
fn find_field_mut(
&mut self,
name: &str,
func: &mut dyn FnMut(Option<&mut dyn $crate::reflect::Reflect>),
) {
self.0.field_mut(name, func)
self.0.find_field_mut(name, func)
}
fn as_array(&self, func: &mut dyn FnMut(Option<&dyn $crate::reflect::ReflectArray>)) {
@@ -203,16 +207,20 @@ macro_rules! delegate_reflect {
self.deref_mut().set(value)
}
fn field(&self, name: &str, func: &mut dyn FnMut(Option<&dyn $crate::reflect::Reflect>)) {
self.deref().field(name, func)
fn find_field(
&self,
name: &str,
func: &mut dyn FnMut(Option<&dyn $crate::reflect::Reflect>),
) {
self.deref().find_field(name, func)
}
fn field_mut(
fn find_field_mut(
&mut self,
name: &str,
func: &mut dyn FnMut(Option<&mut dyn $crate::reflect::Reflect>),
) {
self.deref_mut().field_mut(name, func)
self.deref_mut().find_field_mut(name, func)
}
fn as_array(&self, func: &mut dyn FnMut(Option<&dyn $crate::reflect::ReflectArray>)) {
@@ -342,11 +350,15 @@ macro_rules! blank_reflect {
func(self)
}
fn field(&self, name: &str, func: &mut dyn FnMut(Option<&dyn $crate::reflect::Reflect>)) {
fn find_field(
&self,
name: &str,
func: &mut dyn FnMut(Option<&dyn $crate::reflect::Reflect>),
) {
func(if name == "self" { Some(self) } else { None })
}
fn field_mut(
fn find_field_mut(
&mut self,
name: &str,
func: &mut dyn FnMut(Option<&mut dyn $crate::reflect::Reflect>),
fyrox-core/src/reflect/mod.rs
+8 -8
View File
@@ -158,7 +158,7 @@ pub trait Reflect: Any + Debug {
Self: Sized;
/// Calls user method specified with `#[reflect(setter = ..)]` or falls back to
/// [`Reflect::field_mut`]
/// [`Reflect::find_field_mut`]
#[allow(clippy::type_complexity)]
fn set_field(
&mut self,
@@ -167,7 +167,7 @@ pub trait Reflect: Any + Debug {
func: &mut dyn FnMut(Result<Box<dyn Reflect>, SetFieldError>),
) {
let mut opt_value = Some(value);
self.field_mut(field_name, &mut move |field| {
self.find_field_mut(field_name, &mut move |field| {
let value = opt_value.take().unwrap();
match field {
Some(f) => func(f.set(value).map_err(|value| SetFieldError::InvalidValue {
@@ -182,7 +182,7 @@ pub trait Reflect: Any + Debug {
});
}
fn field(&self, name: &str, func: &mut dyn FnMut(Option<&dyn Reflect>)) {
fn find_field(&self, name: &str, func: &mut dyn FnMut(Option<&dyn Reflect>)) {
self.fields_ref(&mut |fields| {
func(
fields
@@ -193,7 +193,7 @@ pub trait Reflect: Any + Debug {
});
}
fn field_mut(&mut self, name: &str, func: &mut dyn FnMut(Option<&mut dyn Reflect>)) {
fn find_field_mut(&mut self, name: &str, func: &mut dyn FnMut(Option<&mut dyn Reflect>)) {
self.fields_mut(&mut |fields| {
func(
fields
@@ -676,14 +676,14 @@ pub trait GetField {
impl<R: Reflect> GetField for R {
fn get_field<T: 'static>(&self, name: &str, func: &mut dyn FnMut(Option<&T>)) {
self.field(name, &mut |field| match field {
self.find_field(name, &mut |field| match field {
None => func(None),
Some(reflect) => reflect.as_any(&mut |any| func(any.downcast_ref())),
})
}
fn get_field_mut<T: 'static>(&mut self, name: &str, func: &mut dyn FnMut(Option<&mut T>)) {
self.field_mut(name, &mut |field| match field {
self.find_field_mut(name, &mut |field| match field {
None => func(None),
Some(reflect) => reflect.as_any_mut(&mut |any| func(any.downcast_mut())),
})
@@ -788,7 +788,7 @@ impl<'p> Component<'p> {
func: &mut dyn FnMut(Result<&dyn Reflect, ReflectPathError<'p>>),
) {
match self {
Self::Field(path) => reflect.field(path, &mut |field| {
Self::Field(path) => reflect.find_field(path, &mut |field| {
func(field.ok_or(ReflectPathError::UnknownField { s: path }))
}),
Self::Index(path) => {
@@ -819,7 +819,7 @@ impl<'p> Component<'p> {
func: &mut dyn FnMut(Result<&mut dyn Reflect, ReflectPathError<'p>>),
) {
match self {
Self::Field(path) => reflect.field_mut(path, &mut |field| {
Self::Field(path) => reflect.find_field_mut(path, &mut |field| {
func(field.ok_or(ReflectPathError::UnknownField { s: path }))
}),
Self::Index(path) => {
fyrox-core/src/variable.rs
+4 -4
View File
@@ -492,15 +492,15 @@ where
}
#[inline]
fn field(&self, name: &str, func: &mut dyn FnMut(Option<&dyn Reflect>)) {
self.value.field(name, func)
fn find_field(&self, name: &str, func: &mut dyn FnMut(Option<&dyn Reflect>)) {
self.value.find_field(name, func)
}
#[inline]
fn field_mut(&mut self, name: &str, func: &mut dyn FnMut(Option<&mut dyn Reflect>)) {
fn find_field_mut(&mut self, name: &str, func: &mut dyn FnMut(Option<&mut dyn Reflect>)) {
// Any modifications inside of compound structs must mark the variable as modified.
self.mark_modified_and_need_sync();
self.value.field_mut(name, func)
self.value.find_field_mut(name, func)
}
#[inline]
fyrox-graph/src/lib.rs
+4 -4
View File
@@ -1795,12 +1795,12 @@ mod test {
self.0.deref_mut().set_field(field, value, func)
}
fn field(&self, name: &str, func: &mut dyn FnMut(Option<&dyn Reflect>)) {
self.0.deref().field(name, func)
fn find_field(&self, name: &str, func: &mut dyn FnMut(Option<&dyn Reflect>)) {
self.0.deref().find_field(name, func)
}
fn field_mut(&mut self, name: &str, func: &mut dyn FnMut(Option<&mut dyn Reflect>)) {
self.0.deref_mut().field_mut(name, func)
fn find_field_mut(&mut self, name: &str, func: &mut dyn FnMut(Option<&mut dyn Reflect>)) {
self.0.deref_mut().find_field_mut(name, func)
}
fn derived_types() -> &'static [TypeId] {
fyrox-impl/src/scene/node/mod.rs
+4 -4
View File
@@ -650,12 +650,12 @@ impl Reflect for Node {
self.0.deref_mut().set_field(field, value, func)
}
fn field(&self, name: &str, func: &mut dyn FnMut(Option<&dyn Reflect>)) {
self.0.deref().field(name, func)
fn find_field(&self, name: &str, func: &mut dyn FnMut(Option<&dyn Reflect>)) {
self.0.deref().find_field(name, func)
}
fn field_mut(&mut self, name: &str, func: &mut dyn FnMut(Option<&mut dyn Reflect>)) {
self.0.deref_mut().field_mut(name, func)
fn find_field_mut(&mut self, name: &str, func: &mut dyn FnMut(Option<&mut dyn Reflect>)) {
self.0.deref_mut().find_field_mut(name, func)
}
fn try_clone_box(&self) -> Option<Box<dyn Reflect>> {
fyrox-impl/src/script/mod.rs
+4 -4
View File
@@ -784,12 +784,12 @@ impl Reflect for Script {
self.instance.deref_mut().set(value)
}
fn field(&self, name: &str, func: &mut dyn FnMut(Option<&dyn Reflect>)) {
self.instance.deref().field(name, func)
fn find_field(&self, name: &str, func: &mut dyn FnMut(Option<&dyn Reflect>)) {
self.instance.deref().find_field(name, func)
}
fn field_mut(&mut self, name: &str, func: &mut dyn FnMut(Option<&mut dyn Reflect>)) {
self.instance.deref_mut().field_mut(name, func)
fn find_field_mut(&mut self, name: &str, func: &mut dyn FnMut(Option<&mut dyn Reflect>)) {
self.instance.deref_mut().find_field_mut(name, func)
}
fn as_array(&self, func: &mut dyn FnMut(Option<&dyn ReflectArray>)) {
fyrox-resource/src/state.rs
+4 -4
View File
@@ -170,12 +170,12 @@ impl Reflect for ResourceDataWrapper {
self.deref_mut().set_field(field, value, func)
}
fn field(&self, name: &str, func: &mut dyn FnMut(Option<&dyn Reflect>)) {
self.deref().field(name, func)
fn find_field(&self, name: &str, func: &mut dyn FnMut(Option<&dyn Reflect>)) {
self.deref().find_field(name, func)
}
fn field_mut(&mut self, name: &str, func: &mut dyn FnMut(Option<&mut dyn Reflect>)) {
self.deref_mut().field_mut(name, func)
fn find_field_mut(&mut self, name: &str, func: &mut dyn FnMut(Option<&mut dyn Reflect>)) {
self.deref_mut().find_field_mut(name, func)
}
fn as_array(&self, func: &mut dyn FnMut(Option<&dyn ReflectArray>)) {
fyrox-ui/src/node/mod.rs
+4 -4
View File
@@ -354,11 +354,11 @@ impl Reflect for UiNode {
self.0.deref_mut().set_field(field, value, func)
}
fn field(&self, name: &str, func: &mut dyn FnMut(Option<&dyn Reflect>)) {
self.0.deref().field(name, func)
fn find_field(&self, name: &str, func: &mut dyn FnMut(Option<&dyn Reflect>)) {
self.0.deref().find_field(name, func)
}
fn field_mut(&mut self, name: &str, func: &mut dyn FnMut(Option<&mut dyn Reflect>)) {
self.0.deref_mut().field_mut(name, func)
fn find_field_mut(&mut self, name: &str, func: &mut dyn FnMut(Option<&mut dyn Reflect>)) {
self.0.deref_mut().find_field_mut(name, func)
}
}