feedback

Author: nyurik

Cargo.toml

@@ -147,38 +147,25 @@ members = [
 #       This way all crates can use it with `[lints] workspace=true` section
 
 [lints.rust]
-# FIXME(cleanup): should be cleaned up
-unused_imports = "allow"
-unused_qualifications = "allow"  # make ident usage consistent in each file
+# FIXME(cleanup): make ident usage consistent in each file
+unused_qualifications = "allow"
 
 [lints.clippy]
-identity_op = "allow"  # some expressions like `0 | x` are clearer for bit ops
-missing_safety_doc = "allow"  # safety? in libc? seriously?
-
-# FIXME(clippy): all these should probably be fixed
-non_minimal_cfg = "allow"  # for some reason cfg_if! sometimes trigger this
-unnecessary_cast = "allow"  # some casts like `as usize` are only needed for some targets
-
 # Enable pedantic lints - use this manually once in a while, but don't enable by default
 # pedantic = { level = "warn", priority = -1 }
 
-# These were manually fixed already, and should be enforced
+# We are okay with the current state of these lints
 explicit_iter_loop = "warn"
+identity_op = "allow"  # some expressions like `0 | x` are clearer for bit ops
 manual_assert = "warn"
 map_unwrap_or = "warn"
+missing_safety_doc = "allow"  # safety? in libc? seriously?
+non_minimal_cfg = "allow"  # for some reason cfg_if! sometimes trigger this
 ptr_as_ptr = "warn"
 unnecessary_semicolon = "warn"
 
-# FIXME(clippy): these should eventually be fixed, or listed as OK
-cast_possible_truncation = "allow"
-cast_possible_wrap = "allow"
-cast_sign_loss = "allow"
+# FIXME(clippy): these should be fixed if possible
 expl_impl_clone_on_copy = "allow"
-must_use_candidate = "allow"
-pub_underscore_fields = "allow"
-struct_field_names = "allow"
 uninlined_format_args = "allow"
-unreadable_literal = "allow"
+unnecessary_cast = "allow"  # some casts like `as usize` are only needed for some targets
 used_underscore_binding = "allow"
-used_underscore_items = "allow"
-verbose_bit_mask = "allow"

src/unix/solarish/compat.rs

@@ -1,8 +1,6 @@
 // Common functions that are unfortunately missing on illumos and
 // Solaris, but often needed by other crates.
 use core::cmp::min;
-#[cfg(target_os = "illumos")]
-use core::cmp::{Ord, Ordering};
 
 use crate::unix::solarish::*;
 use crate::{c_char, c_int, size_t};
@@ -90,18 +88,16 @@ pub unsafe fn openpty(
 
     // Check if the STREAMS modules are already pushed:
     let setup = crate::ioctl(fds, I_FIND, LDTERM.as_ptr());
-    match setup.cmp(&0) {
-        Ordering::Less => return bail(fdm, fds),
-        Ordering::Equal => {
-            // The line discipline is not present, so push the appropriate STREAMS
-            // modules for the subordinate device:
-            if crate::ioctl(fds, I_PUSH, PTEM.as_ptr()) < 0
-                || crate::ioctl(fds, I_PUSH, LDTERM.as_ptr()) < 0
-            {
-                return bail(fdm, fds);
-            }
+    if setup < 0 {
+        return bail(fdm, fds);
+    } else if setup == 0 {
+        // The line discipline is not present, so push the appropriate STREAMS
+        // modules for the subordinate device:
+        if crate::ioctl(fds, I_PUSH, PTEM.as_ptr()) < 0
+            || crate::ioctl(fds, I_PUSH, LDTERM.as_ptr()) < 0
+        {
+            return bail(fdm, fds);
         }
-        Ordering::Greater => {}
     }
 
     // If provided, set the terminal parameters:
@@ -142,17 +138,13 @@ pub unsafe fn forkpty(
     }
 
     let pid = crate::fork();
-    match pid.cmp(&0) {
-        Ordering::Less => {
-            return bail(*amain, fds);
-        }
-        Ordering::Greater => {
-            // In the parent process, we close the subordinate device and return the
-            // process ID of the new child:
-            crate::close(fds);
-            return pid;
-        }
-        Ordering::Equal => {}
+    if pid < 0 {
+        return bail(*amain, fds);
+    } else if pid > 0 {
+        // In the parent process, we close the subordinate device and return the
+        // process ID of the new child:
+        crate::close(fds);
+        return pid;
     }
 
     // The rest of this function executes in the child process.