summaryrefslogtreecommitdiff
path: root/src/display.rs
diff options
context:
space:
mode:
authorChristian Duerr <chrisduerr@users.noreply.github.com>2018-03-04 22:40:15 +0000
committerGitHub <noreply@github.com>2018-03-04 22:40:15 +0000
commit7f2b398ad2084bdaaa266e8da770a213f0a9a2eb (patch)
tree9d249fd13e80c9ca2d03f37fd6147fbc1ee8ba4a /src/display.rs
parent475ebecfc4e0648242e82e256dee1489f3a3fe81 (diff)
downloadalacritty-7f2b398ad2084bdaaa266e8da770a213f0a9a2eb.tar.gz
alacritty-7f2b398ad2084bdaaa266e8da770a213f0a9a2eb.zip
Remove all instances of unwrap() from config
Unwrapping inside the config file parsing can lead to some issues that prevent us from falling back to a default configuration file. One instance of that issue was mentioned in #1135. Now all instances of `unwrap()` have been removed and replaced with proper error handling. This will make the config more robust and prevents live reload from silently breaking while alacritty is running. This also fixes a few currently existing clippy issues. Clippy added an additonal lint which complains about `MyStruct { field: field }`. These issues have been fixed, except for some false-positives and issues in external macros which will probably be fixed with future updates (rust-lang-nursery/bitflags#149)
Diffstat (limited to 'src/display.rs')
-rw-r--r--src/display.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/display.rs b/src/display.rs
index 9227037e..418f616e 100644
--- a/src/display.rs
+++ b/src/display.rs
@@ -198,15 +198,15 @@ impl Display {
});
Ok(Display {
- window: window,
- renderer: renderer,
- glyph_cache: glyph_cache,
- render_timer: render_timer,
- tx: tx,
- rx: rx,
+ window,
+ renderer,
+ glyph_cache,
+ render_timer,
+ tx,
+ rx,
meter: Meter::new(),
font_size: font::Size::new(0.),
- size_info: size_info,
+ size_info,
last_background_color: background_color,
})
}