Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tygyh/Resolve-all-'#-allow(clippy--useless_conversion)]'-error-supressions' into 'master'

Browse Source 
Resolve all '#[allow(clippy::useless_conversion)]' error supressions

See merge request veloren/veloren!2620
This commit is contained in:
Imbris 2021-07-17 16:50:32 +00:00
commit bff44ec03f
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/cmd.rs
View File

@ -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,

1
world/src/sim/util.rs
View File

@ -212,7 +212,6 @@ pub fn uniform_noise<F: Float + Send>(
/// 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<Item = usize> {
let pos = uniform_idx_as_vec2(map_size_lg, posi);
// NOTE: want to keep this such that the chunk index is in ascending order!