Skip to content

Commit 0695162

Browse files
alexcrichtonalexcrichton
committed
---
yaml --- r: 137155 b: refs/heads/release-prep c: 7b6ecc0 h: refs/heads/master i: 137153: b3d888e 137151: 2b183f3 v: v3
1 parent 85af2e7 commit 0695162

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+213
-658
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2929
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
3030
refs/heads/libuv-update-temp-branch: 6ed22c618766f1f2a2e108eef8ce3f51be0f70b7
3131
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
32-
refs/heads/release-prep: 8993a0aebafcdc8e679c4134db5bdf5c01bc229c
32+
refs/heads/release-prep: 7b6ecc009c40f97bd93ec158b6efe9449f6aba1d

‎branches/release-prep/.travis.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@
33
# downloads a rust/cargo snapshot, which we don't really want for building rust.
44
language: c
55

6-
# Make sure we've got an up-to-date g++ compiler to get past the LLVM configure
7-
# script.
8-
install:
9-
- sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
10-
- sudo apt-get update -qq
11-
- sudo apt-get install g++-4.7
12-
136
# The test suite is in general way too stressful for travis, especially in
147
# terms of time limit and reliability. In the past we've tried to scale things
158
# back to only build the stage1 compiler and run a subset of tests, but this
@@ -18,7 +11,7 @@ install:
1811
# As a result, we're just using travis to run `make tidy` now. It'll help
1912
# everyone find out about their trailing spaces early on!
2013
before_script:
21-
- ./configure
14+
- ./configure --llvm-root=path/to/nowhere
2215
script:
2316
- make tidy
2417

‎branches/release-prep/src/libnum/bigint.rs

Lines changed: 30 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,9 @@ pub mod BigDigit {
8686
use super::DoubleBigDigit;
8787

8888
// `DoubleBigDigit` size dependent
89-
#[allow(non_uppercase_statics)]
9089
pub static bits: uint = 32;
9190

92-
#[allow(non_uppercase_statics)]
9391
pub static base: DoubleBigDigit = 1 << bits;
94-
#[allow(non_uppercase_statics)]
9592
static lo_mask: DoubleBigDigit = (-1 as DoubleBigDigit) >> bits;
9693

9794
#[inline]
@@ -1844,7 +1841,7 @@ mod biguint_tests {
18441841
BigInt::from_biguint(Plus, BigUint::new(vec!(1,2,3))));
18451842
}
18461843

1847-
static SUM_TRIPLES: &'static [(&'static [BigDigit],
1844+
static sum_triples: &'static [(&'static [BigDigit],
18481845
&'static [BigDigit],
18491846
&'static [BigDigit])] = &[
18501847
(&[], &[], &[]),
@@ -1860,7 +1857,7 @@ mod biguint_tests {
18601857

18611858
#[test]
18621859
fn test_add() {
1863-
for elm in SUM_TRIPLES.iter() {
1860+
for elm in sum_triples.iter() {
18641861
let (a_vec, b_vec, c_vec) = *elm;
18651862
let a = BigUint::from_slice(a_vec);
18661863
let b = BigUint::from_slice(b_vec);
@@ -1873,7 +1870,7 @@ mod biguint_tests {
18731870

18741871
#[test]
18751872
fn test_sub() {
1876-
for elm in SUM_TRIPLES.iter() {
1873+
for elm in sum_triples.iter() {
18771874
let (a_vec, b_vec, c_vec) = *elm;
18781875
let a = BigUint::from_slice(a_vec);
18791876
let b = BigUint::from_slice(b_vec);
@@ -1891,7 +1888,7 @@ mod biguint_tests {
18911888
a - b;
18921889
}
18931890

1894-
static MUL_TRIPLES: &'static [(&'static [BigDigit],
1891+
static mul_triples: &'static [(&'static [BigDigit],
18951892
&'static [BigDigit],
18961893
&'static [BigDigit])] = &[
18971894
(&[], &[], &[]),
@@ -1917,7 +1914,7 @@ mod biguint_tests {
19171914
(&[ 0, 0, 1], &[ 0, 0, 0, 1], &[0, 0, 0, 0, 0, 1])
19181915
];
19191916

1920-
static DIV_REM_QUADRUPLES: &'static [(&'static [BigDigit],
1917+
static div_rem_quadruples: &'static [(&'static [BigDigit],
19211918
&'static [BigDigit],
19221919
&'static [BigDigit],
19231920
&'static [BigDigit])]
@@ -1931,7 +1928,7 @@ mod biguint_tests {
19311928

19321929
#[test]
19331930
fn test_mul() {
1934-
for elm in MUL_TRIPLES.iter() {
1931+
for elm in mul_triples.iter() {
19351932
let (a_vec, b_vec, c_vec) = *elm;
19361933
let a = BigUint::from_slice(a_vec);
19371934
let b = BigUint::from_slice(b_vec);
@@ -1941,7 +1938,7 @@ mod biguint_tests {
19411938
assert!(b * a == c);
19421939
}
19431940

1944-
for elm in DIV_REM_QUADRUPLES.iter() {
1941+
for elm in div_rem_quadruples.iter() {
19451942
let (a_vec, b_vec, c_vec, d_vec) = *elm;
19461943
let a = BigUint::from_slice(a_vec);
19471944
let b = BigUint::from_slice(b_vec);
@@ -1955,7 +1952,7 @@ mod biguint_tests {
19551952

19561953
#[test]
19571954
fn test_div_rem() {
1958-
for elm in MUL_TRIPLES.iter() {
1955+
for elm in mul_triples.iter() {
19591956
let (a_vec, b_vec, c_vec) = *elm;
19601957
let a = BigUint::from_slice(a_vec);
19611958
let b = BigUint::from_slice(b_vec);
@@ -1969,7 +1966,7 @@ mod biguint_tests {
19691966
}
19701967
}
19711968

1972-
for elm in DIV_REM_QUADRUPLES.iter() {
1969+
for elm in div_rem_quadruples.iter() {
19731970
let (a_vec, b_vec, c_vec, d_vec) = *elm;
19741971
let a = BigUint::from_slice(a_vec);
19751972
let b = BigUint::from_slice(b_vec);
@@ -1982,7 +1979,7 @@ mod biguint_tests {
19821979

19831980
#[test]
19841981
fn test_checked_add() {
1985-
for elm in SUM_TRIPLES.iter() {
1982+
for elm in sum_triples.iter() {
19861983
let (a_vec, b_vec, c_vec) = *elm;
19871984
let a = BigUint::from_slice(a_vec);
19881985
let b = BigUint::from_slice(b_vec);
@@ -1995,7 +1992,7 @@ mod biguint_tests {
19951992

19961993
#[test]
19971994
fn test_checked_sub() {
1998-
for elm in SUM_TRIPLES.iter() {
1995+
for elm in sum_triples.iter() {
19991996
let (a_vec, b_vec, c_vec) = *elm;
20001997
let a = BigUint::from_slice(a_vec);
20011998
let b = BigUint::from_slice(b_vec);
@@ -2015,7 +2012,7 @@ mod biguint_tests {
20152012

20162013
#[test]
20172014
fn test_checked_mul() {
2018-
for elm in MUL_TRIPLES.iter() {
2015+
for elm in mul_triples.iter() {
20192016
let (a_vec, b_vec, c_vec) = *elm;
20202017
let a = BigUint::from_slice(a_vec);
20212018
let b = BigUint::from_slice(b_vec);
@@ -2025,7 +2022,7 @@ mod biguint_tests {
20252022
assert!(b.checked_mul(&a).unwrap() == c);
20262023
}
20272024

2028-
for elm in DIV_REM_QUADRUPLES.iter() {
2025+
for elm in div_rem_quadruples.iter() {
20292026
let (a_vec, b_vec, c_vec, d_vec) = *elm;
20302027
let a = BigUint::from_slice(a_vec);
20312028
let b = BigUint::from_slice(b_vec);
@@ -2039,7 +2036,7 @@ mod biguint_tests {
20392036

20402037
#[test]
20412038
fn test_checked_div() {
2042-
for elm in MUL_TRIPLES.iter() {
2039+
for elm in mul_triples.iter() {
20432040
let (a_vec, b_vec, c_vec) = *elm;
20442041
let a = BigUint::from_slice(a_vec);
20452042
let b = BigUint::from_slice(b_vec);
@@ -2443,7 +2440,7 @@ mod bigint_tests {
24432440
assert_eq!(negative.to_biguint(), None);
24442441
}
24452442

2446-
static SUM_TRIPLES: &'static [(&'static [BigDigit],
2443+
static sum_triples: &'static [(&'static [BigDigit],
24472444
&'static [BigDigit],
24482445
&'static [BigDigit])] = &[
24492446
(&[], &[], &[]),
@@ -2459,7 +2456,7 @@ mod bigint_tests {
24592456

24602457
#[test]
24612458
fn test_add() {
2462-
for elm in SUM_TRIPLES.iter() {
2459+
for elm in sum_triples.iter() {
24632460
let (a_vec, b_vec, c_vec) = *elm;
24642461
let a = BigInt::from_slice(Plus, a_vec);
24652462
let b = BigInt::from_slice(Plus, b_vec);
@@ -2478,7 +2475,7 @@ mod bigint_tests {
24782475

24792476
#[test]
24802477
fn test_sub() {
2481-
for elm in SUM_TRIPLES.iter() {
2478+
for elm in sum_triples.iter() {
24822479
let (a_vec, b_vec, c_vec) = *elm;
24832480
let a = BigInt::from_slice(Plus, a_vec);
24842481
let b = BigInt::from_slice(Plus, b_vec);
@@ -2495,7 +2492,7 @@ mod bigint_tests {
24952492
}
24962493
}
24972494

2498-
static MUL_TRIPLES: &'static [(&'static [BigDigit],
2495+
static mul_triples: &'static [(&'static [BigDigit],
24992496
&'static [BigDigit],
25002497
&'static [BigDigit])] = &[
25012498
(&[], &[], &[]),
@@ -2521,7 +2518,7 @@ mod bigint_tests {
25212518
(&[ 0, 0, 1], &[ 0, 0, 0, 1], &[0, 0, 0, 0, 0, 1])
25222519
];
25232520

2524-
static DIV_REM_QUADRUPLES: &'static [(&'static [BigDigit],
2521+
static div_rem_quadruples: &'static [(&'static [BigDigit],
25252522
&'static [BigDigit],
25262523
&'static [BigDigit],
25272524
&'static [BigDigit])]
@@ -2535,7 +2532,7 @@ mod bigint_tests {
25352532

25362533
#[test]
25372534
fn test_mul() {
2538-
for elm in MUL_TRIPLES.iter() {
2535+
for elm in mul_triples.iter() {
25392536
let (a_vec, b_vec, c_vec) = *elm;
25402537
let a = BigInt::from_slice(Plus, a_vec);
25412538
let b = BigInt::from_slice(Plus, b_vec);
@@ -2548,7 +2545,7 @@ mod bigint_tests {
25482545
assert!((-b) * a == -c);
25492546
}
25502547

2551-
for elm in DIV_REM_QUADRUPLES.iter() {
2548+
for elm in div_rem_quadruples.iter() {
25522549
let (a_vec, b_vec, c_vec, d_vec) = *elm;
25532550
let a = BigInt::from_slice(Plus, a_vec);
25542551
let b = BigInt::from_slice(Plus, b_vec);
@@ -2587,7 +2584,7 @@ mod bigint_tests {
25872584
}
25882585
}
25892586

2590-
for elm in MUL_TRIPLES.iter() {
2587+
for elm in mul_triples.iter() {
25912588
let (a_vec, b_vec, c_vec) = *elm;
25922589
let a = BigInt::from_slice(Plus, a_vec);
25932590
let b = BigInt::from_slice(Plus, b_vec);
@@ -2597,7 +2594,7 @@ mod bigint_tests {
25972594
if !b.is_zero() { check(&c, &b, &a, &Zero::zero()); }
25982595
}
25992596

2600-
for elm in DIV_REM_QUADRUPLES.iter() {
2597+
for elm in div_rem_quadruples.iter() {
26012598
let (a_vec, b_vec, c_vec, d_vec) = *elm;
26022599
let a = BigInt::from_slice(Plus, a_vec);
26032600
let b = BigInt::from_slice(Plus, b_vec);
@@ -2630,7 +2627,7 @@ mod bigint_tests {
26302627
check_sub(&a.neg(), b, &q.neg(), &r.neg());
26312628
check_sub(&a.neg(), &b.neg(), q, &r.neg());
26322629
}
2633-
for elm in MUL_TRIPLES.iter() {
2630+
for elm in mul_triples.iter() {
26342631
let (a_vec, b_vec, c_vec) = *elm;
26352632
let a = BigInt::from_slice(Plus, a_vec);
26362633
let b = BigInt::from_slice(Plus, b_vec);
@@ -2640,7 +2637,7 @@ mod bigint_tests {
26402637
if !b.is_zero() { check(&c, &b, &a, &Zero::zero()); }
26412638
}
26422639

2643-
for elm in DIV_REM_QUADRUPLES.iter() {
2640+
for elm in div_rem_quadruples.iter() {
26442641
let (a_vec, b_vec, c_vec, d_vec) = *elm;
26452642
let a = BigInt::from_slice(Plus, a_vec);
26462643
let b = BigInt::from_slice(Plus, b_vec);
@@ -2655,7 +2652,7 @@ mod bigint_tests {
26552652

26562653
#[test]
26572654
fn test_checked_add() {
2658-
for elm in SUM_TRIPLES.iter() {
2655+
for elm in sum_triples.iter() {
26592656
let (a_vec, b_vec, c_vec) = *elm;
26602657
let a = BigInt::from_slice(Plus, a_vec);
26612658
let b = BigInt::from_slice(Plus, b_vec);
@@ -2674,7 +2671,7 @@ mod bigint_tests {
26742671

26752672
#[test]
26762673
fn test_checked_sub() {
2677-
for elm in SUM_TRIPLES.iter() {
2674+
for elm in sum_triples.iter() {
26782675
let (a_vec, b_vec, c_vec) = *elm;
26792676
let a = BigInt::from_slice(Plus, a_vec);
26802677
let b = BigInt::from_slice(Plus, b_vec);
@@ -2693,7 +2690,7 @@ mod bigint_tests {
26932690

26942691
#[test]
26952692
fn test_checked_mul() {
2696-
for elm in MUL_TRIPLES.iter() {
2693+
for elm in mul_triples.iter() {
26972694
let (a_vec, b_vec, c_vec) = *elm;
26982695
let a = BigInt::from_slice(Plus, a_vec);
26992696
let b = BigInt::from_slice(Plus, b_vec);
@@ -2706,7 +2703,7 @@ mod bigint_tests {
27062703
assert!((-b).checked_mul(&a).unwrap() == -c);
27072704
}
27082705

2709-
for elm in DIV_REM_QUADRUPLES.iter() {
2706+
for elm in div_rem_quadruples.iter() {
27102707
let (a_vec, b_vec, c_vec, d_vec) = *elm;
27112708
let a = BigInt::from_slice(Plus, a_vec);
27122709
let b = BigInt::from_slice(Plus, b_vec);
@@ -2719,7 +2716,7 @@ mod bigint_tests {
27192716
}
27202717
#[test]
27212718
fn test_checked_div() {
2722-
for elm in MUL_TRIPLES.iter() {
2719+
for elm in mul_triples.iter() {
27232720
let (a_vec, b_vec, c_vec) = *elm;
27242721
let a = BigInt::from_slice(Plus, a_vec);
27252722
let b = BigInt::from_slice(Plus, b_vec);

‎branches/release-prep/src/libnum/rational.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -406,13 +406,10 @@ mod test {
406406
pub static _2: Rational = Ratio { numer: 2, denom: 1};
407407
pub static _1_2: Rational = Ratio { numer: 1, denom: 2};
408408
pub static _3_2: Rational = Ratio { numer: 3, denom: 2};
409-
#[allow(non_uppercase_statics)]
410409
pub static _neg1_2: Rational = Ratio { numer: -1, denom: 2};
411410
pub static _1_3: Rational = Ratio { numer: 1, denom: 3};
412-
#[allow(non_uppercase_statics)]
413411
pub static _neg1_3: Rational = Ratio { numer: -1, denom: 3};
414412
pub static _2_3: Rational = Ratio { numer: 2, denom: 3};
415-
#[allow(non_uppercase_statics)]
416413
pub static _neg2_3: Rational = Ratio { numer: -2, denom: 3};
417414

418415
pub fn to_big(n: Rational) -> BigRational {

0 commit comments

Comments
 (0)