diff --git a/server/src/cmd.rs b/server/src/cmd.rs index f1948cf3ab..370b5c4a28 100644 --- a/server/src/cmd.rs +++ b/server/src/cmd.rs @@ -441,7 +441,6 @@ fn handle_drop_all( Ok(()) } -#[allow(clippy::useless_conversion)] // TODO: Pending review in #587 fn handle_give_item( server: &mut Server, _client: EcsEntity, @@ -1750,7 +1749,6 @@ fn handle_light( Ok(()) } -#[allow(clippy::useless_conversion)] // TODO: Pending review in #587 fn handle_lantern( server: &mut Server, client: EcsEntity, @@ -2046,7 +2044,6 @@ fn handle_spawn_wiring( Ok(()) } -#[allow(clippy::useless_conversion)] // TODO: Pending review in #587 fn handle_adminify( server: &mut Server, client: EcsEntity, @@ -2100,7 +2097,7 @@ fn handle_adminify( // permissions) by someone with a higher role than the person doing the // ban. So if we change how bans work, we should change how things work // here, too, for consistency. - if desired_role > Some(client_real_role.into()) { + if desired_role > Some(client_real_role) { return Err( "Cannot assign someone a temporary role higher than your own permanent one".into(), ); @@ -2157,7 +2154,6 @@ fn handle_adminify( } } -#[allow(clippy::useless_conversion)] // TODO: Pending review in #587 fn handle_tell( server: &mut Server, client: EcsEntity, diff --git a/world/src/sim/util.rs b/world/src/sim/util.rs index cd0b9544fa..8ab66bf162 100644 --- a/world/src/sim/util.rs +++ b/world/src/sim/util.rs @@ -212,7 +212,6 @@ pub fn uniform_noise( /// guarantees that for any point between the given chunk (on the top left) and /// its top-right/down-right/down neighbors, the twelve chunks surrounding this /// box (its "perimeter") are also inspected. -#[allow(clippy::useless_conversion)] // TODO: Pending review in #587 pub fn local_cells(map_size_lg: MapSizeLg, posi: usize) -> impl Clone + Iterator { let pos = uniform_idx_as_vec2(map_size_lg, posi); // NOTE: want to keep this such that the chunk index is in ascending order!