mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

auto merge of #6644 : steveklabnik/rust/remove_unsafe_warning, r=bstrie

Browse Source 
Since a snapshot was done last night, these are good to go.
This commit is contained in:
bors 2013-05-20 10:31:44 -07:00
commit f3b458b5c5
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libstd/fileinput.rs
View File

@ -210,9 +210,7 @@ pub fn from_args() -> FileInput {
pub fn next_file(&self) -> bool {
// No more files
// unsafe block can be removed after the next snapshot
// (next one after 2013-05-03)
if unsafe { self.fi.files.is_empty() } {
if self.fi.files.is_empty() {
self.fi.current_reader = None;
return false;
}
@ -324,9 +322,7 @@ fn read(&self, buf: &mut [u8], len: uint) -> uint {
fn eof(&self) -> bool {
// we've run out of files, and current_reader is either None or eof.
// unsafe block can be removed after the next snapshot
// (next one after 2013-05-03)
(unsafe { self.fi.files.is_empty() }) &&
self.fi.files.is_empty() &&
match self.fi.current_reader { None => true, Some(r) => r.eof() }
}