blasthavers/blastmud
2
1
Fork 1
Code Issues 2 Pull Requests Packages Projects 1 Releases Wiki Activity

Fix warnings from latest version of Rust/Cargo.

Browse Source
This commit is contained in:
Condorra 2023-10-08 16:47:48 +11:00
parent 807a9612fd
commit 16341e2c3e
4 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Cargo.toml
View File

@ -9,6 +9,11 @@ members = [
"ansi", "ansi",
] ]
resolver = "2"
[profile.release-with-debug] [profile.release-with-debug]
inherits = "release" inherits = "release"
debug = true debug = true
[profile.dev]
lto = false

3
blastmud_game/Cargo.toml
View File

@ -50,6 +50,3 @@ tokio-test = "0.4.2"
default = [] default = []
# Export data to YAML files in /tmp on startup # Export data to YAML files in /tmp on startup
yamldump = [] yamldump = []
[profile.dev]
lto = false

40
blastmud_game/src/regular_tasks.rs
View File

@ -47,29 +47,23 @@ fn task_handler_registry(
> = OnceCell::new(); > = OnceCell::new();
TASK_HANDLER_REGISTRY.get_or_init(|| { TASK_HANDLER_REGISTRY.get_or_init(|| {
vec![ vec![
("RunQueuedCommand", queued_command::HANDLER.clone()), ("RunQueuedCommand", queued_command::HANDLER),
("NPCSay", npc::SAY_HANDLER.clone()), ("NPCSay", npc::SAY_HANDLER),
("NPCWander", npc::WANDER_HANDLER.clone()), ("NPCWander", npc::WANDER_HANDLER),
("NPCAggro", npc::AGGRO_HANDLER.clone()), ("NPCAggro", npc::AGGRO_HANDLER),
("AttackTick", combat::TASK_HANDLER.clone()), ("AttackTick", combat::TASK_HANDLER),
("RecloneNPC", npc::RECLONE_HANDLER.clone()), ("RecloneNPC", npc::RECLONE_HANDLER),
("RotCorpse", combat::ROT_CORPSE_HANDLER.clone()), ("RotCorpse", combat::ROT_CORPSE_HANDLER),
("DelayedHealth", effect::DELAYED_HEALTH_HANDLER.clone()), ("DelayedHealth", effect::DELAYED_HEALTH_HANDLER),
("ExpireItem", drop::EXPIRE_ITEM_HANDLER.clone()), ("ExpireItem", drop::EXPIRE_ITEM_HANDLER),
("ChargeRoom", rent::CHARGE_ROOM_HANDLER.clone()), ("ChargeRoom", rent::CHARGE_ROOM_HANDLER),
("SwingShut", open::SWING_SHUT_HANDLER.clone()), ("SwingShut", open::SWING_SHUT_HANDLER),
("DestroyUser", delete::DESTROY_USER_HANDLER.clone()), ("DestroyUser", delete::DESTROY_USER_HANDLER),
("ChargeWages", hire::CHARGE_WAGES_HANDLER.clone()), ("ChargeWages", hire::CHARGE_WAGES_HANDLER),
("TickUrges", urges::TICK_URGES_HANDLER.clone()), ("TickUrges", urges::TICK_URGES_HANDLER),
("ResetSpawns", spawn::RESET_SPAWNS_HANDLER.clone()), ("ResetSpawns", spawn::RESET_SPAWNS_HANDLER),
( ("ResetHanoi", computer_museum_npcs::RESET_GAME_HANDLER),
"ResetHanoi", ("HospitalERSeePatient", general_hospital::SEE_PATIENT_TASK),
computer_museum_npcs::RESET_GAME_HANDLER.clone(),
),
(
"HospitalERSeePatient",
general_hospital::SEE_PATIENT_TASK.clone(),
),
] ]
.into_iter() .into_iter()
.collect() .collect()

4
blastmud_game/src/static_content/journals.rs
View File

@ -106,11 +106,11 @@ pub fn checkers_by_npc(
jc.kill_subscriptions() jc.kill_subscriptions()
.into_iter() .into_iter()
.filter_map(|sub| match sub { .filter_map(|sub| match sub {
KillSubscriptionType::SpecificNPC { code } => Some((code.clone(), *jc)), KillSubscriptionType::SpecificNPC { code } => Some((code, *jc)),
_ => None, _ => None,
}) })
}) })
.group_by(|v| v.0.clone()); .group_by(|v| v.0);
npc_groups npc_groups
.into_iter() .into_iter()
.map(|(species, g)| (species, g.into_iter().map(|v| v.1).collect())) .map(|(species, g)| (species, g.into_iter().map(|v| v.1).collect()))