Skip to content

Commit f3b458b

Browse files
committed
auto merge of #6644 : steveklabnik/rust/remove_unsafe_warning, r=bstrie
Since a snapshot was done last night, these are good to go.
2 parents 84233c0 + eb3f47a commit f3b458b

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

src/libstd/fileinput.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,7 @@ impl FileInput {
210210
pub fn next_file(&self) -> bool {
211211
// No more files
212212

213-
// unsafe block can be removed after the next snapshot
214-
// (next one after 2013-05-03)
215-
if unsafe { self.fi.files.is_empty() } {
213+
if self.fi.files.is_empty() {
216214
self.fi.current_reader = None;
217215
return false;
218216
}
@@ -324,9 +322,7 @@ impl io::Reader for FileInput {
324322
fn eof(&self) -> bool {
325323
// we've run out of files, and current_reader is either None or eof.
326324

327-
// unsafe block can be removed after the next snapshot
328-
// (next one after 2013-05-03)
329-
(unsafe { self.fi.files.is_empty() }) &&
325+
self.fi.files.is_empty() &&
330326
match self.fi.current_reader { None => true, Some(r) => r.eof() }
331327

332328
}

0 commit comments

Comments
 (0)