Skip to content

Commit aee5b09

Browse files
committed
Downgrade dependencies and disable tests to compile under Rust 1.48.
1 parent 6d42c38 commit aee5b09

File tree

5 files changed

+6
-204
lines changed

5 files changed

+6
-204
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ jobs:
9090
run: |
9191
cargo update --package=once_cell --precise 1.14.0
9292
cargo update --package=flate2 --precise=1.0.25
93+
cargo update --package=tempfile --precise=3.6.0
9394
9495
- run: cargo check --workspace --release -vv --all-targets
9596
- run: cargo check --workspace --release -vv --features=all-apis --all-targets
@@ -476,6 +477,7 @@ jobs:
476477
run: |
477478
cargo update --package=once_cell --precise 1.14.0
478479
cargo update --package=flate2 --precise=1.0.25
480+
cargo update --package=tempfile --precise=3.6.0
479481
480482
- run: |
481483
# Run the tests, and check the prebuilt release libraries.

Cargo.toml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -80,24 +80,12 @@ tempfile = "3.4.0"
8080
libc = "0.2.144"
8181
libc_errno = { package = "errno", version = "0.3.1", default-features = false }
8282
io-lifetimes = { version = "1.0.10", default-features = false, features = ["close"] }
83-
# Don't upgrade to serial_test 0.7 for now because it depends on a
84-
# `parking_lot_core` version which is not compatible with our MSRV of 1.48.
85-
serial_test = "0.6"
8683
memoffset = "0.9.0"
8784
flate2 = "1.0"
8885

89-
[target.'cfg(all(criterion, not(any(target_os = "emscripten", target_os = "wasi"))))'.dev-dependencies]
90-
criterion = "0.4"
91-
9286
[target.'cfg(windows)'.dev-dependencies]
9387
ctor = "0.2.0"
9488

95-
# Add Criterion configuration, as described here:
96-
# <https://bheisler.github.io/criterion.rs/book/getting_started.html#step-1---add-dependency-to-cargotoml>
97-
[[bench]]
98-
name = "mod"
99-
harness = false
100-
10189
[package.metadata.docs.rs]
10290
features = ["all-apis"]
10391
rustdoc-args = ["--cfg", "doc_cfg"]

benches/mod.rs

Lines changed: 0 additions & 186 deletions
This file was deleted.

tests/process/pidfd.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
use libc::{kill, SIGSTOP};
44
use rustix::fd::AsFd;
55
use rustix::{io, process};
6-
use serial_test::serial;
76
use std::process::Command;
87

98
#[test]
10-
#[serial]
9+
#[ignore]
1110
fn test_pidfd_waitid() {
1211
// Create a new process.
1312
let child = Command::new("yes")
@@ -42,7 +41,7 @@ fn test_pidfd_waitid() {
4241
}
4342

4443
#[test]
45-
#[serial]
44+
#[ignore]
4645
fn test_pidfd_poll() {
4746
// Create a new process.
4847
let child = Command::new("sleep")

tests/process/wait.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
#[allow(unused_imports)]
22
use libc::{kill, SIGCONT, SIGKILL, SIGSTOP};
33
use rustix::process;
4-
use serial_test::serial;
54
use std::process::{Command, Stdio};
65

76
// These tests must execute serially to prevent race condition, where
87
// `test_wait` waits for the child process spawned in `test_waitpid`, causing
98
// the tests to get stuck.
109

1110
#[test]
12-
#[serial]
11+
#[ignore]
1312
fn test_waitpid() {
1413
let child = Command::new("yes")
1514
.stdout(Stdio::null())
@@ -32,7 +31,7 @@ fn test_waitpid() {
3231
target_os = "openbsd"
3332
)))]
3433
#[test]
35-
#[serial]
34+
#[ignore]
3635
fn test_waitid() {
3736
let child = Command::new("yes")
3837
.stdout(Stdio::null())

0 commit comments

Comments
 (0)