diff --git a/eden/mononoke/cmdlib/src/args/matches.rs b/eden/mononoke/cmdlib/src/args/matches.rs index a8d1e3147d470..ca329549646de 100644 --- a/eden/mononoke/cmdlib/src/args/matches.rs +++ b/eden/mononoke/cmdlib/src/args/matches.rs @@ -297,7 +297,7 @@ impl<'a> MononokeMatches<'a> { self.matches.is_present(name) } - pub fn subcommand(&'a self) -> (&str, Option<&'a ArgMatches<'a>>) { + pub fn subcommand(&self) -> (&str, Option<&ArgMatches<'a>>) { self.matches.subcommand() } diff --git a/eden/mononoke/derived_data/manager/manager/derive.rs b/eden/mononoke/derived_data/manager/manager/derive.rs index f68f6be03d5be..aa9a629ff959b 100644 --- a/eden/mononoke/derived_data/manager/manager/derive.rs +++ b/eden/mononoke/derived_data/manager/manager/derive.rs @@ -91,11 +91,11 @@ impl DerivedDataManager { #[async_recursion] /// Returns the appropriate manager to derive given changeset, either this /// manager, or some secondary manager in the chain. - async fn get_manager( - &self, + async fn get_manager<'s>( + &'s self, ctx: &CoreContext, cs_id: ChangesetId, - ) -> anyhow::Result<&DerivedDataManager> { + ) -> anyhow::Result<&'s DerivedDataManager> { Ok(if let Some(secondary) = &self.inner.secondary { if secondary .assigner diff --git a/eden/mononoke/hgproto/src/sshproto/request.rs b/eden/mononoke/hgproto/src/sshproto/request.rs index d14af9e380526..5bd8977be2189 100644 --- a/eden/mononoke/hgproto/src/sshproto/request.rs +++ b/eden/mononoke/hgproto/src/sshproto/request.rs @@ -5,6 +5,8 @@ * GNU General Public License version 2. */ +#![allow(elided_named_lifetimes)] + use std::collections::HashMap; use std::iter; use std::str; diff --git a/eden/mononoke/mononoke_types/src/path.rs b/eden/mononoke/mononoke_types/src/path.rs index dfd7e33e522c9..c8be64034d671 100644 --- a/eden/mononoke/mononoke_types/src/path.rs +++ b/eden/mononoke/mononoke_types/src/path.rs @@ -909,14 +909,14 @@ impl AsRef<[MPathElement]> for NonRootMPath { pub fn non_root_mpath_element_iter<'a>( mpath: &'a Option, -) -> Box + 'a> { +) -> Box + 'a> { match mpath { Some(path) => Box::new(path.into_iter()), None => Box::new(std::iter::empty()), } } -pub fn mpath_element_iter<'a>(mpath: &'a MPath) -> Box + 'a> { +pub fn mpath_element_iter<'a>(mpath: &'a MPath) -> Box + 'a> { Box::new(mpath.into_iter()) } @@ -1264,7 +1264,7 @@ pub struct CaseConflictTrie<'a> { } impl<'a> CaseConflictTrie<'a> { - fn new(exclusions: &'a PrefixTrie) -> CaseConflictTrie { + fn new(exclusions: &'a PrefixTrie) -> CaseConflictTrie<'a> { CaseConflictTrie { children: Default::default(), lowercase_to_original: Default::default(),