first pass of merging in warp (doesn't build)

app/src/terminal/grid_renderer/cell_glyph_cache.rs

@@ -1,14 +1,13 @@
 //! This module defines CellGlyphCache, a struct which manages the caching of glyph values for cells
 //! when rendering Grids within Warp.
-use galaxyui::elements::DEFAULT_LINE_HEIGHT_RATIO;
+use std::collections::HashMap;
 
+use galaxyui::elements::DEFAULT_LINE_HEIGHT_RATIO;
 use galaxyui::fonts::{Cache as FontCache, FamilyId, FontId, GlyphId, Properties};
 use galaxyui::platform::LineStyle;
 use galaxyui::text_layout::{StyleAndFont, DEFAULT_TOP_BOTTOM_RATIO};
 use galaxyui::PaintContext;
 
-use std::collections::HashMap;
-
 /// Stores cached glyph values for characters/strings. Note that we normally only need to look up
 /// characters - we only look up strings in the case of zerowidth characters (which act as modifiers
 /// to the first character e.g. emoji variant selectors). We have 2 separate caches internally for

app/src/terminal/grid_renderer/cell_type.rs

@@ -1,18 +1,15 @@
+// The color-mapping helpers (`compute_fg_rgb`, `compute_bg_rgb`, and
+// `get_override_color`) below are adapted from the alacritty_terminal crate
+// under the Apache license; see: crates/warp_terminal/src/model/LICENSE-ALACRITTY.
+
 use pathfinder_color::ColorU;
 
-use crate::{
-    terminal::{
-        color,
-        model::{
-            ansi::{color_index, Color, NamedColor},
-            cell::{Cell, Flags},
-            ObfuscateSecrets,
-        },
-    },
-    util::color::OPAQUE,
-};
-
 use super::{BLOCK_FILTER_MATCH_COLOR, FOCUSED_MATCH_COLOR, MATCH_COLOR, URL_COLOR};
+use crate::terminal::color;
+use crate::terminal::model::ansi::{color_index, Color, NamedColor};
+use crate::terminal::model::cell::{Cell, Flags};
+use crate::terminal::model::ObfuscateSecrets;
+use crate::util::color::OPAQUE;
 
 #[derive(PartialEq)]
 pub(super) struct Secret {