---

yaml
---
r: 136979
b: refs/heads/dist-snap
c: 71f752b
h: refs/heads/master
i:
  136977: 46035bc
  136975: f70296f
v: v3

Author: steveklabnik

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 189b7332968972f34cdbbbd9b62d97ababf53059
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: ae81c89f34f1ac2cdb596cf216612e94822a8466
+refs/heads/dist-snap: 71f752bbc4eb2a280cd6f6611ba46075a7fdffd1
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/.travis.yml

@@ -3,6 +3,13 @@
 # downloads a rust/cargo snapshot, which we don't really want for building rust.
 language: c
 
+# Make sure we've got an up-to-date g++ compiler to get past the LLVM configure
+# script.
+install:
+  - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+  - sudo apt-get update -qq
+  - sudo apt-get install g++-4.7
+
 # The test suite is in general way too stressful for travis, especially in
 # terms of time limit and reliability. In the past we've tried to scale things
 # back to only build the stage1 compiler and run a subset of tests, but this
@@ -11,7 +18,7 @@ language: c
 # As a result, we're just using travis to run `make tidy` now. It'll help
 # everyone find out about their trailing spaces early on!
 before_script:
-  - ./configure --llvm-root=path/to/nowhere
+  - ./configure
 script:
   - make tidy
 

branches/dist-snap/src/doc/guide.md

@@ -5074,7 +5074,7 @@ The `channel()` function returns two endpoints: a `Receiver<T>` and a
 `Sender<T>`. You can use the `.send()` method on the `Sender<T>` end, and
 receive the message on the `Receiver<T>` side with the `recv()` method.  This
 method blocks until it gets a message. There's a similar method, `.try_recv()`,
-which returns an `Option<T>` and does not block.
+which returns an `Result<T, TryRecvError>` and does not block.
 
 If you want to send messages to the task as well, create two channels!
 

branches/dist-snap/src/doc/reference.md

@@ -1412,7 +1412,7 @@ struct BitsNStrings<'a> {
     mystring: &'a str
 }
 
-static BITS_N_STRINGS: BitsNStrings<'static> = BitsNStrings {
+static bits_n_strings: BitsNStrings<'static> = BitsNStrings {
     mybits: BITS,
     mystring: STRING
 };

branches/dist-snap/src/libnum/bigint.rs

@@ -86,12 +86,9 @@ pub mod BigDigit {
     use super::DoubleBigDigit;
 
     // `DoubleBigDigit` size dependent
-    #[allow(non_uppercase_statics)]
     pub static bits: uint = 32;
 
-    #[allow(non_uppercase_statics)]
     pub static base: DoubleBigDigit = 1 << bits;
-    #[allow(non_uppercase_statics)]
     static lo_mask: DoubleBigDigit = (-1 as DoubleBigDigit) >> bits;
 
     #[inline]
@@ -1844,7 +1841,7 @@ mod biguint_tests {
               BigInt::from_biguint(Plus, BigUint::new(vec!(1,2,3))));
     }
 
-    static SUM_TRIPLES: &'static [(&'static [BigDigit],
+    static sum_triples: &'static [(&'static [BigDigit],
                                    &'static [BigDigit],
                                    &'static [BigDigit])] = &[
         (&[],          &[],       &[]),
@@ -1860,7 +1857,7 @@ mod biguint_tests {
 
     #[test]
     fn test_add() {
-        for elm in SUM_TRIPLES.iter() {
+        for elm in sum_triples.iter() {
             let (a_vec, b_vec, c_vec) = *elm;
             let a = BigUint::from_slice(a_vec);
             let b = BigUint::from_slice(b_vec);
@@ -1873,7 +1870,7 @@ mod biguint_tests {
 
     #[test]
     fn test_sub() {
-        for elm in SUM_TRIPLES.iter() {
+        for elm in sum_triples.iter() {
             let (a_vec, b_vec, c_vec) = *elm;
             let a = BigUint::from_slice(a_vec);
             let b = BigUint::from_slice(b_vec);
@@ -1891,7 +1888,7 @@ mod biguint_tests {
         a - b;
     }
 
-    static MUL_TRIPLES: &'static [(&'static [BigDigit],
+    static mul_triples: &'static [(&'static [BigDigit],
                                    &'static [BigDigit],
                                    &'static [BigDigit])] = &[
         (&[],               &[],               &[]),
@@ -1917,7 +1914,7 @@ mod biguint_tests {
         (&[ 0,  0,  1],     &[ 0,  0,  0,  1], &[0, 0,  0,  0,  0,  1])
     ];
 
-    static DIV_REM_QUADRUPLES: &'static [(&'static [BigDigit],
+    static div_rem_quadruples: &'static [(&'static [BigDigit],
                                            &'static [BigDigit],
                                            &'static [BigDigit],
                                            &'static [BigDigit])]
@@ -1931,7 +1928,7 @@ mod biguint_tests {
 
     #[test]
     fn test_mul() {
-        for elm in MUL_TRIPLES.iter() {
+        for elm in mul_triples.iter() {
             let (a_vec, b_vec, c_vec) = *elm;
             let a = BigUint::from_slice(a_vec);
             let b = BigUint::from_slice(b_vec);
@@ -1941,7 +1938,7 @@ mod biguint_tests {
             assert!(b * a == c);
         }
 
-        for elm in DIV_REM_QUADRUPLES.iter() {
+        for elm in div_rem_quadruples.iter() {
             let (a_vec, b_vec, c_vec, d_vec) = *elm;
             let a = BigUint::from_slice(a_vec);
             let b = BigUint::from_slice(b_vec);
@@ -1955,7 +1952,7 @@ mod biguint_tests {
 
     #[test]
     fn test_div_rem() {
-        for elm in MUL_TRIPLES.iter() {
+        for elm in mul_triples.iter() {
             let (a_vec, b_vec, c_vec) = *elm;
             let a = BigUint::from_slice(a_vec);
             let b = BigUint::from_slice(b_vec);
@@ -1969,7 +1966,7 @@ mod biguint_tests {
             }
         }
 
-        for elm in DIV_REM_QUADRUPLES.iter() {
+        for elm in div_rem_quadruples.iter() {
             let (a_vec, b_vec, c_vec, d_vec) = *elm;
             let a = BigUint::from_slice(a_vec);
             let b = BigUint::from_slice(b_vec);
@@ -1982,7 +1979,7 @@ mod biguint_tests {
 
     #[test]
     fn test_checked_add() {
-        for elm in SUM_TRIPLES.iter() {
+        for elm in sum_triples.iter() {
             let (a_vec, b_vec, c_vec) = *elm;
             let a = BigUint::from_slice(a_vec);
             let b = BigUint::from_slice(b_vec);
@@ -1995,7 +1992,7 @@ mod biguint_tests {
 
     #[test]
     fn test_checked_sub() {
-        for elm in SUM_TRIPLES.iter() {
+        for elm in sum_triples.iter() {
             let (a_vec, b_vec, c_vec) = *elm;
             let a = BigUint::from_slice(a_vec);
             let b = BigUint::from_slice(b_vec);
@@ -2015,7 +2012,7 @@ mod biguint_tests {
 
     #[test]
     fn test_checked_mul() {
-        for elm in MUL_TRIPLES.iter() {
+        for elm in mul_triples.iter() {
             let (a_vec, b_vec, c_vec) = *elm;
             let a = BigUint::from_slice(a_vec);
             let b = BigUint::from_slice(b_vec);
@@ -2025,7 +2022,7 @@ mod biguint_tests {
             assert!(b.checked_mul(&a).unwrap() == c);
         }
 
-        for elm in DIV_REM_QUADRUPLES.iter() {
+        for elm in div_rem_quadruples.iter() {
             let (a_vec, b_vec, c_vec, d_vec) = *elm;
             let a = BigUint::from_slice(a_vec);
             let b = BigUint::from_slice(b_vec);
@@ -2039,7 +2036,7 @@ mod biguint_tests {
 
     #[test]
     fn test_checked_div() {
-        for elm in MUL_TRIPLES.iter() {
+        for elm in mul_triples.iter() {
             let (a_vec, b_vec, c_vec) = *elm;
             let a = BigUint::from_slice(a_vec);
             let b = BigUint::from_slice(b_vec);
@@ -2443,7 +2440,7 @@ mod bigint_tests {
         assert_eq!(negative.to_biguint(), None);
     }
 
-    static SUM_TRIPLES: &'static [(&'static [BigDigit],
+    static sum_triples: &'static [(&'static [BigDigit],
                                    &'static [BigDigit],
                                    &'static [BigDigit])] = &[
         (&[],          &[],       &[]),
@@ -2459,7 +2456,7 @@ mod bigint_tests {
 
     #[test]
     fn test_add() {
-        for elm in SUM_TRIPLES.iter() {
+        for elm in sum_triples.iter() {
             let (a_vec, b_vec, c_vec) = *elm;
             let a = BigInt::from_slice(Plus, a_vec);
             let b = BigInt::from_slice(Plus, b_vec);
@@ -2478,7 +2475,7 @@ mod bigint_tests {
 
     #[test]
     fn test_sub() {
-        for elm in SUM_TRIPLES.iter() {
+        for elm in sum_triples.iter() {
             let (a_vec, b_vec, c_vec) = *elm;
             let a = BigInt::from_slice(Plus, a_vec);
             let b = BigInt::from_slice(Plus, b_vec);
@@ -2495,7 +2492,7 @@ mod bigint_tests {
         }
     }
 
-    static MUL_TRIPLES: &'static [(&'static [BigDigit],
+    static mul_triples: &'static [(&'static [BigDigit],
                                    &'static [BigDigit],
                                    &'static [BigDigit])] = &[
         (&[],               &[],               &[]),
@@ -2521,7 +2518,7 @@ mod bigint_tests {
         (&[ 0,  0,  1],     &[ 0,  0,  0,  1], &[0, 0,  0,  0,  0,  1])
     ];
 
-    static DIV_REM_QUADRUPLES: &'static [(&'static [BigDigit],
+    static div_rem_quadruples: &'static [(&'static [BigDigit],
                                           &'static [BigDigit],
                                           &'static [BigDigit],
                                           &'static [BigDigit])]
@@ -2535,7 +2532,7 @@ mod bigint_tests {
 
     #[test]
     fn test_mul() {
-        for elm in MUL_TRIPLES.iter() {
+        for elm in mul_triples.iter() {
             let (a_vec, b_vec, c_vec) = *elm;
             let a = BigInt::from_slice(Plus, a_vec);
             let b = BigInt::from_slice(Plus, b_vec);
@@ -2548,7 +2545,7 @@ mod bigint_tests {
             assert!((-b) * a == -c);
         }
 
-        for elm in DIV_REM_QUADRUPLES.iter() {
+        for elm in div_rem_quadruples.iter() {
             let (a_vec, b_vec, c_vec, d_vec) = *elm;
             let a = BigInt::from_slice(Plus, a_vec);
             let b = BigInt::from_slice(Plus, b_vec);
@@ -2587,7 +2584,7 @@ mod bigint_tests {
             }
         }
 
-        for elm in MUL_TRIPLES.iter() {
+        for elm in mul_triples.iter() {
             let (a_vec, b_vec, c_vec) = *elm;
             let a = BigInt::from_slice(Plus, a_vec);
             let b = BigInt::from_slice(Plus, b_vec);
@@ -2597,7 +2594,7 @@ mod bigint_tests {
             if !b.is_zero() { check(&c, &b, &a, &Zero::zero()); }
         }
 
-        for elm in DIV_REM_QUADRUPLES.iter() {
+        for elm in div_rem_quadruples.iter() {
             let (a_vec, b_vec, c_vec, d_vec) = *elm;
             let a = BigInt::from_slice(Plus, a_vec);
             let b = BigInt::from_slice(Plus, b_vec);
@@ -2630,7 +2627,7 @@ mod bigint_tests {
             check_sub(&a.neg(), b, &q.neg(), &r.neg());
             check_sub(&a.neg(), &b.neg(), q, &r.neg());
         }
-        for elm in MUL_TRIPLES.iter() {
+        for elm in mul_triples.iter() {
             let (a_vec, b_vec, c_vec) = *elm;
             let a = BigInt::from_slice(Plus, a_vec);
             let b = BigInt::from_slice(Plus, b_vec);
@@ -2640,7 +2637,7 @@ mod bigint_tests {
             if !b.is_zero() { check(&c, &b, &a, &Zero::zero()); }
         }
 
-        for elm in DIV_REM_QUADRUPLES.iter() {
+        for elm in div_rem_quadruples.iter() {
             let (a_vec, b_vec, c_vec, d_vec) = *elm;
             let a = BigInt::from_slice(Plus, a_vec);
             let b = BigInt::from_slice(Plus, b_vec);
@@ -2655,7 +2652,7 @@ mod bigint_tests {
 
     #[test]
     fn test_checked_add() {
-        for elm in SUM_TRIPLES.iter() {
+        for elm in sum_triples.iter() {
             let (a_vec, b_vec, c_vec) = *elm;
             let a = BigInt::from_slice(Plus, a_vec);
             let b = BigInt::from_slice(Plus, b_vec);
@@ -2674,7 +2671,7 @@ mod bigint_tests {
 
     #[test]
     fn test_checked_sub() {
-        for elm in SUM_TRIPLES.iter() {
+        for elm in sum_triples.iter() {
             let (a_vec, b_vec, c_vec) = *elm;
             let a = BigInt::from_slice(Plus, a_vec);
             let b = BigInt::from_slice(Plus, b_vec);
@@ -2693,7 +2690,7 @@ mod bigint_tests {
 
     #[test]
     fn test_checked_mul() {
-        for elm in MUL_TRIPLES.iter() {
+        for elm in mul_triples.iter() {
             let (a_vec, b_vec, c_vec) = *elm;
             let a = BigInt::from_slice(Plus, a_vec);
             let b = BigInt::from_slice(Plus, b_vec);
@@ -2706,7 +2703,7 @@ mod bigint_tests {
             assert!((-b).checked_mul(&a).unwrap() == -c);
         }
 
-        for elm in DIV_REM_QUADRUPLES.iter() {
+        for elm in div_rem_quadruples.iter() {
             let (a_vec, b_vec, c_vec, d_vec) = *elm;
             let a = BigInt::from_slice(Plus, a_vec);
             let b = BigInt::from_slice(Plus, b_vec);
@@ -2719,7 +2716,7 @@ mod bigint_tests {
     }
     #[test]
     fn test_checked_div() {
-        for elm in MUL_TRIPLES.iter() {
+        for elm in mul_triples.iter() {
             let (a_vec, b_vec, c_vec) = *elm;
             let a = BigInt::from_slice(Plus, a_vec);
             let b = BigInt::from_slice(Plus, b_vec);

branches/dist-snap/src/libnum/rational.rs

@@ -406,13 +406,10 @@ mod test {
     pub static _2: Rational = Ratio { numer: 2, denom: 1};
     pub static _1_2: Rational = Ratio { numer: 1, denom: 2};
     pub static _3_2: Rational = Ratio { numer: 3, denom: 2};
-    #[allow(non_uppercase_statics)]
     pub static _neg1_2: Rational = Ratio { numer: -1, denom: 2};
     pub static _1_3: Rational = Ratio { numer: 1, denom: 3};
-    #[allow(non_uppercase_statics)]
     pub static _neg1_3: Rational = Ratio { numer: -1, denom: 3};
     pub static _2_3: Rational = Ratio { numer: 2, denom: 3};
-    #[allow(non_uppercase_statics)]
     pub static _neg2_3: Rational = Ratio { numer: -2, denom: 3};
 
     pub fn to_big(n: Rational) -> BigRational {