From f6bd6dca21647ca8c77fb781e66f0ecc543f364c Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Thu, 6 Mar 2025 16:31:33 -0800 Subject: [PATCH 1/3] Update to rustix 1.0. --- Cargo.toml | 8 ++++---- tests/stdtests/fs.rs | 4 ++-- tests/stdtests/integration_env.rs | 2 +- tests/stdtests/sync_rwlock.rs | 4 ++-- tests/stdtests/sys_common/io.rs | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 1a742a6..74ef8a7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,18 +13,18 @@ exclude = ["/.github", "ci"] keywords = ["linux"] [dependencies] -c-gull = { version = "0.21.0", default-features = false, features = ["eyra"] } +c-gull = { version = "0.22.0", default-features = false, features = ["eyra"] } [dev-dependencies] assert_cmd = "2.0.12" similar-asserts = "1.1.0" -rand = "0.8.4" +rand = "0.9.0" libc = "0.2.151" cfg-if = "1.0.0" -rand_xorshift = "0.3.0" +rand_xorshift = "0.4.0" # Test that the ctor crate works under eyra. -ctor = "0.2.0" +ctor = "0.4.0" # Check if rustup is installed for tests which = "7.0.0" diff --git a/tests/stdtests/fs.rs b/tests/stdtests/fs.rs index 4f14bfd..71da65e 100644 --- a/tests/stdtests/fs.rs +++ b/tests/stdtests/fs.rs @@ -1285,7 +1285,7 @@ fn _assert_send_sync() { #[test] fn binary_file() { let mut bytes = [0; 1024]; - StdRng::from_entropy().fill_bytes(&mut bytes); + StdRng::from_os_rng().fill_bytes(&mut bytes); let tmpdir = tmpdir(); @@ -1298,7 +1298,7 @@ fn binary_file() { #[test] fn write_then_read() { let mut bytes = [0; 1024]; - StdRng::from_entropy().fill_bytes(&mut bytes); + StdRng::from_os_rng().fill_bytes(&mut bytes); let tmpdir = tmpdir(); diff --git a/tests/stdtests/integration_env.rs b/tests/stdtests/integration_env.rs index 3e2fd8a..a69d0f7 100644 --- a/tests/stdtests/integration_env.rs +++ b/tests/stdtests/integration_env.rs @@ -5,7 +5,7 @@ use std::env::*; use std::ffi::{OsStr, OsString}; -use rand::distributions::{Alphanumeric, DistString}; +use rand::distr::{Alphanumeric, SampleString}; use super::common::test_rng; diff --git a/tests/stdtests/sync_rwlock.rs b/tests/stdtests/sync_rwlock.rs index 1833585..6a1a593 100644 --- a/tests/stdtests/sync_rwlock.rs +++ b/tests/stdtests/sync_rwlock.rs @@ -32,9 +32,9 @@ fn frob() { let tx = tx.clone(); let r = r.clone(); thread::spawn(move || { - let mut rng = rand::thread_rng(); + let mut rng = rand::rng(); for _ in 0..M { - if rng.gen_bool(1.0 / (N as f64)) { + if rng.random_bool(1.0 / (N as f64)) { drop(r.write().unwrap()); } else { drop(r.read().unwrap()); diff --git a/tests/stdtests/sys_common/io.rs b/tests/stdtests/sys_common/io.rs index 353f721..bf1caa7 100644 --- a/tests/stdtests/sys_common/io.rs +++ b/tests/stdtests/sys_common/io.rs @@ -42,7 +42,7 @@ pub mod test { pub fn tmpdir() -> TempDir { let p = env::temp_dir(); - let mut r = rand::thread_rng(); + let mut r = rand::rng(); let ret = p.join(&format!("rust-{}", r.next_u32())); fs::create_dir(&ret).unwrap(); TempDir(ret) From 0550a83ace5b0f897d2bddedcf3df5ea523b4312 Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Thu, 6 Mar 2025 16:34:54 -0800 Subject: [PATCH 2/3] Add libglib2.0-dev to CI build of qemu. --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 91b5b48..42c42d6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -68,7 +68,7 @@ jobs: run: | set -ex sudo apt-get update - sudo apt-get install -y ${{ matrix.gcc_package }} ninja-build + sudo apt-get install -y ${{ matrix.gcc_package }} ninja-build libglib2.0-dev upcase=$(echo ${{ matrix.host_target }} | awk '{ print toupper($0) }' | sed 's/-/_/g') echo CARGO_TARGET_${upcase}_LINKER=${{ matrix.gcc }} >> $GITHUB_ENV echo CC_${{ matrix.target }}=${{ matrix.gcc }} >> $GITHUB_ENV From 5683716d7c45be38015b1d75871d08039417bfb2 Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Thu, 6 Mar 2025 17:01:21 -0800 Subject: [PATCH 3/3] Update to nightly features. --- tests/stdtests.rs | 2 +- tests/stdtests/fs.rs | 2 +- tests/stdtests/process.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/stdtests.rs b/tests/stdtests.rs index 8b285d5..a9505b5 100644 --- a/tests/stdtests.rs +++ b/tests/stdtests.rs @@ -3,7 +3,7 @@ #![feature(duration_constants)] #![feature(io_error_uncategorized)] #![feature(ip)] -#![feature(maybe_uninit_uninit_array)] +#![feature(maybe_uninit_uninit_array_transpose)] #![feature(once_cell_try)] #![feature(read_buf)] #![feature(tcp_linger)] diff --git a/tests/stdtests/fs.rs b/tests/stdtests/fs.rs index 71da65e..824fc50 100644 --- a/tests/stdtests/fs.rs +++ b/tests/stdtests/fs.rs @@ -446,7 +446,7 @@ fn file_test_read_buf() { let filename = &tmpdir.join("test"); check!(fs::write(filename, &[1, 2, 3, 4])); - let mut buf: [MaybeUninit; 128] = MaybeUninit::uninit_array(); + let mut buf: [MaybeUninit; 128] = MaybeUninit::uninit().transpose(); let mut buf = BorrowedBuf::from(buf.as_mut_slice()); let mut file = check!(File::open(filename)); check!(file.read_buf(buf.unfilled())); diff --git a/tests/stdtests/process.rs b/tests/stdtests/process.rs index a256b3d..ca2bbfd 100644 --- a/tests/stdtests/process.rs +++ b/tests/stdtests/process.rs @@ -157,7 +157,7 @@ fn child_stdout_read_buf() { let child = cmd.spawn().unwrap(); let mut stdout = child.stdout.unwrap(); - let mut buf: [MaybeUninit; 128] = MaybeUninit::uninit_array(); + let mut buf: [MaybeUninit; 128] = MaybeUninit::uninit().transpose(); let mut buf = BorrowedBuf::from(buf.as_mut_slice()); stdout.read_buf(buf.unfilled()).unwrap();