Skip to content

Commit 6dc7ba9

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

File tree

4 files changed

+3
-196
lines changed

4 files changed

+3
-196
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ jobs:
9797
cargo update --package=io-lifetimes --precise 1.0.6
9898
cd - >/dev/null
9999
done
100+
cargo update --package=tempfile --precise=3.6.0
100101
101102
- run: cargo check --workspace --release -vv --all-targets
102103
- run: cargo check --workspace --release -vv --features=all-apis --all-targets
@@ -479,6 +480,7 @@ jobs:
479480
cargo update --package=io-lifetimes --precise 1.0.6
480481
cd - >/dev/null
481482
done
483+
cargo update --package=tempfile --precise=3.6.0
482484
483485
- run: |
484486
# 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
@@ -73,24 +73,12 @@ tempfile = "3.2.0"
7373
libc = "0.2.133"
7474
libc_errno = { package = "errno", version = "0.3.0", default-features = false }
7575
io-lifetimes = { version = "1.0.0", default-features = false, features = ["close"] }
76-
# Don't upgrade to serial_test 0.7 for now because it depends on a
77-
# `parking_lot_core` version which is not compatible with our MSRV of 1.48.
78-
serial_test = "0.6"
7976
memoffset = "0.7.1"
8077
flate2 = "1.0"
8178

82-
[target.'cfg(all(criterion, not(any(target_os = "emscripten", target_os = "wasi"))))'.dev-dependencies]
83-
criterion = "0.4"
84-
8579
[target.'cfg(windows)'.dev-dependencies]
8680
ctor = "0.1.21"
8781

88-
# Add Criterion configuration, as described here:
89-
# <https://bheisler.github.io/criterion.rs/book/getting_started.html#step-1---add-dependency-to-cargotoml>
90-
[[bench]]
91-
name = "mod"
92-
harness = false
93-
9482
[package.metadata.docs.rs]
9583
features = ["all-apis"]
9684
rustdoc-args = ["--cfg", "doc_cfg"]

benches/mod.rs

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

tests/process/wait.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
use libc::{kill, SIGSTOP};
22
use rustix::process;
3-
use serial_test::serial;
43
use std::process::{Command, Stdio};
54

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

109
#[test]
11-
#[serial]
10+
#[ignore]
1211
fn test_waitpid() {
1312
let child = Command::new("yes")
1413
.stdout(Stdio::null())

0 commit comments

Comments
 (0)