Bläddra i källkod

refactor(colors): renamed and reintended some code

MartinFillon 2 år sedan
förälder
incheckning
e3457858e9
3 ändrade filer med 6 tillägg och 6 borttagningar
  1. 3 3
      src/output/render/users.rs
  2. 2 2
      src/theme/default_theme.rs
  3. 1 1
      src/theme/mod.rs

+ 3 - 3
src/output/render/users.rs

@@ -28,7 +28,7 @@ impl Render for Option<f::User> {
         } else if uid == 0 {
             colours.root()
         } else {
-            colours.someone_else()
+            colours.other()
         };
         TextCell::paint(style, user_name)
     }
@@ -36,7 +36,7 @@ impl Render for Option<f::User> {
 
 pub trait Colours {
     fn you(&self) -> Style;
-    fn someone_else(&self) -> Style;
+    fn other(&self) -> Style;
     fn root(&self) -> Style;
     fn no_user(&self) -> Style;
 }
@@ -59,7 +59,7 @@ pub mod test {
     #[rustfmt::skip]
     impl Colours for TestColours {
         fn you(&self)          -> Style { Red.bold() }
-        fn someone_else(&self) -> Style { Blue.underline() }
+        fn other(&self) -> Style { Blue.underline() }
         fn root(&self)         -> Style { Blue.underline() }
         fn no_user(&self)      -> Style { Black.italic() }
     }

+ 2 - 2
src/theme/default_theme.rs

@@ -49,10 +49,10 @@ impl UiStyles {
             #[rustfmt::skip]
             users: Users {
                 user_you:                       Yellow.bold(),
-                user_other:     Style::default(),
+                user_other:                     Style::default(),
                 user_root:                      Style::default(),
                 group_yours:                    Yellow.bold(),
-                group_other:                Style::default(),
+                group_other:                    Style::default(),
                 group_root:                     Style::default(),
             },
 

+ 1 - 1
src/theme/mod.rs

@@ -362,7 +362,7 @@ impl render::SizeColours for Theme {
 #[cfg(unix)]
 impl render::UserColours for Theme {
     fn you(&self)           -> Style { self.ui.users.user_you }
-    fn someone_else(&self)  -> Style { self.ui.users.user_root }
+    fn other(&self)  -> Style { self.ui.users.user_other }
     fn root(&self)          -> Style { self.ui.users.user_root }
     fn no_user(&self)       -> Style { self.ui.punctuation }
 }