rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rollup merge of #19868: sourcefrog/master

Browse Source 
The rendered form in http://doc.rust-lang.org/nightly/std/rand/struct.OsRng.html looks wrong.
This commit is contained in:
Alex Crichton
2014-12-17 08:34:43 -08:00
parent 67237a7917 c270390f1b
commit 03e970f043
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libstd/rand/os.rs
View File

@@ -117,7 +117,8 @@ mod imp {
/// `/dev/urandom`, or from `getrandom(2)` system call if available. /// `/dev/urandom`, or from `getrandom(2)` system call if available.
/// - Windows: calls `CryptGenRandom`, using the default cryptographic /// - Windows: calls `CryptGenRandom`, using the default cryptographic
/// service provider with the `PROV_RSA_FULL` type. /// 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. /// This does not block.
pub struct OsRng { pub struct OsRng {
inner: OsRngInner, inner: OsRngInner,
@@ -184,7 +185,8 @@ mod imp {
/// `/dev/urandom`, or from `getrandom(2)` system call if available. /// `/dev/urandom`, or from `getrandom(2)` system call if available.
/// - Windows: calls `CryptGenRandom`, using the default cryptographic /// - Windows: calls `CryptGenRandom`, using the default cryptographic
/// service provider with the `PROV_RSA_FULL` type. /// 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. /// This does not block.
#[allow(missing_copy_implementations)] #[allow(missing_copy_implementations)]
pub struct OsRng { pub struct OsRng {
@@ -256,7 +258,8 @@ mod imp {
/// `/dev/urandom`, or from `getrandom(2)` system call if available. /// `/dev/urandom`, or from `getrandom(2)` system call if available.
/// - Windows: calls `CryptGenRandom`, using the default cryptographic /// - Windows: calls `CryptGenRandom`, using the default cryptographic
/// service provider with the `PROV_RSA_FULL` type. /// 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. /// This does not block.
pub struct OsRng { pub struct OsRng {
hcryptprov: HCRYPTPROV hcryptprov: HCRYPTPROV