feature: Add support for displaying process usernames on Windows (#1016)

3 files changed, 8 insertions, 36 deletions

diff --git a/src/widgets/process_table.rs b/src/widgets/process_table.rs
index 03b74ad0..f6515f97 100644
--- a/src/widgets/process_table.rs
+++ b/src/widgets/process_table.rs
@@ -101,12 +101,8 @@ impl ProcWidgetState {
     pub const WPS: usize = 5;
     pub const T_READ: usize = 6;
     pub const T_WRITE: usize = 7;
-    #[cfg(target_family = "unix")]
     pub const USER: usize = 8;
-    #[cfg(target_family = "unix")]
     pub const STATE: usize = 9;
-    #[cfg(not(target_family = "unix"))]
-    pub const STATE: usize = 8;
 
     fn new_sort_table(config: &AppConfigFields, colours: &CanvasColours) -> SortTable {
         const COLUMNS: [Column<SortTableColumn>; 1] = [Column::hard(SortTableColumn, 7)];
@@ -162,7 +158,6 @@ impl ProcWidgetState {
                 wps,
                 tr,
                 tw,
-                #[cfg(target_family = "unix")]
                 SortColumn::soft(User, Some(0.05)),
                 state,
             ]
@@ -677,7 +672,6 @@ impl ProcWidgetState {
                         *col = ProcColumn::Count;
                         sort_col.default_order = SortOrder::Descending;
 
-                        #[cfg(target_family = "unix")]
                         self.hide_column(Self::USER);
                         self.hide_column(Self::STATE);
                         self.mode = ProcWidgetMode::Grouped;
@@ -686,7 +680,6 @@ impl ProcWidgetState {
                         *col = ProcColumn::Pid;
                         sort_col.default_order = SortOrder::Ascending;
 
-                        #[cfg(target_family = "unix")]
                         self.show_column(Self::USER);
                         self.show_column(Self::STATE);
                         self.mode = ProcWidgetMode::Normal;
@@ -821,6 +814,8 @@ mod test {
             process_char: '?',
             #[cfg(target_family = "unix")]
             user: "root".to_string(),
+            #[cfg(not(target_family = "unix"))]
+            user: "N/A".to_string(),
             num_similar: 0,
             disabled: false,
         };
diff --git a/src/widgets/process_table/proc_widget_column.rs b/src/widgets/process_table/proc_widget_column.rs
index 691aec02..c00eaa80 100644
--- a/src/widgets/process_table/proc_widget_column.rs
+++ b/src/widgets/process_table/proc_widget_column.rs
@@ -109,13 +109,10 @@ impl SortsRow for ProcColumn {
                 }
             }
             ProcColumn::User => {
-                #[cfg(target_family = "unix")]
-                {
-                    if descending {
-                        data.sort_by_cached_key(|pd| Reverse(pd.user.to_lowercase()));
-                    } else {
-                        data.sort_by_cached_key(|pd| pd.user.to_lowercase());
-                    }
+                if descending {
+                    data.sort_by_cached_key(|pd| Reverse(pd.user.to_lowercase()));
+                } else {
+                    data.sort_by_cached_key(|pd| pd.user.to_lowercase());
                 }
             }
         }
diff --git a/src/widgets/process_table/proc_widget_data.rs b/src/widgets/process_table/proc_widget_data.rs
index 0dc95c95..8cfa77c3 100644
--- a/src/widgets/process_table/proc_widget_data.rs
+++ b/src/widgets/process_table/proc_widget_data.rs
@@ -120,7 +120,6 @@ pub struct ProcWidgetData {
     pub total_write: u64,
     pub process_state: String,
     pub process_char: char,
-    #[cfg(target_family = "unix")]
     pub user: String,
     pub num_similar: u64,
     pub disabled: bool,
@@ -155,7 +154,6 @@ impl ProcWidgetData {
             total_write: process.total_write_bytes,
             process_state: process.process_state.0.clone(),
             process_char: process.process_state.1,
-            #[cfg(target_family = "unix")]
             user: process.user.to_string(),
             num_similar: 1,
             disabled: false,
@@ -205,16 +203,7 @@ impl ProcWidgetData {
             ProcColumn::TotalRead => dec_bytes_string(self.total_read),
             ProcColumn::TotalWrite => dec_bytes_string(self.total_write),
             ProcColumn::State => self.process_char.to_string(),
-            ProcColumn::User => {
-                #[cfg(target_family = "unix")]
-                {
-                    self.user.clone()
-                }
-                #[cfg(not(target_family = "unix"))]
-                {
-                    "".to_string()
-                }
-            }
+            ProcColumn::User => self.user.clone(),
         }
     }
 }
@@ -247,16 +236,7 @@ impl DataToCell<ProcColumn> for ProcWidgetData {
                         self.process_state.clone()
                     }
                 }
-                ProcColumn::User => {
-                    #[cfg(target_family = "unix")]
-                    {
-                        self.user.clone()
-                    }
-                    #[cfg(not(target_family = "unix"))]
-                    {
-                        "".to_string()
-                    }
-                }
+                ProcColumn::User => self.user.clone(),
             },
             calculated_width,
         ))