Sanitize imports for prod macros, ran cargo fmt, clear warnings

microsoft · Sep 7, 2019 · 1ad152a · 1ad152a
1 parent af4a942
commit 1ad152a
Show file tree

Hide file tree

Showing 15 changed files with 123 additions and 119 deletions.
diff --git a/examples/aggregation/server/src/local_file_manager.rs b/examples/aggregation/server/src/local_file_manager.rs
@@ -1,20 +1,13 @@
-use com::{IUnknown, IUnknownVPtr, IUnknownVTable, iunknown_gen_vtable,};
 use interface::{
-    ilocal_file_manager::{
-        ILocalFileManager, ILocalFileManagerVPtr, ILocalFileManagerVTable,
-    },
-    ilocal_file_manager_gen_vtable,
+    ilocal_file_manager::ILocalFileManager,
 };
 
 use winapi::{
-    ctypes::c_void,
     shared::{
-        guiddef::{IsEqualGUID, IID, REFIID,},
-        winerror::{E_NOINTERFACE, HRESULT, NOERROR},
+        winerror::{HRESULT, NOERROR},
     },
 };
 
-use core::mem::forget;
 use com::AggrCoClass;
 
 /// The implementation class
@@ -100,7 +93,6 @@ impl LocalFileManager {
 //         let non_del_unknown_vptr = Box::into_raw(Box::new(non_del_iunknown));
 
 //         // Initialising VTable for ILocalFileManager
-//         let ilocalfilemanager = ilocal_file_manager_gen_vtable!(LocalFileManager, 0);
 //         let ilocalfilemanager_vptr = Box::into_raw(Box::new(ilocalfilemanager));
 
 //         let out = LocalFileManager {

diff --git a/examples/aggregation/server/src/local_file_manager_class.rs b/examples/aggregation/server/src/local_file_manager_class.rs
@@ -1,7 +1,7 @@
 use crate::local_file_manager::LocalFileManager;
 
 use com::{
-    ComPtr, IClassFactory, IClassFactoryVPtr, IClassFactoryVTable, IUnknown, IUnknownVPtr,
+    IClassFactory, IClassFactoryVPtr, IClassFactoryVTable, IUnknown, IUnknownVPtr,
     IID_ICLASS_FACTORY, IID_IUNKNOWN,
 };
 
@@ -14,8 +14,6 @@ use winapi::{
     },
 };
 
-use core::mem::forget;
-
 #[repr(C)]
 pub struct LocalFileManagerClass {
     inner: IClassFactoryVPtr,

diff --git a/examples/aggregation/server/src/windows_file_manager.rs b/examples/aggregation/server/src/windows_file_manager.rs
@@ -1,16 +1,15 @@
-use com::{failed, ComPtr, IUnknown, IUnknownVPtr, IUnknownVTable, IID_IUNKNOWN};
+use com::{failed, ComPtr, IUnknown, IUnknownVPtr, IID_IUNKNOWN};
 use interface::{
-    ifile_manager::{IFileManager, IFileManagerVPtr, IFileManagerVTable, IID_IFILE_MANAGER},
-    ilocal_file_manager::{IID_ILOCAL_FILE_MANAGER, ILocalFileManager},
+    ifile_manager::{IFileManager},
+    ilocal_file_manager::{ILocalFileManager},
     CLSID_LOCAL_FILE_MANAGER_CLASS,
-    ifile_manager_gen_vtable,
 };
 
 use winapi::{
     ctypes::c_void,
     shared::{
-        guiddef::{IsEqualGUID, IID, REFCLSID, REFIID,},
-        winerror::{E_NOINTERFACE, HRESULT, NOERROR},
+        guiddef::{REFCLSID, REFIID,},
+        winerror::{HRESULT, NOERROR},
         minwindef::{LPVOID, },
         wtypesbase::CLSCTX_INPROC_SERVER,
     },
@@ -20,7 +19,7 @@ use winapi::{
 };
 
 use std::mem::forget;
-use std::ops::{Deref, DerefMut,};
+use std::ops::{DerefMut,};
 
 use com::CoClass;
 

diff --git a/examples/aggregation/server/src/windows_file_manager_class.rs b/examples/aggregation/server/src/windows_file_manager_class.rs
@@ -1,19 +1,16 @@
 use crate::windows_file_manager::WindowsFileManager;
 use com::{
-    failed, IClassFactory, IClassFactoryVPtr, IClassFactoryVTable, IUnknown, IUnknownVPtr,
+    IClassFactory, IClassFactoryVPtr, IClassFactoryVTable, IUnknown, IUnknownVPtr,
     IID_ICLASS_FACTORY, IID_IUNKNOWN,
 };
-use interface::CLSID_LOCAL_FILE_MANAGER_CLASS;
 
 use winapi::{
     ctypes::c_void,
     shared::{
-        guiddef::{IsEqualGUID, IID, REFCLSID, REFIID},
-        minwindef::{BOOL, LPVOID},
+        guiddef::{IsEqualGUID, IID, REFIID},
+        minwindef::{BOOL,},
         winerror::{CLASS_E_NOAGGREGATION, E_NOINTERFACE, HRESULT, NOERROR, S_OK},
-        wtypesbase::CLSCTX_INPROC_SERVER,
     },
-    um::combaseapi::CoCreateInstance,
 };
 
 #[repr(C)]

diff --git a/examples/basic/server/src/british_short_hair_cat.rs b/examples/basic/server/src/british_short_hair_cat.rs
@@ -1,16 +1,12 @@
 use interface::{
-    ianimal::{IAnimal, IID_IANIMAL},
-    icat::{ICat, ICatVPtr, ICatVTable, IID_ICAT},
-    idomesticanimal::{
-        IDomesticAnimal, IDomesticAnimalVPtr, IDomesticAnimalVTable,
-    },
+    ianimal::IAnimal,
+    icat::ICat,
+    idomesticanimal::IDomesticAnimal,
 };
 
 use winapi::{
-    ctypes::c_void,
     shared::{
-        guiddef::{IsEqualGUID, IID},
-        winerror::{E_NOINTERFACE, HRESULT, NOERROR},
+        winerror::{HRESULT, NOERROR},
     },
 };