diff options
author | Christian Duerr <chrisduerr@users.noreply.github.com> | 2018-03-04 22:40:15 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-04 22:40:15 +0000 |
commit | 7f2b398ad2084bdaaa266e8da770a213f0a9a2eb (patch) | |
tree | 9d249fd13e80c9ca2d03f37fd6147fbc1ee8ba4a /src/selection.rs | |
parent | 475ebecfc4e0648242e82e256dee1489f3a3fe81 (diff) | |
download | alacritty-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/selection.rs')
-rw-r--r-- | src/selection.rs | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/selection.rs b/src/selection.rs index 92410104..cd905164 100644 --- a/src/selection.rs +++ b/src/selection.rs @@ -75,7 +75,7 @@ pub struct Anchor { impl Anchor { fn new(point: Point, side: Side) -> Anchor { - Anchor { point: point, side: side } + Anchor { point, side } } } @@ -114,8 +114,8 @@ impl Selection { end: point, }, initial_expansion: Region { - start: start, - end: end + start, + end, } } } @@ -248,10 +248,10 @@ impl Selection { return None; } else { return Some(Span { - cols: cols, + cols, ty: SpanType::Inclusive, - front: front, - tail: tail + front, + tail, }); } } @@ -266,30 +266,30 @@ impl Selection { Some(match (front_side, tail_side) { // [FX][XX][XT] (Side::Left, Side::Right) => Span { - cols: cols, - front: front, - tail: tail, + cols, + front, + tail, ty: SpanType::Inclusive }, // [ F][XX][T ] (Side::Right, Side::Left) => Span { - cols: cols, - front: front, - tail: tail, + cols, + front, + tail, ty: SpanType::Exclusive }, // [FX][XX][T ] (Side::Left, Side::Left) => Span { - cols: cols, - front: front, - tail: tail, + cols, + front, + tail, ty: SpanType::ExcludeTail }, // [ F][XX][XT] (Side::Right, Side::Right) => Span { - cols: cols, - front: front, - tail: tail, + cols, + front, + tail, ty: SpanType::ExcludeFront }, }) |