Skip to content

Commit 1468211

Browse files
committed
fix unreachable macro calls for rust 2021 (#3889)
# Objective - It was decided in Rust 2021 to make macro like `panic` require a string literal to format instead of directly an object - `unreachable` was missed during the first pass but it was decided to go for it anyway now: rust-lang/rust#92137 (comment) - this is making Bevy CI fail now: https://github.com/bevyengine/bevy/runs/5102586734?check_suite_focus=true ## Solution - Fix calls to `unreachable`
1 parent b346242 commit 1468211

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

crates/bevy_ecs/src/schedule/executor_parallel.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ impl ParallelSystemExecutor for ParallelExecutor {
132132
.finish_receiver
133133
.recv()
134134
.await
135-
.unwrap_or_else(|error| unreachable!(error));
135+
.unwrap_or_else(|error| unreachable!("{}", error));
136136
self.process_finished_system(index);
137137
// Gather other systems than may have finished.
138138
while let Ok(index) = self.finish_receiver.try_recv() {
@@ -208,7 +208,7 @@ impl ParallelExecutor {
208208
start_receiver
209209
.recv()
210210
.await
211-
.unwrap_or_else(|error| unreachable!(error));
211+
.unwrap_or_else(|error| unreachable!("{}", error));
212212
#[cfg(feature = "trace")]
213213
let system_guard = system_span.enter();
214214
unsafe { system.run_unsafe((), world) };
@@ -217,7 +217,7 @@ impl ParallelExecutor {
217217
finish_sender
218218
.send(index)
219219
.await
220-
.unwrap_or_else(|error| unreachable!(error));
220+
.unwrap_or_else(|error| unreachable!("{}", error));
221221
};
222222

223223
#[cfg(feature = "trace")]
@@ -268,7 +268,7 @@ impl ParallelExecutor {
268268
.start_sender
269269
.send(())
270270
.await
271-
.unwrap_or_else(|error| unreachable!(error));
271+
.unwrap_or_else(|error| unreachable!("{}", error));
272272
self.running.set(index, true);
273273
if !system_metadata.is_send {
274274
self.non_send_running = true;

0 commit comments

Comments
 (0)