update rust

.github/workflows/rust-codestyle.yml

@@ -44,6 +44,10 @@ jobs:
         toolchain: stable
         override: true
 
+    - name: Rust build binding
+      run: bash copy.sh && cargo build --verbose
+      working-directory: binding/rust
+
     - name: Run clippy
       run: cargo clippy -- -D warnings
       working-directory: binding/rust
@@ -85,6 +89,10 @@ jobs:
         profile: minimal
         toolchain: stable
         override: true
+
+    - name: Rust build binding
+      run: bash copy.sh && cargo build --verbose
+      working-directory: binding/rust
 
     - name: Run clippy
       run: cargo clippy -- -D warnings

.github/workflows/rust-demos.yml

@@ -50,6 +50,10 @@ jobs:
         profile: minimal
         toolchain: stable
         override: true
+
+    - name: Rust build binding
+      run: bash copy.sh && cargo build --verbose
+      working-directory: binding/rust
 
     - name: Rust build micdemo
       run: cargo build --verbose
@@ -89,6 +93,10 @@ jobs:
       with:
         toolchain: nightly
         override: true
+
+    - name: Rust build binding
+      run: bash copy.sh && cargo build --verbose
+      working-directory: binding/rust
 
     - name: Rust build micdemo
       run: cargo build --verbose

binding/rust/src/rhino.rs

@@ -27,7 +27,11 @@ use libloading::os::unix::Symbol as RawSymbol;
 use libloading::os::windows::Symbol as RawSymbol;
 
 #[repr(C)]
-struct CRhino {}
+struct CRhino {
+    // Fields suggested by the Rustonomicon: https://doc.rust-lang.org/nomicon/ffi.html#representing-opaque-structs
+    _data: [u8; 0],
+    _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
+}
 
 #[repr(C)]
 #[derive(PartialEq, Clone, Debug)]
@@ -87,6 +91,7 @@ type PvGetErrorStackFn =
 type PvFreeErrorStackFn = unsafe extern "C" fn(message_stack: *mut *mut c_char);
 type PvSetSdkFn = unsafe extern "C" fn(sdk: *const c_char);
 
+
 #[derive(PartialEq, Clone, Debug)]
 pub enum RhinoErrorStatus {
     LibraryError(PvStatus),
@@ -129,16 +134,13 @@ impl std::fmt::Display for RhinoError {
         let mut message_string = String::new();
         message_string.push_str(&format!("{} with status '{:?}'", self.message, self.status));
 
-        if self.message_stack.len() == 0 {
-            message_string.push_str(".");
-            write!(f, "{}", message_string)
-        } else {
-            message_string.push_str(":");
+        if !self.message_stack.is_empty() {
+            message_string.push(':');
             for x in 0..self.message_stack.len() {
                 message_string.push_str(&format!("  [{}] {}\n", x, self.message_stack[x]))
-            }
-            write!(f, "{}", message_string)
+            };
         }
+        write!(f, "{}", message_string)
     }
 }
 

demo/rust/filedemo/Cargo.toml

@@ -8,4 +8,4 @@ chrono = "0.4.23"
 clap = "3.2.3"
 hound = "3.4.0"
 itertools = "0.10.3"
-pv_rhino = "=2.2.1"
+pv_rhino = { path = "../../../binding/rust" }

demo/rust/micdemo/Cargo.toml

@@ -10,4 +10,4 @@ ctrlc = "3.2.2"
 hound = "3.4.0"
 itertools = "0.10.3"
 pv_recorder = "=1.2.1"
-pv_rhino = "=2.2.1"
+pv_rhino = { path = "../../../binding/rust" }

resources/.lint/spell-check/dict.txt

@@ -106,6 +106,7 @@ rhinomicdemo
 rhinotestapp
 rodio
 rosado
+Rustonomicon
 RTLD
 seumateu
 shōmei