diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-12-17 08:34:43 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-12-17 11:50:27 -0800 |
| commit | 03e970f043e3482a21936d26ea4b6bc504d845b1 (patch) | |
| tree | 7db25a4dc7bb4743be92cab60e2fcecac6525596 /src/libstd | |
| parent | 67237a7917bfa58b3efbafde9b625bdefbd59408 (diff) | |
| parent | c270390f1b7d2489644f30445e35e25a1595f256 (diff) | |
| download | rust-03e970f043e3482a21936d26ea4b6bc504d845b1.tar.gz rust-03e970f043e3482a21936d26ea4b6bc504d845b1.zip | |
rollup merge of #19868: sourcefrog/master
The rendered form in http://doc.rust-lang.org/nightly/std/rand/struct.OsRng.html looks wrong.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/rand/os.rs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/libstd/rand/os.rs b/src/libstd/rand/os.rs index 4677f168bf5..6bccef07131 100644 --- a/src/libstd/rand/os.rs +++ b/src/libstd/rand/os.rs @@ -117,7 +117,8 @@ mod imp { /// `/dev/urandom`, or from `getrandom(2)` system call if available. /// - Windows: calls `CryptGenRandom`, using the default cryptographic /// service provider with the `PROV_RSA_FULL` type. - /// - iOS: calls SecRandomCopyBytes as /dev/(u)random is sandboxed + /// - iOS: calls SecRandomCopyBytes as /dev/(u)random is sandboxed. + /// /// This does not block. pub struct OsRng { inner: OsRngInner, @@ -184,7 +185,8 @@ mod imp { /// `/dev/urandom`, or from `getrandom(2)` system call if available. /// - Windows: calls `CryptGenRandom`, using the default cryptographic /// service provider with the `PROV_RSA_FULL` type. - /// - iOS: calls SecRandomCopyBytes as /dev/(u)random is sandboxed + /// - iOS: calls SecRandomCopyBytes as /dev/(u)random is sandboxed. + /// /// This does not block. #[allow(missing_copy_implementations)] pub struct OsRng { @@ -256,7 +258,8 @@ mod imp { /// `/dev/urandom`, or from `getrandom(2)` system call if available. /// - Windows: calls `CryptGenRandom`, using the default cryptographic /// service provider with the `PROV_RSA_FULL` type. - /// - iOS: calls SecRandomCopyBytes as /dev/(u)random is sandboxed + /// - iOS: calls SecRandomCopyBytes as /dev/(u)random is sandboxed. + /// /// This does not block. pub struct OsRng { hcryptprov: HCRYPTPROV |