Skip to content

Commit f84e157

Browse files
committed
Auto merge of #94648 - RalfJung:rollup-4iorcrd, r=RalfJung
Rollup of 4 pull requests Successful merges: - #94630 (Update note about tier 2 docs.) - #94633 (Suggest removing a semicolon after derive attributes) - #94642 (Fix source code pages scroll) - #94645 (do not attempt to open cgroup files under Miri) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 07016dc + 3b2ff4d commit f84e157

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

std/src/sys/unix/thread.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,11 @@ fn cgroup2_quota() -> usize {
384384
use crate::path::PathBuf;
385385

386386
let mut quota = usize::MAX;
387+
if cfg!(miri) {
388+
// Attempting to open a file fails under default flags due to isolation.
389+
// And Miri does not have parallelism anyway.
390+
return quota;
391+
}
387392

388393
let _: Option<()> = try {
389394
let mut buf = Vec::with_capacity(128);

0 commit comments

Comments
 (0)