From fe85c8081e462b2854087b3fc8cf0a070d76c3cd Mon Sep 17 00:00:00 2001 From: jake Date: Sat, 6 Jun 2020 08:46:02 -0600 Subject: [PATCH] warnings --- src/ship/monster.rs | 3 +-- src/ship/packet/handler/message.rs | 3 +-- tests/common.rs | 6 +----- tests/test_exp_gain.rs | 22 ++++++---------------- tests/test_item_pickup.rs | 7 ------- 5 files changed, 9 insertions(+), 32 deletions(-) diff --git a/src/ship/monster.rs b/src/ship/monster.rs index 479a145..95af791 100644 --- a/src/ship/monster.rs +++ b/src/ship/monster.rs @@ -1,10 +1,9 @@ #![allow(dead_code)] use std::collections::HashMap; use std::fs::File; -use std::io::{Read, Cursor}; +use std::io::Read; use std::path::PathBuf; use serde::{Serialize, Deserialize}; -use byteorder::{LittleEndian, ReadBytesExt}; use crate::ship::room::{Difficulty, Episode, RoomMode}; diff --git a/src/ship/packet/handler/message.rs b/src/ship/packet/handler/message.rs index 9d2725e..1e21884 100644 --- a/src/ship/packet/handler/message.rs +++ b/src/ship/packet/handler/message.rs @@ -1,11 +1,10 @@ -use log::warn; use libpso::packet::ship::*; use libpso::packet::messages::*; use crate::entity::gateway::EntityGateway; use crate::common::serverstate::ClientId; use crate::common::leveltable::CharacterLevelTable; use crate::ship::ship::{SendShipPacket, ShipError, Rooms, Clients, ItemDropLocation}; -use crate::ship::location::{ClientLocation, ClientLocationError, RoomLobby}; +use crate::ship::location::{ClientLocation, ClientLocationError}; use crate::ship::map::{MapArea}; use crate::ship::items::{ItemManager, ClientItemId}; use crate::ship::packet::builder; diff --git a/tests/common.rs b/tests/common.rs index e3d187f..29f33d0 100644 --- a/tests/common.rs +++ b/tests/common.rs @@ -1,16 +1,12 @@ use std::time::SystemTime; use elseware::common::serverstate::{ClientId, ServerState}; -use elseware::entity::gateway::{EntityGateway, InMemoryGateway}; +use elseware::entity::gateway::EntityGateway; use elseware::entity::account::{UserAccountEntity, NewUserAccountEntity, NewUserSettingsEntity}; use elseware::entity::character::{CharacterEntity, NewCharacterEntity}; -//use elseware::entity::item::{NewItemEntity, ItemDetail, ItemLocation}; -use elseware::entity::item; use elseware::ship::ship::{ShipServerState, RecvShipPacket}; -use elseware::ship::items::{ClientItemId, ActiveItemEntityId, HeldItemType, FloorItemType}; use libpso::packet::ship::*; -use libpso::packet::messages::*; use libpso::packet::login::{Login, Session}; use libpso::{utf8_to_array, utf8_to_utf16_array}; diff --git a/tests/test_exp_gain.rs b/tests/test_exp_gain.rs index 04b019e..57c410a 100644 --- a/tests/test_exp_gain.rs +++ b/tests/test_exp_gain.rs @@ -1,20 +1,11 @@ -use std::time::SystemTime; - use elseware::common::serverstate::{ClientId, ServerState}; use elseware::entity::gateway::{EntityGateway, InMemoryGateway}; -use elseware::entity::account::{UserAccountEntity, NewUserAccountEntity, NewUserSettingsEntity}; -use elseware::entity::character::{CharacterEntity, NewCharacterEntity}; -//use elseware::entity::item::{NewItemEntity, ItemDetail, ItemLocation}; -use elseware::entity::item; use elseware::common::leveltable::CharacterLevelTable; use elseware::ship::ship::{ShipServerState, SendShipPacket, RecvShipPacket}; -use elseware::ship::items::{ClientItemId, ActiveItemEntityId, HeldItemType, FloorItemType}; use elseware::ship::monster::MonsterType; use libpso::packet::ship::*; use libpso::packet::messages::*; -use libpso::packet::login::{Login, Session}; -use libpso::{utf8_to_array, utf8_to_utf16_array}; #[path = "common.rs"] mod common; @@ -70,12 +61,11 @@ async fn test_character_levels_up() { let enemy_id = { let room = ship.rooms[0].as_ref().unwrap(); - let (enemy_id, map_enemy) = (0..).filter_map(|i| { - room.maps.enemy_by_id(i).map(|enemy| { - (i, enemy) + (0..).filter_map(|i| { + room.maps.enemy_by_id(i).map(|_| { + i }).ok() - }).next().unwrap(); - enemy_id + }).next().unwrap() }; let levelup_pkt = ship.handle(ClientId(1), &RecvShipPacket::Message(Message::new(GameMessage::RequestExp(RequestExp{ @@ -140,8 +130,8 @@ async fn test_character_levels_up_multiple_times() { async fn test_one_character_gets_full_exp_and_other_attacker_gets_partial() { let mut entity_gateway = InMemoryGateway::new(); - let (_user1, char1) = new_user_character(&mut entity_gateway, "a1", "a").await; - let (_user2, char2) = new_user_character(&mut entity_gateway, "a2", "a").await; + let (_user1, _char1) = new_user_character(&mut entity_gateway, "a1", "a").await; + let (_user2, _char2) = new_user_character(&mut entity_gateway, "a2", "a").await; let mut ship = ShipServerState::new(entity_gateway.clone()); log_in_char(&mut ship, ClientId(1), "a1", "a").await; diff --git a/tests/test_item_pickup.rs b/tests/test_item_pickup.rs index 233af69..5466ee4 100644 --- a/tests/test_item_pickup.rs +++ b/tests/test_item_pickup.rs @@ -1,18 +1,11 @@ -use std::time::SystemTime; - use elseware::common::serverstate::{ClientId, ServerState}; use elseware::entity::gateway::{EntityGateway, InMemoryGateway}; -use elseware::entity::account::{UserAccountEntity, NewUserAccountEntity, NewUserSettingsEntity}; -use elseware::entity::character::{CharacterEntity, NewCharacterEntity}; -//use elseware::entity::item::{NewItemEntity, ItemDetail, ItemLocation}; use elseware::entity::item; use elseware::ship::ship::{ShipServerState, RecvShipPacket}; use elseware::ship::items::{ClientItemId, ActiveItemEntityId, HeldItemType, FloorItemType}; use libpso::packet::ship::*; use libpso::packet::messages::*; -use libpso::packet::login::{Login, Session}; -use libpso::{utf8_to_array, utf8_to_utf16_array}; #[path = "common.rs"] mod common;