Skip to content

Commit 5ebbaf7

Browse files
committed
remove unsafe and newlines, add notice
1 parent 9855b52 commit 5ebbaf7

9 files changed

+12
-11
lines changed

src/dragonfly_haiku.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,3 @@ pub fn getrandom(dest: &mut [u8]) -> Result<(), Error> {
2020
use_init(f, || File::open("/dev/random"), |f| f.read_exact(dest))
2121
}).map_err(|_| Error::Unknown)
2222
}
23-

src/emscripten.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,3 @@ pub fn getrandom(dest: &mut [u8]) -> Result<(), Error> {
2929
})
3030
}).map_err(|_| Error::Unknown)
3131
}
32-

src/freebsd.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,3 @@ pub fn getrandom(dest: &mut [u8]) -> Result<(), Error> {
2929
}
3030
Ok(())
3131
}
32-

src/fuchsia.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,3 @@ pub fn getrandom(dest: &mut [u8]) -> Result<(), Error> {
1515
fuchsia_cprng::cprng_draw(dest);
1616
Ok(())
1717
}
18-

src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,4 +111,3 @@ mod_use!(
111111
))),
112112
dummy
113113
);
114-

src/netbsd.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,3 @@ pub fn getrandom(dest: &mut [u8]) -> Result<(), Error> {
2626
}, |f| f.read_exact(dest))
2727
}).map_err(|_| Error::Unknown)
2828
}
29-

src/openbsd_bitrig.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,3 @@ pub fn getrandom(dest: &mut [u8]) -> Result<(), Error> {
2525
}
2626
Ok(())
2727
}
28-

src/redox.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,3 @@ pub fn getrandom(dest: &mut [u8]) -> Result<(), Error> {
2020
use_init(f, || File::open("rand:"), |f| f.read_exact(dest))
2121
}).map_err(|_| Error::Unknown)
2222
}
23-

src/utils.rs

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
1+
// Copyright 2018 Developers of the Rand project.
2+
//
3+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
4+
// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
5+
// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
6+
// option. This file may not be copied, modified, or distributed
7+
// except according to those terms.
18
use std::cell::RefCell;
29
use std::ops::DerefMut;
3-
use std::{io, hint};
10+
use std::io;
411

12+
/// If `f` contains `Some(T)` call `use_f` using contents of `f` as an argument,
13+
/// otherwise initialize `f` value using `init_f`, store resulting value in `f`
14+
/// and call `use_f`.
515
pub(crate) fn use_init<T, F, U>(f: &RefCell<Option<T>>, init_f: F, mut use_f: U)
616
-> io::Result<()>
717
where F: FnOnce() -> io::Result<T>, U: FnMut(&mut T) -> io::Result<()>
@@ -15,7 +25,6 @@ pub(crate) fn use_init<T, F, U>(f: &RefCell<Option<T>>, init_f: F, mut use_f: U)
1525

1626
match f {
1727
Some(f) => use_f(f),
18-
None => unsafe { hint::unreachable_unchecked() },
28+
None => unreachable!(),
1929
}
2030
}
21-

0 commit comments

Comments
 (0)