From eb3f47a40a5578f50a9071b430ad95840640a344 Mon Sep 17 00:00:00 2001 From: Steve Klabnik Date: Mon, 20 May 2013 09:17:19 -0700 Subject: [PATCH] Remove two warnings about unneccesary safe blocks. Since a snapshot was done last night, these are good to go. --- src/libstd/fileinput.rs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/libstd/fileinput.rs b/src/libstd/fileinput.rs index 25e248414cdf1..d9a932fbe7c54 100644 --- a/src/libstd/fileinput.rs +++ b/src/libstd/fileinput.rs @@ -210,9 +210,7 @@ impl 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 @@ impl io::Reader for FileInput { 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() } }