Update dependencies

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

Fixes #4735.

6 files changed, 16 insertions, 16 deletions

diff --git a/alacritty/src/config/mod.rs b/alacritty/src/config/mod.rs
index a782f5fe..c321915e 100644
--- a/alacritty/src/config/mod.rs
+++ b/alacritty/src/config/mod.rs
@@ -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 --git a/alacritty/src/config/ui_config.rs b/alacritty/src/config/ui_config.rs
index b3b3021a..2d7b5c98 100644
--- a/alacritty/src/config/ui_config.rs
+++ b/alacritty/src/config/ui_config.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 --git a/alacritty/src/display/content.rs b/alacritty/src/display/content.rs
index 81c2977f..1c7e2989 100644
--- a/alacritty/src/display/content.rs
+++ b/alacritty/src/display/content.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,7 +31,7 @@ pub struct RenderableContent<'a> {
     terminal_cursor: TerminalCursor,
     cursor: Option<RenderableCursor>,
     search: RenderableSearch,
-    config: &'a Config<UIConfig>,
+    config: &'a Config<UiConfig>,
     colors: &'a List,
 }
 
@@ -39,7 +39,7 @@ 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 --git a/alacritty/src/display/wayland_theme.rs b/alacritty/src/display/wayland_theme.rs
index 1932ae01..7a9aac16 100644
--- a/alacritty/src/display/wayland_theme.rs
+++ b/alacritty/src/display/wayland_theme.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 }
     }
diff --git a/alacritty/src/event.rs b/alacritty/src/event.rs
index f3fbc699..affb8f4c 100644
--- a/alacritty/src/event.rs
+++ b/alacritty/src/event.rs
@@ -67,7 +67,7 @@ const MAX_HISTORY_SIZE: usize = 255;
 #[derive(Debug, Clone)]
 pub enum Event {
     TerminalEvent(TerminalEvent),
-    DPRChanged(f64, (u32, u32)),
+    DprChanged(f64, (u32, u32)),
     Scroll(Scroll),
     ConfigReload(PathBuf),
     Message(Message),
@@ -1045,7 +1045,7 @@ impl<N: Notify + OnResize> Processor<N> {
                 } => {
                     *control_flow = ControlFlow::Poll;
                     let size = (new_inner_size.width, new_inner_size.height);
-                    self.event_queue.push(Event::DPRChanged(scale_factor, size).into());
+                    self.event_queue.push(Event::DprChanged(scale_factor, size).into());
                     return;
                 },
                 // Transmute to extend lifetime, which exists only for `ScaleFactorChanged` event.
@@ -1138,7 +1138,7 @@ impl<N: Notify + OnResize> Processor<N> {
     {
         match event {
             GlutinEvent::UserEvent(event) => match event {
-                Event::DPRChanged(scale_factor, (width, height)) => {
+                Event::DprChanged(scale_factor, (width, height)) => {
                     let display_update_pending = &mut processor.ctx.display_update_pending;
 
                     // Push current font to update its DPR.
diff --git a/alacritty/src/renderer/mod.rs b/alacritty/src/renderer/mod.rs
index 1f203332..d4cee1a1 100644
--- a/alacritty/src/renderer/mod.rs
+++ b/alacritty/src/renderer/mod.rs
@@ -20,7 +20,7 @@ use alacritty_terminal::term::color::Rgb;
 use alacritty_terminal::term::SizeInfo;
 
 use crate::config::font::{Font, FontDescription};
-use crate::config::ui_config::{Delta, UIConfig};
+use crate::config::ui_config::{Delta, UiConfig};
 use crate::display::content::RenderableCell;
 use crate::gl;
 use crate::gl::types::*;
@@ -448,7 +448,7 @@ pub struct RenderApi<'a> {
     atlas: &'a mut Vec<Atlas>,
     current_atlas: &'a mut usize,
     program: &'a mut TextShaderProgram,
-    config: &'a UIConfig,
+    config: &'a UiConfig,
 }
 
 #[derive(Debug)]
@@ -682,7 +682,7 @@ impl QuadRenderer {
         }
     }
 
-    pub fn with_api<F, T>(&mut self, config: &UIConfig, props: &SizeInfo, func: F) -> T
+    pub fn with_api<F, T>(&mut self, config: &UiConfig, props: &SizeInfo, func: F) -> T
     where
         F: FnOnce(RenderApi<'_>) -> T,
     {