diff --git a/crates/bevy_input/src/keyboard.rs b/crates/bevy_input/src/keyboard.rs index c5b2f202a38df..32f6bc4fcdd47 100644 --- a/crates/bevy_input/src/keyboard.rs +++ b/crates/bevy_input/src/keyboard.rs @@ -171,7 +171,7 @@ pub enum KeyCode { NumpadAdd, Apostrophe, Apps, - Asterix, + Asterisk, Plus, At, Ax, diff --git a/crates/bevy_property/src/type_registry.rs b/crates/bevy_property/src/type_registry.rs index 224dc96e35360..19d958b533689 100644 --- a/crates/bevy_property/src/type_registry.rs +++ b/crates/bevy_property/src/type_registry.rs @@ -6,7 +6,7 @@ use std::{any::TypeId, fmt}; pub struct PropertyTypeRegistry { registrations: HashMap, short_names: HashMap, - ambigous_names: HashSet, + ambiguous_names: HashSet, } impl PropertyTypeRegistry { @@ -20,10 +20,11 @@ impl PropertyTypeRegistry { fn add_registration(&mut self, registration: PropertyTypeRegistration) { let short_name = registration.short_name.to_string(); - if self.short_names.contains_key(&short_name) || self.ambigous_names.contains(&short_name) { + if self.short_names.contains_key(&short_name) || self.ambiguous_names.contains(&short_name) + { // name is ambiguous. fall back to long names for all ambiguous types self.short_names.remove(&short_name); - self.ambigous_names.insert(short_name); + self.ambiguous_names.insert(short_name); } else { self.short_names .insert(short_name, registration.name.to_string()); diff --git a/crates/bevy_type_registry/src/type_registry.rs b/crates/bevy_type_registry/src/type_registry.rs index 494612dd575bd..0a22562755fc5 100644 --- a/crates/bevy_type_registry/src/type_registry.rs +++ b/crates/bevy_type_registry/src/type_registry.rs @@ -20,7 +20,7 @@ pub struct ComponentRegistry { pub registrations: HashMap, pub short_names: HashMap, pub full_names: HashMap, - pub ambigous_names: HashSet, + pub ambiguous_names: HashSet, } impl ComponentRegistry { @@ -35,10 +35,11 @@ impl ComponentRegistry { let short_name = registration.short_name.to_string(); self.full_names .insert(registration.long_name.to_string(), registration.ty); - if self.short_names.contains_key(&short_name) || self.ambigous_names.contains(&short_name) { + if self.short_names.contains_key(&short_name) || self.ambiguous_names.contains(&short_name) + { // name is ambiguous. fall back to long names for all ambiguous types self.short_names.remove(&short_name); - self.ambigous_names.insert(short_name); + self.ambiguous_names.insert(short_name); } else { self.short_names.insert(short_name, registration.ty); } @@ -65,7 +66,7 @@ impl ComponentRegistry { let mut registration = self.get_with_short_name(type_name); if registration.is_none() { registration = self.get_with_full_name(type_name); - if registration.is_none() && self.ambigous_names.contains(type_name) { + if registration.is_none() && self.ambiguous_names.contains(type_name) { panic!("Type name is ambiguous: {}", type_name); } } diff --git a/crates/bevy_wgpu/src/wgpu_renderer.rs b/crates/bevy_wgpu/src/wgpu_renderer.rs index 964cf2028f933..7b39c2f5e6559 100644 --- a/crates/bevy_wgpu/src/wgpu_renderer.rs +++ b/crates/bevy_wgpu/src/wgpu_renderer.rs @@ -17,7 +17,7 @@ pub struct WgpuRenderer { pub queue: wgpu::Queue, pub window_resized_event_reader: EventReader, pub window_created_event_reader: EventReader, - pub intialized: bool, + pub initialized: bool, } impl WgpuRenderer { @@ -59,7 +59,7 @@ impl WgpuRenderer { queue, window_resized_event_reader: Default::default(), window_created_event_reader: Default::default(), - intialized: false, + initialized: false, } } diff --git a/crates/bevy_winit/src/converters.rs b/crates/bevy_winit/src/converters.rs index f8f49a653e0de..060096de401c1 100644 --- a/crates/bevy_winit/src/converters.rs +++ b/crates/bevy_winit/src/converters.rs @@ -152,7 +152,7 @@ pub fn convert_virtual_key_code(virtual_key_code: winit::event::VirtualKeyCode) winit::event::VirtualKeyCode::NumpadAdd => KeyCode::NumpadAdd, winit::event::VirtualKeyCode::Apostrophe => KeyCode::Apostrophe, winit::event::VirtualKeyCode::Apps => KeyCode::Apps, - winit::event::VirtualKeyCode::Asterisk => KeyCode::Asterix, + winit::event::VirtualKeyCode::Asterisk => KeyCode::Asterisk, winit::event::VirtualKeyCode::Plus => KeyCode::Plus, winit::event::VirtualKeyCode::At => KeyCode::At, winit::event::VirtualKeyCode::Ax => KeyCode::Ax,