Skip to content

Commit 1a16d45

Browse files
eddybeddyb
committed
---
yaml --- r: 102359 b: refs/heads/master c: 3b125ff h: refs/heads/master i: 102357: c4587a2 102355: 05e2bfd 102351: aa9251b v: v3
1 parent 4c717bc commit 1a16d45

File tree

58 files changed

+810
-875
lines changed

Some content is hidden

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

58 files changed

+810
-875
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 712c630ab6bc67a934311c0e31ead3a46ae1a75f
2+
refs/heads/master: 3b125ff3bbe77a8601ba2d424e8aa6f254abfd19
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 6e7f170fedd3c526a643c0b2d13863acd982be02
55
refs/heads/try: a97642026c18a624ff6ea01075dd9550f8ed07ff

‎trunk/src/compiletest/runtest.rs

Lines changed: 80 additions & 80 deletions
Large diffs are not rendered by default.

‎trunk/src/doc/rust.css

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,11 @@ h5 a:link, h5 a:visited {color: black;}
111111
/* Code
112112
========================================================================== */
113113
pre, code {
114-
font-family: Menlo, Monaco, Consolas, "DejaVu Sans Mono", monospace;
114+
font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
115115
border-radius: 4px;
116116
}
117117
pre {
118-
background-color: #FDFDFD;
118+
background-color: #F5F5F5;
119119
border: 1px solid #CCC;
120120
border-radius: 0.5em;
121121
white-space: pre-wrap;
@@ -142,24 +142,24 @@ pre code {
142142
}
143143

144144
/* Code highlighting */
145-
.cm-s-default span.cm-keyword {color: #8959A8;}
145+
.cm-s-default span.cm-keyword {color: #803C8D;}
146146
.cm-s-default span.cm-atom {color: #219;}
147-
.cm-s-default span.cm-number {color: #3E999F;}
148-
.cm-s-default span.cm-def {color: #4271AE;}
149-
/*.cm-s-default span.cm-variable {color: #C82829;}*/
150-
.cm-s-default span.cm-variable-2 {color: #6F906C;}
151-
.cm-s-default span.cm-variable-3 {color: #B76514;}
147+
.cm-s-default span.cm-number {color: #2AA198;}
148+
.cm-s-default span.cm-def {color: #256EB8;}
149+
.cm-s-default span.cm-variable {color: black;}
150+
.cm-s-default span.cm-variable-2 {color: #817E61;}
151+
.cm-s-default span.cm-variable-3 {color: #085;}
152152
.cm-s-default span.cm-property {color: black;}
153153
.cm-s-default span.cm-operator {color: black;}
154-
.cm-s-default span.cm-comment {color: #8E908C;}
155-
.cm-s-default span.cm-string {color: #718C00;}
156-
.cm-s-default span.cm-string-2 {color: #866544;}
154+
.cm-s-default span.cm-comment {color: #A82323;}
155+
.cm-s-default span.cm-string {color: #866544;}
156+
.cm-s-default span.cm-string-2 {color: #F50;}
157157
.cm-s-default span.cm-meta {color: #555;}
158158
/*.cm-s-default span.cm-error {color: #F00;}*/
159159
.cm-s-default span.cm-qualifier {color: #555;}
160160
.cm-s-default span.cm-builtin {color: #30A;}
161161
.cm-s-default span.cm-bracket {color: #CC7;}
162-
.cm-s-default span.cm-tag {color: #C82829;}
162+
.cm-s-default span.cm-tag {color: #170;}
163163
.cm-s-default span.cm-attribute {color: #00C;}
164164

165165
/* The rest

‎trunk/src/doc/rustdoc.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ is how the above advertisement works. An example from the `libstd`
6363
documentation:
6464

6565
~~~
66-
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
66+
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
6767
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
6868
html_root_url = "http://static.rust-lang.org/doc/master")];
6969
~~~

‎trunk/src/libextra/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Rust extras are part of the standard Rust distribution.
2525
#[license = "MIT/ASL2"];
2626
#[crate_type = "rlib"];
2727
#[crate_type = "dylib"];
28-
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
28+
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
2929
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
3030
html_root_url = "http://static.rust-lang.org/doc/master")];
3131

‎trunk/src/libgreen/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
#[license = "MIT/ASL2"];
168168
#[crate_type = "rlib"];
169169
#[crate_type = "dylib"];
170-
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
170+
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
171171
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
172172
html_root_url = "http://static.rust-lang.org/doc/master")];
173173

‎trunk/src/libgreen/simple.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
//! A small module implementing a simple "runtime" used for bootstrapping a rust
1212
//! scheduler pool and then interacting with it.
1313
14-
use std::any::Any;
1514
use std::cast;
1615
use std::rt::Runtime;
1716
use std::rt::local::Local;

‎trunk/src/libgreen/task.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
//! contains the rust task itself in order to juggle around ownership of the
1919
//! values.
2020
21-
use std::any::Any;
2221
use std::cast;
2322
use std::rt::env;
2423
use std::rt::Runtime;

‎trunk/src/libnative/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
#[license = "MIT/ASL2"];
4646
#[crate_type = "rlib"];
4747
#[crate_type = "dylib"];
48-
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
48+
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
4949
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
5050
html_root_url = "http://static.rust-lang.org/doc/master")];
5151
#[deny(unused_result, unused_must_use)];

‎trunk/src/libnative/task.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
//! by rust tasks. This implements the necessary API traits laid out by std::rt
1515
//! in order to spawn new tasks and deschedule the current task.
1616
17-
use std::any::Any;
1817
use std::cast;
1918
use std::rt::env;
2019
use std::rt::local::Local;

‎trunk/src/libnum/bigint.rs

Lines changed: 67 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -266,14 +266,14 @@ impl Mul<BigUint, BigUint> for BigUint {
266266
// (a1*b1 + a0*b0 - (a1-b0)*(b1-a0)) * base +
267267
// a0*b0
268268
let half_len = cmp::max(s_len, o_len) / 2;
269-
let (s_hi, s_lo) = cut_at(self, half_len);
270-
let (o_hi, o_lo) = cut_at(other, half_len);
269+
let (sHi, sLo) = cut_at(self, half_len);
270+
let (oHi, oLo) = cut_at(other, half_len);
271271

272-
let ll = s_lo * o_lo;
273-
let hh = s_hi * o_hi;
272+
let ll = sLo * oLo;
273+
let hh = sHi * oHi;
274274
let mm = {
275-
let (s1, n1) = sub_sign(s_hi, s_lo);
276-
let (s2, n2) = sub_sign(o_hi, o_lo);
275+
let (s1, n1) = sub_sign(sHi, sLo);
276+
let (s2, n2) = sub_sign(oHi, oLo);
277277
match (s1, s2) {
278278
(Equal, _) | (_, Equal) => hh + ll,
279279
(Less, Greater) | (Greater, Less) => hh + ll + (n1 * n2),
@@ -1778,10 +1778,10 @@ mod biguint_tests {
17781778
#[test]
17791779
fn test_add() {
17801780
for elm in sum_triples.iter() {
1781-
let (a_vec, b_vec, c_vec) = *elm;
1782-
let a = BigUint::from_slice(a_vec);
1783-
let b = BigUint::from_slice(b_vec);
1784-
let c = BigUint::from_slice(c_vec);
1781+
let (aVec, bVec, cVec) = *elm;
1782+
let a = BigUint::from_slice(aVec);
1783+
let b = BigUint::from_slice(bVec);
1784+
let c = BigUint::from_slice(cVec);
17851785

17861786
assert!(a + b == c);
17871787
assert!(b + a == c);
@@ -1791,10 +1791,10 @@ mod biguint_tests {
17911791
#[test]
17921792
fn test_sub() {
17931793
for elm in sum_triples.iter() {
1794-
let (a_vec, b_vec, c_vec) = *elm;
1795-
let a = BigUint::from_slice(a_vec);
1796-
let b = BigUint::from_slice(b_vec);
1797-
let c = BigUint::from_slice(c_vec);
1794+
let (aVec, bVec, cVec) = *elm;
1795+
let a = BigUint::from_slice(aVec);
1796+
let b = BigUint::from_slice(bVec);
1797+
let c = BigUint::from_slice(cVec);
17981798

17991799
assert!(c - a == b);
18001800
assert!(c - b == a);
@@ -1842,21 +1842,21 @@ mod biguint_tests {
18421842
#[test]
18431843
fn test_mul() {
18441844
for elm in mul_triples.iter() {
1845-
let (a_vec, b_vec, c_vec) = *elm;
1846-
let a = BigUint::from_slice(a_vec);
1847-
let b = BigUint::from_slice(b_vec);
1848-
let c = BigUint::from_slice(c_vec);
1845+
let (aVec, bVec, cVec) = *elm;
1846+
let a = BigUint::from_slice(aVec);
1847+
let b = BigUint::from_slice(bVec);
1848+
let c = BigUint::from_slice(cVec);
18491849

18501850
assert!(a * b == c);
18511851
assert!(b * a == c);
18521852
}
18531853

18541854
for elm in div_rem_quadruples.iter() {
1855-
let (a_vec, b_vec, c_vec, d_vec) = *elm;
1856-
let a = BigUint::from_slice(a_vec);
1857-
let b = BigUint::from_slice(b_vec);
1858-
let c = BigUint::from_slice(c_vec);
1859-
let d = BigUint::from_slice(d_vec);
1855+
let (aVec, bVec, cVec, dVec) = *elm;
1856+
let a = BigUint::from_slice(aVec);
1857+
let b = BigUint::from_slice(bVec);
1858+
let c = BigUint::from_slice(cVec);
1859+
let d = BigUint::from_slice(dVec);
18601860

18611861
assert!(a == b * c + d);
18621862
assert!(a == c * b + d);
@@ -1866,10 +1866,10 @@ mod biguint_tests {
18661866
#[test]
18671867
fn test_div_rem() {
18681868
for elm in mul_triples.iter() {
1869-
let (a_vec, b_vec, c_vec) = *elm;
1870-
let a = BigUint::from_slice(a_vec);
1871-
let b = BigUint::from_slice(b_vec);
1872-
let c = BigUint::from_slice(c_vec);
1869+
let (aVec, bVec, cVec) = *elm;
1870+
let a = BigUint::from_slice(aVec);
1871+
let b = BigUint::from_slice(bVec);
1872+
let c = BigUint::from_slice(cVec);
18731873

18741874
if !a.is_zero() {
18751875
assert_eq!(c.div_rem(&a), (b.clone(), Zero::zero()));
@@ -1880,11 +1880,11 @@ mod biguint_tests {
18801880
}
18811881

18821882
for elm in div_rem_quadruples.iter() {
1883-
let (a_vec, b_vec, c_vec, d_vec) = *elm;
1884-
let a = BigUint::from_slice(a_vec);
1885-
let b = BigUint::from_slice(b_vec);
1886-
let c = BigUint::from_slice(c_vec);
1887-
let d = BigUint::from_slice(d_vec);
1883+
let (aVec, bVec, cVec, dVec) = *elm;
1884+
let a = BigUint::from_slice(aVec);
1885+
let b = BigUint::from_slice(bVec);
1886+
let c = BigUint::from_slice(cVec);
1887+
let d = BigUint::from_slice(dVec);
18881888

18891889
if !b.is_zero() { assert!(a.div_rem(&b) == (c, d)); }
18901890
}
@@ -2351,10 +2351,10 @@ mod bigint_tests {
23512351
#[test]
23522352
fn test_add() {
23532353
for elm in sum_triples.iter() {
2354-
let (a_vec, b_vec, c_vec) = *elm;
2355-
let a = BigInt::from_slice(Plus, a_vec);
2356-
let b = BigInt::from_slice(Plus, b_vec);
2357-
let c = BigInt::from_slice(Plus, c_vec);
2354+
let (aVec, bVec, cVec) = *elm;
2355+
let a = BigInt::from_slice(Plus, aVec);
2356+
let b = BigInt::from_slice(Plus, bVec);
2357+
let c = BigInt::from_slice(Plus, cVec);
23582358

23592359
assert!(a + b == c);
23602360
assert!(b + a == c);
@@ -2370,10 +2370,10 @@ mod bigint_tests {
23702370
#[test]
23712371
fn test_sub() {
23722372
for elm in sum_triples.iter() {
2373-
let (a_vec, b_vec, c_vec) = *elm;
2374-
let a = BigInt::from_slice(Plus, a_vec);
2375-
let b = BigInt::from_slice(Plus, b_vec);
2376-
let c = BigInt::from_slice(Plus, c_vec);
2373+
let (aVec, bVec, cVec) = *elm;
2374+
let a = BigInt::from_slice(Plus, aVec);
2375+
let b = BigInt::from_slice(Plus, bVec);
2376+
let c = BigInt::from_slice(Plus, cVec);
23772377

23782378
assert!(c - a == b);
23792379
assert!(c - b == a);
@@ -2427,10 +2427,10 @@ mod bigint_tests {
24272427
#[test]
24282428
fn test_mul() {
24292429
for elm in mul_triples.iter() {
2430-
let (a_vec, b_vec, c_vec) = *elm;
2431-
let a = BigInt::from_slice(Plus, a_vec);
2432-
let b = BigInt::from_slice(Plus, b_vec);
2433-
let c = BigInt::from_slice(Plus, c_vec);
2430+
let (aVec, bVec, cVec) = *elm;
2431+
let a = BigInt::from_slice(Plus, aVec);
2432+
let b = BigInt::from_slice(Plus, bVec);
2433+
let c = BigInt::from_slice(Plus, cVec);
24342434

24352435
assert!(a * b == c);
24362436
assert!(b * a == c);
@@ -2440,11 +2440,11 @@ mod bigint_tests {
24402440
}
24412441

24422442
for elm in div_rem_quadruples.iter() {
2443-
let (a_vec, b_vec, c_vec, d_vec) = *elm;
2444-
let a = BigInt::from_slice(Plus, a_vec);
2445-
let b = BigInt::from_slice(Plus, b_vec);
2446-
let c = BigInt::from_slice(Plus, c_vec);
2447-
let d = BigInt::from_slice(Plus, d_vec);
2443+
let (aVec, bVec, cVec, dVec) = *elm;
2444+
let a = BigInt::from_slice(Plus, aVec);
2445+
let b = BigInt::from_slice(Plus, bVec);
2446+
let c = BigInt::from_slice(Plus, cVec);
2447+
let d = BigInt::from_slice(Plus, dVec);
24482448

24492449
assert!(a == b * c + d);
24502450
assert!(a == c * b + d);
@@ -2479,21 +2479,21 @@ mod bigint_tests {
24792479
}
24802480

24812481
for elm in mul_triples.iter() {
2482-
let (a_vec, b_vec, c_vec) = *elm;
2483-
let a = BigInt::from_slice(Plus, a_vec);
2484-
let b = BigInt::from_slice(Plus, b_vec);
2485-
let c = BigInt::from_slice(Plus, c_vec);
2482+
let (aVec, bVec, cVec) = *elm;
2483+
let a = BigInt::from_slice(Plus, aVec);
2484+
let b = BigInt::from_slice(Plus, bVec);
2485+
let c = BigInt::from_slice(Plus, cVec);
24862486

24872487
if !a.is_zero() { check(&c, &a, &b, &Zero::zero()); }
24882488
if !b.is_zero() { check(&c, &b, &a, &Zero::zero()); }
24892489
}
24902490

24912491
for elm in div_rem_quadruples.iter() {
2492-
let (a_vec, b_vec, c_vec, d_vec) = *elm;
2493-
let a = BigInt::from_slice(Plus, a_vec);
2494-
let b = BigInt::from_slice(Plus, b_vec);
2495-
let c = BigInt::from_slice(Plus, c_vec);
2496-
let d = BigInt::from_slice(Plus, d_vec);
2492+
let (aVec, bVec, cVec, dVec) = *elm;
2493+
let a = BigInt::from_slice(Plus, aVec);
2494+
let b = BigInt::from_slice(Plus, bVec);
2495+
let c = BigInt::from_slice(Plus, cVec);
2496+
let d = BigInt::from_slice(Plus, dVec);
24972497

24982498
if !b.is_zero() {
24992499
check(&a, &b, &c, &d);
@@ -2522,21 +2522,21 @@ mod bigint_tests {
25222522
check_sub(&a.neg(), &b.neg(), q, &r.neg());
25232523
}
25242524
for elm in mul_triples.iter() {
2525-
let (a_vec, b_vec, c_vec) = *elm;
2526-
let a = BigInt::from_slice(Plus, a_vec);
2527-
let b = BigInt::from_slice(Plus, b_vec);
2528-
let c = BigInt::from_slice(Plus, c_vec);
2525+
let (aVec, bVec, cVec) = *elm;
2526+
let a = BigInt::from_slice(Plus, aVec);
2527+
let b = BigInt::from_slice(Plus, bVec);
2528+
let c = BigInt::from_slice(Plus, cVec);
25292529

25302530
if !a.is_zero() { check(&c, &a, &b, &Zero::zero()); }
25312531
if !b.is_zero() { check(&c, &b, &a, &Zero::zero()); }
25322532
}
25332533

25342534
for elm in div_rem_quadruples.iter() {
2535-
let (a_vec, b_vec, c_vec, d_vec) = *elm;
2536-
let a = BigInt::from_slice(Plus, a_vec);
2537-
let b = BigInt::from_slice(Plus, b_vec);
2538-
let c = BigInt::from_slice(Plus, c_vec);
2539-
let d = BigInt::from_slice(Plus, d_vec);
2535+
let (aVec, bVec, cVec, dVec) = *elm;
2536+
let a = BigInt::from_slice(Plus, aVec);
2537+
let b = BigInt::from_slice(Plus, bVec);
2538+
let c = BigInt::from_slice(Plus, cVec);
2539+
let d = BigInt::from_slice(Plus, dVec);
25402540

25412541
if !b.is_zero() {
25422542
check(&a, &b, &c, &d);

0 commit comments

Comments
 (0)