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:
ddidderr committed 2026-10-12 05:03:37 +02:00
1 parent 81d4119d85
commit 8bcb85a29a
259 files changed
+2495 -1547

No files matched your search

+20 -4
View File
@@ -7,11 +7,27 @@
//! Port of `sprite/draw/block.zig`.
use super::common::{
Alignment, DrawFn, FIVE_EIGHTHS, Fraction, HALF, HAlign, ONE_EIGHTH, ONE_QUARTER, Quads, Range,
SEVEN_EIGHTHS, Shade, THREE_EIGHTHS, THREE_QUARTERS, VAlign, fill,
Alignment,
DrawFn,
FIVE_EIGHTHS,
Fraction,
HALF,
HAlign,
ONE_EIGHTH,
ONE_QUARTER,
Quads,
Range,
SEVEN_EIGHTHS,
Shade,
THREE_EIGHTHS,
THREE_QUARTERS,
VAlign,
fill,
};
use crate::{
metrics::Metrics,
sprite::canvas::{Canvas, Color, DrawError, Rect},
};
use crate::metrics::Metrics;
use crate::sprite::canvas::{Canvas, Color, DrawError, Rect};
pub const RANGES: &[Range] = &[Range {
min: 0x2580,
+4 -2
View File
@@ -15,8 +15,10 @@
#![allow(clippy::needless_update)]
use super::common::{Corner, DrawFn, Range, Thickness, hline, hline_middle, vline, vline_middle};
use crate::metrics::Metrics;
use crate::sprite::canvas::{Canvas, CapMode, Color, DrawError, Line, Path, Point, StrokeOptions};
use crate::{
metrics::Metrics,
sprite::canvas::{Canvas, CapMode, Color, DrawError, Line, Path, Point, StrokeOptions},
};
pub const RANGES: &[Range] = &[Range {
min: 0x2500,
@@ -24,8 +24,10 @@
//! Port of `sprite/draw/braille.zig`.
use super::common::{DrawFn, Range};
use crate::metrics::Metrics;
use crate::sprite::canvas::{Canvas, Color, DrawError};
use crate::{
metrics::Metrics,
sprite::canvas::{Canvas, Color, DrawError},
};
pub const RANGES: &[Range] = &[Range {
min: 0x2800,
@@ -14,10 +14,14 @@
use std::f64::consts::PI;
use super::box_;
use super::common::{Corner, DrawFn, Edge, Range, Shade, Thickness, hline_middle, vline_middle};
use crate::metrics::Metrics;
use crate::sprite::canvas::{Canvas, CapMode, Color, DrawError, Path, StrokeOptions};
use super::{
box_,
common::{Corner, DrawFn, Edge, Range, Shade, Thickness, hline_middle, vline_middle},
};
use crate::{
metrics::Metrics,
sprite::canvas::{Canvas, CapMode, Color, DrawError, Path, StrokeOptions},
};
pub const RANGES: &[Range] = &[Range {
min: 0xf5d0,
@@ -3,8 +3,10 @@
//! are generally applicable to multiple sets of glyphs
//! rather than being single-use. Port of `sprite/draw/common.zig`.
use crate::metrics::Metrics;
use crate::sprite::canvas::{Canvas, Color, DrawError};
use crate::{
metrics::Metrics,
sprite::canvas::{Canvas, Color, DrawError},
};
/// A function that draws a glyph on the provided canvas.
pub type DrawFn = fn(
@@ -14,8 +14,10 @@
//! Port of `sprite/draw/geometric_shapes.zig`.
use super::common::{Corner, DrawFn, Range, Shade, Thickness};
use crate::metrics::Metrics;
use crate::sprite::canvas::{Canvas, CapMode, Color, DrawError, Path, StrokeOptions};
use crate::{
metrics::Metrics,
sprite::canvas::{Canvas, CapMode, Color, DrawError, Path, StrokeOptions},
};
pub const RANGES: &[Range] = &[
Range {
@@ -11,11 +11,13 @@
use std::f64::consts::SQRT_2;
use super::box_;
use super::common::{DrawFn, Range, Thickness};
use crate::metrics::Metrics;
use crate::sprite::canvas::{
Canvas, CapMode, Color, DrawError, Path, Point, StrokeOptions, Triangle,
use super::{
box_,
common::{DrawFn, Range, Thickness},
};
use crate::{
metrics::Metrics,
sprite::canvas::{Canvas, CapMode, Color, DrawError, Path, Point, StrokeOptions, Triangle},
};
pub const RANGES: &[Range] = &[
@@ -6,8 +6,10 @@
use std::f64::consts::{FRAC_1_SQRT_2, PI, TAU};
use crate::metrics::Metrics;
use crate::sprite::canvas::{Canvas, CapMode, Color, DrawError, Path, Rect, StrokeOptions};
use crate::{
metrics::Metrics,
sprite::canvas::{Canvas, CapMode, Color, DrawError, Path, Rect, StrokeOptions},
};
pub fn underline(
_cp: u32,
@@ -3,16 +3,38 @@
//!
//! Port of `sprite/draw/symbols_for_legacy_computing.zig`.
use super::block;
use super::box_;
use super::common::{
Alignment, Corner, DrawFn, Edge, FIVE_EIGHTHS, Fraction, HALF, HAlign, ONE_EIGHTH, ONE_QUARTER,
ONE_THIRD, Quads, Range, SEVEN_EIGHTHS, Shade, THREE_EIGHTHS, THREE_QUARTERS, TWO_THIRDS,
Thickness, VAlign, fill,
use super::{
block,
box_,
common::{
Alignment,
Corner,
DrawFn,
Edge,
FIVE_EIGHTHS,
Fraction,
HALF,
HAlign,
ONE_EIGHTH,
ONE_QUARTER,
ONE_THIRD,
Quads,
Range,
SEVEN_EIGHTHS,
Shade,
THREE_EIGHTHS,
THREE_QUARTERS,
TWO_THIRDS,
Thickness,
VAlign,
fill,
},
geometric_shapes as geo,
};
use crate::{
metrics::Metrics,
sprite::canvas::{Canvas, Color, DrawError, Line, Path, Point, Rect, StrokeOptions},
};
use super::geometric_shapes as geo;
use crate::metrics::Metrics;
use crate::sprite::canvas::{Canvas, Color, DrawError, Line, Path, Point, Rect, StrokeOptions};
const _: (f64, f64) = (ONE_THIRD, TWO_THIRDS);
@@ -5,11 +5,15 @@
use std::sync::OnceLock;
use super::box_::{self, Lines, Style};
use super::common::{Alignment, Corner, DrawFn, Fraction, Range, fill};
use super::symbols_for_legacy_computing as sflc;
use crate::metrics::Metrics;
use crate::sprite::canvas::{Canvas, CapMode, Color, DrawError, Path, StrokeOptions};
use super::{
box_::{self, Lines, Style},
common::{Alignment, Corner, DrawFn, Fraction, Range, fill},
symbols_for_legacy_computing as sflc,
};
use crate::{
metrics::Metrics,
sprite::canvas::{Canvas, CapMode, Color, DrawError, Path, StrokeOptions},
};
pub const RANGES: &[Range] = &[
Range {
+21 -12
View File
@@ -15,19 +15,28 @@
use std::sync::OnceLock;
use super::Sprite;
use super::canvas::{Canvas, DrawError};
use super::draw::common::{DrawFn, Range};
use super::draw::{
block, box_, braille, branch, geometric_shapes, powerline, special,
symbols_for_legacy_computing, symbols_for_legacy_computing_supplement,
use super::{
Sprite,
canvas::{Canvas, DrawError},
draw::{
block,
box_,
braille,
branch,
common::{DrawFn, Range},
geometric_shapes,
powerline,
special,
symbols_for_legacy_computing,
symbols_for_legacy_computing_supplement,
},
};
pub use crate::{Presentation, face::RenderOptions};
use crate::{
atlas::{self, Atlas},
glyph::Glyph,
metrics::Metrics,
};
use crate::atlas::{self, Atlas};
use crate::glyph::Glyph;
use crate::metrics::Metrics;
pub use crate::Presentation;
pub use crate::face::RenderOptions;
/// Errors from [`Face::render_glyph`].
#[derive(Debug, Clone, PartialEq, Eq, thiserror::Error)]