---

yaml
---
r: 60563
b: refs/heads/auto
c: 18fab45
h: refs/heads/master
i:
  60561: ffa51fe
  60559: cc516eb
v: v3

Author: brson

[refs]

@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 71aa6b6631547a7b2e6839931e73286e0bf6ce5d
+refs/heads/auto: 18fab45aab8622b0bfbcd336d57652bfb2f4f4ac
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/libcore/rt/local.rs

@@ -8,10 +8,21 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use rt::sched::Scheduler;
+use rt::local_ptr;
+
 pub trait Local {
     fn put_local(value: ~Self);
     fn take_local() -> ~Self;
-    fn exists() -> bool;
-    fn borrow(f: &fn(&mut Self));
-    fn unsafe_borrow() -> *mut Self;
+    fn exists_local() -> bool;
+    fn borrow_local(f: &fn(&mut Self));
+    unsafe fn unsafe_borrow_local() -> *mut Self;
 }
+
+impl Local for Scheduler {
+    fn put_local(value: ~Scheduler) { unsafe { local_ptr::put(value) }}
+    fn take_local() -> ~Scheduler { unsafe { local_ptr::take() } }
+    fn exists_local() -> bool { local_ptr::exists() }
+    fn borrow_local(f: &fn(&mut Scheduler)) { unsafe { local_ptr::borrow(f) } }
+    unsafe fn unsafe_borrow_local() -> *mut Scheduler { local_ptr::unsafe_borrow() }
+}

branches/auto/src/libcore/rt/local_sched.rs

@@ -21,29 +21,30 @@ use rt::rtio::{EventLoop, IoFactoryObject};
 use unstable::finally::Finally;
 use rt::local_ptr;
 use tls = rt::thread_local_storage;
+use rt::local::Local;
 
 #[cfg(test)] use rt::uv::uvio::UvEventLoop;
 
 /// Give the Scheduler to thread-local storage
-pub fn put(sched: ~Scheduler) { unsafe { local_ptr::put(sched) } }
+pub fn put(sched: ~Scheduler) { Local::put_local(sched) }
 
 /// Take ownership of the Scheduler from thread-local storage
-pub fn take() -> ~Scheduler { unsafe { local_ptr::take() } }
+pub fn take() -> ~Scheduler { Local::take_local() }
 
 /// Check whether there is a thread-local Scheduler attached to the running thread
-pub fn exists() -> bool { local_ptr::exists() }
+pub fn exists() -> bool { Local::exists_local::<Scheduler>() }
 
 /// Borrow the thread-local scheduler from thread-local storage.
 /// While the scheduler is borrowed it is not available in TLS.
-pub fn borrow(f: &fn(&mut Scheduler)) { unsafe { local_ptr::borrow(f) } }
+pub fn borrow(f: &fn(&mut Scheduler)) { Local::borrow_local(f) }
 
 /// Borrow a mutable reference to the thread-local Scheduler
 ///
 /// # Safety Note
 ///
 /// Because this leaves the Scheduler in thread-local storage it is possible
 /// For the Scheduler pointer to be aliased
-pub unsafe fn unsafe_borrow() -> *mut Scheduler { local_ptr::unsafe_borrow() }
+pub unsafe fn unsafe_borrow() -> *mut Scheduler { Local::unsafe_borrow_local() }
 
 pub unsafe fn unsafe_borrow_io() -> *mut IoFactoryObject {
     let sched = unsafe_borrow();