Skip to content

Rollup of 12 pull requests #30457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Dec 18, 2015
Merged

Rollup of 12 pull requests #30457

Changes from 2 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
2a1efca
Fix typo
jwworth Dec 15, 2015
d91b256
change macro ambiguity example from ty to ident
durka Dec 16, 2015
6309b0f
move error handling from libsyntax/diagnostics.rs to libsyntax/errors/*
nrc Dec 13, 2015
a478811
Move a bunch of stuff from Session to syntax::errors
nrc Dec 14, 2015
7a03349
Add the files I fogot about earlier
nrc Dec 15, 2015
e237151
A little more refactoring inside emitter.rs
nrc Dec 15, 2015
ff0c74f
test errors
nrc Dec 15, 2015
ccb2186
Trivial cleanup
mmcco Dec 17, 2015
09d4a43
libsyntax: Merge OwnedSlice into ptr::P
petrochenkov Dec 16, 2015
0d298f9
Deprecate name `OwnedSlice` and don't use it
petrochenkov Dec 16, 2015
6c87b19
Abstract away differences between Vec and ptr::P in HIR
petrochenkov Dec 17, 2015
2a23e4a
Clarified shadowing example
Xmasreturns Dec 17, 2015
88ffb26
Fix emitting asm and object file output at the same time
dotdash Dec 18, 2015
cb319fc
Rollup merge of #30286 - oli-obk:const_error_span, r=nikomatsakis
Manishearth Dec 18, 2015
c290296
Rollup merge of #30384 - nrc:diagnostics, r=@nikomatsakis
Manishearth Dec 18, 2015
7eb7bc2
Rollup merge of #30398 - jwworth:pull-request-1450205451, r=sanxiyn
Manishearth Dec 18, 2015
158a1bd
Rollup merge of #30406 - durka:patch-13, r=sanxiyn
Manishearth Dec 18, 2015
9e953df
Rollup merge of #30420 - petrochenkov:owned2, r=nrc
Manishearth Dec 18, 2015
e916676
Rollup merge of #30431 - mmcco:cleanup, r=alexcrichton
Manishearth Dec 18, 2015
4f8b32c
Rollup merge of #30447 - Xmasreturns:Docu, r=steveklabnik
Manishearth Dec 18, 2015
a8e4246
Rollup merge of #30452 - dotdash:24876_take_2, r=alexcrichton
Manishearth Dec 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/libstd/rand/os.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ mod imp {
const NR_GETRANDOM: libc::c_long = 355;
#[cfg(any(target_arch = "arm", target_arch = "powerpc"))]
const NR_GETRANDOM: libc::c_long = 384;
#[cfg(any(target_arch = "aarch64"))]
#[cfg(target_arch = "aarch64")]
const NR_GETRANDOM: libc::c_long = 278;

unsafe {
Expand All @@ -60,8 +60,7 @@ mod imp {

fn getrandom_fill_bytes(v: &mut [u8]) {
let mut read = 0;
let len = v.len();
while read < len {
while read < v.len() {
let result = getrandom(&mut v[read..]);
if result == -1 {
let err = errno() as libc::c_int;
Expand Down