diff options
| author | bors <bors@rust-lang.org> | 2013-09-20 00:36:11 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-09-20 00:36:11 -0700 |
| commit | e5fdc7dee52033f1097019d3aafe838db9ab5e3e (patch) | |
| tree | e3965282a18b6ed03a811f118bc6be4262082fef /src/libstd/rt | |
| parent | c7c769d8c2efb05dfa5850ae4aec0d6509d713dc (diff) | |
| parent | e2807a4565575c6a08a2a65c76ee37bf3f48c841 (diff) | |
| download | rust-e5fdc7dee52033f1097019d3aafe838db9ab5e3e.tar.gz rust-e5fdc7dee52033f1097019d3aafe838db9ab5e3e.zip | |
auto merge of #9320 : chris-morgan/rust/unreachable-macro-part-two-of-two-containing-the-destruction-of-the-unreachable-function, r=alexcrichton
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.rs | 3 |
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 } } |
