Restructured everything to make profiling a feature of iced_winit.

2 files changed, 10 insertions, 11 deletions

diff --git a/glutin/Cargo.toml b/glutin/Cargo.toml
index 6749cb96..304170cd 100644
--- a/glutin/Cargo.toml
+++ b/glutin/Cargo.toml
@@ -11,7 +11,7 @@ keywords = ["gui", "ui", "graphics", "interface", "widgets"]
 categories = ["gui"]
 
 [features]
-trace = ["iced_profiling/tracing-chrome"]
+trace = ["iced_winit/trace"]
 debug = ["iced_winit/debug"]
 system = ["iced_winit/system"]
 
@@ -37,7 +37,6 @@ version = "0.5"
 path = "../graphics"
 features = ["opengl"]
 
-[dependencies.iced_profiling]
-version = "0.1.0"
-path = "../profiling"
-optional = true
+[dependencies.tracing]
+version = "0.1.6"
+optional = true
\ No newline at end of file
diff --git a/glutin/src/application.rs b/glutin/src/application.rs
index 21051f16..1464bb2d 100644
--- a/glutin/src/application.rs
+++ b/glutin/src/application.rs
@@ -17,8 +17,8 @@ use iced_winit::{Clipboard, Command, Debug, Proxy, Settings};
 use glutin::window::Window;
 use std::mem::ManuallyDrop;
 
-#[cfg(feature = "trace")]
-use iced_profiling::{info_span, instrument::Instrument};
+#[cfg(feature = "tracing")]
+use tracing::{info_span, instrument::Instrument};
 
 /// Runs an [`Application`] with an executor, compositor, and the provided
 /// settings.
@@ -39,12 +39,12 @@ where
     use glutin::ContextBuilder;
 
     #[cfg(feature = "trace")]
-    let _guard = iced_profiling::init();
+    let _guard = iced_winit::Profiler::init();
 
     let mut debug = Debug::new();
     debug.startup_started();
 
-    #[cfg(feature = "trace")]
+    #[cfg(feature = "tracing")]
     let _ = info_span!("Application::Glutin", "RUN").entered();
 
     let mut event_loop = EventLoopBuilder::with_user_event().build();
@@ -147,7 +147,7 @@ where
             settings.exit_on_close_request,
         );
 
-        #[cfg(feature = "trace")]
+        #[cfg(feature = "tracing")]
         let run_instance =
             run_instance.instrument(info_span!("Application", "LOOP"));
 
@@ -350,7 +350,7 @@ async fn run_instance<A, E, C>(
                 messages.push(message);
             }
             event::Event::RedrawRequested(_) => {
-                #[cfg(feature = "trace")]
+                #[cfg(feature = "tracing")]
                 let _ = info_span!("Application", "FRAME").entered();
 
                 debug.render_started();