---

yaml
---
r: 137689
b: refs/heads/auto
c: d9874bf
h: refs/heads/master
i:
  137687: caa5d4a
v: v3

Author: alexcrichton

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 33700532325627d8127d531dd83cca610681d48f
+refs/heads/auto: d9874bfb4079876dabc092c035d99b2d5b7f8a1c
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librand/chacha.rs

@@ -14,9 +14,9 @@ use core::prelude::*;
 
 use {Rng, SeedableRng, Rand};
 
-static KEY_WORDS    : uint =  8; // 8 words for the 256-bit key
-static STATE_WORDS  : uint = 16;
-static CHACHA_ROUNDS: uint = 20; // Cryptographically secure from 8 upwards as of this writing
+const KEY_WORDS    : uint =  8; // 8 words for the 256-bit key
+const STATE_WORDS  : uint = 16;
+const CHACHA_ROUNDS: uint = 20; // Cryptographically secure from 8 upwards as of this writing
 
 /// A random number generator that uses the ChaCha20 algorithm [1].
 ///

branches/auto/src/librand/isaac.rs

@@ -16,9 +16,9 @@ use core::slice::raw;
 
 use {Rng, SeedableRng, Rand};
 
-static RAND_SIZE_LEN: u32 = 8;
-static RAND_SIZE: u32 = 1 << (RAND_SIZE_LEN as uint);
-static RAND_SIZE_UINT: uint = 1 << (RAND_SIZE_LEN as uint);
+const RAND_SIZE_LEN: u32 = 8;
+const RAND_SIZE: u32 = 1 << (RAND_SIZE_LEN as uint);
+const RAND_SIZE_UINT: uint = 1 << (RAND_SIZE_LEN as uint);
 
 /// A random number generator that uses the ISAAC algorithm[1].
 ///
@@ -251,8 +251,8 @@ impl Rand for IsaacRng {
     }
 }
 
-static RAND_SIZE_64_LEN: uint = 8;
-static RAND_SIZE_64: uint = 1 << RAND_SIZE_64_LEN;
+const RAND_SIZE_64_LEN: uint = 8;
+const RAND_SIZE_64: uint = 1 << RAND_SIZE_64_LEN;
 
 /// A random number generator that uses ISAAC-64[1], the 64-bit
 /// variant of the ISAAC algorithm.
@@ -356,8 +356,8 @@ impl Isaac64Rng {
         // abbreviations
         let mut a = self.a;
         let mut b = self.b + self.c;
-        static MIDPOINT: uint =  RAND_SIZE_64 / 2;
-        static MP_VEC: [(uint, uint), .. 2] = [(0,MIDPOINT), (MIDPOINT, 0)];
+        const MIDPOINT: uint =  RAND_SIZE_64 / 2;
+        const MP_VEC: [(uint, uint), .. 2] = [(0,MIDPOINT), (MIDPOINT, 0)];
         macro_rules! ind (
             ($x:expr) => {
                 *self.mem.unsafe_get(($x as uint >> 3) & (RAND_SIZE_64 - 1))