From 42a27b48df427edf8dbb624c51551a90ecf2e7ea Mon Sep 17 00:00:00 2001 From: Laurenz Date: Thu, 29 Jul 2021 22:27:10 +0200 Subject: [PATCH] Change derive order --- src/eval/scope.rs | 2 +- src/eval/template.rs | 2 +- src/font.rs | 4 ++-- src/geom/path.rs | 2 +- src/layout/frame.rs | 2 +- src/layout/incremental.rs | 2 +- src/loading/fs.rs | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/eval/scope.rs b/src/eval/scope.rs index 9945104a2..72b524cfb 100644 --- a/src/eval/scope.rs +++ b/src/eval/scope.rs @@ -10,7 +10,7 @@ use super::{EcoString, EvalContext, FuncArgs, Function, Value}; pub type Slot = Rc>; /// A stack of scopes. -#[derive(Default, Debug, Clone, PartialEq)] +#[derive(Debug, Default, Clone, PartialEq)] pub struct Scopes<'a> { /// The active scope. pub top: Scope, diff --git a/src/eval/template.rs b/src/eval/template.rs index 33f2b8960..9a71ada44 100644 --- a/src/eval/template.rs +++ b/src/eval/template.rs @@ -9,7 +9,7 @@ use crate::syntax::{Expr, SyntaxTree}; use crate::util::EcoString; /// A template value: `[*Hi* there]`. -#[derive(Default, Debug, Clone)] +#[derive(Debug, Default, Clone)] pub struct Template { nodes: Rc>, } diff --git a/src/font.rs b/src/font.rs index 911bd2f1b..3dec3a631 100644 --- a/src/font.rs +++ b/src/font.rs @@ -163,7 +163,7 @@ impl Display for VerticalFontMetric { /// A length in em units. /// /// `1em` is the same as the font size. -#[derive(Default, Debug, Copy, Clone, Eq, PartialEq, PartialOrd)] +#[derive(Debug, Default, Copy, Clone, Eq, PartialEq, PartialOrd)] pub struct Em(N64); impl Em { @@ -370,7 +370,7 @@ pub struct FaceInfo { } /// Properties that distinguish a face from other faces in the same family. -#[derive(Default, Debug, Copy, Clone, Eq, PartialEq, Hash)] +#[derive(Debug, Default, Copy, Clone, Eq, PartialEq, Hash)] #[derive(Serialize, Deserialize)] pub struct FontVariant { /// The style of the face (normal / italic / oblique). diff --git a/src/geom/path.rs b/src/geom/path.rs index a7aed249e..bb2832fd1 100644 --- a/src/geom/path.rs +++ b/src/geom/path.rs @@ -3,7 +3,7 @@ use super::*; use serde::{Deserialize, Serialize}; /// A bezier path. -#[derive(Default, Debug, Clone, Eq, PartialEq, Serialize, Deserialize)] +#[derive(Debug, Default, Clone, Eq, PartialEq, Serialize, Deserialize)] #[serde(transparent)] pub struct Path(pub Vec); diff --git a/src/layout/frame.rs b/src/layout/frame.rs index 862dc4be6..82ac71a97 100644 --- a/src/layout/frame.rs +++ b/src/layout/frame.rs @@ -9,7 +9,7 @@ use crate::geom::{Length, Path, Point, Size}; use crate::image::ImageId; /// A finished layout with elements at fixed positions. -#[derive(Default, Debug, Clone, Eq, PartialEq, Serialize, Deserialize)] +#[derive(Debug, Default, Clone, Eq, PartialEq, Serialize, Deserialize)] pub struct Frame { /// The size of the frame. pub size: Size, diff --git a/src/layout/incremental.rs b/src/layout/incremental.rs index 352434ede..e7d12d108 100644 --- a/src/layout/incremental.rs +++ b/src/layout/incremental.rs @@ -8,7 +8,7 @@ use super::*; /// /// _This is only available when the `layout-cache` feature is enabled._ #[cfg(feature = "layout-cache")] -#[derive(Default, Debug, Clone)] +#[derive(Debug, Default, Clone)] pub struct LayoutCache { /// Maps from node hashes to the resulting frames and regions in which the /// frames are valid. The right hand side of the hash map is a vector of diff --git a/src/loading/fs.rs b/src/loading/fs.rs index 0f6f1076c..d41a7dc10 100644 --- a/src/loading/fs.rs +++ b/src/loading/fs.rs @@ -17,7 +17,7 @@ use crate::util::PathExt; /// Loads fonts and images from the local file system. /// /// _This is only available when the `fs` feature is enabled._ -#[derive(Default, Debug, Clone)] +#[derive(Debug, Default, Clone)] pub struct FsLoader { faces: Vec, paths: RefCell>,