Skip to content

Commit 51ee208

Browse files
committed
[fix] warnings inside of lambda-rs.
1 parent 9e98be4 commit 51ee208

4 files changed

Lines changed: 36 additions & 39 deletions

File tree

crates/lambda-rs/examples/reflective_room.rs

Lines changed: 14 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -214,22 +214,20 @@ impl Component<ComponentResult, String> for ReflectiveRoomExample {
214214
}
215215

216216
fn on_window_event(&mut self, event: &WindowEvent) -> Result<(), String> {
217-
match event {
218-
WindowEvent::Resize { width, height } => {
219-
self.width = *width;
220-
self.height = *height;
221-
}
222-
_ => {}
217+
if let WindowEvent::Resize { width, height } = event {
218+
self.width = *width;
219+
self.height = *height;
223220
}
224221
return Ok(());
225222
}
226223

227224
fn on_keyboard_event(&mut self, event: &Key) -> Result<(), String> {
228-
match event {
229-
Key::Pressed {
230-
scan_code: _,
231-
virtual_key,
232-
} => match virtual_key {
225+
if let Key::Pressed {
226+
scan_code: _,
227+
virtual_key,
228+
} = event
229+
{
230+
match virtual_key {
233231
Some(VirtualKey::KeyM) => {
234232
self.msaa_samples = if self.msaa_samples > 1 { 1 } else { 4 };
235233
self.needs_rebuild = true;
@@ -272,8 +270,7 @@ impl Component<ComponentResult, String> for ReflectiveRoomExample {
272270
);
273271
}
274272
_ => {}
275-
},
276-
_ => {}
273+
}
277274
}
278275
return Ok(());
279276
}
@@ -625,9 +622,7 @@ impl ReflectiveRoomExample {
625622
.with_immediate_data(immediate_data_size)
626623
.with_buffer(
627624
BufferBuilder::new()
628-
.with_length(
629-
floor_mesh.vertices().len() * std::mem::size_of::<Vertex>(),
630-
)
625+
.with_length(std::mem::size_of_val(floor_mesh.vertices()))
631626
.with_usage(Usage::VERTEX)
632627
.with_properties(Properties::DEVICE_LOCAL)
633628
.with_buffer_type(BufferType::Vertex)
@@ -677,9 +672,7 @@ impl ReflectiveRoomExample {
677672
.with_immediate_data(immediate_data_size)
678673
.with_buffer(
679674
BufferBuilder::new()
680-
.with_length(
681-
cube_mesh.vertices().len() * std::mem::size_of::<Vertex>(),
682-
)
675+
.with_length(std::mem::size_of_val(cube_mesh.vertices()))
683676
.with_usage(Usage::VERTEX)
684677
.with_properties(Properties::DEVICE_LOCAL)
685678
.with_buffer_type(BufferType::Vertex)
@@ -730,9 +723,7 @@ impl ReflectiveRoomExample {
730723
.with_immediate_data(immediate_data_size)
731724
.with_buffer(
732725
BufferBuilder::new()
733-
.with_length(
734-
floor_mesh.vertices().len() * std::mem::size_of::<Vertex>(),
735-
)
726+
.with_length(std::mem::size_of_val(floor_mesh.vertices()))
736727
.with_usage(Usage::VERTEX)
737728
.with_properties(Properties::DEVICE_LOCAL)
738729
.with_buffer_type(BufferType::Vertex)
@@ -768,9 +759,7 @@ impl ReflectiveRoomExample {
768759
.with_immediate_data(immediate_data_size)
769760
.with_buffer(
770761
BufferBuilder::new()
771-
.with_length(
772-
cube_mesh.vertices().len() * std::mem::size_of::<Vertex>(),
773-
)
762+
.with_length(std::mem::size_of_val(cube_mesh.vertices()))
774763
.with_usage(Usage::VERTEX)
775764
.with_properties(Properties::DEVICE_LOCAL)
776765
.with_buffer_type(BufferType::Vertex)

crates/lambda-rs/src/render/mod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1057,8 +1057,7 @@ mod tests {
10571057
fn immediates_validate_pipeline_exists_rejects_unknown_pipeline() {
10581058
let pipelines: Vec<RenderPipeline> = vec![];
10591059
let err = RenderContext::validate_pipeline_exists(&pipelines, 7)
1060-
.err()
1061-
.expect("must error");
1060+
.expect_err("must error");
10621061
assert!(err.to_string().contains("Unknown pipeline 7"));
10631062
}
10641063
}

crates/lambda-rs/src/render/validation.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,10 @@ mod tests {
144144

145145
#[test]
146146
fn validate_instance_range_rejects_negative_length() {
147-
let err = validate_instance_range("Draw", &(5..1))
148-
.err()
149-
.expect("must error");
147+
let start = 5_u32;
148+
let end = 1_u32;
149+
let err =
150+
validate_instance_range("Draw", &(start..end)).expect_err("must error");
150151
assert!(err.contains("Draw instance range start 5 is greater than end 1"));
151152
}
152153

crates/lambda-rs/src/runtimes/application.rs

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -553,8 +553,10 @@ mod tests {
553553

554554
#[test]
555555
fn dispatch_skips_component_when_mask_is_none() {
556-
let mut component = RecordingComponent::default();
557-
component.mask = EventMask::NONE;
556+
let mut component = RecordingComponent {
557+
mask: EventMask::NONE,
558+
..Default::default()
559+
};
558560

559561
let event = Events::Window {
560562
event: WindowEvent::Close,
@@ -569,8 +571,10 @@ mod tests {
569571

570572
#[test]
571573
fn dispatch_skips_component_when_mask_does_not_contain_event() {
572-
let mut component = RecordingComponent::default();
573-
component.mask = EventMask::KEYBOARD;
574+
let mut component = RecordingComponent {
575+
mask: EventMask::KEYBOARD,
576+
..Default::default()
577+
};
574578

575579
let event = Events::Window {
576580
event: WindowEvent::Close,
@@ -586,8 +590,10 @@ mod tests {
586590

587591
#[test]
588592
fn dispatch_calls_exact_handler_when_mask_contains_event() {
589-
let mut component = RecordingComponent::default();
590-
component.mask = EventMask::WINDOW | EventMask::KEYBOARD;
593+
let mut component = RecordingComponent {
594+
mask: EventMask::WINDOW | EventMask::KEYBOARD,
595+
..Default::default()
596+
};
591597

592598
let window_event = Events::Window {
593599
event: WindowEvent::Resize {
@@ -630,9 +636,11 @@ mod tests {
630636

631637
#[test]
632638
fn dispatch_returns_fatal_error_message_on_handler_failure() {
633-
let mut component = RecordingComponent::default();
634-
component.mask = EventMask::WINDOW;
635-
component.fail_window = true;
639+
let mut component = RecordingComponent {
640+
mask: EventMask::WINDOW,
641+
fail_window: true,
642+
..Default::default()
643+
};
636644

637645
let event = Events::Window {
638646
event: WindowEvent::Close,

0 commit comments

Comments
 (0)