]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #19255 : aturon/rust/merge-sync, r=alexcrichton,alexcrichton
authorbors <bors@rust-lang.org>
Tue, 25 Nov 2014 20:32:20 +0000 (20:32 +0000)
committerbors <bors@rust-lang.org>
Tue, 25 Nov 2014 20:32:20 +0000 (20:32 +0000)
This patch merges the `libsync` crate into `libstd`, undoing part of the
facade. This is in preparation for ultimately merging `librustrt`, as
well as the upcoming rewrite of `sync`.

Because this removes the `libsync` crate, it is a:

[breaking-change]

However, all uses of `libsync` should be able to reroute through
`std::sync` and `std::comm` instead.

r? @alexcrichton


Trivial merge