From cd7c497414ac01e874627ec78464718701cd9071 Mon Sep 17 00:00:00 2001 From: Rob Parrett Date: Thu, 13 Feb 2025 08:40:49 -0700 Subject: [PATCH 1/3] Update typos to 1.29.6 --- .github/workflows/ci.yml | 2 +- crates/bevy_ecs/src/entity/entity_set.rs | 2 +- crates/bevy_mikktspace/src/generated.rs | 14 +++++++------- crates/bevy_pbr/src/render/pbr_functions.wgsl | 2 +- crates/bevy_pbr/src/ssr/raymarch.wgsl | 2 +- crates/bevy_picking/src/lib.rs | 2 +- crates/bevy_reflect/src/func/args/count.rs | 2 +- .../src/func/dynamic_function_internal.rs | 2 +- typos.toml | 9 +++++---- 9 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a7769bc92b831..af378638ab381 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -244,7 +244,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Check for typos - uses: crate-ci/typos@v1.29.5 + uses: crate-ci/typos@v1.29.6 - name: Typos info if: failure() run: | diff --git a/crates/bevy_ecs/src/entity/entity_set.rs b/crates/bevy_ecs/src/entity/entity_set.rs index 82ac75c163d32..9e1a92d8f1bb0 100644 --- a/crates/bevy_ecs/src/entity/entity_set.rs +++ b/crates/bevy_ecs/src/entity/entity_set.rs @@ -310,7 +310,7 @@ unsafe impl EntitySetIterator for iter::StepBy {} /// Conversion from an `EntitySetIterator`. /// /// Some collections, while they can be constructed from plain iterators, -/// benefit strongly from the additional uniqeness guarantee [`EntitySetIterator`] offers. +/// benefit strongly from the additional uniqueness guarantee [`EntitySetIterator`] offers. /// Mirroring [`Iterator::collect`]/[`FromIterator::from_iter`], [`EntitySetIterator::collect_set`] and /// `FromEntitySetIterator::from_entity_set_iter` can be used for construction. /// diff --git a/crates/bevy_mikktspace/src/generated.rs b/crates/bevy_mikktspace/src/generated.rs index a35e1d205f16a..8e6a2b27b398b 100644 --- a/crates/bevy_mikktspace/src/generated.rs +++ b/crates/bevy_mikktspace/src/generated.rs @@ -136,7 +136,7 @@ pub struct SGroup { pub iNrFaces: i32, pub pFaceIndices: *mut i32, pub iVertexRepresentative: i32, - pub bOrientPreservering: bool, + pub bOrientPreserving: bool, } impl SGroup { @@ -145,7 +145,7 @@ impl SGroup { iNrFaces: 0, pFaceIndices: null_mut(), iVertexRepresentative: 0, - bOrientPreservering: false, + bOrientPreserving: false, } } } @@ -576,11 +576,11 @@ unsafe fn GenerateTSpaces( if (*pTS_out).iCounter == 1i32 { *pTS_out = AvgTSpace(pTS_out, &mut pSubGroupTspace[l]); (*pTS_out).iCounter = 2i32; - (*pTS_out).bOrient = (*pGroup).bOrientPreservering + (*pTS_out).bOrient = (*pGroup).bOrientPreserving } else { *pTS_out = pSubGroupTspace[l]; (*pTS_out).iCounter = 1i32; - (*pTS_out).bOrient = (*pGroup).bOrientPreservering + (*pTS_out).bOrient = (*pGroup).bOrientPreserving } i += 1 } @@ -838,7 +838,7 @@ unsafe fn Build4RuleGroups( *fresh2 = ptr::from_mut(&mut *pGroups.offset(iNrActiveGroups as isize)); (*(*pTriInfos.offset(f as isize)).AssignedGroup[i as usize]) .iVertexRepresentative = vert_index; - (*(*pTriInfos.offset(f as isize)).AssignedGroup[i as usize]).bOrientPreservering = + (*(*pTriInfos.offset(f as isize)).AssignedGroup[i as usize]).bOrientPreserving = (*pTriInfos.offset(f as isize)).iFlag & 8i32 != 0i32; (*(*pTriInfos.offset(f as isize)).AssignedGroup[i as usize]).iNrFaces = 0i32; let ref mut fresh3 = @@ -927,7 +927,7 @@ unsafe fn AssignRecur( && (*pMyTriInfo).AssignedGroup[2usize].is_null() { (*pMyTriInfo).iFlag &= !8i32; - (*pMyTriInfo).iFlag |= if (*pGroup).bOrientPreservering { + (*pMyTriInfo).iFlag |= if (*pGroup).bOrientPreserving { 8i32 } else { 0i32 @@ -939,7 +939,7 @@ unsafe fn AssignRecur( } else { false }; - if bOrient != (*pGroup).bOrientPreservering { + if bOrient != (*pGroup).bOrientPreserving { return false; } AddTriToGroup(pGroup, iMyTriIndex); diff --git a/crates/bevy_pbr/src/render/pbr_functions.wgsl b/crates/bevy_pbr/src/render/pbr_functions.wgsl index 44890b3a65613..e9b4e1f1a844d 100644 --- a/crates/bevy_pbr/src/render/pbr_functions.wgsl +++ b/crates/bevy_pbr/src/render/pbr_functions.wgsl @@ -241,7 +241,7 @@ fn bend_normal_for_anisotropy(lighting_input: ptr, /// The distance that the hit point penetrates into the hit surface. diff --git a/crates/bevy_picking/src/lib.rs b/crates/bevy_picking/src/lib.rs index 7273614a247ea..7b9c990aed62c 100644 --- a/crates/bevy_picking/src/lib.rs +++ b/crates/bevy_picking/src/lib.rs @@ -7,7 +7,7 @@ //! allows you to express more complex interactions, like detecting when a touch input drags a UI //! element and drops it on a 3d mesh rendered to a different camera. //! -//! Pointer events bubble up the entity hieararchy and can be used with observers, allowing you to +//! Pointer events bubble up the entity hierarchy and can be used with observers, allowing you to //! succinctly express rich interaction behaviors by attaching pointer callbacks to entities: //! //! ```rust diff --git a/crates/bevy_reflect/src/func/args/count.rs b/crates/bevy_reflect/src/func/args/count.rs index d5f410f88dfaf..159950ca61110 100644 --- a/crates/bevy_reflect/src/func/args/count.rs +++ b/crates/bevy_reflect/src/func/args/count.rs @@ -264,7 +264,7 @@ mod tests { } #[test] - fn should_allow_removeting_nonexistent_count() { + fn should_allow_removing_nonexistent_count() { let mut count = ArgCount::default(); assert_eq!(count.len(), 0); diff --git a/crates/bevy_reflect/src/func/dynamic_function_internal.rs b/crates/bevy_reflect/src/func/dynamic_function_internal.rs index eb855dc5cee6d..65b98e5e13a67 100644 --- a/crates/bevy_reflect/src/func/dynamic_function_internal.rs +++ b/crates/bevy_reflect/src/func/dynamic_function_internal.rs @@ -246,7 +246,7 @@ mod tests { } #[test] - fn should_merge_overloaed_into_single() { + fn should_merge_overload_into_single() { let mut func_a = DynamicFunctionInternal { functions: vec!['a', 'b'], info: FunctionInfo::new(SignatureInfo::anonymous().with_arg::("arg0")) diff --git a/typos.toml b/typos.toml index e3a5c2bf4a8d1..3dd8327606d0e 100644 --- a/typos.toml +++ b/typos.toml @@ -1,9 +1,9 @@ [files] extend-exclude = [ - "*.pbxproj", # metadata file - "*.patch", # Automatically generated files that should not be manually modified. - "*.bin", # Binary files - ".git/", # Version control files + "*.pbxproj", # metadata file + "*.patch", # Automatically generated files that should not be manually modified. + "*.bin", # Binary files + ".git/", # Version control files ] ignore-hidden = false @@ -13,6 +13,7 @@ LOD = "LOD" # Level of detail reparametrization = "reparametrization" # Mathematical term in curve context (reparameterize) reparametrize = "reparametrize" reparametrized = "reparametrized" +implementors = "implementors" # https://github.com/crate-ci/typos/issues/1226 # Match a Whole Word - Case Sensitive [default.extend-identifiers] From 8a7c54ebff73d30420decdd751949a083a09579f Mon Sep 17 00:00:00 2001 From: Rob Parrett Date: Thu, 13 Feb 2025 08:54:42 -0700 Subject: [PATCH 2/3] More info --- typos.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/typos.toml b/typos.toml index 3dd8327606d0e..72b047525c05c 100644 --- a/typos.toml +++ b/typos.toml @@ -13,7 +13,7 @@ LOD = "LOD" # Level of detail reparametrization = "reparametrization" # Mathematical term in curve context (reparameterize) reparametrize = "reparametrize" reparametrized = "reparametrized" -implementors = "implementors" # https://github.com/crate-ci/typos/issues/1226 +implementors = "implementors" # Can probably remove after next typos release. https://github.com/crate-ci/typos/issues/1226 # Match a Whole Word - Case Sensitive [default.extend-identifiers] From 294fd45d750fbfbe4ded8cae931290362630ef75 Mon Sep 17 00:00:00 2001 From: Rob Parrett Date: Thu, 13 Feb 2025 09:01:01 -0700 Subject: [PATCH 3/3] Fix mess from previously excluding mikktspace --- typos.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/typos.toml b/typos.toml index 72b047525c05c..e03934b3d22ed 100644 --- a/typos.toml +++ b/typos.toml @@ -1,9 +1,9 @@ [files] extend-exclude = [ - "*.pbxproj", # metadata file - "*.patch", # Automatically generated files that should not be manually modified. - "*.bin", # Binary files - ".git/", # Version control files + "*.pbxproj", # metadata file + "*.patch", # Automatically generated files that should not be manually modified. + "*.bin", # Binary files + ".git/", # Version control files ] ignore-hidden = false