From 984d1f375ecec301dd42b049eecd1b88e3bca32a Mon Sep 17 00:00:00 2001
From: Richard <richardsoncusto@gmail.com>
Date: Tue, 26 Apr 2022 19:18:18 -0300
Subject: Move `compositor` module access from `window` to `crate`

---
 winit/src/application.rs | 7 ++++---
 winit/src/system.rs      | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'winit')

diff --git a/winit/src/application.rs b/winit/src/application.rs
index f5e4c66d..853ede0c 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -13,6 +13,7 @@ use crate::{
 
 use iced_futures::futures;
 use iced_futures::futures::channel::mpsc;
+use iced_graphics::compositor;
 use iced_graphics::window;
 use iced_native::program::Program;
 use iced_native::user_interface::{self, UserInterface};
@@ -426,7 +427,7 @@ async fn run_instance<A, E, C>(
                     }
                     Err(error) => match error {
                         // This is an unrecoverable error.
-                        window::SurfaceError::OutOfMemory => {
+                        compositor::SurfaceError::OutOfMemory => {
                             panic!("{:?}", error);
                         }
                         _ => {
@@ -520,7 +521,7 @@ pub fn update<A: Application, E: Executor>(
     debug: &mut Debug,
     messages: &mut Vec<A::Message>,
     window: &winit::window::Window,
-    graphics_info: &window::Information,
+    graphics_info: &compositor::Information,
 ) {
     for message in messages.drain(..) {
         debug.log_message(&message);
@@ -543,7 +544,7 @@ pub fn run_command<Message: 'static + std::fmt::Debug + Send, E: Executor>(
     clipboard: &mut Clipboard,
     proxy: &mut winit::event_loop::EventLoopProxy<Message>,
     window: &winit::window::Window,
-    graphics_info: &window::Information,
+    graphics_info: &compositor::Information,
 ) {
     use iced_native::command;
     use iced_native::system;
diff --git a/winit/src/system.rs b/winit/src/system.rs
index 1305ba5b..a961c5b4 100644
--- a/winit/src/system.rs
+++ b/winit/src/system.rs
@@ -2,7 +2,7 @@
 use crate::command::{self, Command};
 pub use iced_native::system::*;
 
-use iced_graphics::window;
+use iced_graphics::compositor;
 
 /// Query for available system information.
 ///
@@ -17,7 +17,7 @@ pub fn information<Message>(
 
 #[cfg(feature = "sysinfo")]
 pub(crate) fn get_information(
-    graphics_info: &window::Information,
+    graphics_info: &compositor::Information,
 ) -> Option<Information> {
     use sysinfo::{ProcessExt, ProcessorExt, System, SystemExt};
     let mut system = System::new_all();
@@ -47,7 +47,7 @@ pub(crate) fn get_information(
 
 #[cfg(not(feature = "sysinfo"))]
 pub(crate) fn get_information(
-    _graphics_info: &window::Information,
+    _graphics_info: &compositor::Information,
 ) -> Option<Information> {
     None
 }
-- 
cgit