Skip to content

Commit a701da7

Browse files
Remove error-prone Ord and PartialOrd traits
1 parent 38f18cc commit a701da7

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

crates/bevy_ecs/src/schedule/ambiguity_detection.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use crate::world::World;
44

55
use fixedbitset::FixedBitSet;
66

7-
#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
7+
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
88
/// Systems that access the same Component or Resource within the same stage
99
/// risk an ambiguous order that could result in logic bugs, unless they have an
1010
/// explicit execution ordering constraint between them.
@@ -206,7 +206,7 @@ impl SystemStage {
206206
debug_assert!(!self.systems_modified);
207207

208208
// TODO: remove all internal ambiguities and remove this logic
209-
let ignored_crates = if report_level < ReportExecutionOrderAmbiguities::ReportInternal {
209+
let ignored_crates = if report_level != ReportExecutionOrderAmbiguities::ReportInternal {
210210
vec![
211211
// Rendering
212212
"bevy_render".to_string(),
@@ -255,7 +255,7 @@ impl SystemStage {
255255
println!("\n One of your stages contains {unresolved_count} pairs of systems with unknown order and conflicting data access. \
256256
You may want to add `.before()` or `.after()` constraints between some of these systems to prevent bugs.\n");
257257

258-
if report_level <= ReportExecutionOrderAmbiguities::Minimal {
258+
if report_level == ReportExecutionOrderAmbiguities::Minimal {
259259
println!("Set the level of the `ReportExecutionOrderAmbiguities` resource to `AmbiguityReportLevel::Verbose` for more details.");
260260
} else {
261261
// TODO: clean up this logic once exclusive systems are more compatible with parallel systems

0 commit comments

Comments
 (0)