about summary refs log tree commit diff
path: root/src/libsync
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-08-18 19:16:15 +0000
committerbors <bors@rust-lang.org>2014-08-18 19:16:15 +0000
commit98ec85f19e42edafc3d82a737f0ccbd1b7f4ff6c (patch)
tree6d159da0fd6e2fb638ac02ab238cd85d808c73e7 /src/libsync
parentfcbf012ee6c8719090caa6041e0ec1312e1b7659 (diff)
parent67deb2e65e150a1b9b2fcd457da47e3e13b2c4f7 (diff)
downloadrust-98ec85f19e42edafc3d82a737f0ccbd1b7f4ff6c.tar.gz
rust-98ec85f19e42edafc3d82a737f0ccbd1b7f4ff6c.zip
auto merge of #16575 : pcwalton/rust/import-foo-as-bar, r=aturon
of `use bar as foo`.

Change all uses of `use foo = bar` to `use bar as foo`.

Implements RFC #47.

Closes #16461.

[breaking-change]

r? @aturon
Diffstat (limited to 'src/libsync')
-rw-r--r--src/libsync/comm/shared.rs2
-rw-r--r--src/libsync/comm/stream.rs2
-rw-r--r--src/libsync/mutex.rs2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/libsync/comm/shared.rs b/src/libsync/comm/shared.rs
index 979b0ebcf8f..cb35bd8afb7 100644
--- a/src/libsync/comm/shared.rs
+++ b/src/libsync/comm/shared.rs
@@ -29,7 +29,7 @@ use rustrt::task::{Task, BlockedTask};
 use rustrt::thread::Thread;
 
 use atomic;
-use mpsc = mpsc_queue;
+use mpsc_queue as mpsc;
 
 static DISCONNECTED: int = int::MIN;
 static FUDGE: int = 1024;
diff --git a/src/libsync/comm/stream.rs b/src/libsync/comm/stream.rs
index 11c563301e0..36fe335128e 100644
--- a/src/libsync/comm/stream.rs
+++ b/src/libsync/comm/stream.rs
@@ -28,7 +28,7 @@ use rustrt::thread::Thread;
 
 use atomic;
 use comm::Receiver;
-use spsc = spsc_queue;
+use spsc_queue as spsc;
 
 static DISCONNECTED: int = int::MIN;
 #[cfg(test)]
diff --git a/src/libsync/mutex.rs b/src/libsync/mutex.rs
index 61d895dd406..12de615a81b 100644
--- a/src/libsync/mutex.rs
+++ b/src/libsync/mutex.rs
@@ -68,7 +68,7 @@ use rustrt::mutex;
 use rustrt::task::{BlockedTask, Task};
 use rustrt::thread::Thread;
 
-use q = mpsc_intrusive;
+use mpsc_intrusive as q;
 
 pub static LOCKED: uint = 1 << 0;
 pub static GREEN_BLOCKED: uint = 1 << 1;