File tree Expand file tree Collapse file tree 2 files changed +3
-4
lines changed Expand file tree Collapse file tree 2 files changed +3
-4
lines changed Original file line number Diff line number Diff line change @@ -219,8 +219,6 @@ pub enum Error<E: std::error::Error + Send + Sync + 'static> {
219219 Time ( #[ from] std:: time:: SystemTimeError ) ,
220220 #[ error( "IO error while writing blob or reading file metadata or changing filetype" ) ]
221221 Io ( #[ from] std:: io:: Error ) ,
222- #[ error( transparent) ]
223- FileClose ( #[ from] close_file:: CloseError ) ,
224222 #[ error( "object {} for checkout at {} could not be retrieved from object database" , . oid. to_hex( ) , . path. display( ) ) ]
225223 Find {
226224 #[ source]
Original file line number Diff line number Diff line change 7070 // NOTE: we don't call `file.sync_all()` here knowing that some filesystems don't handle this well.
7171 // revisit this once there is a bug to fix.
7272 update_fstat ( entry, file. metadata ( ) ?) ?;
73- // file.close()?;
73+ file. close ( ) . map_err ( |err| err . unwrap ( ) /* misnomer, won't panic */ ) ?;
7474 obj. data . len ( )
7575 }
7676 git_index:: entry:: Mode :: SYMLINK => {
9191 open_options ( p, destination_is_initially_empty, overwrite_existing) . open ( & dest)
9292 } ) ?;
9393 file. write_all ( obj. data ) ?;
94- file. close ( ) ?;
94+ file. close ( )
95+ . map_err ( |err| err. unwrap ( ) /* misnomer for 'into inner' */ ) ?;
9596 }
9697
9798 update_fstat ( entry, std:: fs:: symlink_metadata ( & dest) ?) ?;
You can’t perform that action at this time.
0 commit comments