File tree Expand file tree Collapse file tree 3 files changed +5
-8
lines changed Expand file tree Collapse file tree 3 files changed +5
-8
lines changed Original file line number Diff line number Diff line change @@ -90,11 +90,6 @@ pub struct ISOFileReader<T: ISO9660Reader> {
9090}
9191
9292impl < T : ISO9660Reader > Read for ISOFileReader < T > {
93- #[ cfg( feature = "nightly" ) ]
94- unsafe fn initializer ( & self ) -> std:: io:: Initializer {
95- std:: io:: Initializer :: nop ( )
96- }
97-
9893 fn read ( & mut self , mut buf : & mut [ u8 ] ) -> io:: Result < usize > {
9994 let mut seek = self . seek ;
10095 while !buf. is_empty ( ) && seek < self . size {
@@ -113,6 +108,8 @@ impl<T: ISO9660Reader> Read for ISOFileReader<T> {
113108 self . seek = seek;
114109 Ok ( bytes)
115110 }
111+
112+ // TODO implement `read_buf` on nightly
116113}
117114
118115impl < T : ISO9660Reader > Seek for ISOFileReader < T > {
Original file line number Diff line number Diff line change @@ -23,7 +23,7 @@ impl<T: Read + Seek> ISO9660Reader for T {
2323impl < T : Read + Seek > ISO9660Reader for T {
2424 default fn read_at ( & mut self , buf : & mut [ u8 ] , lba : u64 ) -> Result < usize > {
2525 self . seek ( SeekFrom :: Start ( lba * 2048 ) ) ?;
26- self . read ( buf) ?
26+ self . read ( buf)
2727 }
2828}
2929
@@ -33,7 +33,7 @@ impl ISO9660Reader for File {
3333 #[ cfg( unix) ]
3434 {
3535 use std:: os:: unix:: fs:: FileExt ;
36- FileExt :: read_at ( self , buf, lba * 2048 ) ?
36+ Ok ( FileExt :: read_at ( self , buf, lba * 2048 ) ?)
3737 }
3838 #[ cfg( not( unix) ) ]
3939 {
Original file line number Diff line number Diff line change 11// SPDX-License-Identifier: (MIT OR Apache-2.0)
22
3- #![ cfg_attr( feature = "nightly" , feature( read_initializer , specialization ) ) ]
3+ #![ cfg_attr( feature = "nightly" , feature( min_specialization ) ) ]
44
55extern crate time;
66#[ macro_use]
You can’t perform that action at this time.
0 commit comments