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

Remove two warnings about unneccesary safe blocks.

Browse Source 
Since a snapshot was done last night, these are good to go.
This commit is contained in:
Steve Klabnik 2013-05-20 09:17:19 -07:00
parent f323b0c8ba
commit eb3f47a40a
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 { pub fn next_file(&self) -> bool {
// No more files // No more files
// unsafe block can be removed after the next snapshot if self.fi.files.is_empty() {
// (next one after 2013-05-03)
if unsafe { self.fi.files.is_empty() } {
self.fi.current_reader = None; self.fi.current_reader = None;
return false; return false;
} }
@ -324,9 +322,7 @@ fn read(&self, buf: &mut [u8], len: uint) -> uint {
fn eof(&self) -> bool { fn eof(&self) -> bool {
// we've run out of files, and current_reader is either None or eof. // we've run out of files, and current_reader is either None or eof.
// unsafe block can be removed after the next snapshot self.fi.files.is_empty() &&
// (next one after 2013-05-03)
(unsafe { self.fi.files.is_empty() }) &&
match self.fi.current_reader { None => true, Some(r) => r.eof() } match self.fi.current_reader { None => true, Some(r) => r.eof() }
} }