diff options
Diffstat (limited to 'alacritty/src')
-rw-r--r-- | alacritty/src/cli.rs | 8 | ||||
-rw-r--r-- | alacritty/src/config/bindings.rs | 2 | ||||
-rw-r--r-- | alacritty/src/config/ui_config.rs | 4 | ||||
-rw-r--r-- | alacritty/src/config/window.rs | 2 | ||||
-rw-r--r-- | alacritty/src/display/hint.rs | 2 | ||||
-rw-r--r-- | alacritty/src/display/mod.rs | 2 | ||||
-rw-r--r-- | alacritty/src/main.rs | 3 | ||||
-rw-r--r-- | alacritty/src/renderer/text/atlas.rs | 2 |
8 files changed, 13 insertions, 12 deletions
diff --git a/alacritty/src/cli.rs b/alacritty/src/cli.rs index a53c6ef3..3c64458b 100644 --- a/alacritty/src/cli.rs +++ b/alacritty/src/cli.rs @@ -174,7 +174,7 @@ fn parse_class(input: &str) -> Result<Class, String> { } /// Terminal specific cli options which can be passed to new windows via IPC. -#[derive(Serialize, Deserialize, Args, Default, Debug, Clone, PartialEq)] +#[derive(Serialize, Deserialize, Args, Default, Debug, Clone, PartialEq, Eq)] pub struct TerminalOptions { /// Start the shell in the specified working directory. #[clap(long)] @@ -225,7 +225,7 @@ impl From<TerminalOptions> for PtyConfig { } /// Window specific cli options which can be passed to new windows via IPC. -#[derive(Serialize, Deserialize, Args, Default, Debug, Clone, PartialEq)] +#[derive(Serialize, Deserialize, Args, Default, Debug, Clone, PartialEq, Eq)] pub struct WindowIdentity { /// Defines the window title [default: Alacritty]. #[clap(short, long)] @@ -270,14 +270,14 @@ pub struct MessageOptions { /// Available socket messages. #[cfg(unix)] -#[derive(Subcommand, Serialize, Deserialize, Debug, Clone, PartialEq)] +#[derive(Subcommand, Serialize, Deserialize, Debug, Clone, PartialEq, Eq)] pub enum SocketMessage { /// Create a new window in the same Alacritty process. CreateWindow(WindowOptions), } /// Subset of options that we pass to a 'create-window' subcommand. -#[derive(Serialize, Deserialize, Args, Default, Clone, Debug, PartialEq)] +#[derive(Serialize, Deserialize, Args, Default, Clone, Debug, PartialEq, Eq)] pub struct WindowOptions { /// Terminal options which can be passed via IPC. #[clap(flatten)] diff --git a/alacritty/src/config/bindings.rs b/alacritty/src/config/bindings.rs index 99d41c28..4c706811 100644 --- a/alacritty/src/config/bindings.rs +++ b/alacritty/src/config/bindings.rs @@ -1009,7 +1009,7 @@ impl<'a> Deserialize<'a> for RawBinding { let val = map.next_value::<SerdeValue>()?; if val.is_u64() { let scancode = val.as_u64().unwrap(); - if scancode > u64::from(std::u32::MAX) { + if scancode > u64::from(u32::MAX) { return Err(<V::Error as Error>::custom(format!( "Invalid key binding, scancode too big: {}", scancode diff --git a/alacritty/src/config/ui_config.rs b/alacritty/src/config/ui_config.rs index 353249d5..74b61923 100644 --- a/alacritty/src/config/ui_config.rs +++ b/alacritty/src/config/ui_config.rs @@ -144,7 +144,7 @@ impl UiConfig { } } -#[derive(Debug, PartialEq)] +#[derive(Debug, PartialEq, Eq)] struct KeyBindings(Vec<KeyBinding>); impl Default for KeyBindings { @@ -162,7 +162,7 @@ impl<'de> Deserialize<'de> for KeyBindings { } } -#[derive(Debug, PartialEq)] +#[derive(Debug, PartialEq, Eq)] struct MouseBindings(Vec<MouseBinding>); impl Default for MouseBindings { diff --git a/alacritty/src/config/window.rs b/alacritty/src/config/window.rs index f181289a..813c0f3a 100644 --- a/alacritty/src/config/window.rs +++ b/alacritty/src/config/window.rs @@ -106,7 +106,7 @@ impl WindowConfig { } } -#[derive(ConfigDeserialize, Debug, Clone, PartialEq)] +#[derive(ConfigDeserialize, Debug, Clone, PartialEq, Eq)] pub struct Identity { /// Window title. pub title: String, diff --git a/alacritty/src/display/hint.rs b/alacritty/src/display/hint.rs index d554993b..8cdb9708 100644 --- a/alacritty/src/display/hint.rs +++ b/alacritty/src/display/hint.rs @@ -164,7 +164,7 @@ impl HintState { } /// Hint match which was selected by the user. -#[derive(PartialEq, Debug, Clone)] +#[derive(PartialEq, Eq, Debug, Clone)] pub struct HintMatch { /// Action for handling the text. pub action: HintAction, diff --git a/alacritty/src/display/mod.rs b/alacritty/src/display/mod.rs index a1788175..91f575e4 100644 --- a/alacritty/src/display/mod.rs +++ b/alacritty/src/display/mod.rs @@ -293,7 +293,7 @@ impl TermDimensions for SizeInfo { } } -#[derive(Default, Clone, Debug, PartialEq)] +#[derive(Default, Clone, Debug, PartialEq, Eq)] pub struct DisplayUpdate { pub dirty: bool, diff --git a/alacritty/src/main.rs b/alacritty/src/main.rs index 8942aa30..7fe7bd92 100644 --- a/alacritty/src/main.rs +++ b/alacritty/src/main.rs @@ -14,6 +14,7 @@ compile_error!(r#"at least one of the "x11"/"wayland" features must be enabled"# #[cfg(target_os = "macos")] use std::env; +use std::fmt::Write as _; use std::io::{self, Write}; use std::path::PathBuf; use std::string::ToString; @@ -233,7 +234,7 @@ fn log_config_path(config: &UiConfig) { let mut msg = String::from("Configuration files loaded from:"); for path in &config.config_paths { - msg.push_str(&format!("\n {:?}", path.display())); + let _ = write!(msg, "\n {:?}", path.display()); } info!("{}", msg); diff --git a/alacritty/src/renderer/text/atlas.rs b/alacritty/src/renderer/text/atlas.rs index 97c8b0b4..0922c570 100644 --- a/alacritty/src/renderer/text/atlas.rs +++ b/alacritty/src/renderer/text/atlas.rs @@ -256,7 +256,7 @@ impl Atlas { } #[inline] - pub fn clear_atlas(atlas: &mut Vec<Atlas>, current_atlas: &mut usize) { + pub fn clear_atlas(atlas: &mut [Atlas], current_atlas: &mut usize) { for atlas in atlas.iter_mut() { atlas.clear(); } |