about summary refs log tree commit diff
path: root/src/libstd/rt
diff options
context:
space:
mode:
authorChris Morgan <me@chrismorgan.info>2013-09-19 15:04:03 +1000
committerChris Morgan <me@chrismorgan.info>2013-09-19 15:04:03 +1000
commite2807a4565575c6a08a2a65c76ee37bf3f48c841 (patch)
treea3902c5db8e070e6e91a1f5b253c45b0ea2c801a /src/libstd/rt
parent4dacd736510b2ae28a54489fe88571f1a6de019f (diff)
downloadrust-e2807a4565575c6a08a2a65c76ee37bf3f48c841.tar.gz
rust-e2807a4565575c6a08a2a65c76ee37bf3f48c841.zip
Replace unreachable() calls with unreachable!().
This is the second of two parts of #8991, now possible as a new snapshot
has been made. (The first part implemented the unreachable!() macro; it
was #8992, 6b7b8f2682.)

``std::util::unreachable()`` is removed summarily; any code which used
it should now use the ``unreachable!()`` macro.

Closes #9312.

Closes #8991.
Diffstat (limited to 'src/libstd/rt')
-rw-r--r--src/libstd/rt/io/extensions.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libstd/rt/io/extensions.rs b/src/libstd/rt/io/extensions.rs
index 1c48d6e7f1e..99634b532b0 100644
--- a/src/libstd/rt/io/extensions.rs
+++ b/src/libstd/rt/io/extensions.rs
@@ -21,7 +21,6 @@ use rt::io::{Reader, Writer, Decorator};
 use rt::io::{read_error, standard_error, EndOfFile, DEFAULT_BUF_SIZE};
 use option::{Option, Some, None};
 use unstable::finally::Finally;
-use util;
 use cast;
 use io::{u64_to_le_bytes, u64_to_be_bytes};
 
@@ -293,7 +292,7 @@ impl<T: Reader> ReaderUtil for T {
                 self.read_byte()
             }
             Some(1) => Some(buf[0]),
-            Some(_) => util::unreachable(),
+            Some(_) => unreachable!(),
             None => None
         }
     }