Brian Anderson
|
319cf6e465
|
Merge remote-tracking branch 'brson/io'
Conflicts:
src/libstd/rt/comm.rs
src/libstd/rt/mod.rs
src/libstd/rt/sched.rs
src/libstd/rt/task.rs
src/libstd/rt/test.rs
src/libstd/rt/tube.rs
src/libstd/rt/uv/uvio.rs
src/libstd/rt/uvio.rs
src/libstd/task/spawn.rs
|
2013-06-16 15:09:25 -07:00 |
|
toddaaro
|
d64d26cd39
|
debugged a compiler ICE when merging local::borrow changes into the main io branch and modified the incoming new file lang.rs to be api-compatible
|
2013-06-10 15:29:02 -07:00 |
|
Philipp Brüschweiler
|
34ee63e93b
|
std::cell: Modernize constructors
Part of #3853
|
2013-06-04 12:03:58 +02:00 |
|
Brian Anderson
|
f4ed554ddb
|
Merge remote-tracking branch 'brson/io' into incoming
Conflicts:
src/libstd/rt/sched.rs
|
2013-05-29 18:22:28 -07:00 |
|
Patrick Walton
|
18df18c817
|
libstd: Fix merge fallout.
|
2013-05-22 21:57:11 -07:00 |
|