fix bad merge for desktop

Author: robmikh

src/desktop/run.rs

@@ -10,7 +10,7 @@ use winit::{
 use bindings::windows::win32::winrt::{RoInitialize, RO_INIT_TYPE};
 use bindings::windows::{foundation::numerics::Vector2, ui::composition::Compositor};
 
-pub fn run() -> winrt::Result<()> {
+pub fn run() -> windows::Result<()> {
     unsafe {
         RoInitialize(RO_INIT_TYPE::RO_INIT_SINGLETHREADED).ok()?;
     }

src/desktop/window_target.rs

@@ -1,4 +1,3 @@
-use crate::desktop::interop::ICompositorDesktopInterop;
 use bindings::windows::ui::composition::{desktop::DesktopWindowTarget, Compositor};
 use bindings::windows::win32::windows_and_messaging::HWND;
 use bindings::windows::win32::winrt::ICompositorDesktopInterop;

src/interop.rs

@@ -21,7 +21,7 @@ struct AppState {
 pub struct MinesweeperAppSource {}
 
 impl MinesweeperAppSource {
-    fn create_view(&mut self) -> winrt::Result<IFrameworkView> {
+    fn create_view(&mut self) -> windows::Result<IFrameworkView> {
         let app = MinesweeperApp {
             state: Arc::new(Mutex::new(None)),
         };
@@ -37,19 +37,19 @@ pub struct MinesweeperApp {
 }
 
 impl MinesweeperApp {
-    fn initialize(&mut self, _window: &Option<CoreApplicationView>) -> winrt::Result<()> {
+    fn initialize(&mut self, _window: &Option<CoreApplicationView>) -> windows::Result<()> {
         Ok(())
     }
 
-    fn set_window(&mut self, _window: &Option<CoreWindow>) -> winrt::Result<()> {
+    fn set_window(&mut self, _window: &Option<CoreWindow>) -> windows::Result<()> {
         Ok(())
     }
 
-    fn load(&mut self, _entry_point: &winrt::HString) -> winrt::Result<()> {
+    fn load(&mut self, _entry_point: &winrt::HString) -> windows::Result<()> {
         Ok(())
     }
 
-    fn run(&mut self) -> winrt::Result<()> {
+    fn run(&mut self) -> windows::Result<()> {
         let window = CoreWindow::get_for_current_thread()?;
 
         // Init Composition
@@ -138,12 +138,12 @@ impl MinesweeperApp {
         Ok(())
     }
 
-    fn uninitialize(&mut self) -> winrt::Result<()> {
+    fn uninitialize(&mut self) -> windows::Result<()> {
         Ok(())
     }
 }
 
-fn get_window_size(window: &CoreWindow) -> winrt::Result<Vector2> {
+fn get_window_size(window: &CoreWindow) -> windows::Result<Vector2> {
     let bounds = window.bounds()?;
     Ok(Vector2 {
         x: bounds.width as f32,

src/uwp/app.rs

@@ -1,7 +1,7 @@
 use crate::uwp::app::MinesweeperAppSource;
 use bindings::windows::application_model::core::{CoreApplication, IFrameworkViewSource};
 
-pub fn run() -> winrt::Result<()> {
+pub fn run() -> windows::Result<()> {
     let app_source = MinesweeperAppSource {};
     let view_source: IFrameworkViewSource = app_source.into();
     CoreApplication::run(&view_source)?;