Tidy up some imports

This commit is contained in:
Laurenz 2023-11-21 15:20:49 +01:00
parent 1ef6ba7f41
commit 36c7301608
8 changed files with 13 additions and 16 deletions

View File

@ -6,7 +6,8 @@ use std::path::PathBuf;
use semver::Version; use semver::Version;
use serde::Deserialize; use serde::Deserialize;
use tempfile::NamedTempFile; use tempfile::NamedTempFile;
use typst::{diag::bail, diag::StrResult, eval::eco_format}; use typst::diag::{bail, StrResult};
use typst::eval::eco_format;
use xz2::bufread::XzDecoder; use xz2::bufread::XzDecoder;
use zip::ZipArchive; use zip::ZipArchive;

View File

@ -5,8 +5,7 @@ use if_chain::if_chain;
use typst::doc::Frame; use typst::doc::Frame;
use typst::eval::{repr, CapturesVisitor, CastInfo, Repr, Tracer, Value}; use typst::eval::{repr, CapturesVisitor, CastInfo, Repr, Tracer, Value};
use typst::geom::{round_2, Length, Numeric}; use typst::geom::{round_2, Length, Numeric};
use typst::syntax::ast; use typst::syntax::{ast, LinkedNode, Source, SyntaxKind};
use typst::syntax::{LinkedNode, Source, SyntaxKind};
use typst::World; use typst::World;
use crate::analyze::analyze_labels; use crate::analyze::analyze_labels;

View File

@ -1,5 +1,4 @@
use crate::layout::GridLayouter; use crate::layout::{BlockElem, GridLayouter, ParElem, Sizing, Spacing};
use crate::layout::{BlockElem, ParElem, Sizing, Spacing};
use crate::prelude::*; use crate::prelude::*;
use crate::text::TextElem; use crate::text::TextElem;

View File

@ -46,9 +46,9 @@ use self::fragment::*;
use self::row::*; use self::row::*;
use self::spacing::*; use self::spacing::*;
use crate::layout::{AlignElem, BoxElem, HElem, ParElem, Spacing}; use crate::layout::{AlignElem, BoxElem, HElem, ParElem, Spacing};
use crate::meta::Supplement;
use crate::meta::{ use crate::meta::{
Count, Counter, CounterUpdate, LocalNameIn, Numbering, Outlinable, Refable, Count, Counter, CounterUpdate, LocalNameIn, Numbering, Outlinable, Refable,
Supplement,
}; };
use crate::prelude::*; use crate::prelude::*;
use crate::shared::BehavedBuilder; use crate::shared::BehavedBuilder;

View File

@ -1,4 +1,5 @@
use icu_properties::{maps::CodePointMapData, LineBreak}; use icu_properties::maps::CodePointMapData;
use icu_properties::LineBreak;
use icu_provider::AsDeserializingBufferProvider; use icu_provider::AsDeserializingBufferProvider;
use icu_provider_adapters::fork::ForkByKeyProvider; use icu_provider_adapters::fork::ForkByKeyProvider;
use icu_provider_blob::BlobDataProvider; use icu_provider_blob::BlobDataProvider;

View File

@ -2,10 +2,9 @@ use std::f32::consts::{PI, TAU};
use std::sync::Arc; use std::sync::Arc;
use ecow::{eco_format, EcoString}; use ecow::{eco_format, EcoString};
use pdf_writer::types::FunctionShadingType; use pdf_writer::types::{ColorSpaceOperand, FunctionShadingType};
use pdf_writer::writers::StreamShadingType; use pdf_writer::writers::StreamShadingType;
use pdf_writer::{types::ColorSpaceOperand, Name}; use pdf_writer::{Filter, Finish, Name, Ref};
use pdf_writer::{Filter, Finish, Ref};
use typst::geom::{ use typst::geom::{
Abs, Angle, Color, ColorSpace, ConicGradient, Gradient, Numeric, Point, Quadrant, Abs, Angle, Color, ColorSpace, ConicGradient, Gradient, Numeric, Point, Quadrant,
Ratio, Relative, Transform, WeightedColor, Ratio, Relative, Transform, WeightedColor,

View File

@ -8,8 +8,7 @@ use std::sync::Arc;
use comemo::Prehashed; use comemo::Prehashed;
use crate::reparser::reparse; use crate::reparser::reparse;
use crate::VirtualPath; use crate::{is_newline, parse, FileId, LinkedNode, Span, SyntaxNode, VirtualPath};
use crate::{is_newline, parse, FileId, LinkedNode, Span, SyntaxNode};
/// A source file. /// A source file.
/// ///

View File

@ -12,11 +12,10 @@ use siphasher::sip128::{Hasher128, SipHasher13};
use crate::diag::StrResult; use crate::diag::StrResult;
use crate::eval::{ use crate::eval::{
fields, ops, repr, Args, Array, AutoValue, Bytes, CastInfo, Content, Dict, Duration, fields, item, ops, repr, Args, Array, AutoValue, Bytes, CastInfo, Content, Datetime,
FromValue, Func, IntoValue, Module, NativeType, NoneValue, Plugin, Reflect, Repr, Dict, Duration, FromValue, Func, IntoValue, Module, NativeType, NoneValue, Plugin,
Scope, Str, Symbol, Type, Version, Reflect, Repr, Scope, Str, Symbol, Type, Version,
}; };
use crate::eval::{item, Datetime};
use crate::geom::{Abs, Angle, Color, Em, Fr, Gradient, Length, Ratio, Rel}; use crate::geom::{Abs, Angle, Color, Em, Fr, Gradient, Length, Ratio, Rel};
use crate::model::{Label, Styles}; use crate::model::{Label, Styles};
use crate::syntax::{ast, Span}; use crate::syntax::{ast, Span};