aboutsummaryrefslogtreecommitdiff
path: root/cc/src/setup_config.rs
diff options
context:
space:
mode:
authorDaniel Mueller <deso@posteo.net>2019-11-01 07:45:35 -0700
committerDaniel Mueller <deso@posteo.net>2019-11-01 07:45:35 -0700
commit9091de47826b82ce357c77090f35e3faaf22091a (patch)
treed6e55728a7136c809b5b284e61a27f38d6a079ab /cc/src/setup_config.rs
parent49be10a8179165d24bbb8eb3490c4ca6f94b42c4 (diff)
downloadnitrocli-9091de47826b82ce357c77090f35e3faaf22091a.tar.gz
nitrocli-9091de47826b82ce357c77090f35e3faaf22091a.tar.bz2
Update cc crate to 1.0.48
This change updates the cc crate to version 1.0.48. Import subrepo cc/:cc at be9f2c1ae05b336aa3d07a4cbefdc1d88a3d8a91
Diffstat (limited to 'cc/src/setup_config.rs')
-rw-r--r--cc/src/setup_config.rs24
1 files changed, 12 insertions, 12 deletions
diff --git a/cc/src/setup_config.rs b/cc/src/setup_config.rs
index 56fe114..bc2b1c2 100644
--- a/cc/src/setup_config.rs
+++ b/cc/src/setup_config.rs
@@ -8,19 +8,19 @@
#![allow(bad_style)]
#![allow(unused)]
+use crate::winapi::Interface;
+use crate::winapi::BSTR;
+use crate::winapi::LPCOLESTR;
+use crate::winapi::LPSAFEARRAY;
+use crate::winapi::S_FALSE;
+use crate::winapi::{CoCreateInstance, CLSCTX_ALL};
+use crate::winapi::{IUnknown, IUnknownVtbl};
+use crate::winapi::{HRESULT, LCID, LPCWSTR, PULONGLONG};
+use crate::winapi::{LPFILETIME, ULONG};
use std::ffi::OsString;
use std::ptr::null_mut;
-use winapi::Interface;
-use winapi::BSTR;
-use winapi::LPCOLESTR;
-use winapi::LPSAFEARRAY;
-use winapi::S_FALSE;
-use winapi::{CoCreateInstance, CLSCTX_ALL};
-use winapi::{IUnknown, IUnknownVtbl};
-use winapi::{HRESULT, LCID, LPCWSTR, PULONGLONG};
-use winapi::{LPFILETIME, ULONG};
-use com::{BStr, ComPtr};
+use crate::com::{BStr, ComPtr};
// Bindings to the Setup.Configuration stuff
pub type InstanceState = u32;
@@ -196,7 +196,7 @@ impl SetupConfiguration {
}
pub fn enum_all_instances(&self) -> Result<EnumSetupInstances, i32> {
let mut obj = null_mut();
- let this = try!(self.0.cast::<ISetupConfiguration2>());
+ let this = self.0.cast::<ISetupConfiguration2>()?;
let err = unsafe { this.EnumAllInstances(&mut obj) };
if err < 0 {
return Err(err);
@@ -249,7 +249,7 @@ impl SetupInstance {
}
pub fn product_path(&self) -> Result<OsString, i32> {
let mut s = null_mut();
- let this = try!(self.0.cast::<ISetupInstance2>());
+ let this = self.0.cast::<ISetupInstance2>()?;
let err = unsafe { this.GetProductPath(&mut s) };
let bstr = unsafe { BStr::from_raw(s) };
if err < 0 {