@@ -11,6 +11,7 @@ mod mmap {
1111 atomic_func,
1212 builtins:: { PyBytes , PyBytesRef , PyInt , PyIntRef , PyTypeRef } ,
1313 byte:: { bytes_from_object, value_from_object} ,
14+ convert:: ToPyException ,
1415 function:: { ArgBytesLike , FuncArgs , OptionalArg } ,
1516 protocol:: {
1617 BufferDescriptor , BufferMethods , PyBuffer , PyMappingMethods , PySequenceMethods ,
@@ -348,9 +349,7 @@ mod mmap {
348349
349350 if fd != -1 {
350351 let file = unsafe { File :: from_raw_fd ( fd) } ;
351- let metadata = file
352- . metadata ( )
353- . map_err ( |e| vm. new_os_error ( e. to_string ( ) ) ) ?;
352+ let metadata = file. metadata ( ) . map_err ( |err| err. to_pyexception ( vm) ) ?;
354353 let file_len: libc:: off_t = metadata. len ( ) . try_into ( ) . expect ( "file size overflow" ) ;
355354 // File::from_raw_fd will consume the fd, so we
356355 // have to get it again.
@@ -379,32 +378,23 @@ mod mmap {
379378 let mut mmap_opt = MmapOptions :: new ( ) ;
380379 let mmap_opt = mmap_opt. offset ( offset. try_into ( ) . unwrap ( ) ) . len ( map_size) ;
381380
382- let ( fd, mmap) = if fd == -1 {
383- (
384- fd,
385- MmapObj :: Write (
386- mmap_opt
387- . map_anon ( )
388- . map_err ( |e| vm. new_os_error ( e. to_string ( ) ) ) ?,
389- ) ,
390- )
391- } else {
392- let new_fd = unistd:: dup ( fd) . map_err ( |e| vm. new_os_error ( e. to_string ( ) ) ) ?;
393- let mmap = match access {
394- AccessMode :: Default | AccessMode :: Write => MmapObj :: Write (
395- unsafe { mmap_opt. map_mut ( fd) }
396- . map_err ( |e| vm. new_os_error ( e. to_string ( ) ) ) ?,
397- ) ,
398- AccessMode :: Read => MmapObj :: Read (
399- unsafe { mmap_opt. map ( fd) } . map_err ( |e| vm. new_os_error ( e. to_string ( ) ) ) ?,
400- ) ,
401- AccessMode :: Copy => MmapObj :: Write (
402- unsafe { mmap_opt. map_copy ( fd) }
403- . map_err ( |e| vm. new_os_error ( e. to_string ( ) ) ) ?,
404- ) ,
405- } ;
406- ( new_fd, mmap)
407- } ;
381+ let ( fd, mmap) = || -> std:: io:: Result < _ > {
382+ if fd == -1 {
383+ let mmap = MmapObj :: Write ( mmap_opt. map_anon ( ) ?) ;
384+ Ok ( ( fd, mmap) )
385+ } else {
386+ let new_fd = unistd:: dup ( fd) ?;
387+ let mmap = match access {
388+ AccessMode :: Default | AccessMode :: Write => {
389+ MmapObj :: Write ( unsafe { mmap_opt. map_mut ( fd) } ?)
390+ }
391+ AccessMode :: Read => MmapObj :: Read ( unsafe { mmap_opt. map ( fd) } ?) ,
392+ AccessMode :: Copy => MmapObj :: Write ( unsafe { mmap_opt. map_copy ( fd) } ?) ,
393+ } ;
394+ Ok ( ( new_fd, mmap) )
395+ }
396+ } ( )
397+ . map_err ( |e| e. to_pyexception ( vm) ) ?;
408398
409399 let m_obj = Self {
410400 closed : AtomicCell :: new ( false ) ,
@@ -662,7 +652,7 @@ mod mmap {
662652 MmapObj :: Read ( _mmap) => { }
663653 MmapObj :: Write ( mmap) => {
664654 mmap. flush_range ( offset, size)
665- . map_err ( |e| vm . new_os_error ( e . to_string ( ) ) ) ?;
655+ . map_err ( |e| e . to_pyexception ( vm ) ) ?;
666656 }
667657 }
668658
@@ -681,7 +671,7 @@ mod mmap {
681671 MmapObj :: Read ( mmap) => mmap. advise ( advice) ,
682672 MmapObj :: Write ( mmap) => mmap. advise ( advice) ,
683673 }
684- . map_err ( |e| vm . new_os_error ( e . to_string ( ) ) ) ?;
674+ . map_err ( |e| e . to_pyexception ( vm ) ) ?;
685675
686676 Ok ( ( ) )
687677 }
@@ -728,7 +718,7 @@ mod mmap {
728718 let src_buf = mmap[ src..src_end] . to_vec ( ) ;
729719 ( & mut mmap[ dest..dest_end] )
730720 . write ( & src_buf)
731- . map_err ( |e| vm . new_os_error ( e . to_string ( ) ) ) ?;
721+ . map_err ( |e| e . to_pyexception ( vm ) ) ?;
732722 Ok ( ( ) )
733723 } ) ?
734724 }
@@ -867,14 +857,10 @@ mod mmap {
867857 }
868858
869859 #[ pymethod]
870- fn size ( & self , vm : & VirtualMachine ) -> PyResult < PyIntRef > {
871- let new_fd = unistd:: dup ( self . fd ) . map_err ( |e| vm . new_os_error ( e . to_string ( ) ) ) ?;
860+ fn size ( & self , vm : & VirtualMachine ) -> std :: io :: Result < PyIntRef > {
861+ let new_fd = unistd:: dup ( self . fd ) ?;
872862 let file = unsafe { File :: from_raw_fd ( new_fd) } ;
873- let file_len = match file. metadata ( ) {
874- Ok ( m) => m. len ( ) ,
875- Err ( e) => return Err ( vm. new_os_error ( e. to_string ( ) ) ) ,
876- } ;
877-
863+ let file_len = file. metadata ( ) ?. len ( ) ;
878864 Ok ( PyInt :: from ( file_len) . into_ref ( & vm. ctx ) )
879865 }
880866
@@ -897,7 +883,7 @@ mod mmap {
897883 let len = self . try_writable ( vm, |mmap| {
898884 ( & mut mmap[ pos..( pos + data. len ( ) ) ] )
899885 . write ( & data)
900- . map_err ( |e| vm . new_os_error ( e . to_string ( ) ) ) ?;
886+ . map_err ( |err| err . to_pyexception ( vm ) ) ?;
901887 Ok ( data. len ( ) )
902888 } ) ??;
903889
@@ -1066,7 +1052,7 @@ mod mmap {
10661052 self . try_writable ( vm, |mmap| {
10671053 ( & mut mmap[ range] )
10681054 . write ( & bytes)
1069- . map_err ( |e| vm . new_os_error ( e . to_string ( ) ) ) ?;
1055+ . map_err ( |err| err . to_pyexception ( vm ) ) ?;
10701056 Ok ( ( ) )
10711057 } ) ?
10721058 } else {
0 commit comments