Skip to content

Commit 9e9310d

Browse files
Indy2222Indy2222
authored
Re-format let-else statements (#564)
Rustfmt version 1.6.0 released on 2023-07-02 added support for let-else statement (PR rust-lang/rustfmt#5690). Make the code compliant.
1 parent 7745fb8 commit 9e9310d

File tree

24 files changed

+102
-45
lines changed

24 files changed

+102
-45
lines changed

‎crates/camera/src/distance.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ fn init<T: Component>(
4848
camera: Query<&Transform, With<Camera3d>>,
4949
objects: Query<(Entity, &Transform), Added<T>>,
5050
) {
51-
let Ok(cam_transform) = camera.get_single() else { return };
51+
let Ok(cam_transform) = camera.get_single() else {
52+
return;
53+
};
5254

5355
for (entity, transform) in objects.iter() {
5456
commands.entity(entity).insert(CameraDistance(
@@ -61,7 +63,9 @@ fn update(
6163
camera: Query<&Transform, With<Camera3d>>,
6264
mut objects: Query<(&Transform, &mut CameraDistance)>,
6365
) {
64-
let Ok(cam_transform) = camera.get_single() else { return };
66+
let Ok(cam_transform) = camera.get_single() else {
67+
return;
68+
};
6569

6670
for (transform, mut camera_distance) in objects.iter_mut() {
6771
let distance = cam_transform.translation.distance(transform.translation);

‎crates/conf/macros/src/lib.rs

+5-6
Original file line numberDiff line numberDiff line change
@@ -262,12 +262,11 @@ fn check_attr(
262262

263263
let arg = &closure.inputs[0];
264264
let Pat::Type(arg) = arg else {
265-
return Err(syn::Error::new_spanned(
266-
attr,
267-
"expected a closure with one argument",
268-
)
269-
.to_compile_error()
270-
.into());
265+
return Err(
266+
syn::Error::new_spanned(attr, "expected a closure with one argument")
267+
.to_compile_error()
268+
.into(),
269+
);
271270
};
272271

273272
let arg_type = quote! { &#field_type };

‎crates/connector/tests/integration.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,8 @@ async fn create_game() -> (Network, u16) {
257257

258258
let port = {
259259
let Incomming::Data { reliable, id, data } = &(received.0)[0] else {
260-
panic!("Unexpected data received: {:?}", received);
261-
};
260+
panic!("Unexpected data received: {:?}", received);
261+
};
262262

263263
assert!(reliable);
264264

‎crates/construction/src/manufacturing.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,9 @@ fn enqueue(
355355
mut lines: Query<&mut AssemblyLine>,
356356
) {
357357
for event in events.iter() {
358-
let Ok(mut line) = lines.get_mut(event.factory()) else { continue };
358+
let Ok(mut line) = lines.get_mut(event.factory()) else {
359+
continue;
360+
};
359361
info!(
360362
"Enqueueing manufacturing of {} in {:?}.",
361363
event.unit(),
@@ -410,7 +412,9 @@ fn produce(
410412
loop {
411413
assembly.blocks_mut().map_capacity = *player_count >= PLAYER_MAX_UNITS;
412414

413-
let Some(unit_type) = assembly.produce(time.elapsed()) else { break };
415+
let Some(unit_type) = assembly.produce(time.elapsed()) else {
416+
break;
417+
};
414418
*player_count += 1;
415419

416420
deliver_events.send(DeliverEvent::new(factory, unit_type));

‎crates/controller/src/commands/handlers.rs

+10-3
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,9 @@ fn right_click_handler(
204204
}) {
205205
Some(enemy) => attack_events.send(GroupAttackEvent::new(enemy)),
206206
None => {
207-
let Some(target) = pointer.terrain_point().map(|p| p.to_flat()) else { return };
207+
let Some(target) = pointer.terrain_point().map(|p| p.to_flat()) else {
208+
return;
209+
};
208210
send_events.send(SendSelectedEvent::new(target));
209211
location_events.send(DeliveryLocationSelectedEvent::new(target));
210212
}
@@ -227,7 +229,10 @@ fn double_click_handler(
227229
SelectionMode::Replace
228230
};
229231

230-
let Some(targeted_entity_type) = pointer.entity().and_then(|entity| playable.get(entity).ok()) else {
232+
let Some(targeted_entity_type) = pointer
233+
.entity()
234+
.and_then(|entity| playable.get(entity).ok())
235+
else {
231236
return;
232237
};
233238

@@ -244,7 +249,9 @@ fn move_camera_arrows_system(
244249
mut move_events: EventWriter<MoveCameraHorizontallyEvent>,
245250
) {
246251
for key_event in key_events.iter() {
247-
let Some(key_code) = key_event.key_code else { continue };
252+
let Some(key_code) = key_event.key_code else {
253+
continue;
254+
};
248255

249256
let mut direction = Vec2::ZERO;
250257
if key_code == KeyCode::Left {

‎crates/controller/src/hud/actionbar.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ fn update(
105105
) {
106106
commands.entity(bar_node.0).despawn_descendants();
107107

108-
let Some(active) = active.0 else {return };
108+
let Some(active) = active.0 else { return };
109109
let object_type = *objects.get(active).unwrap();
110110

111111
if let Some(factory) = solids.get(object_type).factory() {

‎crates/controller/src/hud/minimap/fill.rs

+9-3
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,9 @@ struct CameraPoint<'w, 's> {
110110
impl<'w, 's> CameraPoint<'w, 's> {
111111
fn point(&self, ndc: Vec2) -> Option<Vec2> {
112112
let ray = self.ray.ray(ndc);
113-
let Some(intersection) = self.terrain.cast_ray_msl(&ray, f32::INFINITY) else { return None };
113+
let Some(intersection) = self.terrain.cast_ray_msl(&ray, f32::INFINITY) else {
114+
return None;
115+
};
114116
let point = ray.origin + ray.dir * intersection.toi;
115117
Some(self.ui_coords.flat_to_rel(point.to_flat()))
116118
}
@@ -153,12 +155,16 @@ fn endpoints_to_line(start: Option<Vec2>, end: Option<Vec2>) -> Option<(Vec2, Ve
153155
let aabb = Aabb::new(Point::new(0., 0.), Point::new(1., 1.));
154156
if !aabb.contains_local_point(&start) {
155157
let ray = Ray::new(start, end - start);
156-
let Some(toi) = aabb.cast_local_ray(&ray, 1., false) else { return None };
158+
let Some(toi) = aabb.cast_local_ray(&ray, 1., false) else {
159+
return None;
160+
};
157161
start = ray.origin + toi * ray.dir;
158162
}
159163
if !aabb.contains_local_point(&end) {
160164
let ray = Ray::new(end, start - end);
161-
let Some(toi) = aabb.cast_local_ray(&ray, 1., false) else { return None};
165+
let Some(toi) = aabb.cast_local_ray(&ray, 1., false) else {
166+
return None;
167+
};
162168
end = ray.origin + toi * ray.dir;
163169
}
164170

‎crates/controller/src/hud/minimap/interaction.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,9 @@ fn click_handler(
8888
bounds: Res<MapBounds>,
8989
mut click_events: EventWriter<MinimapClickEvent>,
9090
) {
91-
let Some(cursor) = window_query.single().cursor_position() else { return };
91+
let Some(cursor) = window_query.single().cursor_position() else {
92+
return;
93+
};
9294
for event in input_events.iter() {
9395
if event.state != ButtonState::Released {
9496
continue;

‎crates/core/src/fs.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ where
1818
F: Fn() -> Option<SyncPathBuf>,
1919
{
2020
let Some(base_dir) = base_dir() else {
21-
return Err(
22-
DirError("Base directory cannot be established.")
23-
);
21+
return Err(DirError("Base directory cannot be established."));
2422
};
2523

2624
Ok(AsyncPathBuf::from(base_dir).join("DigitalExtinction"))

‎crates/gui/src/button.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ impl<'w, 's> ButtonOps<'w, 's> {
6464
/// [`Text`] component. The text must consist of a single section. If such
6565
/// a child is found, its text is changed.
6666
pub fn set_text(&mut self, entity: Entity, text: String) -> Result<(), &'static str> {
67-
let Ok(children) = self.button_query.get(entity) else { return Err("Button does not exist.") };
67+
let Ok(children) = self.button_query.get(entity) else {
68+
return Err("Button does not exist.");
69+
};
6870
for &child in children.iter() {
6971
if let Ok(mut text_component) = self.text_query.get_mut(child) {
7072
if text_component.sections.len() == 1 {

‎crates/gui/src/textbox.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,9 @@ fn input_system(
140140
mut characters: EventReader<ReceivedCharacter>,
141141
mut keyboard: EventReader<KeyboardInput>,
142142
) {
143-
let Some((mut text_box, children)) = focused.get_current_mut() else { return };
143+
let Some((mut text_box, children)) = focused.get_current_mut() else {
144+
return;
145+
};
144146

145147
let text_id = children
146148
.iter()

‎crates/lobby/src/auth/passwd.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ impl DbPassword {
5353
/// Securely check that a given password corresponds to the password
5454
/// represented by `self`.
5555
pub(super) fn check(&self, password: &str) -> bool {
56-
let Ok(hashed) = Self::hash(password, &self.1) else { return false };
56+
let Ok(hashed) = Self::hash(password, &self.1) else {
57+
return false;
58+
};
5759
self.0.ct_eq(&hashed).into()
5860
}
5961
}

‎crates/lobby_client/src/client.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ impl<'w> AuthenticatedClient<'w> {
2525
&self,
2626
requestable: &T,
2727
) -> Result<Task<Result<T::Response>>> {
28-
let Some(client) = self.client.as_ref() else { bail!("Client not yet set up.") };
28+
let Some(client) = self.client.as_ref() else {
29+
bail!("Client not yet set up.")
30+
};
2931
let request = client.create(self.auth.token(), requestable)?;
3032
Ok(client.fire::<T>(request))
3133
}

‎crates/lobby_client/src/systems.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ fn setup_client(
3131
if client.is_some() {
3232
return true.into();
3333
}
34-
let Some(conf) = conf else { return false.into() };
34+
let Some(conf) = conf else {
35+
return false.into();
36+
};
3537

3638
let client = LobbyClient::build(conf.multiplayer().server().clone());
3739
commands.insert_resource(client);
@@ -42,7 +44,9 @@ fn set_token<T>(mut events: EventReader<ResponseEvent<T>>, mut auth: ResMut<Auth
4244
where
4345
T: LobbyRequest<Response = Token>,
4446
{
45-
let Some(event) = events.iter().last() else { return };
47+
let Some(event) = events.iter().last() else {
48+
return;
49+
};
4650
let Ok(token) = event.result() else { return };
4751
auth.set_token(token.token().to_owned());
4852
}

‎crates/map/src/hash.rs

+8-2
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,14 @@ impl TryFrom<&Path> for MapHash {
7474
type Error = PathError;
7575

7676
fn try_from(path: &Path) -> Result<Self, Self::Error> {
77-
let Some(file_name) = path.file_name() else { return Err(PathError::FileNameError("No file name in the path.")) };
78-
let Some(file_name) = file_name.to_str() else { return Err(PathError::FileNameError("File name is not a valid UTF-8 string.")) };
77+
let Some(file_name) = path.file_name() else {
78+
return Err(PathError::FileNameError("No file name in the path."));
79+
};
80+
let Some(file_name) = file_name.to_str() else {
81+
return Err(PathError::FileNameError(
82+
"File name is not a valid UTF-8 string.",
83+
));
84+
};
7985

8086
if file_name.ends_with(MAP_FILE_SUFFIX) {
8187
Self::from_hex(&file_name[0..file_name.len() - MAP_FILE_SUFFIX.len()])

‎crates/map/src/io.rs

+6-4
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,9 @@ pub async fn load_metadata<P: AsRef<Path>>(path: P) -> LoadingResult<MapMetadata
5151
let mut entry = loading_io_error!(entry);
5252
let path = loading_io_error!(entry.path());
5353
let Some(path) = path.to_str() else {
54-
return Err(MapLoadingError::ArchiveContent(
55-
String::from("The map archive contains an entry with non-UTF-8 path.")));
54+
return Err(MapLoadingError::ArchiveContent(String::from(
55+
"The map archive contains an entry with non-UTF-8 path.",
56+
)));
5657
};
5758

5859
if path == METADATA_JSON_ENTRY {
@@ -78,8 +79,9 @@ pub async fn load_map<P: AsRef<Path>>(path: P) -> LoadingResult<Map> {
7879
let mut entry = loading_io_error!(entry);
7980
let path = loading_io_error!(entry.path());
8081
let Some(path) = path.to_str() else {
81-
return Err(MapLoadingError::ArchiveContent(
82-
String::from("The map archive contains an entry with non-UTF-8 path.")));
82+
return Err(MapLoadingError::ArchiveContent(String::from(
83+
"The map archive contains an entry with non-UTF-8 path.",
84+
)));
8385
};
8486

8587
if path == METADATA_JSON_ENTRY {

‎crates/menu/src/create.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,9 @@ fn map_selected_system(
214214
mut buttons: ButtonOps,
215215
mut toasts: EventWriter<ToastEvent>,
216216
) {
217-
let Some(event) = map_selected_events.iter().last() else { return };
217+
let Some(event) = map_selected_events.iter().last() else {
218+
return;
219+
};
218220
let hash = match MapHash::try_from(event.path()) {
219221
Ok(hash) => hash,
220222
Err(error) => {

‎crates/menu/src/gamelisting.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,9 @@ fn list_games_system(
162162
mut events: EventReader<ResponseEvent<ListGamesRequest>>,
163163
mut toasts: EventWriter<ToastEvent>,
164164
) {
165-
let Some(event) = events.iter().last() else { return };
165+
let Some(event) = events.iter().last() else {
166+
return;
167+
};
166168
commands.entity(table.0).despawn_descendants();
167169

168170
match event.result() {

‎crates/menu/src/mapselection.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ fn init_buttons(
124124
) {
125125
let Some(mut task) = task else { return };
126126
let Some(result) = future::block_on(future::poll_once(&mut task.0)) else {
127-
return
127+
return;
128128
};
129129

130130
let map_entries = match result {

‎crates/menu/src/singleplayer.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@ fn button_system(
115115
}
116116

117117
fn map_selected_system(mut events: EventReader<MapSelectedEvent>, mut map: ResMut<SelectedMap>) {
118-
let Some(event) = events.iter().last() else { return };
118+
let Some(event) = events.iter().last() else {
119+
return;
120+
};
119121
map.0 = Some(event.path().into());
120122
}

‎crates/movement/src/altitude.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ fn update(
7070
) {
7171
objects.par_iter_mut().for_each_mut(
7272
|(&object_type, mut horizontal, mut climbing, transform)| {
73-
let Some(flight) = solids.get(object_type).flight() else { return };
73+
let Some(flight) = solids.get(object_type).flight() else {
74+
return;
75+
};
7476
let height = transform.translation.y;
7577

7678
let desired_height = if horizontal.stationary() {

‎crates/net/src/connection/databuf.rs

+9-3
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ impl DataBuf {
5858
///
5959
/// Panics if `buf` len is smaller than length of found data.
6060
pub(super) fn get(&self, id: DatagramId, buf: &mut [u8]) -> Option<usize> {
61-
let Some(slot_index) = self.slot_index(id) else { return None };
61+
let Some(slot_index) = self.slot_index(id) else {
62+
return None;
63+
};
6264

6365
let front = self.slots.front().unwrap();
6466
let slot = self.slots.get(slot_index).unwrap();
@@ -77,7 +79,9 @@ impl DataBuf {
7779
/// Removes data stored with ID `id` or does nothing if such data do not
7880
/// exist.
7981
pub(super) fn remove(&mut self, id: DatagramId) {
80-
let Some(slot_index) = self.slot_index(id) else { return };
82+
let Some(slot_index) = self.slot_index(id) else {
83+
return;
84+
};
8185
self.slots.get_mut(slot_index).unwrap().used = false;
8286

8387
while let Some(front) = self.slots.front() {
@@ -94,7 +98,9 @@ impl DataBuf {
9498

9599
/// Get index (withing slots deque) of the slot with ID `id`.
96100
fn slot_index(&self, id: DatagramId) -> Option<usize> {
97-
let Some(&ordinal) = self.ordinals.get(&id) else { return None };
101+
let Some(&ordinal) = self.ordinals.get(&id) else {
102+
return None;
103+
};
98104
// Slots can't be empty since the ordinal was found.
99105
let front = self.slots.front().unwrap();
100106
Some(ordinal.wrapping_sub(front.ordinal))

‎crates/net/src/tasks/dreceiver.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ pub(super) async fn run(
3838
break;
3939
}
4040

41-
let Ok(result) = timeout(Duration::from_millis(500), messages.recv(&mut buffer)).await else {
41+
let Ok(result) = timeout(Duration::from_millis(500), messages.recv(&mut buffer)).await
42+
else {
4243
continue;
4344
};
4445

‎crates/net/src/tasks/dsender.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ pub(super) async fn run(port: u16, datagrams: Receiver<OutDatagram>, messages: M
3232
let mut buffer = [0u8; MAX_DATAGRAM_SIZE];
3333

3434
loop {
35-
let Ok(datagram) = datagrams.recv().await else { break };
35+
let Ok(datagram) = datagrams.recv().await else {
36+
break;
37+
};
3638
if let Err(err) = messages
3739
.send(
3840
&mut buffer,

0 commit comments

Comments
 (0)