feat: removed support for RDFox 6.* and added support for 7.2

Author: jgeluk

.rustfmt.toml

@@ -42,7 +42,7 @@ remove_nested_parens = true
 reorder_impl_items = true
 reorder_imports = true
 reorder_modules = true
-required_version = "1.7.0"
+required_version = "1.8.0"
 space_after_colon = true
 space_before_colon = false
 spaces_around_ranges = false
@@ -58,6 +58,6 @@ unstable_features = true
 use_field_init_shorthand = true
 use_small_heuristics = "Default"
 use_try_shorthand = true
-version = "Two"
+style_edition = "2021"
 where_single_line = true
 wrap_comments = true

Cargo.toml

@@ -5,7 +5,7 @@ version = "0.0.3"
 edition = "2021"
 links = "RDFox-static"
 authors = [
-    "Jacobus Geluk <[email protected]>",
+  "Jacobus Geluk <[email protected]>",
 ]
 repository = "https://github.com/EKGF/rdfox-sys"
 keywords = ["rdf", "sparql", "database", "graph-database", "datalog"]
@@ -28,24 +28,21 @@ thiserror = "1.0.56"
 [build-dependencies]
 curl = "0.4.44"
 lazy_static = "1.4.0"
-zip = "0.6.2"
-bindgen = "0.69.2"
+zip = "2.2.0"
+bindgen = "0.70.1"
 
 [package.metadata.docs.rs]
 rustc-args = ["--cfg", "docsrs"]
 
 [features]
-default = ["rdfox-7-0a", "rdfox-dylib"]
+default = ["rdfox-7-2", "rdfox-dylib"]
 #
 # Switch on if you want to link to `libRDFox.dylib` rather than `libRDFox.a`
 #
 rdfox-dylib = []
+rdfox-static = []
 #
-# Select a version
+# Select one version
 #
-rdfox-6-2 = []
-rdfox-6-3a = []
-rdfox-6-3b = []
 rdfox-7-0a = []
-
-
+rdfox-7-2 = []

build.rs

@@ -126,33 +126,22 @@ lazy_static! {
     static ref RDFOX_DOWNLOAD_HOST: &'static str = option_env!("RDFOX_DOWNLOAD_HOST")
         .unwrap_or("https://rdfox-distribution.s3.eu-west-2.amazonaws.com/release");
 }
-#[cfg(feature = "rdfox-6-2")]
-lazy_static! {
-    static ref RDFOX_VERSION_EXPECTED: &'static str =
-        option_env!("RDFOX_VERSION_EXPECTED").unwrap_or("6.2");
-}
-#[cfg(feature = "rdfox-6-3a")]
-lazy_static! {
-    static ref RDFOX_VERSION_EXPECTED: &'static str =
-        option_env!("RDFOX_VERSION_EXPECTED").unwrap_or("6.3a");
-}
-#[cfg(feature = "rdfox-6-3b")]
-lazy_static! {
-    static ref RDFOX_VERSION_EXPECTED: &'static str =
-        option_env!("RDFOX_VERSION_EXPECTED").unwrap_or("6.3b");
-}
-#[cfg(feature = "rdfox-7-0a")]
+
+#[cfg(not(any(feature = "rdfox-7-0a", feature = "rdfox-7-2",)))]
+compile_error!("You have to at least specify one of the rdfox-X-Y version number features");
+
 lazy_static! {
-    static ref RDFOX_VERSION_EXPECTED: &'static str =
-        option_env!("RDFOX_VERSION_EXPECTED").unwrap_or("7.0a");
+    static ref RDFOX_VERSION_EXPECTED: &'static str = option_env!("RDFOX_VERSION_EXPECTED")
+        .unwrap_or(
+            if cfg!(feature = "rdfox-7-0a") {
+                "7.0a"
+            } else if cfg!(feature = "rdfox-7-2") {
+                "7.2"
+            } else {
+                panic!("Unknown RDFOX version")
+            }
+        );
 }
-#[cfg(not(any(
-    feature = "rdfox-6-2",
-    feature = "rdfox-6-3a",
-    feature = "rdfox-6-3b",
-    feature = "rdfox-7-0a"
-)))]
-compile_error!("You have to at least specify one of the rdfox-X-Y version number features");
 
 fn rdfox_download_url() -> String {
     let host = *RDFOX_DOWNLOAD_HOST;
@@ -309,9 +298,9 @@ fn set_clang_path<S: Into<String>>(path: Option<S>) -> Option<(PathBuf, PathBuf)
     if !clang_bin.exists() {
         clang_bin = path.join("clang");
     }
-    if clang_bin.exists() {
-        println!("cargo:warning=using {}", clang_bin.display());
-    }
+    // if clang_bin.exists() {
+    //     println!("cargo:warning=using {}", clang_bin.display());
+    // }
     Some((path, clang_bin))
 }
 
@@ -330,12 +319,12 @@ fn set_llvm_config_path<S: Into<String>>(path: Option<S>) -> Option<(PathBuf, Pa
     if !llvm_config_bin.exists() {
         llvm_config_bin = path.join("llvm-config");
     }
-    if llvm_config_bin.exists() {
-        println!(
-            "cargo:warning=using {}",
-            llvm_config_bin.display()
-        );
-    }
+    // if llvm_config_bin.exists() {
+    //     println!(
+    //         "cargo:warning=using {}",
+    //         llvm_config_bin.display()
+    //     );
+    // }
     Some((path, llvm_config_bin))
 }
 
@@ -400,6 +389,7 @@ fn check_homebrew_prefix() -> Option<PathBuf> {
     if let Ok(output) = Command::new("brew").args(["--prefix"]).output() {
         let homebrew_prefix =
             String::from_utf8(output.stdout).expect("`brew --prefix` output must be UTF-8");
+        #[allow(irrefutable_let_patterns)]
         if let Ok(path) = PathBuf::try_from(homebrew_prefix) {
             return Some(path);
         }