about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-05-20 10:31:44 -0700
committerbors <bors@rust-lang.org>2013-05-20 10:31:44 -0700
commitf3b458b5c5a555067e9d013066fac9c8de50c3f8 (patch)
tree4bbb39e28694e9f9a7a48526b387e420fa509616
parent84233c0b4b777deb1c826e704f737959c991af54 (diff)
parenteb3f47a40a5578f50a9071b430ad95840640a344 (diff)
downloadrust-f3b458b5c5a555067e9d013066fac9c8de50c3f8.tar.gz
rust-f3b458b5c5a555067e9d013066fac9c8de50c3f8.zip
auto merge of #6644 : steveklabnik/rust/remove_unsafe_warning, r=bstrie
Since a snapshot was done last night, these are good to go.
-rw-r--r--src/libstd/fileinput.rs8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/libstd/fileinput.rs b/src/libstd/fileinput.rs
index 25e248414cd..d9a932fbe7c 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() }
 
     }