From fe7b81062e00852eba697222146c483a79970d1a Mon Sep 17 00:00:00 2001 From: Alice Cecile Date: Thu, 6 Mar 2025 13:29:51 -0800 Subject: [PATCH 1/2] Deprecated Query::many and many_mut --- crates/bevy_ecs/src/query/mod.rs | 2 +- crates/bevy_ecs/src/system/query.rs | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/crates/bevy_ecs/src/query/mod.rs b/crates/bevy_ecs/src/query/mod.rs index 9ed6995876f12..2229fd67a32fa 100644 --- a/crates/bevy_ecs/src/query/mod.rs +++ b/crates/bevy_ecs/src/query/mod.rs @@ -777,7 +777,7 @@ mod tests { let _: Option<&Foo> = q.get(e).ok(); let _: Option<[&Foo; 1]> = q.get_many([e]).ok(); let _: Option<&Foo> = q.single().ok(); - let _: [&Foo; 1] = q.many([e]); + let _: [&Foo; 1] = q.get_many([e]).unwrap(); let _: &Foo = q.single().unwrap(); } diff --git a/crates/bevy_ecs/src/system/query.rs b/crates/bevy_ecs/src/system/query.rs index a9662f28c95f3..22f0d1df20f45 100644 --- a/crates/bevy_ecs/src/system/query.rs +++ b/crates/bevy_ecs/src/system/query.rs @@ -1377,6 +1377,7 @@ impl<'w, 's, D: QueryData, F: QueryFilter> Query<'w, 's, D, F> { /// - [`get_many`](Self::get_many) for the non-panicking version. #[inline] #[track_caller] + #[deprecated(note = "Use `get_many` instead and handle the Result.")] pub fn many(&self, entities: [Entity; N]) -> [ROQueryItem<'_, D>; N] { match self.get_many(entities) { Ok(items) => items, @@ -1682,6 +1683,7 @@ impl<'w, 's, D: QueryData, F: QueryFilter> Query<'w, 's, D, F> { /// - [`many`](Self::many) to get read-only query items. #[inline] #[track_caller] + #[deprecated(note = "Use `get_many_mut` instead and handle the Result.")] pub fn many_mut(&mut self, entities: [Entity; N]) -> [D::Item<'_>; N] { match self.get_many_mut(entities) { Ok(items) => items, From b847e7dac2626dbffc505bec24e0d359cb4814d7 Mon Sep 17 00:00:00 2001 From: Alice Cecile Date: Thu, 6 Mar 2025 18:01:15 -0500 Subject: [PATCH 2/2] Remove test lines Co-authored-by: Chris Russell <8494645+chescock@users.noreply.github.com> --- crates/bevy_ecs/src/query/mod.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/crates/bevy_ecs/src/query/mod.rs b/crates/bevy_ecs/src/query/mod.rs index 2229fd67a32fa..f9dbcc1df48f2 100644 --- a/crates/bevy_ecs/src/query/mod.rs +++ b/crates/bevy_ecs/src/query/mod.rs @@ -777,7 +777,6 @@ mod tests { let _: Option<&Foo> = q.get(e).ok(); let _: Option<[&Foo; 1]> = q.get_many([e]).ok(); let _: Option<&Foo> = q.single().ok(); - let _: [&Foo; 1] = q.get_many([e]).unwrap(); let _: &Foo = q.single().unwrap(); }