Skip to content

Commit

Permalink
Deprecate unreachable function
Browse files Browse the repository at this point in the history
This is designed to merged after servo#162, as it deprecates
a function that should be no longer necessary on newer
Rust versions.
  • Loading branch information
KamilaBorowska committed Oct 4, 2019
1 parent 3ee6d1e commit dde0d8c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
@@ -1,6 +1,6 @@
language: rust
rust:
- 1.20.0
- 1.36.0
- nightly
- beta
- stable
Expand Down
12 changes: 6 additions & 6 deletions lib.rs
Expand Up @@ -54,6 +54,7 @@ use std::borrow::{Borrow, BorrowMut};
use std::cmp;
use std::fmt;
use std::hash::{Hash, Hasher};
use std::hint::unreachable_unchecked;
use std::iter::{IntoIterator, FromIterator, repeat};
use std::mem;
use std::mem::ManuallyDrop;
Expand Down Expand Up @@ -130,12 +131,11 @@ macro_rules! smallvec {
/// Hint to the optimizer that any code path which calls this function is
/// statically unreachable and can be removed.
///
/// Equivalent to `std::hint::unreachable_unchecked` but works in older versions of Rust.
/// Equivalent to `std::hint::unreachable_unchecked`.
#[inline]
#[deprecated(note = "Use std::hint::unreachable_unchecked instead")]
pub unsafe fn unreachable() -> ! {
enum Void {}
let x: &Void = mem::transmute(1usize);
match *x {}
unreachable_unchecked()
}

/// `panic!()` in debug builds, optimization hint in release.
Expand All @@ -144,7 +144,7 @@ macro_rules! debug_unreachable {
() => { debug_unreachable!("entered unreachable code") };
($e:expr) => {
if cfg!(not(debug_assertions)) {
unreachable();
unreachable_unchecked();
} else {
panic!($e);
}
Expand Down Expand Up @@ -768,7 +768,7 @@ impl<A: Array> SmallVec<A> {
pub fn swap_remove(&mut self, index: usize) -> A::Item {
let len = self.len();
self.swap(len - 1, index);
self.pop().unwrap_or_else(|| unsafe { unreachable() })
self.pop().unwrap_or_else(|| unsafe { unreachable_unchecked() })
}

/// Remove all elements from the vector.
Expand Down

0 comments on commit dde0d8c

Please sign in to comment.