From 79a04c3533a509ec80c559149fcaae33b61b6423 Mon Sep 17 00:00:00 2001 From: juliancoffee Date: Sun, 23 Jan 2022 21:19:33 +0200 Subject: [PATCH] fmt --- .gitlab/scripts/code-quality.sh | 2 +- world/src/site/settlement/mod.rs | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.gitlab/scripts/code-quality.sh b/.gitlab/scripts/code-quality.sh index 3016bc0a7f..88b49d27d7 100755 --- a/.gitlab/scripts/code-quality.sh +++ b/.gitlab/scripts/code-quality.sh @@ -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 diff --git a/world/src/site/settlement/mod.rs b/world/src/site/settlement/mod.rs index 3eaa405ec3..e12e5a4f62 100644 --- a/world/src/site/settlement/mod.rs +++ b/world/src/site/settlement/mod.rs @@ -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, 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"), } }