Skip to content

Commit 77444fb

Browse files
committed
---
yaml --- r: 69245 b: refs/heads/auto c: 8fb77c7 h: refs/heads/master i: 69243: 40a16e7 v: v3
1 parent cecf8aa commit 77444fb

File tree

128 files changed

+7255
-2092
lines changed

Some content is hidden

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

128 files changed

+7255
-2092
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: ff34064aa3b49eb649d411b733201c512e9c5eed
17+
refs/heads/auto: 8fb77c70993b8f020a9398a458e9a6aea02eb70b
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1919
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/doc/tutorial.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ was taken.
309309

310310
In short, everything that's not a declaration (declarations are `let` for
311311
variables; `fn` for functions; and any top-level named items such as
312-
[traits](#traits), [enum types](#enums), and [constants](#constants)) is an
312+
[traits](#traits), [enum types](#enums), and static items) is an
313313
expression, including function bodies.
314314

315315
~~~~
@@ -1374,7 +1374,7 @@ let exchange_crayons: ~str = ~"Black, BlizzardBlue, Blue";
13741374
~~~
13751375

13761376
Both vectors and strings support a number of useful
1377-
[methods](#functions-and-methods), defined in [`std::vec`]
1377+
[methods](#methods), defined in [`std::vec`]
13781378
and [`std::str`]. Here are some examples.
13791379

13801380
[`std::vec`]: std/vec.html
@@ -1928,7 +1928,7 @@ that implements a trait includes the name of the trait at the start of
19281928
the definition, as in the following impls of `Printable` for `int`
19291929
and `~str`.
19301930

1931-
[impls]: #functions-and-methods
1931+
[impls]: #methods
19321932

19331933
~~~~
19341934
# trait Printable { fn print(&self); }

branches/auto/src/compiletest/compiletest.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -242,13 +242,13 @@ pub fn make_tests(config: &config) -> ~[test::TestDescAndFn] {
242242
let mut tests = ~[];
243243
let dirs = os::list_dir_path(&config.src_base);
244244
for dirs.iter().advance |file| {
245-
let file = file.clone();
245+
let file = (*file).clone();
246246
debug!("inspecting file %s", file.to_str());
247-
if is_test(config, &file) {
248-
let t = do make_test(config, &file) {
247+
if is_test(config, file) {
248+
let t = do make_test(config, file) {
249249
match config.mode {
250-
mode_codegen => make_metrics_test_closure(config, &file),
251-
_ => make_test_closure(config, &file)
250+
mode_codegen => make_metrics_test_closure(config, file),
251+
_ => make_test_closure(config, file)
252252
}
253253
};
254254
tests.push(t)

branches/auto/src/libextra/extra.rs

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,23 @@ use std::str::{StrSlice, OwnedStr};
3636

3737
pub use std::os;
3838

39+
pub mod uv_ll;
40+
41+
// General io and system-services modules
42+
43+
#[path = "net/mod.rs"]
44+
pub mod net;
45+
46+
// libuv modules
47+
pub mod uv;
48+
pub mod uv_iotask;
49+
pub mod uv_global_loop;
50+
51+
3952
// Utility modules
4053

4154
pub mod c_vec;
55+
pub mod timer;
4256
pub mod io_util;
4357
pub mod rc;
4458

@@ -76,7 +90,6 @@ pub mod sha2;
7690

7791
// And ... other stuff
7892

79-
pub mod url;
8093
pub mod ebml;
8194
pub mod dbg;
8295
pub mod getopts;

branches/auto/src/libextra/flatpipes.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -639,6 +639,7 @@ mod test {
639639
use flatpipes::serial;
640640
use io_util::BufReader;
641641
use flatpipes::{BytePort, FlatChan, FlatPort};
642+
use net::tcp::TcpSocketBuf;
642643

643644
use std::comm;
644645
use std::int;
@@ -727,8 +728,7 @@ mod test {
727728
}
728729

729730
// FIXME #2064: Networking doesn't work on x86
730-
// XXX Broken until networking support is added back
731-
/*#[test]
731+
#[test]
732732
#[cfg(target_arch = "x86_64")]
733733
fn test_pod_tcp_stream() {
734734
fn reader_port(buf: TcpSocketBuf
@@ -745,7 +745,6 @@ mod test {
745745
#[test]
746746
#[cfg(target_arch = "x86_64")]
747747
fn test_serializing_tcp_stream() {
748-
// XXX Broken until networking support is added back
749748
fn reader_port(buf: TcpSocketBuf
750749
) -> serial::ReaderPort<int, TcpSocketBuf> {
751750
serial::reader_port(buf)
@@ -861,7 +860,7 @@ mod test {
861860
}
862861

863862
finish_port.recv();
864-
}*/
863+
}
865864

866865
// Tests that the different backends behave the same when the
867866
// binary streaming protocol is broken

0 commit comments

Comments
 (0)