summaryrefslogtreecommitdiff
path: root/alacritty_terminal/src/grid
diff options
context:
space:
mode:
authorChristian Duerr <contact@christianduerr.com>2020-12-31 05:52:45 +0000
committerGitHub <noreply@github.com>2020-12-31 05:52:45 +0000
commit1723e30d25f0c6068f9532448b016a89aa491a95 (patch)
tree543790b11a4fdc3c82f7f0b0ebc1cbc79d1c2009 /alacritty_terminal/src/grid
parent0aa1df327bf5c3e7892ad13d949be7e598aafda9 (diff)
downloadalacritty-1723e30d25f0c6068f9532448b016a89aa491a95.tar.gz
alacritty-1723e30d25f0c6068f9532448b016a89aa491a95.zip
Use ConfigDeserialize for all config enums
This fixes up all of the remaining enums which are used in the configuration file to make sure they all support fully case insensitive deserialization. Fixes #4611.
Diffstat (limited to 'alacritty_terminal/src/grid')
-rw-r--r--alacritty_terminal/src/grid/mod.rs2
-rw-r--r--alacritty_terminal/src/grid/row.rs2
-rw-r--r--alacritty_terminal/src/grid/storage.rs2
3 files changed, 3 insertions, 3 deletions
diff --git a/alacritty_terminal/src/grid/mod.rs b/alacritty_terminal/src/grid/mod.rs
index 1c23bfc8..4b3c86dc 100644
--- a/alacritty_terminal/src/grid/mod.rs
+++ b/alacritty_terminal/src/grid/mod.rs
@@ -126,7 +126,7 @@ impl IndexMut<CharsetIndex> for Charsets {
/// ^
/// cols
/// ```
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
pub struct Grid<T> {
/// Current cursor for writing data.
#[serde(skip)]
diff --git a/alacritty_terminal/src/grid/row.rs b/alacritty_terminal/src/grid/row.rs
index 5b1be31c..e48103a6 100644
--- a/alacritty_terminal/src/grid/row.rs
+++ b/alacritty_terminal/src/grid/row.rs
@@ -13,7 +13,7 @@ use crate::index::Column;
use crate::term::cell::ResetDiscriminant;
/// A row in the grid.
-#[derive(Default, Clone, Debug, Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, Default, Clone, Debug)]
pub struct Row<T> {
inner: Vec<T>,
diff --git a/alacritty_terminal/src/grid/storage.rs b/alacritty_terminal/src/grid/storage.rs
index 96c578b3..a7d4adcf 100644
--- a/alacritty_terminal/src/grid/storage.rs
+++ b/alacritty_terminal/src/grid/storage.rs
@@ -26,7 +26,7 @@ const MAX_CACHE_SIZE: usize = 1_000;
/// [`slice::rotate_left`]: https://doc.rust-lang.org/std/primitive.slice.html#method.rotate_left
/// [`Deref`]: std::ops::Deref
/// [`zero`]: #structfield.zero
-#[derive(Deserialize, Serialize, Clone, Debug)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
pub struct Storage<T> {
inner: Vec<Row<T>>,