Update dependencies

This introduces some duplicate dependencies, though they are necessary
to build properly without any warnings.

Fixes alacritty#4735.

Author: chrisduerr

Diff for: CHANGELOG.md

@@ -20,6 +20,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Crash due to assertion failure on 32-bit architectures
 - Segmentation fault on shutdown with Wayland
 - Incorrect estimated DPR with Wayland
+- Consecutive clipboard stores dropped on Wayland until the application is refocused
 
 ### Removed
 

Diff for: Cargo.lock

@@ -25,12 +25,12 @@ use crate::cli::Options;
 pub use crate::config::bindings::{Action, Binding, BindingMode, Key, SearchAction, ViAction};
 #[cfg(test)]
 pub use crate::config::mouse::{ClickHandler, Mouse};
-use crate::config::ui_config::UIConfig;
+use crate::config::ui_config::UiConfig;
 
 /// Maximum number of depth for the configuration file imports.
 const IMPORT_RECURSION_LIMIT: usize = 5;
 
-pub type Config = TermConfig<UIConfig>;
+pub type Config = TermConfig<UiConfig>;
 
 /// Result from config loading.
 pub type Result<T> = std::result::Result<T, Error>;

Diff for: alacritty/src/config/mod.rs

@@ -15,7 +15,7 @@ use crate::config::mouse::Mouse;
 use crate::config::window::WindowConfig;
 
 #[derive(ConfigDeserialize, Debug, PartialEq)]
-pub struct UIConfig {
+pub struct UiConfig {
     /// Font configuration.
     pub font: Font,
 
@@ -56,7 +56,7 @@ pub struct UIConfig {
     background_opacity: Percentage,
 }
 
-impl Default for UIConfig {
+impl Default for UiConfig {
     fn default() -> Self {
         Self {
             alt_send_esc: true,
@@ -76,7 +76,7 @@ impl Default for UIConfig {
     }
 }
 
-impl UIConfig {
+impl UiConfig {
     #[inline]
     pub fn background_opacity(&self) -> f32 {
         self.background_opacity.as_f32()

Diff for: alacritty/src/config/ui_config.rs

@@ -14,7 +14,7 @@ use alacritty_terminal::term::{
     RenderableContent as TerminalContent, RenderableCursor as TerminalCursor, Term, TermMode,
 };
 
-use crate::config::ui_config::UIConfig;
+use crate::config::ui_config::UiConfig;
 use crate::display::color::{List, DIM_FACTOR};
 
 /// Minimum contrast between a fixed cursor color and the cell's background.
@@ -31,15 +31,15 @@ pub struct RenderableContent<'a> {
     terminal_cursor: TerminalCursor,
     cursor: Option<RenderableCursor>,
     search: RenderableSearch,
-    config: &'a Config<UIConfig>,
+    config: &'a Config<UiConfig>,
     colors: &'a List,
 }
 
 impl<'a> RenderableContent<'a> {
     pub fn new<T: EventListener>(
         term: &'a Term<T>,
         dfas: Option<&RegexSearch>,
-        config: &'a Config<UIConfig>,
+        config: &'a Config<UiConfig>,
         colors: &'a List,
         show_cursor: bool,
     ) -> Self {

Diff for: alacritty/src/display/content.rs

@@ -70,11 +70,11 @@ impl WaylandTheme for AlacrittyWaylandTheme {
     }
 }
 
-trait IntoARGBColor {
+trait IntoArgbColor {
     fn into_rgba(self) -> ARGBColor;
 }
 
-impl IntoARGBColor for Rgb {
+impl IntoArgbColor for Rgb {
     fn into_rgba(self) -> ARGBColor {
         ARGBColor { a: 0xff, r: self.r, g: self.g, b: self.b }
     }