summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurenz <laurmaedje@gmail.com>2021-07-29 22:27:10 +0200
committerLaurenz <laurmaedje@gmail.com>2021-07-29 22:27:10 +0200
commit42a27b48df427edf8dbb624c51551a90ecf2e7ea (patch)
tree9892b610e5de7707dca7fadef0d470a837dd261d
parent2c6127dea611944abb09a0d38375ad7cf9baced0 (diff)
Change derive order
-rw-r--r--src/eval/scope.rs2
-rw-r--r--src/eval/template.rs2
-rw-r--r--src/font.rs4
-rw-r--r--src/geom/path.rs2
-rw-r--r--src/layout/frame.rs2
-rw-r--r--src/layout/incremental.rs2
-rw-r--r--src/loading/fs.rs2
7 files changed, 8 insertions, 8 deletions
diff --git a/src/eval/scope.rs b/src/eval/scope.rs
index 9945104a..72b524cf 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<RefCell<Value>>;
/// 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 33f2b896..9a71ada4 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<Vec<TemplateNode>>,
}
diff --git a/src/font.rs b/src/font.rs
index 911bd2f1..3dec3a63 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 a7aed249..bb2832fd 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<PathElement>);
diff --git a/src/layout/frame.rs b/src/layout/frame.rs
index 862dc4be..82ac71a9 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 352434ed..e7d12d10 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 0f6f1076..d41a7dc1 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<FaceInfo>,
paths: RefCell<HashMap<FileId, PathBuf>>,