Skip to content

Commit ef15d44

Browse files
committed
Fix build with nightly feature
1 parent 2e29b91 commit ef15d44

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

src/directory_entry/isofile.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,6 @@ pub struct ISOFileReader<T: ISO9660Reader> {
9090
}
9191

9292
impl<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

118115
impl<T: ISO9660Reader> Seek for ISOFileReader<T> {

src/fileref.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ impl<T: Read + Seek> ISO9660Reader for T {
2323
impl<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
{

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
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

55
extern crate time;
66
#[macro_use]

0 commit comments

Comments
 (0)