Clean up case list

Author: tgross35

library/std/src/sys/pal/unix/thread.rs

@@ -322,8 +322,7 @@ pub(crate) fn current_os_id() -> Option<u64> {
     // Most Unix platforms have a way to query an integer ID of the current thread, all with
     // slightly different spellings.
     cfg_if::cfg_if! {
-        // Linux-like and some BSDs have methods to get the current `pid_t`, which is an `i32` on
-        // these platforms.
+        // Most platforms have a function returning a `pid_t` or int, which is an `i32`.
         if #[cfg(any(target_os = "android", target_os = "linux", target_os = "nto"))] {
             // SAFETY: FFI call with no preconditions.
             let id: libc::pid_t = unsafe { libc::gettid() };
@@ -336,20 +335,12 @@ pub(crate) fn current_os_id() -> Option<u64> {
             // SAFETY: FFI call with no preconditions.
             let id: libc::c_int = unsafe { libc::pthread_getthreadid_np() };
             Some(id as u64)
-        }
-
-        // Solaris, Illumos, and NetBSD are similar but their functions return a `u32`.
-        else if #[cfg(any(target_os = "illumos", target_os = "solaris"))] {
-            // SAFETY: FFI call with no preconditions.
-            let id: libc::thread_t = unsafe { libc::thr_self() };
-            Some(id.into())
         } else if #[cfg(target_os = "netbsd")] {
+            // SAFETY: FFI call with no preconditions.
             let id: libc::lwpid_t = unsafe { libc::_lwp_self() };
-            Some(id.into())
-        }
-
-        // Apple allows querying arbitrary thread IDs, `thread=NULL` queries the current thread.
-        else if #[cfg(target_vendor = "apple")] {
+            Some(id as u64)
+        } else if #[cfg(target_vendor = "apple")] {
+            // Apple allows querying arbitrary thread IDs, `thread=NULL` queries the current thread.
             let mut id = 0u64;
             // SAFETY: `thread_id` is a valid pointer, no other preconditions.
             let status: libc::c_int = unsafe { libc::pthread_threadid_np(0, &mut id) };
@@ -358,10 +349,8 @@ pub(crate) fn current_os_id() -> Option<u64> {
             } else {
                 None
             }
-        }
-
-        // As a fallback, return the pid which can be used to help identify a crashing process.
-        else {
+        } else {
+            // As a fallback, return the pid which can be used to help identify a crashing process.
             Some(super::os::getpid().into())
         }
     }