remove unused lifetime parameters

Summary: This was used for the arena from oxidized_by_ref, which is now gone, so clean it up

Reviewed By: geralt-encore

Differential Revision: D83835893

fbshipit-source-id: f4c21dc1663d419739e43a7e35b9df38e4b227cf

Author: Scott Owens

hphp/hack/src/Cargo.lock

@@ -206,10 +206,10 @@ pub(crate) fn compile_from_text(hackc_opts: &mut crate::Opts, w: &mut impl Write
     Ok(())
 }
 
-fn compile_impl<'d>(
+fn compile_impl(
     env: NativeEnv,
     source_text: Vec<u8>,
-    decl_provider: Option<Arc<dyn DeclProvider<'d> + 'd>>,
+    decl_provider: Option<Arc<dyn DeclProvider>>,
 ) -> Result<Vec<u8>> {
     let text = SourceText::make(Arc::new(env.filepath.clone()), &source_text);
     let mut hhas = Vec::new();
@@ -241,7 +241,7 @@ pub(crate) fn test_decl_compile(hackc_opts: &mut crate::Opts, w: &mut impl Write
         let parsed_file =
             direct_decl_parser::parse_decls_for_bytecode(&decl_opts, filename, &source_text);
         #[allow(clippy::arc_with_non_send_sync)]
-        let provider: Arc<SingleDeclProvider<'_, NReason>> =
+        let provider: Arc<SingleDeclProvider<NReason>> =
             Arc::new(SingleDeclProvider::make(parsed_file.decls, hackc_opts)?);
         let env = hackc_opts.native_env(path)?;
         let hhas = compile_impl(env, source_text, Some(provider.clone()))?;
@@ -301,17 +301,16 @@ struct Access {
 }
 
 #[derive(Debug)]
-struct SingleDeclProvider<'a, R: Reason> {
+struct SingleDeclProvider<R: Reason> {
     decls: DeclsHolder,
     shallow_decl_provider: Option<Arc<dyn ShallowDeclProvider<R>>>,
     type_requests: RefCell<Vec<Access>>,
     func_requests: RefCell<Vec<Access>>,
     const_requests: RefCell<Vec<Access>>,
     module_requests: RefCell<Vec<Access>>,
-    _marker: std::marker::PhantomData<&'a ()>,
 }
 
-impl<'a, R: Reason> DeclProvider<'a> for SingleDeclProvider<'a, R> {
+impl<R: Reason> DeclProvider for SingleDeclProvider<R> {
     fn type_decl(&self, symbol: &str, depth: u64) -> Result<TypeDecl, Error> {
         let decl = {
             let decl = self.find_decl(|decls| decl_provider::find_type_decl(decls, symbol));
@@ -428,7 +427,7 @@ fn make_naming_table_powered_shallow_decl_provider<R: Reason>(
     ))
 }
 
-impl<'a, R: Reason> SingleDeclProvider<'a, R> {
+impl<R: Reason> SingleDeclProvider<R> {
     fn make(decls: Decls, hackc_opts: &crate::Opts) -> Result<Self> {
         Ok(SingleDeclProvider {
             decls: match hackc_opts.use_serialized_decls {
@@ -448,7 +447,6 @@ impl<'a, R: Reason> SingleDeclProvider<'a, R> {
             func_requests: Default::default(),
             const_requests: Default::default(),
             module_requests: Default::default(),
-            _marker: std::marker::PhantomData,
         })
     }
 

hphp/hack/src/hackc/cli/compile.rs

@@ -1477,8 +1477,8 @@ fn prepare_defs(defs: &mut [Def]) -> usize {
     class_count as usize
 }
 
-pub fn convert_toplevel_prog<'d>(
-    e: &mut Emitter<'d>,
+pub fn convert_toplevel_prog(
+    e: &mut Emitter,
     defs: &mut Vec<Def>,
     namespace_env: Arc<namespace_env::Env>,
 ) -> Result<()> {

hphp/hack/src/hackc/compile/closure_convert.rs

@@ -190,11 +190,11 @@ impl Profile {
 /// Compile Hack source code, write HHAS text to `writer`.
 /// Update `profile` with stats from any passes that run,
 /// even if the compiler ultimately returns Err.
-pub fn from_text<'d>(
+pub fn from_text(
     writer: &mut dyn std::io::Write,
     source_text: SourceText<'_>,
     native_env: &NativeEnv,
-    decl_provider: Option<Arc<dyn DeclProvider<'d> + 'd>>,
+    decl_provider: Option<Arc<dyn DeclProvider>>,
     profile: &mut Profile,
 ) -> Result<()> {
     let mut emitter = create_emitter(native_env, decl_provider);
@@ -224,7 +224,7 @@ pub fn from_text<'d>(
 }
 
 fn rewrite_and_emit<'p, 'd>(
-    emitter: &mut Emitter<'d>,
+    emitter: &mut Emitter,
     namespace_env: Arc<NamespaceEnv>,
     mut ast: ast::Program,
     profile: &'p mut Profile,
@@ -250,10 +250,10 @@ fn rewrite_and_emit<'p, 'd>(
     unit
 }
 
-pub fn unit_from_text<'d>(
+pub fn unit_from_text(
     source_text: SourceText<'_>,
     native_env: &NativeEnv,
-    decl_provider: Option<Arc<dyn DeclProvider<'d> + 'd>>,
+    decl_provider: Option<Arc<dyn DeclProvider>>,
     profile: &mut Profile,
 ) -> Result<Unit> {
     let opts = &elab::CodegenOpts {
@@ -263,10 +263,10 @@ pub fn unit_from_text<'d>(
     unit_from_text_with_opts(source_text, native_env, decl_provider, profile, opts)
 }
 
-pub fn unit_from_text_with_opts<'d>(
+pub fn unit_from_text_with_opts(
     source_text: SourceText<'_>,
     native_env: &NativeEnv,
-    decl_provider: Option<Arc<dyn DeclProvider<'d> + 'd>>,
+    decl_provider: Option<Arc<dyn DeclProvider>>,
     profile: &mut Profile,
     opts: &elab::CodegenOpts,
 ) -> Result<Unit> {
@@ -304,7 +304,7 @@ pub fn unit_to_string(
     Ok(())
 }
 
-fn create_namespace_env(emitter: &Emitter<'_>) -> NamespaceEnv {
+fn create_namespace_env(emitter: &Emitter) -> NamespaceEnv {
     NamespaceEnv::empty(
         emitter.options().hhvm.aliased_namespaces_cloned().collect(),
         Mode::ForCodegen,
@@ -316,8 +316,8 @@ fn create_namespace_env(emitter: &Emitter<'_>) -> NamespaceEnv {
     )
 }
 
-fn emit_unit_from_text<'d>(
-    emitter: &mut Emitter<'d>,
+fn emit_unit_from_text(
+    emitter: &mut Emitter,
     flags: &EnvFlags,
     source_text: SourceText<'_>,
     profile: &mut Profile,
@@ -597,10 +597,7 @@ fn emit_fatal(fatal_op: FatalOp, pos: Pos, msg: impl Into<String>) -> Result<Uni
     emit_unit::emit_fatal_unit(fatal_op, pos, msg)
 }
 
-fn create_emitter<'d>(
-    native_env: &NativeEnv,
-    decl_provider: Option<Arc<dyn DeclProvider<'d> + 'd>>,
-) -> Emitter<'d> {
+fn create_emitter(native_env: &NativeEnv, decl_provider: Option<Arc<dyn DeclProvider>>) -> Emitter {
     Emitter::new(
         NativeEnv::to_options(native_env),
         native_env.flags.is_systemlib,

hphp/hack/src/hackc/compile/compile.rs

@@ -60,8 +60,8 @@ fn debugger_eval_should_modify(tast: &[ast::Def]) -> Result<bool> {
     }
 }
 
-pub fn rewrite_program<'d>(
-    emitter: &mut Emitter<'d>,
+pub fn rewrite_program(
+    emitter: &mut Emitter,
     prog: &mut ast::Program,
     namespace_env: Arc<namespace_env::Env>,
 ) -> Result<()> {

hphp/hack/src/hackc/compile/rewrite_program.rs

@@ -10,22 +10,22 @@ use oxidized::ast;
 use oxidized::ast_defs;
 use oxidized::pos::Pos;
 
-struct RewriteXmlVisitor<'e, 'd> {
-    phantom: std::marker::PhantomData<&'e &'d ()>,
+struct RewriteXmlVisitor<'e> {
+    phantom: std::marker::PhantomData<&'e ()>,
 }
 
-struct Ctx<'e, 'd> {
-    emitter: &'e mut Emitter<'d>,
+struct Ctx<'e> {
+    emitter: &'e mut Emitter,
 }
 
-impl<'ast, 'e, 'd> VisitorMut<'ast> for RewriteXmlVisitor<'e, 'd> {
-    type Params = AstParams<Ctx<'e, 'd>, Error>;
+impl<'ast, 'e> VisitorMut<'ast> for RewriteXmlVisitor<'e> {
+    type Params = AstParams<Ctx<'e>, Error>;
 
     fn object(&mut self) -> &mut dyn VisitorMut<'ast, Params = Self::Params> {
         self
     }
 
-    fn visit_expr(&mut self, c: &mut Ctx<'e, 'd>, e: &'ast mut ast::Expr) -> Result<()> {
+    fn visit_expr(&mut self, c: &mut Ctx<'e>, e: &'ast mut ast::Expr) -> Result<()> {
         let ast::Expr(_, pos, expr) = e;
         let emitter = &mut c.emitter;
         if let ast::Expr_::Xml(cs) = expr {
@@ -36,7 +36,7 @@ impl<'ast, 'e, 'd> VisitorMut<'ast> for RewriteXmlVisitor<'e, 'd> {
     }
 }
 
-pub fn rewrite_xml(emitter: &mut Emitter<'_>, prog: &mut ast::Program) -> Result<()> {
+pub fn rewrite_xml(emitter: &mut Emitter, prog: &mut ast::Program) -> Result<()> {
     let mut xml_visitor = RewriteXmlVisitor {
         phantom: std::marker::PhantomData,
     };
@@ -45,7 +45,7 @@ pub fn rewrite_xml(emitter: &mut Emitter<'_>, prog: &mut ast::Program) -> Result
 }
 
 fn rewrite_xml_(
-    e: &mut Emitter<'_>,
+    e: &mut Emitter,
     pos: &Pos,
     (id, attributes, children): (ast::Sid, Vec<ast::XhpAttribute>, Vec<ast::Expr>),
 ) -> Result<ast::Expr> {

hphp/hack/src/hackc/compile/rewrite_xml.rs

@@ -86,7 +86,7 @@ pub enum TypeDecl {
 ///
 /// Further traversal into the type of Bar should it too be a type alias
 /// would be at a depth of two.
-pub trait DeclProvider<'d>: std::fmt::Debug {
+pub trait DeclProvider: std::fmt::Debug {
     /// Get a decl for the given type name and depth.
     /// * `symbol` - the name of the symbol being requested
     /// * `depth` - a hint to the provider about the number of layers of decl

hphp/hack/src/hackc/decl_provider/decl_provider.rs

@@ -17,16 +17,16 @@ use crate::Result;
 use crate::TypeDecl;
 
 /// A DeclProvider that memoizes results of previous queries.
-pub struct MemoProvider<'d> {
-    next: Arc<dyn DeclProvider<'d> + 'd>,
+pub struct MemoProvider {
+    next: Arc<dyn DeclProvider>,
     types: RefCell<HashMap<String, TypeDecl>>,
     funcs: RefCell<HashMap<String, FunDecl>>,
     consts: RefCell<HashMap<String, ConstDecl>>,
     modules: RefCell<HashMap<String, ModuleDecl>>,
 }
 
-impl<'d> MemoProvider<'d> {
-    pub fn new(next: Arc<dyn DeclProvider<'d> + 'd>) -> Self {
+impl MemoProvider {
+    pub fn new(next: Arc<dyn DeclProvider>) -> Self {
         Self {
             next,
             types: Default::default(),
@@ -53,7 +53,7 @@ impl<'d> MemoProvider<'d> {
     }
 }
 
-impl<'d> DeclProvider<'d> for MemoProvider<'d> {
+impl DeclProvider for MemoProvider {
     fn type_decl(&self, symbol: &str, depth: u64) -> Result<TypeDecl> {
         Self::fetch_or_insert(&self.types, symbol, || self.next.type_decl(symbol, depth))
     }
@@ -71,7 +71,7 @@ impl<'d> DeclProvider<'d> for MemoProvider<'d> {
     }
 }
 
-impl<'d> std::fmt::Debug for MemoProvider<'d> {
+impl std::fmt::Debug for MemoProvider {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         self.next.fmt(f)
     }

hphp/hack/src/hackc/decl_provider/memo_provider.rs

@@ -24,14 +24,14 @@ use crate::TypeDecl;
 ///
 /// Useful when the file under compilation is not indexed by the HHVM autoloader
 /// or similar circumstances.
-pub struct SelfProvider<'d> {
-    fallback_decl_provider: Option<Arc<dyn DeclProvider<'d> + 'd>>,
+pub struct SelfProvider {
+    fallback_decl_provider: Option<Arc<dyn DeclProvider>>,
     decls: Decls,
 }
 
-impl<'d> SelfProvider<'d> {
+impl SelfProvider {
     pub fn new(
-        fallback_decl_provider: Option<Arc<dyn DeclProvider<'d> + 'd>>,
+        fallback_decl_provider: Option<Arc<dyn DeclProvider>>,
         decl_opts: DeclParserOptions,
         source_text: SourceText<'_>,
     ) -> Self {
@@ -52,25 +52,25 @@ impl<'d> SelfProvider<'d> {
     /// When decls are turned on everywhere by default and it is no longer optional
     /// this can simply return a nonoption decl provider
     pub fn wrap_existing_provider(
-        fallback_decl_provider: Option<Arc<dyn DeclProvider<'d> + 'd>>,
+        fallback_decl_provider: Option<Arc<dyn DeclProvider>>,
         decl_opts: DeclParserOptions,
         source_text: SourceText<'_>,
-    ) -> Option<Arc<dyn DeclProvider<'d> + 'd>> {
+    ) -> Option<Arc<dyn DeclProvider>> {
         if fallback_decl_provider.is_none() {
             None
         } else {
             Some(Arc::new(SelfProvider::new(
                 fallback_decl_provider,
                 decl_opts,
                 source_text,
-            )) as Arc<dyn DeclProvider<'d> + 'd>)
+            )) as Arc<dyn DeclProvider>)
         }
     }
 
     fn result_or_else<T>(
         &self,
         decl: Result<T>,
-        get_fallback_decl: impl Fn(&Arc<dyn DeclProvider<'d> + 'd>) -> Result<T>,
+        get_fallback_decl: impl Fn(&Arc<dyn DeclProvider>) -> Result<T>,
     ) -> Result<T> {
         decl.or_else(|_| {
             self.fallback_decl_provider
@@ -80,7 +80,7 @@ impl<'d> SelfProvider<'d> {
     }
 }
 
-impl<'d> DeclProvider<'d> for SelfProvider<'d> {
+impl DeclProvider for SelfProvider {
     fn type_decl(&self, symbol: &str, depth: u64) -> Result<TypeDecl> {
         self.result_or_else(crate::find_type_decl(&self.decls, symbol), |provider| {
             provider.type_decl(symbol, depth)
@@ -106,7 +106,7 @@ impl<'d> DeclProvider<'d> for SelfProvider<'d> {
     }
 }
 
-impl<'d> std::fmt::Debug for SelfProvider<'d> {
+impl std::fmt::Debug for SelfProvider {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         if let Some(p) = &self.fallback_decl_provider {
             write!(f, "SelfProvider({:?})", p)

hphp/hack/src/hackc/decl_provider/self_provider.rs

@@ -26,7 +26,7 @@ pub enum ClassExpr {
 
 impl ClassExpr {
     fn get_original_class_name(
-        emitter: &Emitter<'_>,
+        emitter: &Emitter,
         scope: &Scope<'_>,
         check_traits: bool,
         resolve_self: bool,
@@ -60,7 +60,7 @@ impl ClassExpr {
     }
 
     fn get_original_parent_class_name(
-        emitter: &Emitter<'_>,
+        emitter: &Emitter,
         scope: &Scope<'_>,
         check_traits: bool,
         resolve_self: bool,
@@ -86,7 +86,7 @@ impl ClassExpr {
     }
 
     pub fn expr_to_class_expr(
-        emitter: &Emitter<'_>,
+        emitter: &Emitter,
         scope: &Scope<'_>,
         check_traits: bool,
         resolve_self: bool,
@@ -123,8 +123,8 @@ impl ClassExpr {
         }
     }
 
-    pub fn class_id_to_class_expr<'a, 'd>(
-        emitter: &Emitter<'d>,
+    pub fn class_id_to_class_expr<'a>(
+        emitter: &Emitter,
         scope: &Scope<'a>,
         check_traits: bool,
         resolve_self: bool,