Merge pull request #1358 from asomers/rust_1.40.0

Raise MSRV to 1.40.0

2 files changed, 4 insertions, 7 deletions

diff --git a/test/sys/test_aio.rs b/test/sys/test_aio.rs
index 37ad3257..3878da94 100644
--- a/test/sys/test_aio.rs
+++ b/test/sys/test_aio.rs
@@ -137,6 +137,9 @@ fn test_fsync_error() {
 // in Travis's version of glibc or Linux.  Either way, we must skip the test.
 // https://github.com/nix-rust/nix/issues/1099
 #[cfg_attr(target_os = "linux", ignore)]
+// On Cirrus, aio_suspend is failing with EINVAL
+// https://github.com/nix-rust/nix/issues/1361
+#[cfg_attr(target_os = "macos", ignore)]
 fn test_aio_suspend() {
     const INITIAL: &[u8] = b"abcdef123456";
     const WBUF: &[u8] = b"CDEFG";
diff --git a/test/test_unistd.rs b/test/test_unistd.rs
index a5c6a332..d169d6e0 100644
--- a/test/test_unistd.rs
+++ b/test/test_unistd.rs
@@ -1064,13 +1064,7 @@ fn test_ttyname_not_pty() {
 }
 
 #[test]
-#[cfg(all(not(target_os = "redox"), not(target_env = "musl")))]
+#[cfg(all(not(target_os = "redox")))]
 fn test_ttyname_invalid_fd() {
     assert_eq!(ttyname(-1), Err(Error::Sys(Errno::EBADF)));
 }
-
-#[test]
-#[cfg(all(not(target_os = "redox"), target_env = "musl"))]
-fn test_ttyname_invalid_fd() {
-    assert_eq!(ttyname(-1), Err(Error::Sys(Errno::ENOTTY)));
-}