Rename `player` to `players`

Marshall Bowers created 2 years ago

Change summary

crates/theme2/src/theme2.rs          | 2 +-
crates/theme2/src/themes/one_dark.rs | 2 +-
crates/ui2/src/color.rs              | 4 ++--
crates/ui2/src/elements/player.rs    | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)

Detailed changes

crates/theme2/src/theme2.rs

@@ -75,7 +75,7 @@ pub struct Theme {
     pub git_ignored: Hsla,
     pub git_renamed: Hsla,
 
-    pub player: [PlayerTheme; 8],
+    pub players: [PlayerTheme; 8],
 }
 
 #[derive(Clone)]

crates/theme2/src/themes/one_dark.rs

@@ -57,7 +57,7 @@ pub fn one_dark() -> Theme {
         git_conflict: rgba(0xdec184ff).into(),
         git_ignored: rgba(0x555a63ff).into(),
         git_renamed: rgba(0xdec184ff).into(),
-        player: [
+        players: [
             PlayerTheme {
                 cursor: rgba(0x74ade8ff).into(),
                 selection: rgba(0x74ade83d).into(),

crates/ui2/src/color.rs

@@ -154,7 +154,7 @@ pub struct ThemeColor {
     pub git_ignored: Hsla,
     pub git_renamed: Hsla,
 
-    pub player: [PlayerThemeColors; 8],
+    pub players: [PlayerThemeColors; 8],
 }
 
 impl std::fmt::Debug for ThemeColor {
@@ -245,7 +245,7 @@ impl std::fmt::Debug for ThemeColor {
             .field("git_conflict", &self.git_conflict.to_rgb().to_hex())
             .field("git_ignored", &self.git_ignored.to_rgb().to_hex())
             .field("git_renamed", &self.git_renamed.to_rgb().to_hex())
-            .field("player", &self.player)
+            .field("players", &self.players)
             .finish()
     }
 }

crates/ui2/src/elements/player.rs

@@ -140,12 +140,12 @@ impl Player {
 
     pub fn cursor_color<S: 'static>(&self, cx: &mut ViewContext<S>) -> Hsla {
         let theme = theme(cx);
-        theme.player[self.index].cursor
+        theme.players[self.index].cursor
     }
 
     pub fn selection_color<S: 'static>(&self, cx: &mut ViewContext<S>) -> Hsla {
         let theme = theme(cx);
-        theme.player[self.index].selection
+        theme.players[self.index].selection
     }
 
     pub fn avatar_src(&self) -> &str {