Merge pull request #150 from hecrj/refactor/move-renderer-traits

Move `Debugger` and `Windowed` traits

2 files changed, 6 insertions, 5 deletions

diff --git a/wgpu/src/renderer.rs b/wgpu/src/renderer.rs
index 9757904c..56fe45af 100644
--- a/wgpu/src/renderer.rs
+++ b/wgpu/src/renderer.rs
@@ -3,8 +3,8 @@ use crate::{
     Transformation,
 };
 use iced_native::{
-    renderer::{Debugger, Windowed},
-    Background, Color, Layout, MouseCursor, Point, Rectangle, Vector, Widget,
+    layout, window, Background, Color, Layout, MouseCursor, Point, Rectangle,
+    Vector, Widget,
 };
 use std::sync::Arc;
 use wgpu::{
@@ -454,7 +454,7 @@ impl iced_native::Renderer for Renderer {
     }
 }
 
-impl Windowed for Renderer {
+impl window::Renderer for Renderer {
     type Settings = Settings;
     type Target = Target;
 
@@ -472,7 +472,7 @@ impl Windowed for Renderer {
     }
 }
 
-impl Debugger for Renderer {
+impl layout::Debugger for Renderer {
     fn explain<Message>(
         &mut self,
         defaults: &Defaults,
diff --git a/wgpu/src/renderer/target.rs b/wgpu/src/renderer/target.rs
index 569f3c62..5fe4b50b 100644
--- a/wgpu/src/renderer/target.rs
+++ b/wgpu/src/renderer/target.rs
@@ -1,4 +1,5 @@
 use crate::{Renderer, Transformation};
+use iced_native::window;
 
 use raw_window_handle::HasRawWindowHandle;
 
@@ -31,7 +32,7 @@ impl Target {
     }
 }
 
-impl iced_native::renderer::Target for Target {
+impl window::Target for Target {
     type Renderer = Renderer;
 
     fn new<W: HasRawWindowHandle>(