diff options
| author | Steve Klabnik <steve@steveklabnik.com> | 2013-05-20 09:17:19 -0700 |
|---|---|---|
| committer | Steve Klabnik <steve@steveklabnik.com> | 2013-05-20 09:17:19 -0700 |
| commit | eb3f47a40a5578f50a9071b430ad95840640a344 (patch) | |
| tree | ebed2c350a966d2d0c4986b0e861109fc48d21a7 | |
| parent | f323b0c8bac704366eb307437faea231fb73b8d1 (diff) | |
| download | rust-eb3f47a40a5578f50a9071b430ad95840640a344.tar.gz rust-eb3f47a40a5578f50a9071b430ad95840640a344.zip | |
Remove two warnings about unneccesary safe blocks.
Since a snapshot was done last night, these are good to go.
| -rw-r--r-- | src/libstd/fileinput.rs | 8 |
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() } } |
