diff --git a/src/asciicast.rs b/src/asciicast.rs index e516360..b8bb3de 100644 --- a/src/asciicast.rs +++ b/src/asciicast.rs @@ -336,7 +336,7 @@ mod tests { env.insert("SHELL".to_owned(), "/usr/bin/fish".to_owned()); env.insert("TERM".to_owned(), "xterm256-color".to_owned()); - let theme = TtyTheme { + let tty_theme = TtyTheme { fg: RGB8::new(0, 1, 2), bg: RGB8::new(0, 100, 200), palette: vec![ @@ -365,7 +365,7 @@ mod tests { command: Some("/bin/bash".to_owned()), title: Some("Demo".to_owned()), env: Some(env), - term_theme: Some(theme), + term_theme: Some(tty_theme), ..Default::default() }; diff --git a/src/asciicast/v2.rs b/src/asciicast/v2.rs index cbd97aa..9a1f3e4 100644 --- a/src/asciicast/v2.rs +++ b/src/asciicast/v2.rs @@ -371,24 +371,24 @@ impl From<&Header> for V2Header { } impl From<&TtyTheme> for V2Theme { - fn from(theme: &TtyTheme) -> Self { - let palette = theme.palette.iter().copied().map(RGB8).collect(); + fn from(tty_theme: &TtyTheme) -> Self { + let palette = tty_theme.palette.iter().copied().map(RGB8).collect(); V2Theme { - fg: RGB8(theme.fg), - bg: RGB8(theme.bg), + fg: RGB8(tty_theme.fg), + bg: RGB8(tty_theme.bg), palette: V2Palette(palette), } } } impl From<&V2Theme> for TtyTheme { - fn from(theme: &V2Theme) -> Self { - let palette = theme.palette.0.iter().map(|c| c.0).collect(); + fn from(tty_theme: &V2Theme) -> Self { + let palette = tty_theme.palette.0.iter().map(|c| c.0).collect(); TtyTheme { - fg: theme.fg.0, - bg: theme.bg.0, + fg: tty_theme.fg.0, + bg: tty_theme.bg.0, palette, } } diff --git a/src/asciicast/v3.rs b/src/asciicast/v3.rs index 81cf9b4..4963e0b 100644 --- a/src/asciicast/v3.rs +++ b/src/asciicast/v3.rs @@ -425,24 +425,24 @@ impl From<&Header> for V3Header { } impl From<&TtyTheme> for V3Theme { - fn from(theme: &TtyTheme) -> Self { - let palette = theme.palette.iter().copied().map(RGB8).collect(); + fn from(tty_theme: &TtyTheme) -> Self { + let palette = tty_theme.palette.iter().copied().map(RGB8).collect(); V3Theme { - fg: RGB8(theme.fg), - bg: RGB8(theme.bg), + fg: RGB8(tty_theme.fg), + bg: RGB8(tty_theme.bg), palette: V3Palette(palette), } } } impl From<&V3Theme> for TtyTheme { - fn from(theme: &V3Theme) -> Self { - let palette = theme.palette.0.iter().map(|c| c.0).collect(); + fn from(tty_theme: &V3Theme) -> Self { + let palette = tty_theme.palette.0.iter().map(|c| c.0).collect(); TtyTheme { - fg: theme.fg.0, - bg: theme.bg.0, + fg: tty_theme.fg.0, + bg: tty_theme.bg.0, palette, } } diff --git a/src/file_writer.rs b/src/file_writer.rs index b0613fa..eaf440a 100644 --- a/src/file_writer.rs +++ b/src/file_writer.rs @@ -35,7 +35,7 @@ impl session::OutputStarter for FileWriterStarter { mut self: Box, time: SystemTime, tty_size: TtySize, - theme: Option, + tty_theme: Option, ) -> io::Result> { let timestamp = time.duration_since(UNIX_EPOCH).unwrap().as_secs(); @@ -44,7 +44,7 @@ impl session::OutputStarter for FileWriterStarter { term_rows: tty_size.1, term_type: self.metadata.term_type, term_version: self.metadata.term_version, - term_theme: theme, + term_theme: tty_theme, timestamp: Some(timestamp), idle_time_limit: self.metadata.idle_time_limit, command: self.metadata.command.as_ref().cloned(), diff --git a/src/pty.rs b/src/pty.rs index dcbd062..82ce47d 100644 --- a/src/pty.rs +++ b/src/pty.rs @@ -25,7 +25,7 @@ use crate::tty::{Tty, TtySize, TtyTheme}; type ExtraEnv = HashMap; pub trait HandlerStarter { - fn start(self, tty_size: TtySize, theme: Option) -> H; + fn start(self, tty_size: TtySize, tty_theme: Option) -> H; } pub trait Handler { @@ -396,7 +396,7 @@ mod tests { } impl HandlerStarter for TestHandlerStarter { - fn start(self, tty_size: TtySize, _theme: Option) -> TestHandler { + fn start(self, tty_size: TtySize, _tty_theme: Option) -> TestHandler { TestHandler { tty_size, output: Vec::new(), diff --git a/src/session.rs b/src/session.rs index 4fe006d..d37a624 100644 --- a/src/session.rs +++ b/src/session.rs @@ -23,7 +23,7 @@ pub trait OutputStarter { self: Box, time: SystemTime, tty_size: TtySize, - theme: Option, + tty_theme: Option, ) -> io::Result>; } diff --git a/src/stream.rs b/src/stream.rs index 3837e92..3bf4bd1 100644 --- a/src/stream.rs +++ b/src/stream.rs @@ -174,13 +174,13 @@ impl session::OutputStarter for OutputStarter { self: Box, _time: SystemTime, tty_size: TtySize, - theme: Option, + tty_theme: Option, ) -> io::Result> { let (stream_tx, stream_rx) = mpsc::unbounded_channel(); let request_rx = self.request_rx; self.handle - .spawn(async move { run(tty_size, theme, stream_rx, request_rx).await }); + .spawn(async move { run(tty_size, tty_theme, stream_rx, request_rx).await }); Ok(Box::new(Output(stream_tx))) }