From aee1474b6e1f556985e62038a13ffc9d00b77248 Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emilernerfeldt@gmail.com>
Date: Sun, 10 Jan 2021 10:54:34 +0100
Subject: [PATCH] Move align.rs into mod math

---
 egui/src/layout.rs                 | 1 -
 egui/src/lib.rs                    | 2 --
 egui/src/{ => math}/align.rs       | 0
 egui/src/math/mod.rs               | 9 ++++++++-
 egui/src/paint/command.rs          | 6 +-----
 egui/src/painter.rs                | 3 +--
 egui_demo_lib/src/frame_history.rs | 2 +-
 7 files changed, 11 insertions(+), 12 deletions(-)
 rename egui/src/{ => math}/align.rs (100%)

diff --git a/egui/src/layout.rs b/egui/src/layout.rs
index 59088366..b44efdef 100644
--- a/egui/src/layout.rs
+++ b/egui/src/layout.rs
@@ -496,7 +496,6 @@ impl Layout {
 impl Layout {
     /// Shows where the next widget is going to be placed
     pub(crate) fn debug_paint_cursor(&self, region: &Region, painter: &crate::Painter) {
-        use crate::align::Align2;
         use crate::paint::*;
 
         let cursor = region.cursor;
diff --git a/egui/src/lib.rs b/egui/src/lib.rs
index 24a1b2eb..6550914a 100644
--- a/egui/src/lib.rs
+++ b/egui/src/lib.rs
@@ -78,7 +78,6 @@
 )]
 #![allow(clippy::manual_range_contains)]
 
-pub mod align;
 mod animation_manager;
 pub mod containers;
 mod context;
@@ -99,7 +98,6 @@ pub mod util;
 pub mod widgets;
 
 pub use {
-    align::Align,
     containers::*,
     context::{Context, CtxRef},
     id::Id,
diff --git a/egui/src/align.rs b/egui/src/math/align.rs
similarity index 100%
rename from egui/src/align.rs
rename to egui/src/math/align.rs
diff --git a/egui/src/math/mod.rs b/egui/src/math/mod.rs
index dd669482..239031af 100644
--- a/egui/src/math/mod.rs
+++ b/egui/src/math/mod.rs
@@ -8,13 +8,20 @@ use std::ops::{Add, Div, Mul, RangeInclusive, Sub};
 
 // ----------------------------------------------------------------------------
 
+pub mod align;
 mod pos2;
 mod rect;
 mod rot2;
 pub mod smart_aim;
 mod vec2;
 
-pub use {pos2::*, rect::*, rot2::*, vec2::*};
+pub use {
+    align::{Align, Align2},
+    pos2::*,
+    rect::*,
+    rot2::*,
+    vec2::*,
+};
 
 // ----------------------------------------------------------------------------
 
diff --git a/egui/src/paint/command.rs b/egui/src/paint/command.rs
index 72120e1f..587f8b4c 100644
--- a/egui/src/paint/command.rs
+++ b/egui/src/paint/command.rs
@@ -1,10 +1,6 @@
 use {
     super::{fonts::TextStyle, Color32, Fonts, Galley, Triangles},
-    crate::{
-        align::Align2,
-        math::{Pos2, Rect},
-        *,
-    },
+    crate::*,
 };
 
 /// A paint primitive such as a circle or a piece of text.
diff --git a/egui/src/painter.rs b/egui/src/painter.rs
index 8a3849c0..2c656c15 100644
--- a/egui/src/painter.rs
+++ b/egui/src/painter.rs
@@ -1,7 +1,6 @@
 use crate::{
-    align::Align2,
     layers::PaintCmdIdx,
-    math::{Pos2, Rect, Vec2},
+    math::{Align2, Pos2, Rect, Vec2},
     paint::{Fonts, Galley, PaintCmd, Stroke, TextStyle},
     Color32, CtxRef, LayerId,
 };
diff --git a/egui_demo_lib/src/frame_history.rs b/egui_demo_lib/src/frame_history.rs
index 3b2a24b0..15ffd43d 100644
--- a/egui_demo_lib/src/frame_history.rs
+++ b/egui_demo_lib/src/frame_history.rs
@@ -91,7 +91,7 @@ impl FrameHistory {
                 cmds.push(PaintCmd::text(
                     ui.fonts(),
                     pos2(rect.left(), y),
-                    egui::align::Align2::LEFT_BOTTOM,
+                    egui::Align2::LEFT_BOTTOM,
                     text,
                     TextStyle::Monospace,
                     Color32::WHITE,