From 1471cc84c5cd7b759d3f08ade5161c8f1c812afd Mon Sep 17 00:00:00 2001
From: Carter Anderson <mcanders1@gmail.com>
Date: Mon, 6 Apr 2020 00:12:54 -0700
Subject: [PATCH] crate-ify bevy_diagnostic

---
 Cargo.toml                                          |  1 +
 bevy_diagnostic/Cargo.toml                          | 13 +++++++++++++
 .../src}/diagnostic.rs                              |  0
 .../src}/diagnostics.rs                             |  7 ++-----
 src/diagnostic/mod.rs => bevy_diagnostic/src/lib.rs |  2 +-
 src/lib.rs                                          |  2 +-
 6 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 bevy_diagnostic/Cargo.toml
 rename {src/diagnostic => bevy_diagnostic/src}/diagnostic.rs (100%)
 rename {src/diagnostic => bevy_diagnostic/src}/diagnostics.rs (96%)
 rename src/diagnostic/mod.rs => bevy_diagnostic/src/lib.rs (96%)

diff --git a/Cargo.toml b/Cargo.toml
index d0b0acd9cc..f91340b064 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,6 +13,7 @@ bevy_app = { path = "bevy_app" }
 bevy_asset = { path = "bevy_asset" }
 bevy_core = { path = "bevy_core" }
 bevy_derive = { path = "bevy_derive" }
+bevy_diagnostic = { path = "bevy_diagnostic" }
 bevy_input = { path = "bevy_input" }
 bevy_render = { path = "bevy_render" }
 bevy_transform = { path = "bevy_transform" }
diff --git a/bevy_diagnostic/Cargo.toml b/bevy_diagnostic/Cargo.toml
new file mode 100644
index 0000000000..42110f1cbf
--- /dev/null
+++ b/bevy_diagnostic/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "bevy_diagnostic"
+version = "0.1.0"
+authors = ["Carter Anderson <mcanders1@gmail.com>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+bevy_app = { path = "../bevy_app" }
+bevy_core = { path = "../bevy_core" }
+legion = { path = "../bevy_legion" }
+uuid = { version = "0.8", features = ["v4", "serde"] }
diff --git a/src/diagnostic/diagnostic.rs b/bevy_diagnostic/src/diagnostic.rs
similarity index 100%
rename from src/diagnostic/diagnostic.rs
rename to bevy_diagnostic/src/diagnostic.rs
diff --git a/src/diagnostic/diagnostics.rs b/bevy_diagnostic/src/diagnostics.rs
similarity index 96%
rename from src/diagnostic/diagnostics.rs
rename to bevy_diagnostic/src/diagnostics.rs
index fac892db93..2440ac3891 100644
--- a/src/diagnostic/diagnostics.rs
+++ b/bevy_diagnostic/src/diagnostics.rs
@@ -1,9 +1,6 @@
 use super::{Diagnostic, DiagnosticId, Diagnostics};
-use crate::{
-    core::time::Time,
-    prelude::{Resources, SystemBuilder},
-};
-use legion::prelude::Schedulable;
+use bevy_core::time::Time;
+use legion::prelude::*;
 use std::time::Duration;
 use uuid::Uuid;
 
diff --git a/src/diagnostic/mod.rs b/bevy_diagnostic/src/lib.rs
similarity index 96%
rename from src/diagnostic/mod.rs
rename to bevy_diagnostic/src/lib.rs
index 57663b855c..da9fe9439b 100644
--- a/src/diagnostic/mod.rs
+++ b/bevy_diagnostic/src/lib.rs
@@ -2,7 +2,7 @@ mod diagnostic;
 pub mod diagnostics;
 pub use diagnostic::*;
 
-use crate::app::{AppPlugin, AppBuilder};
+use bevy_app::{AppPlugin, AppBuilder};
 use std::time::Duration;
 use diagnostics::{print_diagnostics_system, frame_time_diagnostic_system};
 
diff --git a/src/lib.rs b/src/lib.rs
index 5ef39a1ed5..c14d9e7b2b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,5 +1,4 @@
 #![feature(specialization)]
-pub mod diagnostic;
 pub mod ecs;
 pub mod prelude;
 pub mod serialization;
@@ -7,6 +6,7 @@ pub mod ui;
 
 pub use bevy_transform as transform;
 pub use bevy_core as core;
+pub use bevy_diagnostic as diagnostic;
 pub use bevy_asset as asset;
 pub use bevy_render as render;
 pub use bevy_app as app;