summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml6
-rw-r--r--test/test.rs6
2 files changed, 2 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml
index 869c8e4e..0e31309c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -85,12 +85,8 @@ matrix:
rust: 1.36.0
# Make sure stable is always working too
- # FIXME: Travis's "stable" images are stuck on 1.35.0. Until that's fixed,
- # explicitly request 1.37.0, which is as of this writing the latest stable
- # release.
- # https://travis-ci.community/t/stable-rust-channel-outdated/4213
- env: TARGET=x86_64-unknown-linux-gnu
- rust: 1.37.0
+ rust: stable
# Test that we can build with the lowest version of all dependencies.
# "cargo test" doesn't work because some of our dev-dependencies, like
diff --git a/test/test.rs b/test/test.rs
index 709ac6d8..0efe9bd6 100644
--- a/test/test.rs
+++ b/test/test.rs
@@ -102,7 +102,7 @@ cfg_if! {
}
cfg_if! {
- if #[cfg(any(target_os = "android", target_os = "linux"))] {
+ if #[cfg(target_os = "linux")] {
macro_rules! require_kernel_version {
($name:expr, $version_requirement:expr) => {
use ::std::io::Write;
@@ -130,10 +130,6 @@ cfg_if! {
}
}
}
- } else {
- macro_rules! require_kernel_version {
- ($name:expr) => {}
- }
}
}