Merge branch 'main' into chore/move-valid-to-new-repo

.github/workflows/ci.yml

@@ -75,6 +75,11 @@ jobs:
         with:
           target: wasm32-unknown-unknown
 
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "20.11.0"
+
       - name: Install Wasm Pack
         run: cargo install wasm-bindgen-cli --vers "0.2.92"
 

.nightly/rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2024-06-01"
+channel = "nightly-2024-10-20"
 profile = "default"

benches/request_template_bench.rs

@@ -33,7 +33,7 @@ impl PathValue for Context {
 }
 
 impl PathString for Context {
-    fn path_string<'a, T: AsRef<str>>(&'a self, parts: &'a [T]) -> Option<Cow<'_, str>> {
+    fn path_string<'a, T: AsRef<str>>(&'a self, parts: &'a [T]) -> Option<Cow<'a, str>> {
         self.value.path_string(parts)
     }
 }

rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.80"
+channel = "1.82"
 profile = "default"

src/cli/fmt.rs

@@ -9,7 +9,7 @@ impl Fmt {
         format!("{}", heading.bold())
     }
 
-    pub fn meta(meta: &String) -> String {
+    pub fn meta(meta: &str) -> String {
         format!("{}", meta.yellow())
     }
 

src/core/async_graphql_hyper.rs

@@ -397,7 +397,7 @@ impl GraphQLArcResponse {
                     .collect::<Vec<u8>>();
 
                 // Wrap the result in square brackets
-                [&[b'['], &combined[..], &[b']']].concat()
+                [b"[", &combined[..], b"]"].concat()
             }
             JITBatchResponse::Single(resp) => resp.body.as_ref().to_owned(),
         };

src/core/blueprint/definitions.rs

@@ -496,7 +496,7 @@ pub fn to_field_definition(
     object_name: &str,
     config_module: &ConfigModule,
     type_of: &config::Type,
-    name: &String,
+    name: &str,
 ) -> Valid<FieldDefinition, String> {
     update_args()
         .and(update_http().trace(config::Http::trace_name().as_str()))

src/core/config/npo/tracker.rs

@@ -33,7 +33,7 @@ impl<'a> From<Chunk<Chunk<FieldName<'a>>>> for QueryPath<'a> {
     }
 }
 
-impl<'a> Display for QueryPath<'a> {
+impl Display for QueryPath<'_> {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         let query_data: Vec<String> = self
             .0
@@ -109,7 +109,7 @@ pub struct PathTracker<'a> {
 }
 
 impl<'a> PathTracker<'a> {
-    pub fn new(config: &'a Config) -> PathTracker {
+    pub fn new(config: &'a Config) -> PathTracker<'a> {
         PathTracker { config, cache: Default::default() }
     }
 

src/core/config/reader_context.rs

@@ -13,7 +13,7 @@ pub struct ConfigReaderContext<'a> {
     pub headers: HeaderMap,
 }
 
-impl<'a> PathString for ConfigReaderContext<'a> {
+impl PathString for ConfigReaderContext<'_> {
     fn path_string<T: AsRef<str>>(&self, path: &[T]) -> Option<Cow<'_, str>> {
         if path.is_empty() {
             return None;

src/core/config/transformer/merge_types/similarity.rs

@@ -22,7 +22,7 @@ struct SimilarityTypeInfo<'a> {
 }
 
 impl<'a> Similarity<'a> {
-    pub fn new(config: &'a Config) -> Similarity {
+    pub fn new(config: &'a Config) -> Similarity<'a> {
         Similarity { config, type_similarity_cache: PairMap::default() }
     }
 

src/core/generator/generator.rs

@@ -27,6 +27,7 @@ pub struct Generator {
     transformers: Vec<Box<dyn Transform<Value = Config, Error = String>>>,
 }
 
+#[allow(clippy::large_enum_variant)]
 #[derive(Clone)]
 pub enum Input {
     Json {

src/core/grpc/request_template.rs

@@ -204,7 +204,7 @@ mod tests {
     }
 
     impl crate::core::path::PathString for Context {
-        fn path_string<'a, T: AsRef<str>>(&'a self, parts: &'a [T]) -> Option<Cow<'_, str>> {
+        fn path_string<'a, T: AsRef<str>>(&'a self, parts: &'a [T]) -> Option<Cow<'a, str>> {
             self.value.path_string(parts)
         }
     }

src/core/has_headers.rs

@@ -6,7 +6,7 @@ pub trait HasHeaders {
     fn headers(&self) -> &HeaderMap;
 }
 
-impl<'a, Ctx: ResolverContextLike> HasHeaders for EvalContext<'a, Ctx> {
+impl<Ctx: ResolverContextLike> HasHeaders for EvalContext<'_, Ctx> {
     fn headers(&self) -> &HeaderMap {
         self.headers()
     }

src/core/http/request_template.rs

@@ -277,7 +277,6 @@ impl<Ctx: PathString + HasHeaders + PathValue> CacheKey<Ctx> for RequestTemplate
 
 /// ValueStringEval parses the mustache template and uses ctx to retrieve the
 /// values for templates.
-
 struct ValueStringEval<A>(std::marker::PhantomData<A>);
 impl<A> Default for ValueStringEval<A> {
     fn default() -> Self {
@@ -344,7 +343,7 @@ mod tests {
     }
 
     impl crate::core::path::PathString for Context {
-        fn path_string<'a, T: AsRef<str>>(&'a self, parts: &'a [T]) -> Option<Cow<'_, str>> {
+        fn path_string<'a, T: AsRef<str>>(&'a self, parts: &'a [T]) -> Option<Cow<'a, str>> {
             self.value.path_string(parts)
         }
     }

src/core/ir/eval.rs

@@ -12,18 +12,12 @@ use super::{Error, EvalContext, ResolverContextLike, TypedValue};
 use crate::core::json::{JsonLike, JsonObjectLike};
 use crate::core::serde_value_ext::ValueExt;
 
-// Fake trait to capture proper lifetimes.
-// see discussion https://users.rust-lang.org/t/rpitit-allows-more-flexible-code-in-comparison-with-raw-rpit-in-inherit-impl/113417
-// TODO: could be removed after migrating to 2024 edition
-pub trait Captures<T: ?Sized> {}
-impl<T: ?Sized, U: ?Sized> Captures<T> for U {}
-
 impl IR {
     #[tracing::instrument(skip_all, fields(otel.name = %self), err)]
     pub fn eval<'a, 'b, Ctx>(
         &'a self,
         ctx: &'b mut EvalContext<'a, Ctx>,
-    ) -> impl Future<Output = Result<ConstValue, Error>> + Send + Captures<&'b &'a ()>
+    ) -> impl Future<Output = Result<ConstValue, Error>> + Send + use<'a, 'b, Ctx>
     where
         Ctx: ResolverContextLike + Sync,
     {

src/core/ir/eval_context.rs

@@ -108,7 +108,7 @@ impl<'a, Ctx: ResolverContextLike> EvalContext<'a, Ctx> {
     }
 }
 
-impl<'a, Ctx: ResolverContextLike> GraphQLOperationContext for EvalContext<'a, Ctx> {
+impl<Ctx: ResolverContextLike> GraphQLOperationContext for EvalContext<'_, Ctx> {
     fn directives(&self) -> Option<String> {
         let selection_field = self.graphql_ctx.field()?;
         selection_field

src/core/ir/resolver_context_like.rs

@@ -47,7 +47,7 @@ impl<'a> From<async_graphql::dynamic::ResolverContext<'a>> for ResolverContext<'
     }
 }
 
-impl<'a> ResolverContextLike for ResolverContext<'a> {
+impl ResolverContextLike for ResolverContext<'_> {
     fn value(&self) -> Option<&Value> {
         self.inner.parent_value.as_value()
     }

src/core/jit/context.rs

@@ -85,7 +85,7 @@ impl<'a, Input: Clone, Output> Context<'a, Input, Output> {
     }
 }
 
-impl<'a> ResolverContextLike for Context<'a, ConstValue, ConstValue> {
+impl ResolverContextLike for Context<'_, ConstValue, ConstValue> {
     fn value(&self) -> Option<&ConstValue> {
         self.value
     }

src/core/jit/fixtures/jp.rs

@@ -115,7 +115,7 @@ impl<'a, Value: Deserialize<'a> + Clone + 'a + JsonLike<'a> + std::fmt::Debug> J
         JP { test_data, plan, vars }
     }
 
-    pub fn synth(&'a self) -> Synth<Value> {
+    pub fn synth(&'a self) -> Synth<'a, Value> {
         let ProcessedTestData { posts, users } = self.test_data.to_processed();
         let vars = self.vars.clone();
 

src/core/jit/transform/skip.rs

@@ -17,7 +17,7 @@ impl<'a, Var, Value> Skip<'a, Var, Value> {
     }
 }
 
-impl<'a, Var, Value: Clone> Transform for Skip<'a, Var, Value>
+impl<Var, Value: Clone> Transform for Skip<'_, Var, Value>
 where
     Var: for<'b> JsonLike<'b> + Clone,
 {

src/core/json/borrow.rs

@@ -108,7 +108,7 @@ impl<'ctx> JsonLike<'ctx> for Value<'ctx> {
         self.is_null()
     }
 
-    fn get_path<T: AsRef<str>>(&'ctx self, path: &[T]) -> Option<&Self> {
+    fn get_path<T: AsRef<str>>(&'ctx self, path: &[T]) -> Option<&'ctx Self> {
         let mut val = self;
         for token in path {
             val = match val {
@@ -123,14 +123,14 @@ impl<'ctx> JsonLike<'ctx> for Value<'ctx> {
         Some(val)
     }
 
-    fn get_key(&'ctx self, path: &str) -> Option<&Self> {
+    fn get_key(&'ctx self, path: &str) -> Option<&'ctx Self> {
         match self {
             Value::Object(map) => map.get(path),
             _ => None,
         }
     }
 
-    fn group_by(&'ctx self, path: &[String]) -> std::collections::HashMap<String, Vec<&Self>> {
+    fn group_by(&'ctx self, path: &[String]) -> std::collections::HashMap<String, Vec<&'ctx Self>> {
         let src = gather_path_matches(self, path, vec![]);
         group_by_key(src)
     }

src/core/json/json_like.rs

@@ -27,9 +27,9 @@ pub trait JsonLike<'json>: Sized {
     fn as_f64(&self) -> Option<f64>;
     fn as_bool(&self) -> Option<bool>;
     fn is_null(&self) -> bool;
-    fn get_path<T: AsRef<str>>(&'json self, path: &[T]) -> Option<&Self>;
-    fn get_key(&'json self, path: &str) -> Option<&Self>;
-    fn group_by(&'json self, path: &[String]) -> HashMap<String, Vec<&Self>>;
+    fn get_path<T: AsRef<str>>(&'json self, path: &[T]) -> Option<&'json Self>;
+    fn get_key(&'json self, path: &str) -> Option<&'json Self>;
+    fn group_by(&'json self, path: &[String]) -> HashMap<String, Vec<&'json Self>>;
 }
 
 /// A trait for objects that can be used as JSON objects

src/core/mustache/eval.rs

@@ -16,7 +16,7 @@ impl<A> PathStringEval<A> {
     }
 }
 
-impl<'a, A: PathString> Eval<'a> for PathStringEval<A> {
+impl<A: PathString> Eval<'_> for PathStringEval<A> {
     type In = A;
     type Out = String;
 
@@ -78,7 +78,7 @@ impl<A> PathGraphqlEval<A> {
     }
 }
 
-impl<'a, A: PathGraphql> Eval<'a> for PathGraphqlEval<A> {
+impl<A: PathGraphql> Eval<'_> for PathGraphqlEval<A> {
     type In = A;
     type Out = String;
 

src/core/path.rs

@@ -1,14 +1,12 @@
+//! The path module provides a trait for accessing values from a JSON-like
+//! structure.
 use std::borrow::Cow;
 
 use serde_json::json;
 
 use crate::core::ir::{EvalContext, ResolverContextLike};
 use crate::core::json::JsonLike;
 
-///
-/// The path module provides a trait for accessing values from a JSON-like
-/// structure.
-
 ///
 /// The PathString trait provides a method for accessing values from a JSON-like
 /// structure. The returned value is encoded as a plain string.
@@ -66,7 +64,7 @@ pub enum ValueString<'a> {
     String(Cow<'a, str>),
 }
 
-impl<'a, Ctx: ResolverContextLike> EvalContext<'a, Ctx> {
+impl<Ctx: ResolverContextLike> EvalContext<'_, Ctx> {
     fn to_raw_value<T: AsRef<str>>(&self, path: &[T]) -> Option<ValueString<'_>> {
         let ctx = self;
 
@@ -101,13 +99,13 @@ impl<'a, Ctx: ResolverContextLike> EvalContext<'a, Ctx> {
     }
 }
 
-impl<'a, Ctx: ResolverContextLike> PathValue for EvalContext<'a, Ctx> {
+impl<Ctx: ResolverContextLike> PathValue for EvalContext<'_, Ctx> {
     fn raw_value<'b, T: AsRef<str>>(&'b self, path: &[T]) -> Option<ValueString<'b>> {
         self.to_raw_value(path)
     }
 }
 
-impl<'a, Ctx: ResolverContextLike> PathString for EvalContext<'a, Ctx> {
+impl<Ctx: ResolverContextLike> PathString for EvalContext<'_, Ctx> {
     fn path_string<T: AsRef<str>>(&self, path: &[T]) -> Option<Cow<'_, str>> {
         self.to_raw_value(path).and_then(|value| match value {
             ValueString::String(env) => Some(env),
@@ -116,7 +114,7 @@ impl<'a, Ctx: ResolverContextLike> PathString for EvalContext<'a, Ctx> {
     }
 }
 
-impl<'a, Ctx: ResolverContextLike> PathGraphql for EvalContext<'a, Ctx> {
+impl<Ctx: ResolverContextLike> PathGraphql for EvalContext<'_, Ctx> {
     fn path_graphql<T: AsRef<str>>(&self, path: &[T]) -> Option<String> {
         if path.len() < 2 {
             return None;

src/core/rest/endpoint.rs

@@ -29,7 +29,6 @@ pub struct Endpoint {
 }
 
 /// Creates a Rest instance from @rest directive
-
 impl Endpoint {
     pub fn get_method(&self) -> &Method {
         &self.method

src/core/tracing.rs

@@ -27,7 +27,7 @@ const INFO_STR: &str = "INFO";
 const WARN_STR: &str = "WARN";
 const ERROR_STR: &str = "ERROR";
 
-impl<'a> fmt::Display for FmtLevel<'a> {
+impl fmt::Display for FmtLevel<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         if self.ansi {
             match *self.level {