don't autocopy the dll, truncates the bitflags

Author: pierre

Cargo.lock

@@ -26,9 +26,6 @@ num_enum = "0.5"
 thiserror = "1"
 bitflags = "1.3.2"
 
-[build-dependencies]
-copy_to_output = "2.0.0"
-
 [dev-dependencies]
 throbber = "0.1"
 image = "0.24.2"

Cargo.toml

@@ -1,7 +1,5 @@
 use std::{env, path::PathBuf};
 
-use copy_to_output::copy_to_output;
-
 fn main() {
     // Find Leap SDK
     println!(r"cargo:rerun-if-env-changed=LEAPSDK_LIB_PATH");
@@ -21,13 +19,5 @@ fn main() {
         // Link to LeapC.lib
         println!(r"cargo:rustc-link-search={}", path_str);
         println!(r"cargo:rustc-link-lib=static=LeapC");
-
-        // Copy LeapC.dll to the output
-        let mut leapcdll_path = leapsdk_path.clone();
-        leapcdll_path.push("LeapC.dll");
-        let leapcdll_path = leapcdll_path.to_str().unwrap();
-        println!("cargo:rerun-if-changed={}", leapcdll_path);
-        copy_to_output(leapcdll_path, &env::var("PROFILE").unwrap())
-            .expect("Failed to copy LeapC.dll to the output path");
     }
 }

build.rs

@@ -10,7 +10,7 @@ fn main() {
 
     connection.wait_for("Connecting to the service...".to_string(), |e| match e {
         Event::Connection(e) => {
-            let flags = e.flags().expect("Invalid service state flags");
+            let flags = e.flags();
             Msg::Success(format!("Connected. Service state: {:?}", flags))
         }
         _ => Msg::None,

examples/interactive.rs

@@ -20,8 +20,8 @@ impl DeviceInfo {
     }
 
     #[doc = " A combination of eLeapDeviceStatus flags. @since 3.0.0"]
-    pub fn status(&self) -> Option<DeviceStatus> {
-        DeviceStatus::from_bits(self.handle.status)
+    pub fn status(&self) -> DeviceStatus {
+        DeviceStatus::from_bits_truncate(self.handle.status)
     }
 
     // TODO get_caps
@@ -79,6 +79,6 @@ mod tests {
         assert_ne!(device_info.pid(), DevicePID::Unknown);
         let serial = device_info.serial().expect("Failed to get serial");
         assert!(serial.len() > 0);
-        device_info.status().expect("Failed to get device status");
+        let _status = device_info.status();
     }
 }

src/device_info.rs

@@ -12,8 +12,8 @@ crate::leap_ref_struct!(
 
 impl<'a> ConnectionEvent<'a> {
     #[doc = " A combination of eLeapServiceDisposition flags. @since 3.1.3"]
-    pub fn flags(&self) -> Option<ServiceState> {
-        ServiceState::from_bits(self.handle.flags)
+    pub fn flags(&self) -> ServiceState {
+        ServiceState::from_bits_truncate(self.handle.flags)
     }
 }
 
@@ -27,13 +27,12 @@ mod tests {
         let mut connection =
             Connection::create(ConnectionConfig::default()).expect("Failed to connect");
         connection.open().expect("Failed to open the connection");
-        let flags = connection.expect_event(
+        let _flags = connection.expect_event(
             "Did not receive a connection event.".to_string(),
             |e| match e {
                 Event::Connection(e) => Some(e.flags()),
                 _ => None,
             },
         );
-        flags.expect("Connection event with unknown flags.");
     }
 }

src/events/connection_event.rs

@@ -20,7 +20,7 @@ impl<'a> DeviceEvent<'a> {
     }
 
     #[doc = " The status of the connected device. A combination of flags from the eLeapDeviceStatus collection."]
-    pub fn status(&self) -> Option<DeviceStatus> {
-        DeviceStatus::from_bits(self.handle.status)
+    pub fn status(&self) -> DeviceStatus {
+        DeviceStatus::from_bits_truncate(self.handle.status)
     }
 }

src/events/device_event.rs

@@ -17,12 +17,12 @@ impl<'a> DeviceStatusChangeEvent<'a> {
     }
 
     #[doc = " The last known status of the device. This is a combination of eLeapDeviceStatus flags. @since 3.1.3"]
-    pub fn status(&self) -> Option<DeviceStatus> {
-        DeviceStatus::from_bits(self.handle.status)
+    pub fn status(&self) -> DeviceStatus {
+        DeviceStatus::from_bits_truncate(self.handle.status)
     }
 
     #[doc = " The current status of the device. This is a combination of eLeapDeviceStatus flags. @since 3.1.3"]
-    pub fn last_status(&self) -> Option<DeviceStatus> {
-        DeviceStatus::from_bits(self.handle.last_status)
+    pub fn last_status(&self) -> DeviceStatus {
+        DeviceStatus::from_bits_truncate(self.handle.last_status)
     }
 }

src/events/device_status_change_event.rs

@@ -13,8 +13,8 @@ crate::leap_ref_struct!(
 impl<'a> PolicyEvent<'a> {
     #[doc = " A bitfield containing the policies effective at the"]
     #[doc = " time the policy event was processed. @since 3.0.0"]
-    pub fn current_policy(&self) -> Option<PolicyFlags> {
-        PolicyFlags::from_bits(self.handle.current_policy.into())
+    pub fn current_policy(&self) -> PolicyFlags {
+        PolicyFlags::from_bits_truncate(self.handle.current_policy.into())
     }
 }
 
@@ -32,10 +32,7 @@ mod tests {
             "Did not receive an image policy event".to_string(),
             |e| match e {
                 Event::Policy(e) => {
-                    if e.current_policy()
-                        .expect("Failed to parse a policy flag")
-                        .contains(PolicyFlags::IMAGES)
-                    {
+                    if e.current_policy().contains(PolicyFlags::IMAGES) {
                         Some(())
                     } else {
                         None