Fixes a bunch of clippy warnings, adds clippy to CI
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
2022-06-18 16:06:54 +02:00
parent 5576bc8b80
commit c99b1bf8d9
14 changed files with 42 additions and 27 deletions

View File

@@ -7,6 +7,7 @@ use crate::dynamic_data::script_handling::script::Script;
use crate::static_data::items::item::Item;
use crate::static_data::libraries::static_data::StaticData;
use crate::{PkmnResult, StringKey};
use std::ops::Deref;
#[derive(Debug)]
pub struct DynamicLibrary {
@@ -41,11 +42,11 @@ impl DynamicLibrary {
pub fn stat_calculator(&self) -> &BattleStatCalculator {
&self.stat_calculator
}
pub fn damage_calculator(&self) -> &Box<dyn DamageLibrary> {
&self.damage_calculator
pub fn damage_calculator(&self) -> &dyn DamageLibrary {
self.damage_calculator.deref()
}
pub fn misc_library(&self) -> &Box<dyn MiscLibrary<'static>> {
&self.misc_library
pub fn misc_library(&self) -> &dyn MiscLibrary<'static> {
self.misc_library.deref()
}
pub fn load_script(&self, _category: ScriptCategory, _key: &StringKey) -> PkmnResult<Option<Box<dyn Script>>> {
@@ -64,7 +65,7 @@ pub mod test {
use crate::dynamic_data::libraries::misc_library::Gen7MiscLibrary;
use crate::static_data::libraries::static_data;
pub fn build<'library>() -> DynamicLibrary {
pub fn build() -> DynamicLibrary {
DynamicLibrary {
static_data: static_data::test::build(),
stat_calculator: BattleStatCalculator {},

View File

@@ -64,6 +64,12 @@ impl<'library> Gen7MiscLibrary<'library> {
}
}
impl<'library> Default for Gen7MiscLibrary<'library> {
fn default() -> Self {
Self::new()
}
}
impl<'library> Drop for Gen7MiscLibrary<'library> {
fn drop(&mut self) {
unsafe {