From c2f01af76db2d0a6a2e5664e66eb3efcc3900dec Mon Sep 17 00:00:00 2001 From: MinerSebas Date: Sun, 17 Oct 2021 17:11:58 +0200 Subject: [PATCH 1/2] Fix compile-fail tests --- crates/bevy_ecs/src/system/mod.rs | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/crates/bevy_ecs/src/system/mod.rs b/crates/bevy_ecs/src/system/mod.rs index a0523bc6fe9d0..a3d08e0b9c065 100644 --- a/crates/bevy_ecs/src/system/mod.rs +++ b/crates/bevy_ecs/src/system/mod.rs @@ -789,6 +789,7 @@ mod tests { /// ```compile_fail /// use bevy_ecs::prelude::*; +/// #[derive(Component)] /// struct A(usize); /// fn system(mut query: Query<&mut A>, e: Res) { /// let mut iter = query.iter_mut(); @@ -802,11 +803,12 @@ mod tests { /// } /// ``` #[allow(unused)] -#[cfg(doc)] +#[cfg(doctest)] fn system_query_iter_lifetime_safety_test() {} /// ```compile_fail /// use bevy_ecs::prelude::*; +/// #[derive(Component)] /// struct A(usize); /// fn system(mut query: Query<&mut A>, e: Res) { /// let mut a1 = query.get_mut(*e).unwrap(); @@ -816,11 +818,12 @@ fn system_query_iter_lifetime_safety_test() {} /// } /// ``` #[allow(unused)] -#[cfg(doc)] +#[cfg(doctest)] fn system_query_get_lifetime_safety_test() {} /// ```compile_fail /// use bevy_ecs::prelude::*; +/// #[derive(Component)] /// struct A(usize); /// fn query_set(mut queries: QuerySet<(QueryState<&mut A>, QueryState<&A>)>, e: Res) { /// let mut q2 = queries.q0(); @@ -836,11 +839,12 @@ fn system_query_get_lifetime_safety_test() {} /// } /// ``` #[allow(unused)] -#[cfg(doc)] +#[cfg(doctest)] fn system_query_set_iter_lifetime_safety_test() {} /// ```compile_fail /// use bevy_ecs::prelude::*; +/// #[derive(Component)] /// struct A(usize); /// fn query_set(mut queries: QuerySet<(QueryState<&mut A>, QueryState<&A>)>, e: Res) { /// let q1 = queries.q1(); @@ -856,11 +860,12 @@ fn system_query_set_iter_lifetime_safety_test() {} /// } /// ``` #[allow(unused)] -#[cfg(doc)] +#[cfg(doctest)] fn system_query_set_iter_flip_lifetime_safety_test() {} /// ```compile_fail /// use bevy_ecs::prelude::*; +/// #[derive(Component)] /// struct A(usize); /// fn query_set(mut queries: QuerySet<(QueryState<&mut A>, QueryState<&A>)>, e: Res) { /// let mut q2 = queries.q0(); @@ -874,11 +879,12 @@ fn system_query_set_iter_flip_lifetime_safety_test() {} /// } /// ``` #[allow(unused)] -#[cfg(doc)] +#[cfg(doctest)] fn system_query_set_get_lifetime_safety_test() {} /// ```compile_fail /// use bevy_ecs::prelude::*; +/// #[derive(Component)] /// struct A(usize); /// fn query_set(mut queries: QuerySet<(QueryState<&mut A>, QueryState<&A>)>, e: Res) { /// let q1 = queries.q1(); @@ -891,13 +897,15 @@ fn system_query_set_get_lifetime_safety_test() {} /// } /// ``` #[allow(unused)] -#[cfg(doc)] +#[cfg(doctest)] fn system_query_set_get_flip_lifetime_safety_test() {} /// ```compile_fail /// use bevy_ecs::prelude::*; /// use bevy_ecs::system::SystemState; +/// #[derive(Component)] /// struct A(usize); +/// #[derive(Component)] /// struct B(usize); /// struct State { /// state_r: SystemState>, @@ -918,13 +926,15 @@ fn system_query_set_get_flip_lifetime_safety_test() {} /// } /// ``` #[allow(unused)] -#[cfg(doc)] +#[cfg(doctest)] fn system_state_get_lifetime_safety_test() {} /// ```compile_fail /// use bevy_ecs::prelude::*; /// use bevy_ecs::system::SystemState; +/// #[derive(Component)] /// struct A(usize); +/// #[derive(Component)] /// struct B(usize); /// struct State { /// state_r: SystemState>, @@ -943,5 +953,5 @@ fn system_state_get_lifetime_safety_test() {} /// } /// ``` #[allow(unused)] -#[cfg(doc)] +#[cfg(doctest)] fn system_state_iter_lifetime_safety_test() {} From 0ef046ecc60ecddbf4e0f45391964d6a792e992f Mon Sep 17 00:00:00 2001 From: MinerSebas Date: Sun, 17 Oct 2021 18:25:01 +0200 Subject: [PATCH 2/2] Add expected error code to compile_fail tests --- crates/bevy_ecs/src/system/mod.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/crates/bevy_ecs/src/system/mod.rs b/crates/bevy_ecs/src/system/mod.rs index a3d08e0b9c065..a123d871b3a01 100644 --- a/crates/bevy_ecs/src/system/mod.rs +++ b/crates/bevy_ecs/src/system/mod.rs @@ -787,7 +787,7 @@ mod tests { } } -/// ```compile_fail +/// ```compile_fail E0499 /// use bevy_ecs::prelude::*; /// #[derive(Component)] /// struct A(usize); @@ -806,7 +806,7 @@ mod tests { #[cfg(doctest)] fn system_query_iter_lifetime_safety_test() {} -/// ```compile_fail +/// ```compile_fail E0499 /// use bevy_ecs::prelude::*; /// #[derive(Component)] /// struct A(usize); @@ -821,7 +821,7 @@ fn system_query_iter_lifetime_safety_test() {} #[cfg(doctest)] fn system_query_get_lifetime_safety_test() {} -/// ```compile_fail +/// ```compile_fail E0499 /// use bevy_ecs::prelude::*; /// #[derive(Component)] /// struct A(usize); @@ -842,7 +842,7 @@ fn system_query_get_lifetime_safety_test() {} #[cfg(doctest)] fn system_query_set_iter_lifetime_safety_test() {} -/// ```compile_fail +/// ```compile_fail E0499 /// use bevy_ecs::prelude::*; /// #[derive(Component)] /// struct A(usize); @@ -863,7 +863,7 @@ fn system_query_set_iter_lifetime_safety_test() {} #[cfg(doctest)] fn system_query_set_iter_flip_lifetime_safety_test() {} -/// ```compile_fail +/// ```compile_fail E0499 /// use bevy_ecs::prelude::*; /// #[derive(Component)] /// struct A(usize); @@ -882,7 +882,7 @@ fn system_query_set_iter_flip_lifetime_safety_test() {} #[cfg(doctest)] fn system_query_set_get_lifetime_safety_test() {} -/// ```compile_fail +/// ```compile_fail E0499 /// use bevy_ecs::prelude::*; /// #[derive(Component)] /// struct A(usize); @@ -900,7 +900,7 @@ fn system_query_set_get_lifetime_safety_test() {} #[cfg(doctest)] fn system_query_set_get_flip_lifetime_safety_test() {} -/// ```compile_fail +/// ```compile_fail E0502 /// use bevy_ecs::prelude::*; /// use bevy_ecs::system::SystemState; /// #[derive(Component)] @@ -929,7 +929,7 @@ fn system_query_set_get_flip_lifetime_safety_test() {} #[cfg(doctest)] fn system_state_get_lifetime_safety_test() {} -/// ```compile_fail +/// ```compile_fail E0502 /// use bevy_ecs::prelude::*; /// use bevy_ecs::system::SystemState; /// #[derive(Component)]