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

fmt

Browse Source
This commit is contained in:
juliancoffee 2022-01-23 21:19:33 +02:00
parent 5a370cb6f7
commit 79a04c3533
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab/scripts/code-quality.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash
time cargo clippy --all-targets --locked --features="bin_cmd_doc_gen,bin_compression,bin_csv,bin_graphviz,bin_bot,bin_entity_migrate, asset_tweak" -- -D warnings &&
time cargo clippy --all-targets --locked --features="bin_cmd_doc_gen,bin_compression,bin_csv,bin_graphviz,bin_bot,bin_entity_migrate,asset_tweak" -- -D warnings &&
# Ensure that the veloren-voxygen default-publish feature builds as it excludes some default features
time cargo clippy -p veloren-voxygen --locked --no-default-features --features="default-publish" -- -D warnings &&
time cargo fmt --all -- --check

7
world/src/site/settlement/mod.rs
View File

@ -18,9 +18,7 @@ use common::{
comp::{
self, agent, bird_medium,
inventory::{
loadout_builder::{make_potion_bag, LoadoutBuilder},
slot::ArmorSlot,
trade_pricing::TradePricing,
loadout_builder::LoadoutBuilder, slot::ArmorSlot, trade_pricing::TradePricing,
},
quadruped_small, Item,
},
@ -1012,8 +1010,7 @@ fn humanoid(pos: Vec3<f32>, economy: &SiteInformation, dynamic_rng: &mut impl Rn
.with_economy(economy)
.with_lazy_loadout(merchant_loadout)
.with_asset_expect("common.entity.village.merchant"),
_ => entity
.with_asset_expect("common.entity.village.villager"),
_ => entity.with_asset_expect("common.entity.village.villager"),
}
}