style: apply nightly rustfmt import grouping across the workspace
rustfmt.toml sets group_imports, imports_granularity and imports_layout, which are nightly-only; agents formatted with stable rustfmt, which ignored them. This is a formatting-only pass with `cargo +nightly fmt`. Test Plan: - cargo clippy --workspace --all-targets -- -D warnings - cargo test --workspace
This commit is contained in:
1 parent
81d4119d85
commit
8bcb85a29a
259 files changed
+2495
-1547
No files matched your search
@@ -11,9 +11,11 @@
|
||||
//! prepare/add/finalize/shape sequence.
|
||||
|
||||
use super::hb;
|
||||
use crate::face::freetype::Face;
|
||||
use crate::shape::{self, Cell, DEFAULT_FEATURES, FeatureList, TextRun};
|
||||
use crate::shared_grid::SharedGrid;
|
||||
use crate::{
|
||||
face::freetype::Face,
|
||||
shape::{self, Cell, DEFAULT_FEATURES, FeatureList, TextRun},
|
||||
shared_grid::SharedGrid,
|
||||
};
|
||||
|
||||
#[derive(Debug, thiserror::Error)]
|
||||
pub enum ShapeError {
|
||||
@@ -297,13 +299,22 @@ impl Shaper {
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::face::{DesiredSize, FontData, Options};
|
||||
use crate::shaper::run::{RunIterator, RunOptions};
|
||||
use crate::shaper::test_util::{
|
||||
Term, TestFont, shape_all, test_shaper, test_shaper_with_discovered_font,
|
||||
test_shaper_with_font,
|
||||
use crate::{
|
||||
Library,
|
||||
embedded,
|
||||
face::{DesiredSize, FontData, Options},
|
||||
shaper::{
|
||||
run::{RunIterator, RunOptions},
|
||||
test_util::{
|
||||
Term,
|
||||
TestFont,
|
||||
shape_all,
|
||||
test_shaper,
|
||||
test_shaper_with_discovered_font,
|
||||
test_shaper_with_font,
|
||||
},
|
||||
},
|
||||
};
|
||||
use crate::{Library, embedded};
|
||||
|
||||
fn text(s: &str) -> Vec<(u32, u32)> {
|
||||
s.chars()
|
||||
|
||||
@@ -2,8 +2,10 @@
|
||||
//! Each individual codepoint is mapped directly to the detected text run
|
||||
//! font's glyph index.
|
||||
|
||||
use crate::face::freetype::Face;
|
||||
use crate::shape::{self, Cell};
|
||||
use crate::{
|
||||
face::freetype::Face,
|
||||
shape::{self, Cell},
|
||||
};
|
||||
|
||||
#[derive(Debug, Clone, Copy)]
|
||||
struct Codepoint {
|
||||
|
||||
@@ -12,12 +12,17 @@
|
||||
use std::hash::{DefaultHasher, Hash, Hasher};
|
||||
|
||||
use ghostty_config::types_a::FontShapingBreak;
|
||||
use ghostty_terminal::page::{Cell, ContentTag, Page, Wide};
|
||||
use ghostty_terminal::style::{Color, Style as TermStyle};
|
||||
use ghostty_terminal::{
|
||||
page::{Cell, ContentTag, Page, Wide},
|
||||
style::{Color, Style as TermStyle},
|
||||
};
|
||||
|
||||
use crate::collection::Index;
|
||||
use crate::shared_grid::{Error as GridError, SharedGrid};
|
||||
use crate::{Presentation, Style};
|
||||
use crate::{
|
||||
Presentation,
|
||||
Style,
|
||||
collection::Index,
|
||||
shared_grid::{Error as GridError, SharedGrid},
|
||||
};
|
||||
|
||||
/// The Kitty graphics unicode placeholder codepoint
|
||||
/// (`terminal.kitty.graphics.unicode.placeholder`).
|
||||
|
||||
@@ -9,19 +9,29 @@
|
||||
|
||||
#![allow(clippy::collapsible_if)]
|
||||
|
||||
use ghostty_terminal::page::Cell;
|
||||
use ghostty_terminal::point::{Coordinate, Point};
|
||||
use ghostty_terminal::screen::{Options, Screen};
|
||||
use ghostty_vt::color::Rgb;
|
||||
use ghostty_vt::sgr::Attribute;
|
||||
use ghostty_terminal::{
|
||||
page::Cell,
|
||||
point::{Coordinate, Point},
|
||||
screen::{Options, Screen},
|
||||
};
|
||||
use ghostty_vt::{color::Rgb, sgr::Attribute};
|
||||
|
||||
use crate::codepoint_resolver::CodepointResolver;
|
||||
use crate::collection::{AddOptions, Collection, LoadOptions, SizeAdjustment};
|
||||
use crate::discovery::{Descriptor, Fontconfig};
|
||||
use crate::face::{DesiredSize, FontData, Options as FaceOptions};
|
||||
use crate::shaper::harfbuzz::Shaper;
|
||||
use crate::shaper::run::{RunCell, RunIterator, RunOptions};
|
||||
use crate::{Face, Library, SharedGrid, Style, embedded, shape};
|
||||
use crate::{
|
||||
Face,
|
||||
Library,
|
||||
SharedGrid,
|
||||
Style,
|
||||
codepoint_resolver::CodepointResolver,
|
||||
collection::{AddOptions, Collection, LoadOptions, SizeAdjustment},
|
||||
discovery::{Descriptor, Fontconfig},
|
||||
embedded,
|
||||
face::{DesiredSize, FontData, Options as FaceOptions},
|
||||
shape,
|
||||
shaper::{
|
||||
harfbuzz::Shaper,
|
||||
run::{RunCell, RunIterator, RunOptions},
|
||||
},
|
||||
};
|
||||
|
||||
#[derive(Clone, Copy)]
|
||||
pub(crate) enum TestFont {
|
||||
|
||||
Reference in new issue
Block a user