Skip to content

Commit 6f5d40a

Browse files
author
Matthew Russo
committed
fix clippy errors
1 parent 3acc7ac commit 6f5d40a

21 files changed

+77
-92
lines changed

‎src/bin/00_base_code.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,8 @@ impl HelloTriangleApplication {
3333
loop {
3434
let mut done = false;
3535
self.events_loop.poll_events(|ev| {
36-
match ev {
37-
Event::WindowEvent { event: WindowEvent::CloseRequested, .. } => done = true,
38-
_ => ()
36+
if let Event::WindowEvent { event: WindowEvent::CloseRequested, .. } = ev {
37+
done = true
3938
}
4039
});
4140
if done {

‎src/bin/01_instance_creation.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,8 @@ impl HelloTriangleApplication {
6464
loop {
6565
let mut done = false;
6666
self.events_loop.poll_events(|ev| {
67-
match ev {
68-
Event::WindowEvent { event: WindowEvent::CloseRequested, .. } => done = true,
69-
_ => ()
67+
if let Event::WindowEvent { event: WindowEvent::CloseRequested, .. } = ev {
68+
done = true
7069
}
7170
});
7271
if done {

‎src/bin/02_validation_layers.rs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ impl HelloTriangleApplication {
7878
let required_extensions = Self::get_required_extensions();
7979

8080
if ENABLE_VALIDATION_LAYERS && Self::check_validation_layer_support() {
81-
Instance::new(Some(&app_info), &required_extensions, VALIDATION_LAYERS.iter().map(|s| *s))
81+
Instance::new(Some(&app_info), &required_extensions, VALIDATION_LAYERS.iter().cloned())
8282
.expect("failed to create Vulkan instance")
8383
} else {
8484
Instance::new(Some(&app_info), &required_extensions, None)
@@ -124,9 +124,8 @@ impl HelloTriangleApplication {
124124
loop {
125125
let mut done = false;
126126
self.events_loop.poll_events(|ev| {
127-
match ev {
128-
Event::WindowEvent { event: WindowEvent::CloseRequested, .. } => done = true,
129-
_ => ()
127+
if let Event::WindowEvent { event: WindowEvent::CloseRequested, .. } = ev {
128+
done = true
130129
}
131130
});
132131
if done {

‎src/bin/03_physical_device_selection.rs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ impl HelloTriangleApplication {
9898
let required_extensions = Self::get_required_extensions();
9999

100100
if ENABLE_VALIDATION_LAYERS && Self::check_validation_layer_support() {
101-
Instance::new(Some(&app_info), &required_extensions, VALIDATION_LAYERS.iter().map(|s| *s))
101+
Instance::new(Some(&app_info), &required_extensions, VALIDATION_LAYERS.iter().cloned())
102102
.expect("failed to create Vulkan instance")
103103
} else {
104104
Instance::new(Some(&app_info), &required_extensions, None)
@@ -171,9 +171,8 @@ impl HelloTriangleApplication {
171171
loop {
172172
let mut done = false;
173173
self.events_loop.poll_events(|ev| {
174-
match ev {
175-
Event::WindowEvent { event: WindowEvent::CloseRequested, .. } => done = true,
176-
_ => ()
174+
if let Event::WindowEvent { event: WindowEvent::CloseRequested, .. } = ev {
175+
done = true
177176
}
178177
});
179178
if done {

‎src/bin/04_logical_device.rs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ impl HelloTriangleApplication {
107107
let required_extensions = Self::get_required_extensions();
108108

109109
if ENABLE_VALIDATION_LAYERS && Self::check_validation_layer_support() {
110-
Instance::new(Some(&app_info), &required_extensions, VALIDATION_LAYERS.iter().map(|s| *s))
110+
Instance::new(Some(&app_info), &required_extensions, VALIDATION_LAYERS.iter().cloned())
111111
.expect("failed to create Vulkan instance")
112112
} else {
113113
Instance::new(Some(&app_info), &required_extensions, None)
@@ -205,9 +205,8 @@ impl HelloTriangleApplication {
205205
loop {
206206
let mut done = false;
207207
self.events_loop.poll_events(|ev| {
208-
match ev {
209-
Event::WindowEvent { event: WindowEvent::CloseRequested, .. } => done = true,
210-
_ => ()
208+
if let Event::WindowEvent { event: WindowEvent::CloseRequested, .. } = ev {
209+
done = true
211210
}
212211
});
213212
if done {

‎src/bin/05_window_surface.rs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ impl HelloTriangleApplication {
107107
let required_extensions = Self::get_required_extensions();
108108

109109
if ENABLE_VALIDATION_LAYERS && Self::check_validation_layer_support() {
110-
Instance::new(Some(&app_info), &required_extensions, VALIDATION_LAYERS.iter().map(|s| *s))
110+
Instance::new(Some(&app_info), &required_extensions, VALIDATION_LAYERS.iter().cloned())
111111
.expect("failed to create Vulkan instance")
112112
} else {
113113
Instance::new(Some(&app_info), &required_extensions, None)
@@ -225,9 +225,8 @@ impl HelloTriangleApplication {
225225
loop {
226226
let mut done = false;
227227
self.events_loop.poll_events(|ev| {
228-
match ev {
229-
Event::WindowEvent { event: WindowEvent::CloseRequested, .. } => done = true,
230-
_ => ()
228+
if let Event::WindowEvent { event: WindowEvent::CloseRequested, .. } = ev {
229+
done = true
231230
}
232231
});
233232
if done {

‎src/bin/06_swap_chain_creation.rs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ impl HelloTriangleApplication {
133133
let required_extensions = Self::get_required_extensions();
134134

135135
if ENABLE_VALIDATION_LAYERS && Self::check_validation_layer_support() {
136-
Instance::new(Some(&app_info), &required_extensions, VALIDATION_LAYERS.iter().map(|s| *s))
136+
Instance::new(Some(&app_info), &required_extensions, VALIDATION_LAYERS.iter().cloned())
137137
.expect("failed to create Vulkan instance")
138138
} else {
139139
Instance::new(Some(&app_info), &required_extensions, None)
@@ -354,9 +354,8 @@ impl HelloTriangleApplication {
354354
loop {
355355
let mut done = false;
356356
self.events_loop.poll_events(|ev| {
357-
match ev {
358-
Event::WindowEvent { event: WindowEvent::CloseRequested, .. } => done = true,
359-
_ => ()
357+
if let Event::WindowEvent { event: WindowEvent::CloseRequested, .. } = ev {
358+
done = true
360359
}
361360
});
362361
if done {

‎src/bin/08_graphics_pipeline.rs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ impl HelloTriangleApplication {
135135
let required_extensions = Self::get_required_extensions();
136136

137137
if ENABLE_VALIDATION_LAYERS && Self::check_validation_layer_support() {
138-
Instance::new(Some(&app_info), &required_extensions, VALIDATION_LAYERS.iter().map(|s| *s))
138+
Instance::new(Some(&app_info), &required_extensions, VALIDATION_LAYERS.iter().cloned())
139139
.expect("failed to create Vulkan instance")
140140
} else {
141141
Instance::new(Some(&app_info), &required_extensions, None)
@@ -360,9 +360,8 @@ impl HelloTriangleApplication {
360360
loop {
361361
let mut done = false;
362362
self.events_loop.poll_events(|ev| {
363-
match ev {
364-
Event::WindowEvent { event: WindowEvent::CloseRequested, .. } => done = true,
365-
_ => ()
363+
if let Event::WindowEvent { event: WindowEvent::CloseRequested, .. } = ev {
364+
done = true
366365
}
367366
});
368367
if done {

‎src/bin/09_shader_modules.rs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ impl HelloTriangleApplication {
135135
let required_extensions = Self::get_required_extensions();
136136

137137
if ENABLE_VALIDATION_LAYERS && Self::check_validation_layer_support() {
138-
Instance::new(Some(&app_info), &required_extensions, VALIDATION_LAYERS.iter().map(|s| *s))
138+
Instance::new(Some(&app_info), &required_extensions, VALIDATION_LAYERS.iter().cloned())
139139
.expect("failed to create Vulkan instance")
140140
} else {
141141
Instance::new(Some(&app_info), &required_extensions, None)
@@ -379,9 +379,8 @@ impl HelloTriangleApplication {
379379
loop {
380380
let mut done = false;
381381
self.events_loop.poll_events(|ev| {
382-
match ev {
383-
Event::WindowEvent { event: WindowEvent::CloseRequested, .. } => done = true,
384-
_ => ()
382+
if let Event::WindowEvent { event: WindowEvent::CloseRequested, .. } = ev {
383+
done = true
385384
}
386385
});
387386
if done {

‎src/bin/10_fixed_functions.rs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ impl HelloTriangleApplication {
140140
let required_extensions = Self::get_required_extensions();
141141

142142
if ENABLE_VALIDATION_LAYERS && Self::check_validation_layer_support() {
143-
Instance::new(Some(&app_info), &required_extensions, VALIDATION_LAYERS.iter().map(|s| *s))
143+
Instance::new(Some(&app_info), &required_extensions, VALIDATION_LAYERS.iter().cloned())
144144
.expect("failed to create Vulkan instance")
145145
} else {
146146
Instance::new(Some(&app_info), &required_extensions, None)
@@ -409,9 +409,8 @@ impl HelloTriangleApplication {
409409
loop {
410410
let mut done = false;
411411
self.events_loop.poll_events(|ev| {
412-
match ev {
413-
Event::WindowEvent { event: WindowEvent::CloseRequested, .. } => done = true,
414-
_ => ()
412+
if let Event::WindowEvent { event: WindowEvent::CloseRequested, .. } = ev {
413+
done = true
415414
}
416415
});
417416
if done {

0 commit comments

Comments
 (0)