From 641aa921bf3bea569be7d3e3699a5888b6e4d82b Mon Sep 17 00:00:00 2001 From: juliancoffee Date: Sat, 26 Jun 2021 22:05:01 +0300 Subject: [PATCH] style --- common/src/recipe.rs | 1 - voxygen/src/hud/crafting.rs | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/common/src/recipe.rs b/common/src/recipe.rs index b5e26e7099..422833dc33 100644 --- a/common/src/recipe.rs +++ b/common/src/recipe.rs @@ -113,7 +113,6 @@ impl assets::Compound for RecipeBook { cache: &assets::AssetCache, specifier: &str, ) -> Result { - #[inline] fn load_item_def(spec: &(String, u32)) -> Result<(Arc, u32), assets::Error> { let def = Arc::::load_cloned(&spec.0)?; diff --git a/voxygen/src/hud/crafting.rs b/voxygen/src/hud/crafting.rs index b495c11c44..f0dc50f820 100644 --- a/voxygen/src/hud/crafting.rs +++ b/voxygen/src/hud/crafting.rs @@ -185,7 +185,6 @@ impl CraftingTab { fn satisfies(self, recipe: &Recipe) -> bool { let (item, _count) = &recipe.output; - let recycling = recipe.is_recycling; match self { CraftingTab::All => true, CraftingTab::Food => item.tags().contains(&ItemTag::Food), @@ -199,7 +198,8 @@ impl CraftingTab { (item.tags().contains(&ItemTag::MetalIngot) || item.tags().contains(&ItemTag::Textile) || item.tags().contains(&ItemTag::Leather) - || item.tags().contains(&ItemTag::BaseMaterial)) && !recycling + || item.tags().contains(&ItemTag::BaseMaterial)) + && !recipe.is_recycling }, CraftingTab::Bag => item.tags().contains(&ItemTag::Bag), CraftingTab::Tool => item.tags().contains(&ItemTag::CraftingTool),