@@ -6,9 +6,9 @@ use std::boxed::Box as Box_;
6
6
use std:: mem;
7
7
#[ cfg( not( windows) ) ]
8
8
#[ cfg( any( feature = "v2_58" , feature = "dox" ) ) ]
9
- use std:: os:: unix:: io:: AsRawFd ;
9
+ use std:: os:: unix:: io:: { AsFd , AsRawFd } ;
10
10
#[ cfg( not( windows) ) ]
11
- use std:: os:: unix:: io:: { AsFd , FromRawFd , IntoRawFd , RawFd } ;
11
+ use std:: os:: unix:: io:: { FromRawFd , OwnedFd , RawFd } ;
12
12
use std:: ptr;
13
13
14
14
// #[cfg(windows)]
@@ -243,7 +243,7 @@ pub fn unix_open_pipe(flags: i32) -> Result<(RawFd, RawFd), Error> {
243
243
#[ doc( alias = "g_file_open_tmp" ) ]
244
244
pub fn file_open_tmp (
245
245
tmpl : Option < impl AsRef < std:: path:: Path > > ,
246
- ) -> Result < ( RawFd , std:: path:: PathBuf ) , crate :: Error > {
246
+ ) -> Result < ( OwnedFd , std:: path:: PathBuf ) , crate :: Error > {
247
247
unsafe {
248
248
let mut name_used = ptr:: null_mut ( ) ;
249
249
let mut error = ptr:: null_mut ( ) ;
@@ -253,7 +253,7 @@ pub fn file_open_tmp(
253
253
& mut error,
254
254
) ;
255
255
if error. is_null ( ) {
256
- Ok ( ( ret . into_raw_fd ( ) , from_glib_full ( name_used) ) )
256
+ Ok ( ( OwnedFd :: from_raw_fd ( ret ) , from_glib_full ( name_used) ) )
257
257
} else {
258
258
Err ( from_glib_full ( error) )
259
259
}
0 commit comments