From f90dd12efd808c8dcb354bb0667d63dd298cf00c Mon Sep 17 00:00:00 2001 From: Christian Duerr Date: Mon, 11 Oct 2021 00:54:18 +0000 Subject: Update rustfmt configuration In this change I went through all current rustfmt configuration options and expanded our existing configuration with overrides whenever deemed appropriate. The `normalize_doc_attributes` option is still unstable, but seems to work without any issues. Even when passing macros like `include_str!` that is recognized properly and not normalized. So while this wasn't an issue anywhere in the code, it should make sure it never will be. When it comes to imports there are two new major additions. The `imports_granularity` and `group_imports` options. Both mostly just incorporate unwritten rules that have existed in Alacritty for a long time. Unfortunately since `alacritty_terminal` imports in `alacritty` are supposed to be separate blocks, the `group_imports` option cannot be used. --- alacritty_terminal/src/grid/row.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'alacritty_terminal/src/grid') diff --git a/alacritty_terminal/src/grid/row.rs b/alacritty_terminal/src/grid/row.rs index c932e83f..f6bcb022 100644 --- a/alacritty_terminal/src/grid/row.rs +++ b/alacritty_terminal/src/grid/row.rs @@ -1,10 +1,8 @@ //! Defines the Row type which makes up lines in the grid. use std::cmp::{max, min}; -use std::ops::{Index, IndexMut}; -use std::ops::{Range, RangeFrom, RangeFull, RangeTo, RangeToInclusive}; -use std::ptr; -use std::slice; +use std::ops::{Index, IndexMut, Range, RangeFrom, RangeFull, RangeTo, RangeToInclusive}; +use std::{ptr, slice}; use serde::{Deserialize, Serialize}; -- cgit v1.2.3-54-g00ecf