Update outdated reftests

alacritty_terminal/src/grid/mod.rs

@@ -122,18 +122,15 @@ pub struct Grid<T> {
     /// If the displayed region isn't at the bottom of the screen, it stays
     /// stationary while more text is emitted. The scrolling implementation
     /// updates this offset accordingly.
-    #[serde(default)]
     display_offset: usize,
 
     /// An limit on how far back it's possible to scroll
-    #[serde(default)]
     scroll_limit: usize,
 
     /// Selected region
     #[serde(skip)]
     pub selection: Option<Selection>,
 
-    #[serde(default)]
     max_scroll_limit: usize,
 }
 

alacritty_terminal/src/grid/storage.rs

@@ -46,7 +46,6 @@ pub struct Storage<T> {
     /// having to truncate the raw `inner` buffer.
     /// As long as `len` is bigger than `inner`, it is also possible to grow the scrollback buffer
     /// without any additional insertions.
-    #[serde(default)]
     len: usize,
 }
 

alacritty_terminal/tests/ref.rs

@@ -99,11 +99,11 @@ fn ref_test(dir: &Path) {
     let recording = read_u8(dir.join("alacritty.recording"));
     let serialized_size = read_string(dir.join("size.json")).unwrap();
     let serialized_grid = read_string(dir.join("grid.json")).unwrap();
-    let serialized_cfg = read_string(dir.join("config.json")).unwrap_or_default();
+    let serialized_cfg = read_string(dir.join("config.json")).unwrap();
 
     let size: SizeInfo = json::from_str(&serialized_size).unwrap();
     let grid: Grid<Cell> = json::from_str(&serialized_grid).unwrap();
-    let ref_config: RefConfig = json::from_str(&serialized_cfg).unwrap_or_default();
+    let ref_config: RefConfig = json::from_str(&serialized_cfg).unwrap();
 
     let mut config = MockConfig::default();
     config.scrolling.set_history(ref_config.history_size);

alacritty_terminal/tests/ref/csi_rep/config.json

@@ -0,0 +1 @@
+{"history_size":0}

alacritty_terminal/tests/ref/csi_rep/size.json

@@ -1 +1 @@
-{"width":522.0,"height":360.0,"cell_width":7.0,"cell_height":16.0,"padding_x":3.0,"padding_y":3.0}
+{"width":1900.0,"height":1038.0,"cell_width":18.0,"cell_height":35.0,"padding_x":0.0,"padding_y":0.0,"dpr":2.0}

alacritty_terminal/tests/ref/fish_cc/config.json

@@ -0,0 +1 @@
+{"history_size":0}

alacritty_terminal/tests/ref/fish_cc/size.json

@@ -1 +1 @@
-{"width":804.0,"height":604.0,"cell_width":10.0,"cell_height":25.0,"padding_x":0.0,"padding_y":0.0}
+{"width":1900.0,"height":1038.0,"cell_width":18.0,"cell_height":35.0,"padding_x":0.0,"padding_y":0.0,"dpr":2.0}

alacritty_terminal/tests/ref/grid_reset/size.json

@@ -1 +1 @@
-{"width":2532.0,"height":1380.0,"cell_width":9.0,"cell_height":19.0,"padding_x":3.0,"padding_y":3.0}
+{"width":1900.0,"height":1038.0,"cell_width":18.0,"cell_height":35.0,"padding_x":0.0,"padding_y":0.0,"dpr":2.0}

alacritty_terminal/tests/ref/history/size.json

@@ -1 +1 @@
-{"width":939.0,"height":1020.0,"cell_width":8.0,"cell_height":18.0,"padding_x":2.0,"padding_y":2.0}
+{"width":1900.0,"height":1038.0,"cell_width":18.0,"cell_height":35.0,"padding_x":0.0,"padding_y":0.0,"dpr":2.0}

alacritty_terminal/tests/ref/indexed_256_colors/config.json

@@ -0,0 +1 @@
+{"history_size":0}

alacritty_terminal/tests/ref/indexed_256_colors/size.json

@@ -1 +1 @@
-{"width":1124.0,"height":628.0,"cell_width":14.0,"cell_height":26.0,"padding_x":0.0,"padding_y":0.0}
+{"width":1900.0,"height":1038.0,"cell_width":18.0,"cell_height":35.0,"padding_x":0.0,"padding_y":0.0,"dpr":2.0}

alacritty_terminal/tests/ref/issue_855/config.json

@@ -0,0 +1 @@
+{"history_size":0}

alacritty_terminal/tests/ref/issue_855/size.json

@@ -1 +1 @@
-{"width":670.0,"height":382.0,"cell_width":9.0,"cell_height":17.0,"padding_x":3.0,"padding_y":3.0}
+{"width":1900.0,"height":1038.0,"cell_width":18.0,"cell_height":35.0,"padding_x":0.0,"padding_y":0.0,"dpr":2.0}

alacritty_terminal/tests/ref/ll/config.json

@@ -0,0 +1 @@
+{"history_size":0}

alacritty_terminal/tests/ref/ll/size.json

@@ -1 +1 @@
-{"width":1124.0,"height":628.0,"cell_width":14.0,"cell_height":26.0,"padding_x":0.0,"padding_y":0.0}
+{"width":1900.0,"height":1038.0,"cell_width":18.0,"cell_height":35.0,"padding_x":0.0,"padding_y":0.0,"dpr":2.0}

alacritty_terminal/tests/ref/newline_with_cursor_beyond_scroll_region/config.json

@@ -0,0 +1 @@
+{"history_size":0}

alacritty_terminal/tests/ref/newline_with_cursor_beyond_scroll_region/size.json

@@ -1 +1 @@
-{"width":587.0,"height":360.0,"cell_width":7.0,"cell_height":16.0,"padding_x":3.0,"padding_y":3.0}
+{"width":1900.0,"height":1038.0,"cell_width":18.0,"cell_height":35.0,"padding_x":0.0,"padding_y":0.0,"dpr":2.0}

alacritty_terminal/tests/ref/tab_rendering/config.json

@@ -0,0 +1 @@
+{"history_size":0}

alacritty_terminal/tests/ref/tmux_git_log/config.json

@@ -0,0 +1 @@
+{"history_size":0}

alacritty_terminal/tests/ref/tmux_git_log/size.json

@@ -1 +1 @@
-{"width":1124.0,"height":628.0,"cell_width":14.0,"cell_height":26.0,"padding_x":0.0,"padding_y":0.0}
+{"width":1900.0,"height":1038.0,"cell_width":18.0,"cell_height":35.0,"padding_x":0.0,"padding_y":0.0,"dpr":2.0}

alacritty_terminal/tests/ref/tmux_htop/config.json

@@ -0,0 +1 @@
+{"history_size":0}

alacritty_terminal/tests/ref/tmux_htop/size.json

@@ -1 +1 @@
-{"width":1124.0,"height":628.0,"cell_width":14.0,"cell_height":26.0,"padding_x":0.0,"padding_y":0.0}
+{"width":1900.0,"height":1038.0,"cell_width":18.0,"cell_height":35.0,"padding_x":0.0,"padding_y":0.0,"dpr":2.0}

alacritty_terminal/tests/ref/vim_simple_edit/config.json

@@ -0,0 +1 @@
+{"history_size":0}

alacritty_terminal/tests/ref/vttest_cursor_movement_1/config.json

@@ -0,0 +1 @@
+{"history_size":0}

alacritty_terminal/tests/ref/vttest_cursor_movement_1/size.json

@@ -1 +1 @@
-{"width":644.0,"height":412.0,"cell_width":8.0,"cell_height":17.0,"padding_x":0.0,"padding_y":0.0}
+{"width":1900.0,"height":1038.0,"cell_width":18.0,"cell_height":35.0,"padding_x":0.0,"padding_y":0.0,"dpr":2.0}

alacritty_terminal/tests/ref/vttest_insert/config.json

@@ -0,0 +1 @@
+{"history_size":0}

alacritty_terminal/tests/ref/vttest_insert/size.json

@@ -1 +1 @@
-{"width":1124.0,"height":676.0,"cell_width":14.0,"cell_height":28.0,"padding_x":0.0,"padding_y":0.0}
+{"width":1900.0,"height":1038.0,"cell_width":18.0,"cell_height":35.0,"padding_x":0.0,"padding_y":0.0,"dpr":2.0}

alacritty_terminal/tests/ref/vttest_origin_mode_1/config.json

@@ -0,0 +1 @@
+{"history_size":0}

alacritty_terminal/tests/ref/vttest_origin_mode_1/size.json

@@ -1 +1 @@
-{"width":644.0,"height":412.0,"cell_width":8.0,"cell_height":17.0,"padding_x":0.0,"padding_y":0.0}
+{"width":1900.0,"height":1038.0,"cell_width":18.0,"cell_height":35.0,"padding_x":0.0,"padding_y":0.0,"dpr":2.0}

alacritty_terminal/tests/ref/vttest_origin_mode_2/config.json

@@ -0,0 +1 @@
+{"history_size":0}

alacritty_terminal/tests/ref/vttest_origin_mode_2/size.json

@@ -1 +1 @@
-{"width":644.0,"height":412.0,"cell_width":8.0,"cell_height":17.0,"padding_x":0.0,"padding_y":0.0}
+{"width":1900.0,"height":1038.0,"cell_width":18.0,"cell_height":35.0,"padding_x":0.0,"padding_y":0.0,"dpr":2.0}

alacritty_terminal/tests/ref/vttest_scroll/config.json

@@ -0,0 +1 @@
+{"history_size":0}

alacritty_terminal/tests/ref/vttest_scroll/size.json

@@ -1 +1 @@
-{"width":644.0,"height":412.0,"cell_width":8.0,"cell_height":17.0,"padding_x":0.0,"padding_y":0.0}
+{"width":1900.0,"height":1038.0,"cell_width":18.0,"cell_height":35.0,"padding_x":0.0,"padding_y":0.0,"dpr":2.0}

alacritty_terminal/tests/ref/vttest_tab_clear_set/config.json

@@ -0,0 +1 @@
+{"history_size":0}

alacritty_terminal/tests/ref/zsh_tab_completion/config.json

@@ -0,0 +1 @@
+{"history_size":0}

alacritty_terminal/tests/ref/zsh_tab_completion/size.json

@@ -1 +1 @@
-{"width":1204.0,"height":676.0,"cell_width":15.0,"cell_height":28.0,"padding_x":0.0,"padding_y":0.0}
+{"width":1900.0,"height":1038.0,"cell_width":18.0,"cell_height":35.0,"padding_x":0.0,"padding_y":0.0,"dpr":2.0}