Skip to content

Commit 2760692

Browse files
authored
Update typos to 1.29.6 (#17850)
# Objective Update typos, fix new typos. 1.29.6 was just released to fix an [issue](crate-ci/typos#1228) where January's corrections were not included in the binaries for the last release. Reminder: typos can be tossed in the monthly [non-critical corrections issue](crate-ci/typos#1221). ## Solution I chose to allow `implementors`, because a good argument seems to be being made [here](crate-ci/typos#1226) and there is now a PR to address that. ## Discussion Should I exclude `bevy_mikktspace`? At one point I think we had an informal policy of "don't mess with mikktspace until #9050 is merged" but it doesn't seem like that is likely to be merged any time soon. I think these particular corrections in mikktspace are fine because - The same typo mistake seems to have been fixed in that PR - The entire file containing these corrections was deleted in that PR ## Typo of the Month correspindong -> corresponding
1 parent 610fe51 commit 2760692

File tree

9 files changed

+15
-14
lines changed

9 files changed

+15
-14
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ jobs:
244244
steps:
245245
- uses: actions/checkout@v4
246246
- name: Check for typos
247-
uses: crate-ci/[email protected].5
247+
uses: crate-ci/[email protected].6
248248
- name: Typos info
249249
if: failure()
250250
run: |

crates/bevy_ecs/src/entity/entity_set.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ unsafe impl<I: EntitySetIterator> EntitySetIterator for iter::StepBy<I> {}
310310
/// Conversion from an `EntitySetIterator`.
311311
///
312312
/// Some collections, while they can be constructed from plain iterators,
313-
/// benefit strongly from the additional uniqeness guarantee [`EntitySetIterator`] offers.
313+
/// benefit strongly from the additional uniqueness guarantee [`EntitySetIterator`] offers.
314314
/// Mirroring [`Iterator::collect`]/[`FromIterator::from_iter`], [`EntitySetIterator::collect_set`] and
315315
/// `FromEntitySetIterator::from_entity_set_iter` can be used for construction.
316316
///

crates/bevy_mikktspace/src/generated.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ pub struct SGroup {
136136
pub iNrFaces: i32,
137137
pub pFaceIndices: *mut i32,
138138
pub iVertexRepresentative: i32,
139-
pub bOrientPreservering: bool,
139+
pub bOrientPreserving: bool,
140140
}
141141

142142
impl SGroup {
@@ -145,7 +145,7 @@ impl SGroup {
145145
iNrFaces: 0,
146146
pFaceIndices: null_mut(),
147147
iVertexRepresentative: 0,
148-
bOrientPreservering: false,
148+
bOrientPreserving: false,
149149
}
150150
}
151151
}
@@ -576,11 +576,11 @@ unsafe fn GenerateTSpaces<I: Geometry>(
576576
if (*pTS_out).iCounter == 1i32 {
577577
*pTS_out = AvgTSpace(pTS_out, &mut pSubGroupTspace[l]);
578578
(*pTS_out).iCounter = 2i32;
579-
(*pTS_out).bOrient = (*pGroup).bOrientPreservering
579+
(*pTS_out).bOrient = (*pGroup).bOrientPreserving
580580
} else {
581581
*pTS_out = pSubGroupTspace[l];
582582
(*pTS_out).iCounter = 1i32;
583-
(*pTS_out).bOrient = (*pGroup).bOrientPreservering
583+
(*pTS_out).bOrient = (*pGroup).bOrientPreserving
584584
}
585585
i += 1
586586
}
@@ -838,7 +838,7 @@ unsafe fn Build4RuleGroups(
838838
*fresh2 = ptr::from_mut(&mut *pGroups.offset(iNrActiveGroups as isize));
839839
(*(*pTriInfos.offset(f as isize)).AssignedGroup[i as usize])
840840
.iVertexRepresentative = vert_index;
841-
(*(*pTriInfos.offset(f as isize)).AssignedGroup[i as usize]).bOrientPreservering =
841+
(*(*pTriInfos.offset(f as isize)).AssignedGroup[i as usize]).bOrientPreserving =
842842
(*pTriInfos.offset(f as isize)).iFlag & 8i32 != 0i32;
843843
(*(*pTriInfos.offset(f as isize)).AssignedGroup[i as usize]).iNrFaces = 0i32;
844844
let ref mut fresh3 =
@@ -927,7 +927,7 @@ unsafe fn AssignRecur(
927927
&& (*pMyTriInfo).AssignedGroup[2usize].is_null()
928928
{
929929
(*pMyTriInfo).iFlag &= !8i32;
930-
(*pMyTriInfo).iFlag |= if (*pGroup).bOrientPreservering {
930+
(*pMyTriInfo).iFlag |= if (*pGroup).bOrientPreserving {
931931
8i32
932932
} else {
933933
0i32
@@ -939,7 +939,7 @@ unsafe fn AssignRecur(
939939
} else {
940940
false
941941
};
942-
if bOrient != (*pGroup).bOrientPreservering {
942+
if bOrient != (*pGroup).bOrientPreserving {
943943
return false;
944944
}
945945
AddTriToGroup(pGroup, iMyTriIndex);

crates/bevy_pbr/src/render/pbr_functions.wgsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ fn bend_normal_for_anisotropy(lighting_input: ptr<function, lighting::LightingIn
241241
(*lighting_input).layers[LAYER_BASE].R = R;
242242
}
243243

244-
#endif // STANDARD_MATERIAL_ANISTROPY
244+
#endif // STANDARD_MATERIAL_ANISOTROPY
245245

246246
// NOTE: Correctly calculates the view vector depending on whether
247247
// the projection is orthographic or perspective.

crates/bevy_pbr/src/ssr/raymarch.wgsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ struct DepthRayMarchResult {
286286
/// Range: `0..=1` as a lerp factor over `ray_start_cs..=ray_end_cs`.
287287
hit_t: f32,
288288

289-
/// UV correspindong to `hit_t`.
289+
/// UV corresponding to `hit_t`.
290290
hit_uv: vec2<f32>,
291291

292292
/// The distance that the hit point penetrates into the hit surface.

crates/bevy_picking/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//! allows you to express more complex interactions, like detecting when a touch input drags a UI
88
//! element and drops it on a 3d mesh rendered to a different camera.
99
//!
10-
//! Pointer events bubble up the entity hieararchy and can be used with observers, allowing you to
10+
//! Pointer events bubble up the entity hierarchy and can be used with observers, allowing you to
1111
//! succinctly express rich interaction behaviors by attaching pointer callbacks to entities:
1212
//!
1313
//! ```rust

crates/bevy_reflect/src/func/args/count.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ mod tests {
264264
}
265265

266266
#[test]
267-
fn should_allow_removeting_nonexistent_count() {
267+
fn should_allow_removing_nonexistent_count() {
268268
let mut count = ArgCount::default();
269269

270270
assert_eq!(count.len(), 0);

crates/bevy_reflect/src/func/dynamic_function_internal.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ mod tests {
246246
}
247247

248248
#[test]
249-
fn should_merge_overloaed_into_single() {
249+
fn should_merge_overload_into_single() {
250250
let mut func_a = DynamicFunctionInternal {
251251
functions: vec!['a', 'b'],
252252
info: FunctionInfo::new(SignatureInfo::anonymous().with_arg::<i8>("arg0"))

typos.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ LOD = "LOD" # Level of detail
1313
reparametrization = "reparametrization" # Mathematical term in curve context (reparameterize)
1414
reparametrize = "reparametrize"
1515
reparametrized = "reparametrized"
16+
implementors = "implementors" # Can probably remove after next typos release. https://github.com/crate-ci/typos/issues/1226
1617

1718
# Match a Whole Word - Case Sensitive
1819
[default.extend-identifiers]

0 commit comments

Comments
 (0)