misc cleanup

Author: mach-kernel

launchk/src/tui/omnibox/command.rs

@@ -40,41 +40,41 @@ pub static OMNIBOX_COMMANDS: [(&str, &str, OmniboxCommand); 12] = [
     ),
     (
         "bootstrap",
-        "▶️  Bootstrap highlighted service",
+        "Bootstrap highlighted service",
         OmniboxCommand::BootstrapRequest,
     ),
     (
         "bootout",
-        "⏏️  Stop highlighted service",
+        "Stop highlighted service",
         OmniboxCommand::BootoutRequest,
     ),
     (
         "enable",
-        "▶️  Enable highlighted job (enables load)",
+        "Enable highlighted job (enables load)",
         OmniboxCommand::EnableRequest,
     ),
     (
         "disable",
-        "⏏️  Disable highlighted job (prevents load)",
+        "Disable highlighted job (prevents load)",
         OmniboxCommand::DisableRequest,
     ),
-    ("edit", "✍️  Edit plist with $EDITOR", OmniboxCommand::Edit),
-    ("csrinfo", "ℹ️  See all CSR flags", OmniboxCommand::CSRInfo),
+    ("edit", "Edit plist with $EDITOR", OmniboxCommand::Edit),
+    ("csrinfo", "See all CSR flags", OmniboxCommand::CSRInfo),
     (
         "dumpstate",
-        "ℹ️  launchctl dumpstate",
+        "launchctl dumpstate",
         OmniboxCommand::DumpState,
     ),
     (
         "dumpjpcategory",
-        "ℹ️  launchctl dumpjpcategory",
+        "launchctl dumpjpcategory",
         OmniboxCommand::DumpJetsamPropertiesCategory,
     ),
     (
         "procinfo",
-        "ℹ️  launchctl procinfo for highlighted process",
+        "launchctl procinfo for highlighted process",
         OmniboxCommand::ProcInfo,
     ),
-    ("help", "🤔  Show all commands", OmniboxCommand::Help),
-    ("exit", "🚪  see ya!", OmniboxCommand::Quit),
+    ("help", "Show all commands", OmniboxCommand::Help),
+    ("exit", "Exit", OmniboxCommand::Quit),
 ];

launchk/src/tui/omnibox/view.rs

@@ -143,7 +143,6 @@ impl OmniboxView {
         };
 
         match (event, mode) {
-            (ev, OmniboxMode::JobTypeFilter) => Self::handle_job_type_filter(ev, state),
             // User -> string filters
             (Event::Char(_), OmniboxMode::LabelFilter)
             | (Event::Char(_), OmniboxMode::CommandFilter) => {
@@ -394,9 +393,8 @@ impl View for OmniboxView {
                 Some("".to_string()),
                 None,
             )),
-            (e, OmniboxMode::Idle) => Self::handle_job_type_filter(&e, &state),
-            (e, OmniboxMode::JobTypeFilter) => {
-                let s = Self::handle_active(&e, &state);
+            (e, OmniboxMode::JobTypeFilter | OmniboxMode::Idle) => {
+                let s = Self::handle_job_type_filter(&e, &state);
                 self.tx.send(OmniboxEvent::Command(OmniboxCommand::FocusServiceList)).expect("Must focus");
                 s
             },

xpc-sys/src/api/pipe_routine.rs

@@ -84,8 +84,6 @@ pub fn pipe_interface_routine<S: Into<XPCObject>>(
 pub fn handle_reply_dict_errors(reply: XPCObject) -> Result<XPCObject, XPCError> {
     let dict: XPCHashMap = reply.clone().to_rust()?;
 
-    log::debug!("XPC dictionary reply {:?}", dict);
-
     if dict.contains_key("error") {
         let errcode: i64 = dict.get("error").unwrap().to_rust()?;
 

xpc-sys/src/object/unix_fifo.rs

@@ -15,7 +15,6 @@ pub struct UnixFifo(pub CString);
 
 impl UnixFifo {
     /// Create a new FIFO, make sure mode_t is 0oXXX!
-    #[must_use]
     pub fn new(mode: mode_t) -> Result<Self, String> {
         let fifo_name = unsafe { CStr::from_ptr(tmpnam(null_mut())) };
         let err = unsafe { mkfifo(fifo_name.as_ptr(), mode) };
@@ -28,7 +27,6 @@ impl UnixFifo {
     }
 
     /// Open O_RDONLY, read until EOF, close fd, return buffer.
-    #[must_use]
     pub fn block_and_read_bytes(&self) -> Result<Vec<u8>, String> {
         let Self(fifo_name) = self;
 
@@ -44,7 +42,6 @@ impl UnixFifo {
     }
 
     /// Open O_WRONLY, call fn, close fd, yield result
-    #[must_use]
     pub fn with_writer<T>(&self, f: impl Fn(RawFd) -> T) -> Result<T, String> {
         let Self(fifo_name) = self;
         let fifo_fd_write = unsafe { open(fifo_name.as_ptr(), O_WRONLY) };
@@ -55,7 +52,6 @@ impl UnixFifo {
     }
 
     /// Wrap libc close()
-    #[must_use]
     pub fn close(fd: RawFd) -> Result<(), String> {
         let err = unsafe { libc::close(fd) };