Skip to content

Commit 28f813f

Browse files
committed
Auto merge of #1756 - RalfJung:getrandom, r=RalfJung
also test old getrandom getrandom 0.1 is still in use, so let's make sure it also still works with Miri.
2 parents 9c41b8b + 84f4490 commit 28f813f

File tree

3 files changed

+26
-6
lines changed

3 files changed

+26
-6
lines changed

test-cargo-miri/Cargo.lock

Lines changed: 21 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test-cargo-miri/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ issue_1705 = { path = "issue-1705" }
1616

1717
[dev-dependencies]
1818
rand = { version = "0.8", features = ["small_rng"] }
19-
getrandom = { version = "0.2" }
19+
getrandom_1 = { package = "getrandom", version = "0.1" }
20+
getrandom_2 = { package = "getrandom", version = "0.2" }
2021
serde_derive = "1.0" # not actually used, but exercises some unique code path (`--extern` .so file)
2122

2223
[lib]

test-cargo-miri/tests/test.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ fn does_not_work_on_miri() {
2424

2525
#[test]
2626
fn entropy_rng() {
27-
// Test `getrandom` directly.
27+
// Test `getrandom` directly (in multiple different versions).
2828
let mut data = vec![0; 16];
29-
getrandom::getrandom(&mut data).unwrap();
29+
getrandom_1::getrandom(&mut data).unwrap();
30+
getrandom_2::getrandom(&mut data).unwrap();
3031

3132
// Try seeding with "real" entropy.
3233
let mut rng = SmallRng::from_entropy();

0 commit comments

Comments
 (0)