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

Remove unecesssary lifetimes

Browse Source
This commit is contained in:
tygyh 2022-07-15 16:20:15 +02:00
parent fb7bdd8bf8
commit 25e20b5fa0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/recipe.rs
View File

@ -645,9 +645,9 @@ impl ComponentRecipe {
/// a component recipe. If it does, return a vec of inventory slots that
/// contain the ingredients needed, whose positions correspond to particular
/// recipe are missing.
pub fn inventory_contains_additional_ingredients<'a>(
pub fn inventory_contains_additional_ingredients(
&self,
inv: &'a Inventory,
inv: &Inventory,
) -> Result<Vec<(u32, InvSlotId)>, Vec<(&RecipeInput, u32)>> {
inventory_contains_ingredients(
self.additional_inputs

2
voxygen/i18n/src/lib.rs
View File

@ -162,7 +162,7 @@ impl LocalizationGuard {
///
/// First lookup is done in the active language, second in
/// the fallback (if present).
pub fn get_opt<'a>(&'a self, key: &str) -> Option<&'a str> {
pub fn get_opt(&self, key: &str) -> Option<&str> {
self.active
.get(key)
.or_else(|| self.fallback.as_ref().and_then(|f| f.get(key)))