Compare commits

..

1 Commits

Author SHA1 Message Date
2aa5d6881c ci(lint): simplify clippy rules 2026-04-13 19:53:54 -04:00
2 changed files with 24 additions and 23 deletions

View File

@@ -69,7 +69,7 @@ jobs:
- name: Install components
run: rustup component add clippy rustfmt
- run: cargo clippy ${{ matrix.feature.flags }} -- -D clippy::pedantic
- run: cargo clippy ${{ matrix.feature.flags }} -D clippy::pedantic
- if: always()
run: cargo fmt --check

View File

@@ -2,7 +2,7 @@
macro_rules! get_entities {
($client:ident) => {{
let ecs = $client.ecs.read();
ecs.try_query::<(
if let Some(mut query) = ecs.try_query::<(
&AzaleaPosition,
&CustomName,
&EntityKindComponent,
@@ -11,8 +11,7 @@ macro_rules! get_entities {
&MinecraftEntityId,
Option<&Owneruuid>,
&Pose,
)>()
.map(|mut query| {
)>() {
query
.iter(&ecs)
.map(
@@ -30,8 +29,9 @@ macro_rules! get_entities {
},
)
.collect::<Vec<_>>()
})
.unwrap_or_default()
} else {
Vec::new()
}
}};
}
@@ -39,7 +39,7 @@ macro_rules! get_entities {
macro_rules! get_players {
($client:ident) => {{
let ecs = $client.ecs.read();
ecs.try_query_filtered::<(
if let Some(mut query) = ecs.try_query_filtered::<(
&MinecraftEntityId,
&EntityUuid,
&EntityKindComponent,
@@ -47,7 +47,7 @@ macro_rules! get_players {
&LookDirection,
&Pose,
), (With<Player>, Without<Dead>)>()
.map(|mut query| {
{
query
.iter(&ecs)
.map(|(id, uuid, kind, position, direction, pose)| {
@@ -61,7 +61,8 @@ macro_rules! get_players {
)
})
.collect::<Vec<_>>()
})
.unwrap_or_default()
} else {
Vec::new()
}
}};
}