Compare commits

..

No commits in common. "36261663bed2ef2eac77c7d480c5f9a87ab106ea" and "1f5e94ccfb04ec25789e75b1aac4ad77782e83ad" have entirely different histories.

5 changed files with 5 additions and 9 deletions

View File

@ -1,9 +1,9 @@
use std::fs::File;
use serde_json::Value;
use crate::entity::character::CharacterClass;
use std::sync::LazyLock;
use std::cell::LazyCell;
pub static LEVEL_TABLE: LazyLock<CharacterLevelTable> = LazyLock::new(CharacterLevelTable::default);
pub const LEVEL_TABLE: LazyCell<CharacterLevelTable> = LazyCell::new(|| CharacterLevelTable::default());
#[derive(Default, Copy, Clone, Debug, PartialEq, Eq)]
pub struct CharacterStats {

View File

@ -1,6 +1,3 @@
// this lint is currently bugged and suggests incorrect code https://github.com/rust-lang/rust-clippy/issues/9123
#![allow(clippy::explicit_auto_deref)]
use std::convert::{From, TryFrom, Into};
use futures::{Future, TryStreamExt};
use async_std::stream::StreamExt;

View File

@ -16,7 +16,6 @@ use crate::ship::drops::generic_weapon::AttributeTable;
use crate::ship::drops::generic_armor::GenericArmorTable;
use crate::ship::drops::generic_shield::GenericShieldTable;
type ItemParseFn = Box<dyn Fn(&String) -> Option<RareDropItem>>;
#[derive(Debug, Copy, Clone)]
pub enum RareDropItem {
@ -30,7 +29,7 @@ pub enum RareDropItem {
impl RareDropItem {
pub fn from_string(name: String) -> RareDropItem {
let parse_funcs: [ItemParseFn; 6] = [
let parse_funcs: [Box<dyn Fn(&String) -> Option<RareDropItem>>; 6] = [
Box::new(|i| Some(RareDropItem::Weapon(str::parse::<WeaponType>(i).ok()?))),
Box::new(|i| Some(RareDropItem::Armor(str::parse::<ArmorType>(i).ok()?))),
Box::new(|i| Some(RareDropItem::Shield(str::parse::<ShieldType>(i).ok()?))),

View File

@ -330,7 +330,7 @@ impl<'a> ItemStateProxy<'a> {
self.item_state.character_bank.extend(self.proxied_state.character_bank.clone());
self.item_state.character_room.extend(self.proxied_state.character_room.clone());
self.item_state.character_floor.extend(self.proxied_state.character_floor.clone());
self.item_state.room_floor.extend(self.proxied_state.room_floor);
self.item_state.room_floor.extend(self.proxied_state.room_floor.clone());
}
}

View File

@ -123,7 +123,7 @@ impl TradeState {
return Err(TradeStateError::MismatchedTrade(c1.client, c2.client));
}
Ok(func(&mut c1, &mut c2))
Ok(func(&mut *c1, &mut *c2))
}
// TODO: is it possible for this to not return Options?