upgrade deps; tag 0.0.4

Author: tiye

.github/workflows/check.yaml

@@ -14,17 +14,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: supplypike/setup-bin@v3
+      - uses: calcit-lang/setup-[email protected]
         with:
-          uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.9/cr'
-          name: 'cr'
-          version: '0.8.9'
-
-      - uses: supplypike/setup-bin@v3
-        with:
-          uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.9/caps'
-          name: 'caps'
-          version: '0.8.9'
+          version: "0.8.50"
 
       - uses: dtolnay/rust-toolchain@stable
         with:

.rustfmt.toml

@@ -0,0 +1,3 @@
+
+max_width = 136
+tab_spaces = 2

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "calcit_regex"
-version = "0.0.2"
+version = "0.0.4"
 authors = ["jiyinyiyong <[email protected]>"]
 edition = "2021"
 
@@ -13,6 +13,6 @@ crate-type = ["dylib"] # Creates dynamic lib
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cirru_edn = "0.5.0"
-cirru_parser = "0.1.25"
-regex = "1.8.4"
+cirru_edn = "0.6.3"
+cirru_parser = "0.1.29"
+regex = "1.10.4"

Cargo.toml

@@ -1,9 +1,9 @@
-use cirru_edn::Edn;
+use cirru_edn::{Edn, EdnListView};
 use regex::Regex;
 
 #[no_mangle]
 pub fn abi_version() -> String {
-  String::from("0.0.6")
+  String::from("0.0.7")
 }
 
 #[no_mangle]
@@ -51,8 +51,8 @@ pub fn re_find(args: Vec<Edn>) -> Result<Edn, String> {
           Ok(p) => {
             let mut matched = p.find_iter(s);
             match matched.next() {
-              Some(v) => Ok(Edn::Str(v.as_str().to_string().into_boxed_str())),
-              None => Ok(Edn::Str("".to_owned().into_boxed_str())), // TODO maybe nil
+              Some(v) => Ok(Edn::Str(v.as_str().to_string().into())),
+              None => Ok(Edn::Str("".to_owned().into())), // TODO maybe nil
             }
           }
           Err(e) => Err(format!("re-find failed, {}", e)),
@@ -73,9 +73,9 @@ pub fn re_find_all(args: Vec<Edn>) -> Result<Edn, String> {
         Ok(p) => {
           let mut ys: Vec<Edn> = vec![];
           for v in p.find_iter(s) {
-            ys.push(Edn::Str(v.as_str().to_string().into_boxed_str()))
+            ys.push(Edn::Str(v.as_str().to_string().into()))
           }
-          Ok(Edn::List(ys))
+          Ok(Edn::List(EdnListView(ys)))
         }
         Err(e) => Err(format!("re-find-all failed, {}", e)),
       },
@@ -96,7 +96,7 @@ pub fn re_split(args: Vec<Edn>) -> Result<Edn, String> {
           for piece in p.split(s) {
             ys.push(Edn::str(piece));
           }
-          Ok(Edn::List(ys))
+          Ok(Edn::List(EdnListView(ys)))
         }
         Err(e) => Err(format!("re-split failed, {}", e)),
       },
@@ -112,13 +112,10 @@ pub fn re_replace_all(args: Vec<Edn>) -> Result<Edn, String> {
   if args.len() == 3 {
     match (&args[0], &args[1], &args[2]) {
       (Edn::Str(s), Edn::Str(pattern), Edn::Str(next)) => match Regex::new(pattern) {
-        Ok(p) => Ok(Edn::str(p.replace_all(&**s, &**next).into_owned())),
+        Ok(p) => Ok(Edn::str(p.replace_all(s, &**next).into_owned())),
         Err(e) => Err(format!("re-replace-all failed, {}", e)),
       },
-      (a, b, c) => Err(format!(
-        "re-replace-all expected 3 strings: {} {} {}",
-        a, b, c
-      )),
+      (a, b, c) => Err(format!("re-replace-all expected 3 strings: {} {} {}", a, b, c)),
     }
   } else {
     Err(format!("re-replace-all expected 3 strings: {:?}", args))