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--needless_return)]'-error-supressions' into 'master'

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

See merge request veloren/veloren!2632
This commit is contained in:
Marcel 2021-07-18 02:00:03 +00:00
commit 6004a10a1a
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/cmd.rs
View File

@ -57,7 +57,6 @@ pub trait ChatCommandExt {
fn execute(&self, server: &mut Server, entity: EcsEntity, args: Vec<String>); fn execute(&self, server: &mut Server, entity: EcsEntity, args: Vec<String>);
} }
impl ChatCommandExt for ChatCommand { impl ChatCommandExt for ChatCommand {
#[allow(clippy::needless_return)] // TODO: Pending review in #587
fn execute(&self, server: &mut Server, entity: EcsEntity, args: Vec<String>) { fn execute(&self, server: &mut Server, entity: EcsEntity, args: Vec<String>) {
// TODO: Pass arguments to commands as Vec<String>, not String, to support // TODO: Pass arguments to commands as Vec<String>, not String, to support
// proper parsing. // proper parsing.
@ -1636,7 +1635,6 @@ fn handle_kit(
} }
#[allow(clippy::float_cmp)] // TODO: Pending review in #587 #[allow(clippy::float_cmp)] // TODO: Pending review in #587
#[allow(clippy::needless_return)] // TODO: Pending review in #587
fn handle_object( fn handle_object(
server: &mut Server, server: &mut Server,
client: EcsEntity, client: EcsEntity,

1
voxygen/src/ui/fonts.rs
View File

@ -7,7 +7,6 @@ pub struct Font {
} }
impl Font { impl Font {
#[allow(clippy::needless_return)] // TODO: Pending review in #587
fn new(font: &i18n::Font, ui: &mut crate::ui::Ui) -> Result<Self, assets::Error> { fn new(font: &i18n::Font, ui: &mut crate::ui::Ui) -> Result<Self, assets::Error> {
let raw_font = RawFont::load(&font.asset_key)?.cloned(); let raw_font = RawFont::load(&font.asset_key)?.cloned();