Skip to content

Commit 8e1d005

Browse files
authored
Fix QueryData derive codegen (#19750)
Custom derived `QueryData` impls currently generate `Item` structs with the lifetimes swapped, which blows up the borrow checker sometimes. See: https://discord.com/channels/691052431525675048/749335865876021248/1385509416086011914 could add a regression test, TBH I don't know the error well enough to do that minimally. Seems like it's that both lifetimes on `QueryData::Item` need to be covariant, but I'm not sure.
1 parent b6bd205 commit 8e1d005

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

crates/bevy_ecs/macros/src/query_data.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ pub fn derive_query_data_impl(input: TokenStream) -> TokenStream {
8383
let user_generics_with_world_and_state = {
8484
let mut generics = ast.generics;
8585
generics.params.insert(0, parse_quote!('__w));
86-
generics.params.insert(0, parse_quote!('__s));
86+
generics.params.insert(1, parse_quote!('__s));
8787
generics
8888
};
8989
let (

0 commit comments

Comments
 (0)