Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Commit

Permalink
Ran cargofmt
Browse files Browse the repository at this point in the history
  • Loading branch information
adrianwithah committed Sep 8, 2019
1 parent 53b4ef7 commit 75b82f2
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 38 deletions.
16 changes: 4 additions & 12 deletions examples/aggregation/server/src/local_file_manager.rs
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -27,9 +21,7 @@ impl ILocalFileManager for LocalFileManager {

impl LocalFileManager {
pub(crate) fn new() -> Box<LocalFileManager> {
let init = InitLocalFileManager {
user_field: 2,
};
let init = InitLocalFileManager { user_field: 2 };
LocalFileManager::allocate(init)
}
}
}
16 changes: 6 additions & 10 deletions examples/aggregation/server/src/windows_file_manager.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -41,7 +38,6 @@ impl Drop for InitWindowsFileManager {
forget(lfm_iunknown);
};
}

}

impl IFileManager for WindowsFileManager {
Expand All @@ -54,7 +50,7 @@ impl IFileManager for WindowsFileManager {
impl WindowsFileManager {
pub(crate) fn new() -> Box<WindowsFileManager> {
let init = InitWindowsFileManager {
lfm_iunknown: std::ptr::null_mut::<IUnknownVPtr>()
lfm_iunknown: std::ptr::null_mut::<IUnknownVPtr>(),
};

let mut wfm = WindowsFileManager::allocate(init);
Expand All @@ -80,4 +76,4 @@ impl WindowsFileManager {

wfm
}
}
}
2 changes: 1 addition & 1 deletion examples/basic/interface/src/ianimal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
2 changes: 1 addition & 1 deletion examples/basic/interface/src/idomesticanimal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ use crate::IAnimal;
#[com_interface(C22425DF-EFB2-4B85-933E-9CF7B23459E8)]
pub trait IDomesticAnimal: IAnimal {
fn train(&mut self) -> HRESULT;
}
}
18 changes: 4 additions & 14 deletions examples/basic/server/src/british_short_hair_cat.rs
Original file line number Diff line number Diff line change
@@ -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;

Expand Down Expand Up @@ -44,9 +36,7 @@ impl IAnimal for BritishShortHairCat {

impl BritishShortHairCat {
pub(crate) fn new() -> Box<BritishShortHairCat> {
let init = InitBritishShortHairCat {
num_owners: 20
};
let init = InitBritishShortHairCat { num_owners: 20 };
BritishShortHairCat::allocate(init)
}
}
Expand Down

0 comments on commit 75b82f2

Please sign in to comment.