more cleanup/improvements (zshipko#154)

* add ocaml 5.2 to ci

* update ndarray

* disable fail-fast on ci for now

* clippy

* update setup-ocaml

* ci

* ci

* ci

* ci

Author: zshipko

.github/workflows/ocaml.yml

@@ -9,22 +9,22 @@ on:
 
 
 jobs:
-  build:
+  build-ubuntu:
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
-        os: [macos-latest, ubuntu-latest]
         ocaml-compiler:
           [
-            "5.1.0",
+            "5.2.0",
+            "5.1.1",
             "5.0.0",
             "4.14.1",
             "4.13.1",
             "4.12.1",
-            "4.11.0",
-            "4.10.0",
+            #"4.11.2",
+            "4.10.2",
           ]
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -35,9 +35,13 @@ jobs:
           path: "~/.opam"
           key: ocaml-rs-opam-${{ matrix.ocaml-compiler }}-${{ matrix.os }}
       - name: Use OCaml ${{ matrix.ocaml-compiler }}
-        uses: ocaml/setup-ocaml@v2
+        uses: ocaml/setup-ocaml@v3
         with:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
+      - if: matrix.os == 'macos-latest'
+        run: brew install zstd
+      - if: matrix.os == 'ubuntu-latest'
+        run: sudo apt install libzstd-dev
       - run: opam install dune ppx_inline_test
       - name: Run OCaml tests
         run: opam exec -- dune runtest --root=./test

.github/workflows/rust.yml

@@ -12,17 +12,19 @@ jobs:
     name: Build
     runs-on: ${{ matrix.os }}
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
         os: [macos-latest, ubuntu-latest]
         ocaml-compiler:
           [
+            "5.2.0",
+            "5.1.1",
             "5.0.0",
             "4.14.1",
             "4.13.1",
             "4.12.1",
-            "4.11.0",
-            "4.10.0",
+            #"4.11.2",
+            "4.10.2",
           ]
 
     steps:
@@ -37,10 +39,15 @@ jobs:
           key: ocaml-rs-opam-${{ matrix.ocaml-compiler }}-${{ matrix.os }}
 
       - name: Use OCaml ${{ matrix.ocaml-compiler }}
-        uses: ocaml/setup-ocaml@v2
+        uses: ocaml/setup-ocaml@v3
         with:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
 
+      - if: matrix.os == 'macos-latest'
+        run: brew install zstd
+      - if: matrix.os == 'ubuntu-latest'
+        run: sudo apt install libzstd-dev
+
       - name: Install mdbook
         uses: baptiste0928/cargo-install@v2
         with:

Cargo.toml

@@ -18,7 +18,7 @@ ocaml-sys = {path = "./sys", version = ">=0.23"}
 ocaml-boxroot-sys = {version = "0.3.1"}
 ocaml-derive = {path = "./derive", optional = true, version = "^1.0.0-beta.5"}
 cstr_core = {version = "0.2", optional = true}
-ndarray = {version = "^0.15.1", optional = true}
+ndarray = {version = "^0.16.1", optional = true}
 
 [features]
 default = ["derive"]

derive/src/lib.rs

@@ -142,7 +142,7 @@ pub fn ocaml_sig(attribute: TokenStream, item: TokenStream) -> TokenStream {
 /// - Wraps the function body using `ocaml::body`
 /// - Automatic type conversion for arguments/return value (including Result types)
 /// - Defines a bytecode function automatically for functions that take more than 5 arguments. The
-/// bytecode function for `my_func` would be `my_func_bytecode`
+///   bytecode function for `my_func` would be `my_func_bytecode`
 /// - Allows for an optional ident argument specifying the name of the `gc` handle parameter
 #[proc_macro_attribute]
 pub fn ocaml_func(attribute: TokenStream, item: TokenStream) -> TokenStream {

src/types.rs

@@ -656,7 +656,7 @@ pub(crate) mod bigarray_ext {
         if unsafe { (*ba).is_fortran() } {
             shape.f()
         } else {
-            shape.into_shape()
+            shape.into_shape_with_order()
         }
     }
 }

src/value.rs

@@ -175,6 +175,7 @@ impl Value {
         let (used, max) = cfg.unwrap_or((0, 1));
         Value::new(sys::caml_alloc_final(
             core::mem::size_of::<T>(),
+            #[allow(clippy::missing_transmute_annotations)]
             core::mem::transmute(finalizer),
             used,
             max,

sys/build.rs

@@ -145,7 +145,7 @@ fn run() -> std::io::Result<()> {
     let minor = split[1].parse::<usize>().unwrap();
 
     if major >= 5 || cfg!(feature = "ocaml5") {
-        println!("cargo:rustc-cfg=ocaml5");
+        println!("cargo:rustc-cfg=feature=\"ocaml5\"");
     }
 
     #[cfg(feature = "link")]

sys/src/state.rs

@@ -27,7 +27,7 @@ pub type backtrace_slot = *mut ::core::ffi::c_void;
 
 #[repr(C)]
 #[derive(Debug)]
-#[cfg(not(ocaml5))]
+#[cfg(not(feature = "ocaml5"))]
 pub struct caml_domain_state {
     pub _young_ptr: *mut Value,
     pub _young_limit: *mut Value,
@@ -78,7 +78,7 @@ pub struct caml_domain_state {
 
 #[repr(C)]
 #[derive(Debug)]
-#[cfg(ocaml5)]
+#[cfg(feature = "ocaml5")]
 pub struct caml_domain_state {
     pub _young_limit: core::sync::atomic::AtomicUsize,
     pub _young_ptr: *mut Value,

test/.cargo/config test/.cargo/config.toml

@@ -9,7 +9,7 @@ crate-type = ["staticlib", "cdylib"]
 [dependencies]
 ocaml-sys = { path = "../sys" }
 ocaml = { path = "..", features = ["bigarray-ext"] }
-ndarray = "^0.15.1"
+ndarray = "^0.16.1"
 
 [build-dependencies]
 ocaml-build = { path = "../build" }