aboutsummaryrefslogtreecommitdiff
path: root/alacritty/src/config/serde_utils.rs
diff options
context:
space:
mode:
Diffstat (limited to 'alacritty/src/config/serde_utils.rs')
-rw-r--r--alacritty/src/config/serde_utils.rs5
1 files changed, 5 insertions, 0 deletions
diff --git a/alacritty/src/config/serde_utils.rs b/alacritty/src/config/serde_utils.rs
index ecf1c858..beb9c36b 100644
--- a/alacritty/src/config/serde_utils.rs
+++ b/alacritty/src/config/serde_utils.rs
@@ -16,6 +16,7 @@ pub fn merge(base: Value, replacement: Value) -> Value {
(Value::Mapping(base), Value::Mapping(replacement)) => {
Value::Mapping(merge_mapping(base, replacement))
},
+ (value, Value::Null) => value,
(_, value) => value,
}
}
@@ -54,6 +55,10 @@ mod tests {
let base = Value::String(String::new());
let replacement = Value::String(String::from("test"));
assert_eq!(merge(base, replacement.clone()), replacement);
+
+ let base = Value::Mapping(Mapping::new());
+ let replacement = Value::Null;
+ assert_eq!(merge(base.clone(), replacement), base);
}
#[test]