diff options
| author | bors <bors@rust-lang.org> | 2018-06-22 15:26:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-06-22 15:26:52 +0000 |
| commit | 4dc2d745b9103dc4493b49277337ef4580425d7c (patch) | |
| tree | 0acf0f96d649ae3884436241cfed39de669ebdcc /src/libstd/sys | |
| parent | 01dbfdaf4f45b68b49332b8785262a3a780d0a19 (diff) | |
| parent | d41cb9992f268e1d679e139429271f748f4d7783 (diff) | |
| download | rust-4dc2d745b9103dc4493b49277337ef4580425d7c.tar.gz rust-4dc2d745b9103dc4493b49277337ef4580425d7c.zip | |
Auto merge of #51704 - kennytm:rollup, r=kennytm
Rollup of 6 pull requests Successful merges: - #51158 (Mention spec and indented blocks in doctest docs) - #51629 (Do not consume semicolon twice while parsing local statement) - #51637 (Update zx_cprng_draw_new on Fuchsia) - #51664 (make more libsyntax methods public) - #51666 (Disable probestack when GCOV profiling is being used) - #51703 (Recognize the extra "LLVM tools versions" argument to build-manifest.) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/unix/rand.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/libstd/sys/unix/rand.rs b/src/libstd/sys/unix/rand.rs index caa18945765..3f7f0671490 100644 --- a/src/libstd/sys/unix/rand.rs +++ b/src/libstd/sys/unix/rand.rs @@ -183,15 +183,14 @@ mod imp { mod imp { #[link(name = "zircon")] extern { - fn zx_cprng_draw(buffer: *mut u8, len: usize, actual: *mut usize) -> i32; + fn zx_cprng_draw_new(buffer: *mut u8, len: usize) -> i32; } fn getrandom(buf: &mut [u8]) -> Result<usize, i32> { unsafe { - let mut actual = 0; - let status = zx_cprng_draw(buf.as_mut_ptr(), buf.len(), &mut actual); + let status = zx_cprng_draw_new(buf.as_mut_ptr(), buf.len()); if status == 0 { - Ok(actual) + Ok(buf.len()) } else { Err(status) } |
