Merge pull request #111 from silicon-heaven/dependabot/cargo/jaq-all-v3.0.0

build(deps): bump jaq-all from v3.0.0-beta to v3.0.0

Author: syyyr

Cargo.toml

@@ -5,7 +5,7 @@ name = "shvproto"
 description = "Rust implementation of the SHV protocol"
 license = "MIT"
 repository = "https://github.com/silicon-heaven/libshvproto-rs"
-version = "6.1.6"
+version = "6.1.7"
 edition = "2024"
 
 [dependencies]
@@ -16,7 +16,7 @@ hex = "0.4"
 clap = { version = "4.5", features = ["derive"] }
 simple_logger = { version = "5.0", features = ["stderr"], optional = true }
 serde = { version = "1.0.219", features = ["derive"], optional = true }
-jaq-all = { git = "https://github.com/01mf02/jaq", tag = "v3.0.0-beta", version = "0.1.0-beta", optional = true }
+jaq-all = { git = "https://github.com/01mf02/jaq", tag = "v3.0.0", version = "0.1.0-beta", optional = true }
 # FIXME: remove this after jaq support is complete
 fn_name = "0.1.0"
 

src/bin/cp2cp.rs

@@ -200,7 +200,7 @@ fn main() {
 
         #[cfg(feature = "cq")]
         let output_values = if let Some(filter) = opts.cq_filter {
-            let filter = match jaq_all::compile_with(&filter, jaq_std::defs(), jaq_std::funs(), &[]) {
+            let filter = match jaq_all::compile_with(&filter, jaq_all::jaq_core::defs().chain(jaq_std::defs()), jaq_all::jaq_core::funs().chain(jaq_std::funs()), &[]) {
                 Ok(filter) => filter,
                 Err(error) => {
                     eprintln!("Failed to parse cq filter: {error:?}");

src/jaq.rs

@@ -5,7 +5,7 @@ use jaq_all::jaq_core::{Error, ops};
 use crate::{RpcValue, Value};
 
 pub type ValR = jaq_all::jaq_core::ValR<RpcValue>;
-pub type ValX = jaq_all::jaq_core::ValX<RpcValue>;
+pub type ValX<'a> = jaq_all::jaq_core::ValX<'a, RpcValue>;
 impl Neg for RpcValue {
     type Output = ValR;
     fn neg(self) -> Self::Output {
@@ -245,29 +245,29 @@ impl jaq_all::jaq_core::ValT for RpcValue {
         todo!("{}", fn_name::uninstantiated!());
     }
 
-    fn map_values<I: Iterator<Item = ValX>>(
+    fn map_values<'a, I: Iterator<Item = ValX<'a>>>(
         self,
         _opt: jaq_all::jaq_core::path::Opt,
         _f: impl Fn(Self) -> I,
-    ) -> ValX {
+    ) -> ValX<'a> {
         todo!("{}", fn_name::uninstantiated!());
     }
 
-    fn map_index<I: Iterator<Item = ValX>>(
+    fn map_index<'a, I: Iterator<Item = ValX<'a>>>(
         self,
         _index: &Self,
         _opt: jaq_all::jaq_core::path::Opt,
         _f: impl Fn(Self) -> I,
-    ) -> ValX {
+    ) -> ValX<'a> {
         todo!("{}", fn_name::uninstantiated!());
     }
 
-    fn map_range<I: Iterator<Item = ValX>>(
+    fn map_range<'a, I: Iterator<Item = ValX<'a>>>(
         self,
         _range: jaq_all::jaq_core::val::Range<&Self>,
         _opt: jaq_all::jaq_core::path::Opt,
         _f: impl Fn(Self) -> I,
-    ) -> ValX {
+    ) -> ValX<'a> {
         todo!("{}", fn_name::uninstantiated!());
     }