diff options
author | Joe Wilm <jwilm@users.noreply.github.com> | 2017-01-06 21:51:24 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-06 21:51:24 -0800 |
commit | 852c2d8f15bfc11f0222fa08626c38724accd35a (patch) | |
tree | 0880b8e38d76ae4ba0fb1772fbd11cae53168729 /src/util.rs | |
parent | 62739bd226974358a811b4680b4b74c268418f5b (diff) | |
parent | 4e1f4c8cd7180606156b71ad0222f60e4559f2b3 (diff) | |
download | r-alacritty-852c2d8f15bfc11f0222fa08626c38724accd35a.tar.gz r-alacritty-852c2d8f15bfc11f0222fa08626c38724accd35a.tar.bz2 r-alacritty-852c2d8f15bfc11f0222fa08626c38724accd35a.zip |
Merge pull request #131 from Manishearth/stable
Make it compile on stable Rust (almost)
Diffstat (limited to 'src/util.rs')
-rw-r--r-- | src/util.rs | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/util.rs b/src/util.rs index 44f7b3de..ccb22cc9 100644 --- a/src/util.rs +++ b/src/util.rs @@ -13,6 +13,16 @@ // limitations under the License. use std::cmp; +#[cfg(not(feature = "nightly"))] +#[inline(always)] +#[cfg_attr(feature = "clippy", allow(inline_always))] +pub unsafe fn unlikely(x: bool) -> bool { + x +} + +#[cfg(feature = "nightly")] +pub use ::std::intrinsics::unlikely; + /// Threading utilities pub mod thread { /// Like `thread::spawn`, but with a `name` argument |