@@ -460,7 +460,7 @@ impl SystemStage {
460
460
}
461
461
}
462
462
463
- /// Collapses a name returned by std::any::type_name to remove its module path
463
+ /// Collapses a name returned by [` std::any::type_name`] to remove its module path
464
464
fn format_type_name ( raw_name : & str ) -> String {
465
465
// Generics result in nested paths within <..> blocks
466
466
// Consider "bevy_render::camera::camera::extract_cameras<bevy_render::camera::bundle::Camera3d>"
@@ -781,7 +781,7 @@ mod tests {
781
781
. add_system ( res_system) ;
782
782
783
783
assert_eq ! (
784
- test_stage. n_ambiguities( & mut world, ExecutionOrderAmbiguities :: Forbid ) ,
784
+ test_stage. n_ambiguities( & mut world, ExecutionOrderAmbiguities :: Warn ) ,
785
785
0
786
786
) ;
787
787
}
@@ -795,7 +795,21 @@ mod tests {
795
795
. add_system ( res_system. label ( "IGNORE_ME" ) ) ;
796
796
797
797
assert_eq ! (
798
- test_stage. n_ambiguities( & mut world, ExecutionOrderAmbiguities :: Forbid ) ,
798
+ test_stage. n_ambiguities( & mut world, ExecutionOrderAmbiguities :: Warn ) ,
799
+ 0
800
+ ) ;
801
+ }
802
+
803
+ #[ test]
804
+ fn ambiguous_with_system ( ) {
805
+ let mut world = World :: new ( ) ;
806
+ let mut test_stage = SystemStage :: parallel ( ) ;
807
+ test_stage
808
+ . add_system ( system_a. ambiguous_with ( system_b) )
809
+ . add_system ( system_b) ;
810
+
811
+ assert_eq ! (
812
+ test_stage. n_ambiguities( & mut world, ExecutionOrderAmbiguities :: Warn ) ,
799
813
0
800
814
) ;
801
815
}
@@ -824,51 +838,37 @@ mod tests {
824
838
}
825
839
826
840
#[ test]
827
- fn ambiguous_with_system ( ) {
828
- let mut world = World :: new ( ) ;
829
- let mut test_stage = SystemStage :: parallel ( ) ;
830
- test_stage
831
- . add_system ( system_a. ambiguous_with ( system_b) )
832
- . add_system ( system_b) ;
833
-
834
- assert_eq ! (
835
- test_stage. n_ambiguities( & mut world, ExecutionOrderAmbiguities :: Forbid ) ,
836
- 0
837
- ) ;
838
- }
839
-
840
- #[ test]
841
- fn off ( ) {
841
+ fn allow ( ) {
842
842
let mut world = World :: new ( ) ;
843
843
let mut test_stage = make_test_stage ( & mut world) ;
844
844
assert_eq ! (
845
- test_stage. n_ambiguities( & mut world, ExecutionOrderAmbiguities :: Forbid ) ,
845
+ test_stage. n_ambiguities( & mut world, ExecutionOrderAmbiguities :: Allow ) ,
846
846
0
847
847
) ;
848
848
}
849
849
850
850
#[ test]
851
- fn minimal ( ) {
851
+ fn warn ( ) {
852
852
let mut world = World :: new ( ) ;
853
853
let mut test_stage = make_test_stage ( & mut world) ;
854
854
assert_eq ! (
855
- test_stage. n_ambiguities( & mut world, ExecutionOrderAmbiguities :: Forbid ) ,
855
+ test_stage. n_ambiguities( & mut world, ExecutionOrderAmbiguities :: Warn ) ,
856
856
2
857
857
) ;
858
858
}
859
859
860
860
#[ test]
861
- fn verbose ( ) {
861
+ fn warn_verbose ( ) {
862
862
let mut world = World :: new ( ) ;
863
863
let mut test_stage = make_test_stage ( & mut world) ;
864
864
assert_eq ! (
865
- test_stage. n_ambiguities( & mut world, ExecutionOrderAmbiguities :: Forbid ) ,
865
+ test_stage. n_ambiguities( & mut world, ExecutionOrderAmbiguities :: WarnVerbose ) ,
866
866
2
867
867
) ;
868
868
}
869
869
870
870
#[ test]
871
- fn deterministic ( ) {
871
+ fn forbid ( ) {
872
872
let mut world = World :: new ( ) ;
873
873
let mut test_stage = make_test_stage ( & mut world) ;
874
874
assert_eq ! (
0 commit comments