From 75b82f2e650ed5c88b31d81a64bd5b539d1b28a4 Mon Sep 17 00:00:00 2001 From: adrianwithah Date: Sun, 8 Sep 2019 02:35:44 +0100 Subject: [PATCH] Ran cargofmt --- .../server/src/local_file_manager.rs | 16 ++++------------ .../server/src/windows_file_manager.rs | 16 ++++++---------- examples/basic/interface/src/ianimal.rs | 2 +- .../basic/interface/src/idomesticanimal.rs | 2 +- .../basic/server/src/british_short_hair_cat.rs | 18 ++++-------------- 5 files changed, 16 insertions(+), 38 deletions(-) diff --git a/examples/aggregation/server/src/local_file_manager.rs b/examples/aggregation/server/src/local_file_manager.rs index 9722aa3b..d002103b 100644 --- a/examples/aggregation/server/src/local_file_manager.rs +++ b/examples/aggregation/server/src/local_file_manager.rs @@ -1,12 +1,6 @@ -use interface::{ - ilocal_file_manager::ILocalFileManager, -}; +use interface::ilocal_file_manager::ILocalFileManager; -use winapi::{ - shared::{ - winerror::{HRESULT, NOERROR}, - }, -}; +use winapi::shared::winerror::{HRESULT, NOERROR}; use com::AggrCoClass; @@ -27,9 +21,7 @@ impl ILocalFileManager for LocalFileManager { impl LocalFileManager { pub(crate) fn new() -> Box { - let init = InitLocalFileManager { - user_field: 2, - }; + let init = InitLocalFileManager { user_field: 2 }; LocalFileManager::allocate(init) } -} \ No newline at end of file +} diff --git a/examples/aggregation/server/src/windows_file_manager.rs b/examples/aggregation/server/src/windows_file_manager.rs index 23fa4869..d9678d88 100644 --- a/examples/aggregation/server/src/windows_file_manager.rs +++ b/examples/aggregation/server/src/windows_file_manager.rs @@ -1,21 +1,18 @@ use com::{failed, ComPtr, IUnknown, IUnknownVPtr, IID_IUNKNOWN}; use interface::{ - ifile_manager::{IFileManager}, - ilocal_file_manager::{ILocalFileManager}, + ifile_manager::IFileManager, ilocal_file_manager::ILocalFileManager, CLSID_LOCAL_FILE_MANAGER_CLASS, }; use winapi::{ ctypes::c_void, shared::{ - guiddef::{REFCLSID, REFIID,}, + guiddef::{REFCLSID, REFIID}, + minwindef::LPVOID, winerror::{HRESULT, NOERROR}, - minwindef::{LPVOID, }, wtypesbase::CLSCTX_INPROC_SERVER, }, - um::{ - combaseapi::CoCreateInstance - }, + um::combaseapi::CoCreateInstance, }; use std::mem::forget; @@ -41,7 +38,6 @@ impl Drop for InitWindowsFileManager { forget(lfm_iunknown); }; } - } impl IFileManager for WindowsFileManager { @@ -54,7 +50,7 @@ impl IFileManager for WindowsFileManager { impl WindowsFileManager { pub(crate) fn new() -> Box { let init = InitWindowsFileManager { - lfm_iunknown: std::ptr::null_mut::() + lfm_iunknown: std::ptr::null_mut::(), }; let mut wfm = WindowsFileManager::allocate(init); @@ -80,4 +76,4 @@ impl WindowsFileManager { wfm } -} \ No newline at end of file +} diff --git a/examples/basic/interface/src/ianimal.rs b/examples/basic/interface/src/ianimal.rs index 097ecffd..04b9de6f 100644 --- a/examples/basic/interface/src/ianimal.rs +++ b/examples/basic/interface/src/ianimal.rs @@ -4,4 +4,4 @@ use winapi::um::winnt::HRESULT; #[com_interface(EFF8970E-C50F-45E0-9284-291CE5A6F771)] pub trait IAnimal: IUnknown { fn eat(&mut self) -> HRESULT; -} \ No newline at end of file +} diff --git a/examples/basic/interface/src/idomesticanimal.rs b/examples/basic/interface/src/idomesticanimal.rs index a569694b..0a48eaef 100644 --- a/examples/basic/interface/src/idomesticanimal.rs +++ b/examples/basic/interface/src/idomesticanimal.rs @@ -6,4 +6,4 @@ use crate::IAnimal; #[com_interface(C22425DF-EFB2-4B85-933E-9CF7B23459E8)] pub trait IDomesticAnimal: IAnimal { fn train(&mut self) -> HRESULT; -} \ No newline at end of file +} diff --git a/examples/basic/server/src/british_short_hair_cat.rs b/examples/basic/server/src/british_short_hair_cat.rs index 2a51a1f8..f585fdd4 100644 --- a/examples/basic/server/src/british_short_hair_cat.rs +++ b/examples/basic/server/src/british_short_hair_cat.rs @@ -1,14 +1,6 @@ -use interface::{ - ianimal::IAnimal, - icat::ICat, - idomesticanimal::IDomesticAnimal, -}; - -use winapi::{ - shared::{ - winerror::{HRESULT, NOERROR}, - }, -}; +use interface::{ianimal::IAnimal, icat::ICat, idomesticanimal::IDomesticAnimal}; + +use winapi::shared::winerror::{HRESULT, NOERROR}; use com::CoClass; @@ -44,9 +36,7 @@ impl IAnimal for BritishShortHairCat { impl BritishShortHairCat { pub(crate) fn new() -> Box { - let init = InitBritishShortHairCat { - num_owners: 20 - }; + let init = InitBritishShortHairCat { num_owners: 20 }; BritishShortHairCat::allocate(init) } }