ci: add build-rust job (plus build fixes)

* fix trivial rustfmt comment complaint * fix typo in c-API function name
axxel · Jan 21, 2024 · 3b0f703 · 3b0f703
1 parent 9e03476
commit 3b0f703
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -117,6 +117,36 @@ jobs:
         name: android-artifacts
         path: "wrappers/android/zxingcpp/build/outputs/aar/zxingcpp-debug.aar"
 
+  build-rust:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Setup Rust
+      run: |
+        rustup update
+        rustup component add clippy
+        rustup component add rustfmt
+
+    - name: Lint
+      working-directory: wrappers/rust
+      run: |
+        cargo fmt --check
+        cargo clippy -- -Dwarnings
+
+    - name: Build
+      working-directory: wrappers/rust
+      run: cargo build --release --verbose --features bundled,image --examples
+
+    - name: Package
+      working-directory: wrappers/rust
+      # --allow-dirty is required on the windows build (but not the ubuntu build?!)
+      run: cargo package --verbose --allow-dirty --features bundled,image
+
   build-wasm:
     runs-on: ubuntu-latest
     steps:

diff --git a/core/src/zxing-c.cpp b/core/src/zxing-c.cpp
@@ -136,7 +136,7 @@ void zxing_ReaderOptions_setFormats(zxing_ReaderOptions* opts, zxing_BarcodeForm
 	opts->setFormats(static_cast<BarcodeFormat>(formats));
 }
 
-zxing_BarcodeFormats zxing_ReaderOptions_formats(const zxing_ReaderOptions* opts)
+zxing_BarcodeFormats zxing_ReaderOptions_getFormats(const zxing_ReaderOptions* opts)
 {
 	auto v = opts->formats();
 	return *reinterpret_cast<zxing_BarcodeFormats*>(&v);

diff --git a/wrappers/rust/build.rs b/wrappers/rust/build.rs
@@ -25,7 +25,7 @@ fn main() -> miette::Result<()> {
 		println!("cargo:rustc-link-search=native={}", lib_dir);
 		println!("cargo:rustc-link-lib=dylib=ZXing");
 	} else {
-//		panic!("ZXing library not found. Use feature 'bundled' or set environment variabale ZXING_CPP_LIB_DIR.")
+		// panic!("ZXing library not found. Use feature 'bundled' or set environment variabale ZXING_CPP_LIB_DIR.")
 	}
 
 	// manual bindings.rs generation: