feat: modernize to Rust edition 2024 (#74)

* feat: modernize to Rust edition 2024

Ignoring the CentOS build, we will deprecate it.

Author: seuros

.github/workflows/ci.yml

@@ -1,6 +1,6 @@
 name: CI
 
-on: 
+on:
   pull_request:
     branches: [ master ]
 
@@ -13,14 +13,17 @@ jobs:
     runs-on: ${{ matrix.platform }}
 
     steps:
-    - name: Install system dependencies
-      run: sudo apt-get install -y git cmake make gcc g++ libssl-dev
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         submodules: true
 
+    - name: Install system dependencies
+      run: sudo apt-get install -y git cmake make gcc g++ libssl-dev
+
     - name: Set up Rust toolchain
       uses: dtolnay/rust-toolchain@stable
+      with:
+        components: clippy, rustfmt
     - name: Run rust linter
       run: cargo clippy
     - name: Run rust formatter
@@ -35,9 +38,13 @@ jobs:
 
   build_centos:
     runs-on: ubuntu-latest
-    container: 
+    container:
       image: centos:8
     steps:
+    - uses: actions/checkout@v5
+      with:
+        submodules: true
+
     - name: Modify repo files of centos image
       run: |
         sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
@@ -47,18 +54,13 @@ jobs:
       run: |
         yum install -y git cmake make gcc gcc-c++ openssl-devel epel-release clang
 
-    - name: Install rustup
-      run: |
-        curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-
-    - uses: actions/checkout@v4
+    - name: Set up Rust toolchain
+      uses: dtolnay/rust-toolchain@stable
       with:
-        submodules: true
+        components: clippy, rustfmt
 
     - name: Build the project
-      run: |
-        . "$HOME/.cargo/env"
-        cargo build --release
+      run: cargo build --release
 
   build_macos:
     strategy:
@@ -68,15 +70,15 @@ jobs:
     runs-on: ${{ matrix.platform }}
 
     steps:
-    - name: Install Rustup
-      run: |
-        curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rustup-init.sh
-        sh rustup-init.sh -y --default-toolchain none
-        rustup target add ${{ matrix.target }}
+    - uses: actions/checkout@v5
+      with:
+        submodules: true
 
-    - uses: actions/checkout@v4
+    - name: Set up Rust toolchain
+      uses: dtolnay/rust-toolchain@stable
       with:
-          submodules: true
+        targets: ${{ matrix.target }}
+        components: clippy, rustfmt
 
     - name: Build the client
       run: cargo build --release
@@ -85,19 +87,20 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         submodules: true
 
     - name: Set up Rust toolchain
       uses: dtolnay/rust-toolchain@stable
       with:
         targets: x86_64-pc-windows-msvc
+        components: clippy, rustfmt
 
     - name: Install OpenSSL via vcpkg
       run: |
         vcpkg install openssl:x64-windows-static
-        
+
     - name: Build the client
       run: cargo build --release --target=x86_64-pc-windows-msvc
       env:

Cargo.toml

@@ -1,32 +1,34 @@
 [package]
 name = "rsmgclient"
-version = "2.0.3"
+version = "3.0.0"
 description = "Memgraph database adapter for Rust programming language."
 authors = ["Memgraph Contributors <[email protected]>"]
 license = "Apache-2.0"
 homepage = "https://memgraph.com"
 repository = "https://github.com/memgraph/rsmgclient"
 readme = "README.md"
 documentation = "https://docs.rs/rsmgclient"
-edition = "2018"
+edition = "2024"
 keywords = ["memgraph", "client", "driver", "database-adapter"]
 categories = ["database", "api-bindings"]
 exclude = [
     ".github/*"
 ]
 
 [dependencies]
-maplit = "1.0.2"
-chrono = "0.4.19"
+maplit = "1.0"
+chrono = "0.4"
+chrono-tz = "0.10"
+thiserror = "2.0"
 
 [dev-dependencies]
 libc = "0.2"
-serial_test = "0.4.0"
-serde_json = "1.0.57"
+serial_test = "3.2"
+serde_json = "1.0"
 
 [build-dependencies]
-bindgen = "0.68.1"
-cmake = "0.1.51"
+bindgen = "0.72"
+cmake = "0.1"
 
 [dev-dependencies.cargo-husky]
 version = "1"

benches/connection.rs

@@ -7,7 +7,7 @@ use std::{thread, time};
 
 use serde_json::json;
 use std::collections::HashMap;
-use std::fs::{create_dir_all, OpenOptions};
+use std::fs::{OpenOptions, create_dir_all};
 use std::io::prelude::*;
 use std::path::Path;
 

build.rs

@@ -52,14 +52,17 @@ impl Error for BuildError {}
 // NOTE: We have to build mgclient and link the rust binary with the same SSL and Crypto libs.
 
 fn build_mgclient_macos() -> Result<PathBuf, BuildError> {
-    println!("MacOS detected. We will check if you have either the MacPorts or Homebrew package managers.");
+    println!(
+        "MacOS detected. We will check if you have either the MacPorts or Homebrew package managers."
+    );
     println!("Checking for MacPorts...");
     let output = Command::new("/usr/bin/command")
         .args(["-v", "port"])
         .output()
         .map_err(|err| BuildError::IoError(format!("'/usr/bin/command -v port': {}", err)))?
         .stdout;
-    let port_path = String::from_utf8(output).unwrap();
+    let port_path = String::from_utf8(output)
+        .map_err(|err| BuildError::Unknown(format!("Invalid UTF-8 in port path: {}", err)))?;
     if !port_path.is_empty() {
         let port_path = &port_path[..port_path.len() - 1];
         println!(
@@ -72,17 +75,19 @@ fn build_mgclient_macos() -> Result<PathBuf, BuildError> {
             Command::new(port_path)
                 .args(["installed", "openssl"])
                 .output()
-                .expect("Failed to execute shell command 'port installed openssl'")
+                .map_err(|err| BuildError::IoError(format!("'port installed openssl': {}", err)))?
                 .stdout,
         )
-        .unwrap();
+        .map_err(|err| BuildError::Unknown(format!("Invalid UTF-8 in port output: {}", err)))?;
         if output == "None of the specified ports are installed.\n" {
-            panic!("The openssl port does not seem to be installed! Please install it using 'port install openssl'.");
+            panic!(
+                "The openssl port does not seem to be installed! Please install it using 'port install openssl'."
+            );
         }
         let openssl_lib_dir = port_binary_path
             .ancestors()
             .nth(2)
-            .unwrap()
+            .ok_or_else(|| BuildError::Unknown("Unable to find port parent directory".to_string()))?
             .join("libexec")
             .join("openssl3")
             .join("lib");
@@ -104,13 +109,14 @@ fn build_mgclient_macos() -> Result<PathBuf, BuildError> {
             .output()
             .map_err(|err| BuildError::IoError(format!("'/usr/bin/command -v brew': {}", err)))?
             .stdout;
-        let brew_path = String::from_utf8(output).unwrap();
+        let brew_path = String::from_utf8(output)
+            .map_err(|err| BuildError::Unknown(format!("Invalid UTF-8 in brew path: {}", err)))?;
         if brew_path.is_empty() {
             println!("Homebrew not found.");
-            BuildError::Unknown(
+            return Err(BuildError::Unknown(
                 "We did not detect either MacPorts or Homebrew on your machine. We cannot proceed."
                     .to_string(),
-            );
+            ));
         } else {
             println!("'brew' executable detected at {:?}", &brew_path);
             println!("Proceeding with installation assuming Homebrew is your package manager");
@@ -140,9 +146,15 @@ fn build_mgclient_macos() -> Result<PathBuf, BuildError> {
             })
             .collect::<Vec<PathBuf>>();
         openssl_dirs.sort_by(|a, b| {
-            let a_time = a.metadata().unwrap().modified().unwrap();
-            let b_time = b.metadata().unwrap().modified().unwrap();
-            b_time.cmp(&a_time)
+            // If we can't get metadata, treat as older file (sort to end)
+            let a_time = a.metadata().ok().and_then(|m| m.modified().ok());
+            let b_time = b.metadata().ok().and_then(|m| m.modified().ok());
+            match (b_time, a_time) {
+                (Some(b), Some(a)) => b.cmp(&a),
+                (Some(_), None) => std::cmp::Ordering::Less,
+                (None, Some(_)) => std::cmp::Ordering::Greater,
+                (None, None) => std::cmp::Ordering::Equal,
+            }
         });
         let openssl_root_path = openssl_dirs[0].clone();
         println!(
@@ -268,10 +280,14 @@ fn main() -> Result<(), BuildError> {
         .header(format!("{}", mgclient_export_h.display()))
         .header(format!("{}", mgclient_mgvalue_h.display()))
         .clang_arg(format!("-I{}", mgclient_out.join("include").display()))
-        .parse_callbacks(Box::new(bindgen::CargoCallbacks))
+        .parse_callbacks(Box::new(bindgen::CargoCallbacks::new()))
+        .generate_cstr(true)
         .generate()
         .expect("Unable to generate bindings");
-    let out_path = PathBuf::from(env::var("OUT_DIR").unwrap());
+    let out_path =
+        PathBuf::from(env::var("OUT_DIR").map_err(|_| {
+            BuildError::Unknown("OUT_DIR environment variable not set".to_string())
+        })?);
     bindings
         .write_to_file(out_path.join("bindings.rs"))
         .expect("Couldn't write bindings!");

src/bindings/mod.rs

@@ -13,7 +13,6 @@
 // limitations under the License.
 
 #![allow(
-    dead_code,
     non_upper_case_globals,
     non_camel_case_types,
     non_snake_case,