From 139bcb8304c47ac89a30961fd6843ff26432c2c0 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Fri, 28 May 2021 14:33:02 -0700
Subject: [PATCH] Rename `foo/mod.rs` files too `foo.rs`

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
---
 gpui/src/{elements/new.rs => elements.rs}     | 54 +++++++++++++++++-
 gpui/src/elements/mod.rs                      | 56 -------------------
 gpui/src/{platform/mod.rs => platform.rs}     |  0
 gpui/src/platform/{mac/mod.rs => mac.rs}      |  0
 zed/src/{editor/mod.rs => editor.rs}          |  0
 zed/src/editor/{buffer/mod.rs => buffer.rs}   |  0
 .../{display_map/mod.rs => display_map.rs}    |  0
 zed/src/{sum_tree/mod.rs => sum_tree.rs}      |  0
 8 files changed, 52 insertions(+), 58 deletions(-)
 rename gpui/src/{elements/new.rs => elements.rs} (86%)
 delete mode 100644 gpui/src/elements/mod.rs
 rename gpui/src/{platform/mod.rs => platform.rs} (100%)
 rename gpui/src/platform/{mac/mod.rs => mac.rs} (100%)
 rename zed/src/{editor/mod.rs => editor.rs} (100%)
 rename zed/src/editor/{buffer/mod.rs => buffer.rs} (100%)
 rename zed/src/editor/{display_map/mod.rs => display_map.rs} (100%)
 rename zed/src/{sum_tree/mod.rs => sum_tree.rs} (100%)

diff --git a/gpui/src/elements/new.rs b/gpui/src/elements.rs
similarity index 86%
rename from gpui/src/elements/new.rs
rename to gpui/src/elements.rs
index e45a71e16a421db141e4e00ddae45c961bf0d42c..f78a3f999d34e6af9b056d934f5d1bbc6a25d028 100644
--- a/gpui/src/elements/new.rs
+++ b/gpui/src/elements.rs
@@ -1,7 +1,36 @@
+mod align;
+mod canvas;
+mod constrained_box;
+mod container;
+mod empty;
+mod event_handler;
+mod flex;
+mod label;
+mod line_box;
+mod mouse_event_handler;
+mod stack;
+mod svg;
+mod uniform_list;
+
+pub use crate::presenter::ChildView;
+pub use align::*;
+pub use canvas::*;
+pub use constrained_box::*;
+pub use container::*;
+pub use empty::*;
+pub use event_handler::*;
+pub use flex::*;
+pub use label::*;
+pub use line_box::*;
+pub use mouse_event_handler::*;
+pub use stack::*;
+pub use svg::*;
+pub use uniform_list::*;
+
 use crate::{
     geometry::{rect::RectF, vector::Vector2F},
-    json, AfterLayoutContext, DebugContext, Event, EventContext, LayoutContext, PaintContext,
-    SizeConstraint,
+    json, AfterLayoutContext, AppContext, DebugContext, Event, EventContext, LayoutContext,
+    PaintContext, SizeConstraint,
 };
 use core::panic;
 use json::ToJson;
@@ -268,3 +297,24 @@ impl ElementBox {
         value
     }
 }
+
+pub trait ParentElement<'a>: Extend<ElementBox> + Sized {
+    fn add_children(&mut self, children: impl IntoIterator<Item = ElementBox>) {
+        self.extend(children);
+    }
+
+    fn add_child(&mut self, child: ElementBox) {
+        self.add_children(Some(child));
+    }
+
+    fn with_children(mut self, children: impl IntoIterator<Item = ElementBox>) -> Self {
+        self.add_children(children);
+        self
+    }
+
+    fn with_child(self, child: ElementBox) -> Self {
+        self.with_children(Some(child))
+    }
+}
+
+impl<'a, T> ParentElement<'a> for T where T: Extend<ElementBox> {}
diff --git a/gpui/src/elements/mod.rs b/gpui/src/elements/mod.rs
deleted file mode 100644
index ab56cf280258a3cf0430c53d61a653c549e83631..0000000000000000000000000000000000000000
--- a/gpui/src/elements/mod.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-mod align;
-mod canvas;
-mod constrained_box;
-mod container;
-mod empty;
-mod event_handler;
-mod flex;
-mod label;
-mod line_box;
-mod mouse_event_handler;
-mod new;
-mod stack;
-mod svg;
-mod uniform_list;
-
-pub use crate::presenter::ChildView;
-pub use align::*;
-pub use canvas::*;
-pub use constrained_box::*;
-pub use container::*;
-pub use empty::*;
-pub use event_handler::*;
-pub use flex::*;
-pub use label::*;
-pub use line_box::*;
-pub use mouse_event_handler::*;
-pub use new::*;
-pub use stack::*;
-pub use svg::*;
-pub use uniform_list::*;
-
-use crate::{
-    AfterLayoutContext, AppContext, Event, EventContext, LayoutContext, PaintContext,
-    SizeConstraint,
-};
-
-pub trait ParentElement<'a>: Extend<ElementBox> + Sized {
-    fn add_children(&mut self, children: impl IntoIterator<Item = ElementBox>) {
-        self.extend(children);
-    }
-
-    fn add_child(&mut self, child: ElementBox) {
-        self.add_children(Some(child));
-    }
-
-    fn with_children(mut self, children: impl IntoIterator<Item = ElementBox>) -> Self {
-        self.add_children(children);
-        self
-    }
-
-    fn with_child(self, child: ElementBox) -> Self {
-        self.with_children(Some(child))
-    }
-}
-
-impl<'a, T> ParentElement<'a> for T where T: Extend<ElementBox> {}
diff --git a/gpui/src/platform/mod.rs b/gpui/src/platform.rs
similarity index 100%
rename from gpui/src/platform/mod.rs
rename to gpui/src/platform.rs
diff --git a/gpui/src/platform/mac/mod.rs b/gpui/src/platform/mac.rs
similarity index 100%
rename from gpui/src/platform/mac/mod.rs
rename to gpui/src/platform/mac.rs
diff --git a/zed/src/editor/mod.rs b/zed/src/editor.rs
similarity index 100%
rename from zed/src/editor/mod.rs
rename to zed/src/editor.rs
diff --git a/zed/src/editor/buffer/mod.rs b/zed/src/editor/buffer.rs
similarity index 100%
rename from zed/src/editor/buffer/mod.rs
rename to zed/src/editor/buffer.rs
diff --git a/zed/src/editor/display_map/mod.rs b/zed/src/editor/display_map.rs
similarity index 100%
rename from zed/src/editor/display_map/mod.rs
rename to zed/src/editor/display_map.rs
diff --git a/zed/src/sum_tree/mod.rs b/zed/src/sum_tree.rs
similarity index 100%
rename from zed/src/sum_tree/mod.rs
rename to zed/src/sum_tree.rs