Update dependencies

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

Fixes #4735.

13 files changed, 94 insertions, 81 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80824961..78a2ef01 100644
--- a/CHANGELOG.md
+++ b/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 --git a/Cargo.lock b/Cargo.lock
index 7a3c8b5c..43e30741 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,5 +1,7 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "ab_glyph_rasterizer"
 version = "0.1.4"
@@ -179,9 +181,9 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
 
 [[package]]
 name = "byteorder"
-version = "1.3.4"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
+checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b"
 
 [[package]]
 name = "calloop"
@@ -493,9 +495,9 @@ dependencies = [
 
 [[package]]
 name = "derivative"
-version = "2.1.3"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaed5874effa6cde088c644ddcdcb4ffd1511391c5be4fdd7a5ccd02c7e4a183"
+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -566,10 +568,11 @@ dependencies = [
 
 [[package]]
 name = "embed-resource"
-version = "1.4.1"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3b2f39c0462f098c1ca4abc408f7482949bbe2ab19bca5a4419f91f69e5bccc"
+checksum = "0bd6a41d89e233bcd6978fe7333191a2054d518d105a1165ada1d2ebc445ce98"
 dependencies = [
+ "cc",
  "vswhom",
  "winreg",
 ]
@@ -586,13 +589,13 @@ dependencies = [
 
 [[package]]
 name = "filetime"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c122a393ea57648015bf06fbd3d372378992e86b9ff5a7a497b076a28c79efe"
+checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.2.4",
  "winapi 0.3.9",
 ]
 
@@ -797,9 +800,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.1.17"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
 dependencies = [
  "libc",
 ]
@@ -823,9 +826,9 @@ dependencies = [
 
 [[package]]
 name = "inotify-sys"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4563555856585ab3180a5bf0b2f9f8d301a728462afffc8195b3f5394229c55"
+checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
 dependencies = [
  "libc",
 ]
@@ -896,15 +899,15 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.81"
+version = "0.2.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
+checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c"
 
 [[package]]
 name = "libloading"
-version = "0.6.6"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9367bdfa836b7e3cf895867f7a570283444da90562980ec2263d6e1569b16bc"
+checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883"
 dependencies = [
  "cfg-if 1.0.0",
  "winapi 0.3.9",
@@ -912,9 +915,9 @@ dependencies = [
 
 [[package]]
 name = "linked-hash-map"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a"
+checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
 
 [[package]]
 name = "lock_api"
@@ -927,11 +930,11 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.11"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "serde",
 ]
 
@@ -1109,9 +1112,9 @@ dependencies = [
 
 [[package]]
 name = "nom"
-version = "6.0.1"
+version = "6.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88034cfd6b4a0d54dd14f4a507eceee36c0b70e5a02236c4e4df571102be17f0"
+checksum = "ab6f70b46d6325aa300f1c7bb3d470127dfc27806d8ea6bf294ee0ce643ce2b1"
 dependencies = [
  "memchr",
  "version_check",
@@ -1223,14 +1226,14 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ccb628cad4f84851442432c60ad8e1f607e29752d0bf072cbd0baf28aa34272"
+checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018"
 dependencies = [
  "cfg-if 1.0.0",
  "instant",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.2.4",
  "smallvec",
  "winapi 0.3.9",
 ]
@@ -1278,9 +1281,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.8"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df"
+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
 dependencies = [
  "proc-macro2",
 ]
@@ -1301,13 +1304,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
 
 [[package]]
+name = "redox_syscall"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05ec8ca9416c5ea37062b502703cd7fcb207736bc294f6e0cf367ac6fc234570"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
 name = "redox_users"
 version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
 dependencies = [
  "getrandom",
- "redox_syscall",
+ "redox_syscall 0.1.57",
  "rust-argon2",
 ]
 
@@ -1323,9 +1335,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.21"
+version = "0.6.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
+checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581"
 
 [[package]]
 name = "rust-argon2"
@@ -1378,18 +1390,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "serde"
-version = "1.0.118"
+version = "1.0.123"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800"
+checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.118"
+version = "1.0.123"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df"
+checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1398,9 +1410,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.61"
+version = "1.0.62"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fceb2595057b6891a4ee808f70054bd2d12f0e97f1cbb78689b59f676df325a"
+checksum = "ea1c6153794552ea7cf7cf63b1231a25de00ec90db326ba6264440fa08e31486"
 dependencies = [
  "itoa",
  "ryu",
@@ -1409,9 +1421,9 @@ dependencies = [
 
 [[package]]
 name = "serde_yaml"
-version = "0.8.15"
+version = "0.8.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "971be8f6e4d4a47163b405a3df70d14359186f9ab0f3a3ec37df144ca1ce089f"
+checksum = "15654ed4ab61726bf918a39cb8d98a2e2995b002387807fa6ba58fdf7f59bb23"
 dependencies = [
  "dtoa",
  "linked-hash-map",
@@ -1478,9 +1490,9 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 
 [[package]]
 name = "smallvec"
-version = "1.6.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a55ca5f3b68e41c979bf8c46a6f1da892ca4db8f94023ce0bd32407573b1ac0"
+checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
 
 [[package]]
 name = "smithay-client-toolkit"
@@ -1503,9 +1515,9 @@ dependencies = [
 
 [[package]]
 name = "smithay-clipboard"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab88b219728cad0697a6c9e75da50bf5220ba01b3485e33e407931539a8ebc91"
+checksum = "06384dfaf645908220d976ae24ed39f6cf92efecb0225ea0a948e403014de527"
 dependencies = [
  "smithay-client-toolkit",
  "wayland-client",
@@ -1542,9 +1554,9 @@ checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
 
 [[package]]
 name = "syn"
-version = "1.0.58"
+version = "1.0.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc60a3d73ea6594cd712d830cc1f0390fd71542d8c8cd24e70cc54cdfd5e05d5"
+checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081"
 dependencies = [
  "proc-macro2",
  "quote",
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,
     {
diff --git a/alacritty_terminal/src/ansi.rs b/alacritty_terminal/src/ansi.rs
index 8f2264af..560b8e00 100644
--- a/alacritty_terminal/src/ansi.rs
+++ b/alacritty_terminal/src/ansi.rs
@@ -372,7 +372,7 @@ impl Default for CursorShape {
 pub enum Mode {
     /// ?1
     CursorKeys = 1,
-    /// Select 80 or 132 columns per page.
+    /// Select 80 or 132 columns per page (DECCOLM).
     ///
     /// CSI ? 3 h -> set 132 column font.
     /// CSI ? 3 l -> reset 80 column font.
@@ -383,7 +383,7 @@ pub enum Mode {
     /// * erases all data in page memory
     /// * resets DECLRMM to unavailable
     /// * clears data from the status line (if set to host-writable)
-    DECCOLM = 3,
+    ColumnMode = 3,
     /// IRM Insert Mode.
     ///
     /// NB should be part of non-private mode enum.
@@ -440,7 +440,7 @@ impl Mode {
         if private {
             Some(match num {
                 1 => Mode::CursorKeys,
-                3 => Mode::DECCOLM,
+                3 => Mode::ColumnMode,
                 6 => Mode::Origin,
                 7 => Mode::LineWrap,
                 12 => Mode::BlinkingCursor,
@@ -1404,7 +1404,7 @@ mod tests {
         let mut parser = Processor::new();
         let mut handler = MockHandler::default();
 
-        for byte in &BYTES[..] {
+        for byte in BYTES {
             parser.advance(&mut handler, *byte, &mut io::sink());
         }
 
@@ -1418,7 +1418,7 @@ mod tests {
         let mut parser = Processor::new();
         let mut handler = MockHandler::default();
 
-        for byte in &bytes[..] {
+        for byte in bytes {
             parser.advance(&mut handler, *byte, &mut io::sink());
         }
 
@@ -1427,7 +1427,7 @@ mod tests {
 
         let bytes: &[u8] = &[0x1b, b'[', b'c'];
 
-        for byte in &bytes[..] {
+        for byte in bytes {
             parser.advance(&mut handler, *byte, &mut io::sink());
         }
 
@@ -1436,7 +1436,7 @@ mod tests {
 
         let bytes: &[u8] = &[0x1b, b'[', b'0', b'c'];
 
-        for byte in &bytes[..] {
+        for byte in bytes {
             parser.advance(&mut handler, *byte, &mut io::sink());
         }
 
@@ -1450,7 +1450,7 @@ mod tests {
         let mut parser = Processor::new();
         let mut handler = MockHandler::default();
 
-        for byte in &bytes[..] {
+        for byte in bytes {
             parser.advance(&mut handler, *byte, &mut io::sink());
         }
 
@@ -1462,7 +1462,7 @@ mod tests {
         let mut parser = Processor::new();
         let mut handler = MockHandler::default();
 
-        for byte in &bytes[..] {
+        for byte in bytes {
             parser.advance(&mut handler, *byte, &mut io::sink());
         }
 
@@ -1480,7 +1480,7 @@ mod tests {
         let mut parser = Processor::new();
         let mut handler = MockHandler::default();
 
-        for byte in &BYTES[..] {
+        for byte in BYTES {
             parser.advance(&mut handler, *byte, &mut io::sink());
         }
 
@@ -1511,7 +1511,7 @@ mod tests {
         let mut handler = MockHandler::default();
         let mut parser = Processor::new();
 
-        for byte in &BYTES[..] {
+        for byte in BYTES {
             parser.advance(&mut handler, *byte, &mut io::sink());
         }
     }
@@ -1522,7 +1522,7 @@ mod tests {
         let mut parser = Processor::new();
         let mut handler = MockHandler::default();
 
-        for byte in &BYTES[..] {
+        for byte in BYTES {
             parser.advance(&mut handler, *byte, &mut io::sink());
         }
 
diff --git a/alacritty_terminal/src/config/mod.rs b/alacritty_terminal/src/config/mod.rs
index 59449faa..0b313598 100644
--- a/alacritty_terminal/src/config/mod.rs
+++ b/alacritty_terminal/src/config/mod.rs
@@ -105,8 +105,8 @@ impl Cursor {
     }
 }
 
-#[serde(untagged)]
 #[derive(Deserialize, Debug, Copy, Clone, PartialEq, Eq)]
+#[serde(untagged)]
 pub enum ConfigCursorStyle {
     Shape(CursorShape),
     WithBlinking {
@@ -174,8 +174,8 @@ impl From<CursorBlinking> for bool {
     }
 }
 
-#[serde(untagged)]
 #[derive(Deserialize, Debug, Clone, PartialEq, Eq)]
+#[serde(untagged)]
 pub enum Program {
     Just(String),
     WithArgs {
diff --git a/alacritty_terminal/src/event_loop.rs b/alacritty_terminal/src/event_loop.rs
index 2fe3f64e..8a6441ce 100644
--- a/alacritty_terminal/src/event_loop.rs
+++ b/alacritty_terminal/src/event_loop.rs
@@ -221,7 +221,7 @@ where
         let mut terminal = None;
 
         loop {
-            match self.pty.reader().read(&mut buf[..]) {
+            match self.pty.reader().read(buf) {
                 Ok(0) => break,
                 Ok(got) => {
                     // Record bytes read; used to limit time spent in pty_read.
diff --git a/alacritty_terminal/src/term/color.rs b/alacritty_terminal/src/term/color.rs
index a67e2c6e..32c6af2b 100644
--- a/alacritty_terminal/src/term/color.rs
+++ b/alacritty_terminal/src/term/color.rs
@@ -115,7 +115,7 @@ impl<'de> Deserialize<'de> for Rgb {
             where
                 E: serde::de::Error,
             {
-                Rgb::from_str(&value[..]).map_err(|_| {
+                Rgb::from_str(value).map_err(|_| {
                     E::custom(format!(
                         "failed to parse rgb color {}; expected hex color like #ff00ff",
                         value
@@ -219,7 +219,7 @@ impl<'de> Deserialize<'de> for CellRgb {
                     _ => (),
                 }
 
-                Rgb::from_str(&value[..]).map(CellRgb::Rgb).map_err(|_| {
+                Rgb::from_str(value).map(CellRgb::Rgb).map_err(|_| {
                     E::custom(format!("failed to parse color {}; expected {}", value, EXPECTING))
                 })
             }
diff --git a/alacritty_terminal/src/term/mod.rs b/alacritty_terminal/src/term/mod.rs
index 4ece1b52..a898ecc4 100644
--- a/alacritty_terminal/src/term/mod.rs
+++ b/alacritty_terminal/src/term/mod.rs
@@ -1573,7 +1573,7 @@ impl<T: EventListener> Handler for Term<T> {
             ansi::Mode::LineWrap => self.mode.insert(TermMode::LINE_WRAP),
             ansi::Mode::LineFeedNewLine => self.mode.insert(TermMode::LINE_FEED_NEW_LINE),
             ansi::Mode::Origin => self.mode.insert(TermMode::ORIGIN),
-            ansi::Mode::DECCOLM => self.deccolm(),
+            ansi::Mode::ColumnMode => self.deccolm(),
             ansi::Mode::Insert => self.mode.insert(TermMode::INSERT),
             ansi::Mode::BlinkingCursor => {
                 let style = self.cursor_style.get_or_insert(self.default_cursor_style);
@@ -1615,7 +1615,7 @@ impl<T: EventListener> Handler for Term<T> {
             ansi::Mode::LineWrap => self.mode.remove(TermMode::LINE_WRAP),
             ansi::Mode::LineFeedNewLine => self.mode.remove(TermMode::LINE_FEED_NEW_LINE),
             ansi::Mode::Origin => self.mode.remove(TermMode::ORIGIN),
-            ansi::Mode::DECCOLM => self.deccolm(),
+            ansi::Mode::ColumnMode => self.deccolm(),
             ansi::Mode::Insert => self.mode.remove(TermMode::INSERT),
             ansi::Mode::BlinkingCursor => {
                 let style = self.cursor_style.get_or_insert(self.default_cursor_style);