fix(clippy): fix enum variant names lint (#119)

[the build](https://github.com/sassman/t-rec-rs/runs/5356845166?check_suite_focus=true#step:5:200) broke because of the enum variant prefix `_`, the variants have been renamed
sassman · Mar 1, 2022 · 9f3578c · 9f3578c
1 parent a66e7ae
commit 9f3578c
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/src/macos/window_id.rs b/src/macos/window_id.rs
@@ -16,10 +16,10 @@ use std::os::raw::c_void;
 
 #[derive(Debug)]
 enum DictEntryValue {
-    _Number(i64),
-    _Bool(bool),
-    _String(String),
-    _Unknown,
+    Number(i64),
+    Bool(bool),
+    String(String),
+    Unknown,
 }
 
 ///
@@ -56,7 +56,7 @@ pub fn window_list() -> Result<WindowList> {
         }
         let window_owner = get_from_dict(dic_ref, "kCGWindowOwnerName");
         let window_id = get_from_dict(dic_ref, "kCGWindowNumber");
-        if let (DictEntryValue::_String(name), DictEntryValue::_Number(win_id)) =
+        if let (DictEntryValue::String(name), DictEntryValue::Number(win_id)) =
             (window_owner, window_id)
         {
             win_list.push((Some(name), win_id as u64));
@@ -83,29 +83,29 @@ fn get_from_dict(dict: CFDictionaryRef, key: &str) -> DictEntryValue {
                     let out_value: *mut i64 = &mut value_i64;
                     let converted = unsafe { CFNumberGetValue(value, I64, out_value.cast()) };
                     if converted {
-                        return DictEntryValue::_Number(value_i64);
+                        return DictEntryValue::Number(value_i64);
                     }
                 }
                 I32 => {
                     let mut value_i32 = 0_i32;
                     let out_value: *mut i32 = &mut value_i32;
                     let converted = unsafe { CFNumberGetValue(value, I32, out_value.cast()) };
                     if converted {
-                        return DictEntryValue::_Number(value_i32 as i64);
+                        return DictEntryValue::Number(value_i32 as i64);
                     }
                 }
                 n => {
                     eprintln!("Unsupported Number of typeId: {}", n);
                 }
             }
         } else if type_id == unsafe { CFBooleanGetTypeID() } {
-            return DictEntryValue::_Bool(unsafe { CFBooleanGetValue(value.cast()) });
+            return DictEntryValue::Bool(unsafe { CFBooleanGetValue(value.cast()) });
         } else if type_id == unsafe { CFStringGetTypeID() } {
             let c_ptr = unsafe { CFStringGetCStringPtr(value.cast(), kCFStringEncodingUTF8) };
             return if !c_ptr.is_null() {
                 let c_result = unsafe { CStr::from_ptr(c_ptr) };
                 let result = String::from(c_result.to_str().unwrap());
-                DictEntryValue::_String(result)
+                DictEntryValue::String(result)
             } else {
                 // in this case there is a high chance we got a `NSString` instead of `CFString`
                 // we have to use the objc runtime to fetch it
@@ -115,14 +115,14 @@ fn get_from_dict(dict: CFDictionaryRef, key: &str) -> DictEntryValue {
                 let str = std::str::from_utf8(nss.deref().as_str().as_bytes());
 
                 match str {
-                    Ok(s) => DictEntryValue::_String(s.to_owned()),
-                    Err(_) => DictEntryValue::_Unknown,
+                    Ok(s) => DictEntryValue::String(s.to_owned()),
+                    Err(_) => DictEntryValue::Unknown,
                 }
             };
         } else {
             eprintln!("Unexpected type: {}", type_id);
         }
     }
 
-    DictEntryValue::_Unknown
+    DictEntryValue::Unknown
 }