Merge pull request #217 from cramertj/fuchsia-update

dhardy · web-flow · commit 3a892285cd08 · 2018-01-03T11:52:14.000Z
Update fuchsia-zircon
diff --git a/Cargo.toml b/Cargo.toml
@@ -37,4 +37,4 @@ log = "0.3, <=0.3.8"
 members = ["rand-derive"]
 
 [target.'cfg(target_os = "fuchsia")'.dependencies]
-fuchsia-zircon = "0.3"
+fuchsia-zircon = "0.3.2"
diff --git a/src/os.rs b/src/os.rs
@@ -407,7 +407,7 @@ mod imp {
             next_u64(&mut |v| self.fill_bytes(v))
         }
         fn fill_bytes(&mut self, v: &mut [u8]) {
-            for s in v.chunks_mut(fuchsia_zircon::ZX_CPRNG_DRAW_MAX_LEN) {
+            for s in v.chunks_mut(fuchsia_zircon::sys::ZX_CPRNG_DRAW_MAX_LEN) {
                 let mut filled = 0;
                 while filled < s.len() {
                     match fuchsia_zircon::cprng_draw(&mut s[filled..]) {

Original file line number	Diff line number	Diff line change
`@@ -407,7 +407,7 @@ mod imp {`
`407`	`407`	`next_u64(&mut \|v\| self.fill_bytes(v))`
`408`	`408`	`}`
`409`	`409`	`fn fill_bytes(&mut self, v: &mut [u8]) {`
`410`		`- for s in v.chunks_mut(fuchsia_zircon::ZX_CPRNG_DRAW_MAX_LEN) {`
	`410`	`+ for s in v.chunks_mut(fuchsia_zircon::sys::ZX_CPRNG_DRAW_MAX_LEN) {`
`411`	`411`	`let mut filled = 0;`
`412`	`412`	`while filled < s.len() {`
`413`	`413`	`match fuchsia_zircon::cprng_draw(&mut s[filled..]) {`