Refactor function signatures to use lifetime annotations for improved clarity

Author: oldrev

crates/core/src/runtime/context/mod.rs

@@ -283,7 +283,7 @@ fn parse_store_expr(input: &str) -> nom::IResult<&str, &str, nom::error::Error<&
     Ok((input, store))
 }
 
-fn context_store_parser(input: &str) -> nom::IResult<&str, ContextKey, nom::error::Error<&str>> {
+fn context_store_parser(input: &str) -> nom::IResult<&str, ContextKey<'_>, nom::error::Error<&str>> {
     // use crate::text::nom_parsers::*;
     use nom::combinator::{opt, rest};
 

crates/core/src/runtime/model/json/deser.rs

@@ -327,7 +327,7 @@ fn generate_new_xored_id_value(subflow_id: ElementId, old_id: &str) -> crate::Re
     Ok(JsonValue::String((subflow_id ^ old_id).to_string()))
 }
 
-pub fn parse_red_type_value(t: &str) -> RedElementTypeValue {
+pub fn parse_red_type_value(t: &str) -> RedElementTypeValue<'_> {
     match t.split_once(':') {
         Some((x, y)) => RedElementTypeValue { red_type: x, id: parse_red_id_str(y) },
         None => RedElementTypeValue { red_type: t, id: None },

crates/core/src/runtime/model/json/npdeser.rs

@@ -110,7 +110,7 @@ where
     }
 
     impl BoolVisitor {
-        fn convert_to_bool<E>(v: &str) -> Option<Result<<BoolVisitor as Visitor>::Value, E>>
+        fn convert_to_bool<E>(v: &str) -> Option<Result<<BoolVisitor as Visitor<'_>>::Value, E>>
         where
             E: Error,
         {

crates/core/src/runtime/model/msg.rs

@@ -406,11 +406,11 @@ impl MsgHandle {
         MsgHandle::new(msg)
     }
 
-    pub async fn read(&self) -> tokio::sync::RwLockReadGuard<Msg> {
+    pub async fn read(&self) -> tokio::sync::RwLockReadGuard<'_, Msg> {
         self.inner.read().await
     }
 
-    pub async fn write(&self) -> tokio::sync::RwLockWriteGuard<Msg> {
+    pub async fn write(&self) -> tokio::sync::RwLockWriteGuard<'_, Msg> {
         self.inner.write().await
     }
 

crates/core/src/runtime/model/propex.rs

@@ -144,15 +144,15 @@ fn string_literal<'a, E: ParseError<&'a str>>(input: &'a str) -> IResult<&'a str
     Ok((input, content))
 }
 
-fn first_string_literal_property(i: &str) -> IResult<&str, PropexSegment, nom::error::Error<&str>> {
+fn first_string_literal_property(i: &str) -> IResult<&str, PropexSegment<'_>, nom::error::Error<&str>> {
     token(string_literal).map(|x| PropexSegment::Property(Cow::Borrowed(x))).parse(i)
 }
 
-fn first_direct_property(i: &str) -> IResult<&str, PropexSegment, nom::error::Error<&str>> {
+fn first_direct_property(i: &str) -> IResult<&str, PropexSegment<'_>, nom::error::Error<&str>> {
     nom_parsers::js_identifier.map(|x| PropexSegment::Property(Cow::Borrowed(x))).parse(i)
 }
 
-fn first_property(i: &str) -> IResult<&str, PropexSegment, nom::error::Error<&str>> {
+fn first_property(i: &str) -> IResult<&str, PropexSegment<'_>, nom::error::Error<&str>> {
     context(
         "first_property",
         alt((
@@ -167,25 +167,25 @@ fn first_property(i: &str) -> IResult<&str, PropexSegment, nom::error::Error<&st
 }
 
 /// `['prop']` or `["prop"]`
-fn quoted_index_property(i: &str) -> IResult<&str, PropexSegment, nom::error::Error<&str>> {
+fn quoted_index_property(i: &str) -> IResult<&str, PropexSegment<'_>, nom::error::Error<&str>> {
     delimited(token(char('[')), string_literal, token(char(']')))
         .map(|x| PropexSegment::Property(Cow::Borrowed(x)))
         .parse(i)
 }
 
 /// `.property`
-fn direct_identifier_property(i: &str) -> IResult<&str, PropexSegment, nom::error::Error<&str>> {
+fn direct_identifier_property(i: &str) -> IResult<&str, PropexSegment<'_>, nom::error::Error<&str>> {
     context("direct_property", preceded(char('.'), nom_parsers::js_identifier))
         .map(|x: &str| PropexSegment::Property(Cow::Borrowed(x)))
         .parse(i)
 }
 
 /// `.123`
-fn direct_numbers_index(i: &str) -> IResult<&str, PropexSegment, nom::error::Error<&str>> {
+fn direct_numbers_index(i: &str) -> IResult<&str, PropexSegment<'_>, nom::error::Error<&str>> {
     context("direct_numbers_index", preceded(token(char('.')), token(parse_usize))).map(PropexSegment::Index).parse(i)
 }
 
-fn subproperty(i: &str) -> IResult<&str, PropexSegment, nom::error::Error<&str>> {
+fn subproperty(i: &str) -> IResult<&str, PropexSegment<'_>, nom::error::Error<&str>> {
     context(
         "subproperty",
         alt((
@@ -199,13 +199,13 @@ fn subproperty(i: &str) -> IResult<&str, PropexSegment, nom::error::Error<&str>>
     .parse(i)
 }
 
-fn bracket_index(i: &str) -> IResult<&str, PropexSegment, nom::error::Error<&str>> {
+fn bracket_index(i: &str) -> IResult<&str, PropexSegment<'_>, nom::error::Error<&str>> {
     context("index", delimited(token(char('[')), token(parse_usize), token(char(']'))))
         .map(PropexSegment::Index)
         .parse(i)
 }
 
-fn nested(i: &str) -> IResult<&str, PropexSegment, nom::error::Error<&str>> {
+fn nested(i: &str) -> IResult<&str, PropexSegment<'_>, nom::error::Error<&str>> {
     let (i, _) = token(char('[')).parse(i)?;
     let (i, first) = first_direct_property.parse(i)?;
     let (i, rest) = many1(subproperty).parse(i)?;
@@ -216,7 +216,7 @@ fn nested(i: &str) -> IResult<&str, PropexSegment, nom::error::Error<&str>> {
     Ok((i, PropexSegment::Nested(result)))
 }
 
-fn expression(input: &str) -> IResult<&str, PropexPath, nom::error::Error<&str>> {
+fn expression(input: &str) -> IResult<&str, PropexPath<'_>, nom::error::Error<&str>> {
     let (input, first) = first_property.parse(input)?;
 
     let (input, rest) = context(
@@ -238,7 +238,7 @@ fn expression(input: &str) -> IResult<&str, PropexPath, nom::error::Error<&str>>
     }
 }
 
-pub fn parse(expr: &str) -> Result<PropexPath, PropexError> {
+pub fn parse(expr: &str) -> Result<PropexPath<'_>, PropexError> {
     if expr.is_empty() {
         return Err(PropexError::BadArguments);
     }

crates/core/src/runtime/model/variant/mod.rs

@@ -34,7 +34,7 @@ pub enum PropexEnv<'a> {
 pub trait PropexEnvSliceExt<'a> {
     fn find(&self, seg: &str, this: &'a Variant) -> Option<&'a Variant>;
     fn find_ext(&self, seg: &str) -> Option<&'a Variant>;
-    fn find_seg(&self, seg: &str) -> Option<&PropexEnv>;
+    fn find_seg(&self, seg: &str) -> Option<&PropexEnv<'_>>;
 }
 
 #[derive(Debug, Clone)]

crates/pymod/src/lib.rs

@@ -28,7 +28,7 @@ fn edgelink_pymod(_py: Python, m: &PyModule) -> PyResult<()> {
 }
 
 #[pyfunction]
-fn rust_sleep(py: Python) -> PyResult<&PyAny> {
+fn rust_sleep(py: Python<'_>) -> PyResult<&PyAny> {
     pyo3_asyncio::tokio::future_into_py(py, async {
         eprintln!("Sleeping in Rust!");
         tokio::time::sleep(std::time::Duration::from_secs(1)).await;