diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-09-04 14:47:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-04 14:47:40 +0000 |
| commit | 54cd6fe77977652256d695d565e1b1a5fe4d5613 (patch) | |
| tree | 7b9854e489e377e19df86e696a79c48343a2647f /test | |
| parent | a4a465d25567f163f9552b977eb4d17435251d41 (diff) | |
| parent | 43a71ff5e385a9af455b275736b520184f7fa00c (diff) | |
| download | nix-54cd6fe77977652256d695d565e1b1a5fe4d5613.zip | |
Merge #1114
1114: Replace most instances of mem::uninitialized with mem::MaybeUninit r=asomers a=asomers
Only two instances remain:
* For the deprecated sys::socket::CmsgSpace::new. We should probably
just remove that method.
* For sys::termios::Termios::default_uninit. This will require some
more thought.
Co-authored-by: Alan Somers <asomers@gmail.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/sys/test_aio.rs | 4 | ||||
| -rw-r--r-- | test/sys/test_ptrace.rs | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/test/sys/test_aio.rs b/test/sys/test_aio.rs index d4b09b0b..66a73fdc 100644 --- a/test/sys/test_aio.rs +++ b/test/sys/test_aio.rs @@ -133,6 +133,10 @@ fn test_fsync_error() { #[test] #[cfg_attr(all(target_env = "musl", target_arch = "x86_64"), ignore)] +// On Travis, aio_suspend hits an assertion within glibc. This is either a bug +// 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)] fn test_aio_suspend() { const INITIAL: &[u8] = b"abcdef123456"; const WBUF: &[u8] = b"CDEFG"; diff --git a/test/sys/test_ptrace.rs b/test/sys/test_ptrace.rs index 24d9b522..a5630923 100644 --- a/test/sys/test_ptrace.rs +++ b/test/sys/test_ptrace.rs @@ -46,7 +46,7 @@ fn test_ptrace_getsiginfo() { #[test] #[cfg(any(target_os = "android", target_os = "linux"))] fn test_ptrace_setsiginfo() { - let siginfo = unsafe { mem::uninitialized() }; + let siginfo = unsafe { mem::zeroed() }; if let Err(Error::UnsupportedOperation) = ptrace::setsiginfo(getpid(), &siginfo) { panic!("ptrace_setsiginfo returns Error::UnsupportedOperation!"); } |