From 56097de74e01a309ea49c8730be6b689dc153d8f Mon Sep 17 00:00:00 2001 From: Christian Duerr Date: Sat, 2 Jan 2021 02:30:52 +0000 Subject: [PATCH] Fix deserialization of untagged enums Fixes #4634. --- alacritty_terminal/src/config/mod.rs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/alacritty_terminal/src/config/mod.rs b/alacritty_terminal/src/config/mod.rs index caa8930b..9b6f695f 100644 --- a/alacritty_terminal/src/config/mod.rs +++ b/alacritty_terminal/src/config/mod.rs @@ -131,7 +131,12 @@ impl Cursor { #[derive(Deserialize, Debug, Copy, Clone, PartialEq, Eq)] pub enum ConfigCursorStyle { Shape(CursorShape), - WithBlinking { shape: CursorShape, blinking: CursorBlinking }, + WithBlinking { + #[serde(default)] + shape: CursorShape, + #[serde(default)] + blinking: CursorBlinking, + }, } impl Default for ConfigCursorStyle { @@ -195,7 +200,11 @@ impl Into for CursorBlinking { #[derive(Deserialize, Debug, Clone, PartialEq, Eq)] pub enum Program { Just(String), - WithArgs { program: String, args: Vec }, + WithArgs { + program: String, + #[serde(default)] + args: Vec, + }, } impl Program {