diff --git a/src/engine.rs b/src/engine.rs index b079ae9a..0b164d91 100644 --- a/src/engine.rs +++ b/src/engine.rs @@ -627,17 +627,17 @@ pub struct Limits { /// Context of a script evaluation process. #[derive(Debug)] -pub struct EvalContext<'e, 'x, 'px: 'x, 'a, 's, 'm, 'pm: 'm, 't, 'pt: 't> { +pub struct EvalContext<'e, 'x, 'px: 'x, 'a, 's, 'm, 't, 'pt: 't> { pub(crate) engine: &'e Engine, pub(crate) scope: &'x mut Scope<'px>, pub(crate) mods: &'a mut Imports, pub(crate) state: &'s mut State, - pub(crate) lib: &'m [&'pm Module], + pub(crate) lib: &'m [&'m Module], pub(crate) this_ptr: &'t mut Option<&'pt mut Dynamic>, pub(crate) level: usize, } -impl<'e, 'x, 'px, 'a, 's, 'm, 'pm, 't, 'pt> EvalContext<'e, 'x, 'px, 'a, 's, 'm, 'pm, 't, 'pt> { +impl<'e, 'x, 'px, 'a, 's, 'm, 't, 'pt> EvalContext<'e, 'x, 'px, 'a, 's, 'm, 't, 'pt> { /// The current [`Engine`]. #[inline(always)] pub fn engine(&self) -> &Engine { diff --git a/src/fn_native.rs b/src/fn_native.rs index 7c69a768..59df6849 100644 --- a/src/fn_native.rs +++ b/src/fn_native.rs @@ -55,17 +55,17 @@ pub type Locked = crate::stdlib::sync::RwLock; /// Context of a native Rust function call. #[derive(Debug, Copy, Clone)] -pub struct NativeCallContext<'e, 'n, 's, 'a, 'm, 'pm: 'm> { +pub struct NativeCallContext<'e, 'n, 's, 'a, 'm> { engine: &'e Engine, fn_name: &'n str, source: Option<&'s str>, pub(crate) mods: Option<&'a Imports>, - pub(crate) lib: &'m [&'pm Module], + pub(crate) lib: &'m [&'m Module], } -impl<'e, 'n, 's, 'a, 'm, 'pm: 'm, M: AsRef<[&'pm Module]> + ?Sized> +impl<'e, 'n, 's, 'a, 'm, M: AsRef<[&'m Module]> + ?Sized> From<(&'e Engine, &'n str, Option<&'s str>, &'a Imports, &'m M)> - for NativeCallContext<'e, 'n, 's, 'a, 'm, 'pm> + for NativeCallContext<'e, 'n, 's, 'a, 'm> { #[inline(always)] fn from(value: (&'e Engine, &'n str, Option<&'s str>, &'a Imports, &'m M)) -> Self { @@ -79,8 +79,8 @@ impl<'e, 'n, 's, 'a, 'm, 'pm: 'm, M: AsRef<[&'pm Module]> + ?Sized> } } -impl<'e, 'n, 'm, 'pm: 'm, M: AsRef<[&'pm Module]> + ?Sized> From<(&'e Engine, &'n str, &'m M)> - for NativeCallContext<'e, 'n, '_, '_, 'm, 'pm> +impl<'e, 'n, 'm, M: AsRef<[&'m Module]> + ?Sized> From<(&'e Engine, &'n str, &'m M)> + for NativeCallContext<'e, 'n, '_, '_, 'm> { #[inline(always)] fn from(value: (&'e Engine, &'n str, &'m M)) -> Self { @@ -94,10 +94,10 @@ impl<'e, 'n, 'm, 'pm: 'm, M: AsRef<[&'pm Module]> + ?Sized> From<(&'e Engine, &' } } -impl<'e, 'n, 's, 'a, 'm, 'pm> NativeCallContext<'e, 'n, 's, 'a, 'm, 'pm> { +impl<'e, 'n, 's, 'a, 'm> NativeCallContext<'e, 'n, 's, 'a, 'm> { /// Create a new [`NativeCallContext`]. #[inline(always)] - pub fn new(engine: &'e Engine, fn_name: &'n str, lib: &'m impl AsRef<[&'pm Module]>) -> Self { + pub fn new(engine: &'e Engine, fn_name: &'n str, lib: &'m impl AsRef<[&'m Module]>) -> Self { Self { engine, fn_name, @@ -116,7 +116,7 @@ impl<'e, 'n, 's, 'a, 'm, 'pm> NativeCallContext<'e, 'n, 's, 'a, 'm, 'pm> { fn_name: &'n str, source: &'s Option<&str>, imports: &'a mut Imports, - lib: &'m impl AsRef<[&'pm Module]>, + lib: &'m impl AsRef<[&'m Module]>, ) -> Self { Self { engine, diff --git a/src/syntax.rs b/src/syntax.rs index 1ec40876..96498a2c 100644 --- a/src/syntax.rs +++ b/src/syntax.rs @@ -61,7 +61,7 @@ impl Expression<'_> { } } -impl EvalContext<'_, '_, '_, '_, '_, '_, '_, '_, '_> { +impl EvalContext<'_, '_, '_, '_, '_, '_, '_, '_> { /// Evaluate an [expression tree][Expression]. /// /// # WARNING - Low Level API