@@ -103,24 +103,6 @@ mod test {
103103 use crate :: rngs:: StdRng ;
104104 use crate :: { RngCore , SeedableRng } ;
105105
106- // Get ChaCha state, omitting the constants
107- fn rng_state ( rng : & StdRng ) -> & [ u32 ; 12 ] {
108- use core:: mem:: { size_of, transmute} ;
109-
110- // Experimentally this matches the size and layout of rand_core::ChaCha12Rng
111- struct State {
112- _results : [ u32 ; 64 ] ,
113- _index : usize ,
114- #[ cfg( target_pointer_width = "64" ) ]
115- _pad : usize ,
116- state : [ u32 ; 12 ] ,
117- }
118- assert_eq ! ( size_of:: <StdRng >( ) , size_of:: <State >( ) ) ;
119-
120- let state: & State = unsafe { transmute ( rng) } ;
121- & state. state
122- }
123-
124106 #[ test]
125107 fn test_stdrng_construction ( ) {
126108 // Test value-stability of StdRng. This is expected to break any time
@@ -133,20 +115,11 @@ mod test {
133115
134116 let mut rng0 = StdRng :: from_seed ( seed) ;
135117
136- let expected = [ 1 , 23 , 456 , 7890 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ] ;
137- assert_eq ! ( rng_state( & rng0) , & expected) ;
138-
139118 let x0 = rng0. next_u64 ( ) ;
140119
141120 let mut rng1 = StdRng :: from_rng ( & mut rng0) ;
142121 let x1 = rng1. next_u64 ( ) ;
143122
144- let expected = [
145- 0x98c064cf , 0x42da2de , 0xb7949e00 , 0xf46bfbdb , 0x7e3b786e , 0xaaddd44f , 0xf7a37c04 ,
146- 0x8255c7e9 , 4 , 0 , 0 , 0 ,
147- ] ;
148- assert_eq ! ( rng_state( & rng1) , & expected) ;
149-
150123 assert_eq ! ( [ x0, x1] , target) ;
151124 }
152125
@@ -160,8 +133,6 @@ mod test {
160133 let seed = [ 0u8 ; 32 ] ;
161134 let mut rng = StdRng :: from_seed ( seed) ;
162135
163- assert_eq ! ( rng_state( & rng) , & [ 0u32 ; 12 ] ) ;
164-
165136 let mut results = [ 0u8 ; 64 ] ;
166137 rng. fill_bytes ( & mut results) ;
167138 #[ rustfmt:: skip]
@@ -205,10 +176,6 @@ mod test {
205176 seed[ 0 ] = 1 ;
206177 let mut rng = StdRng :: from_seed ( seed) ;
207178
208- let mut expected = [ 0u32 ; 12 ] ;
209- expected[ 0 ] = 1 ;
210- assert_eq ! ( rng_state( & rng) , & expected) ;
211-
212179 let mut results = [ 0u8 ; 64 ] ;
213180 rng. fill_bytes ( & mut results) ;
214181 #[ rustfmt:: skip]
@@ -252,10 +219,6 @@ mod test {
252219 let mut rng = StdRng :: from_seed ( seed) ;
253220 rng. 0 . set_stream ( 1 ) ;
254221
255- let mut expected = [ 0u32 ; 12 ] ;
256- expected[ 10 ] = 1 ;
257- assert_eq ! ( rng_state( & rng) , & expected) ;
258-
259222 let mut results = [ 0u8 ; 64 ] ;
260223 rng. fill_bytes ( & mut results) ;
261224 #[ rustfmt:: skip]
@@ -306,17 +269,6 @@ mod test {
306269 let mut rng = StdRng :: from_seed ( seed) ;
307270 rng. 0 . set_stream ( u64:: from_le_bytes ( iv) ) ;
308271
309- #[ rustfmt:: skip]
310- let expected = [
311- 0xb1c16ec4 , 0x78a8e88c ,
312- 0xe7375a72 , 0x35b7df80 ,
313- 0x2eed681f , 0xfb794c19 ,
314- 0xe1beaec6 , 0x5d9767a6 ,
315- 0x00000000 , 0x00000000 ,
316- 0xd531da1a , 0x218268cf ,
317- ] ;
318- assert_eq ! ( rng_state( & rng) , & expected) ;
319-
320272 let mut results = [ 0u8 ; 64 ] ;
321273 rng. fill_bytes ( & mut results) ;
322274 #[ rustfmt:: skip]
@@ -360,12 +312,6 @@ mod test {
360312 let words_per_block = 16 ;
361313 rng. 0 . set_word_pos ( ( block as u128 ) * words_per_block) ;
362314
363- let mut expected = [ 0u32 ; 12 ] ;
364- // Note: four blocks get generated by set_word_pos
365- expected[ 8 ] = block. wrapping_add ( 4 ) ;
366- expected[ 9 ] = 1 ;
367- assert_eq ! ( rng_state( & rng) , & expected) ;
368-
369315 let mut results = [ 0u8 ; 64 ] ;
370316 rng. fill_bytes ( & mut results) ;
371317 #[ rustfmt:: skip]
0 commit comments