librustc: Convert all uses of old lifetime notation to new lifetime notation. rs=delifetiming

4 files changed, 8 insertions, 8 deletions

diff --git a/src/libcore/rt/io.rs b/src/libcore/rt/io.rs
index 3a94c01e0a4..55e062de85b 100644
--- a/src/libcore/rt/io.rs
+++ b/src/libcore/rt/io.rs
@@ -22,7 +22,7 @@ pub trait EventLoop {
     fn run(&mut self);
     fn callback(&mut self, ~fn());
     /// The asynchronous I/O services. Not all event loops may provide one
-    fn io(&mut self) -> Option<&self/mut IoFactoryObject>;
+    fn io(&mut self) -> Option<&'self mut IoFactoryObject>;
 }
 
 pub trait IoFactory {
diff --git a/src/libcore/rt/sched.rs b/src/libcore/rt/sched.rs
index 8f315452e5e..69cbbdd2ad4 100644
--- a/src/libcore/rt/sched.rs
+++ b/src/libcore/rt/sched.rs
@@ -265,12 +265,12 @@ pub impl Scheduler {
         }
     }
 
-    // XXX: Hack. This should return &self/mut but I don't know how to
+    // XXX: Hack. This should return &'self mut but I don't know how to
     // make the borrowcheck happy
     fn task_from_last_cleanup_job(&mut self) -> &mut Task {
         fail_unless!(!self.cleanup_jobs.is_empty());
-        let last_job: &self/mut CleanupJob = &mut self.cleanup_jobs[0];
-        let last_task: &self/Task = match last_job {
+        let last_job: &'self mut CleanupJob = &mut self.cleanup_jobs[0];
+        let last_task: &'self Task = match last_job {
             &RescheduleTask(~ref task) => task,
             &RecycleTask(~ref task) => task,
             &GiveTask(~ref task, _) => task,
@@ -356,7 +356,7 @@ impl ThreadLocalScheduler {
         }
     }
 
-    fn get_scheduler(&mut self) -> &self/mut Scheduler {
+    fn get_scheduler(&mut self) -> &'self mut Scheduler {
         unsafe {
             let key = match self { &ThreadLocalScheduler(key) => key };
             let mut value: *mut c_void = tls::get(key);
diff --git a/src/libcore/rt/uv.rs b/src/libcore/rt/uv.rs
index c947e4dde4c..80224fa523a 100644
--- a/src/libcore/rt/uv.rs
+++ b/src/libcore/rt/uv.rs
@@ -659,7 +659,7 @@ fn install_watcher_data<H, W: Watcher + NativeHandle<*H>>(watcher: &mut W) {
 }
 
 fn get_watcher_data<H, W: Watcher + NativeHandle<*H>>(
-    watcher: &r/mut W) -> &r/mut WatcherData {
+    watcher: &'r mut W) -> &'r mut WatcherData {
 
     unsafe {
         let data = uvll::get_data_for_uv_handle(watcher.native_handle());
diff --git a/src/libcore/rt/uvio.rs b/src/libcore/rt/uvio.rs
index f7275652e7f..a971ed92b7e 100644
--- a/src/libcore/rt/uvio.rs
+++ b/src/libcore/rt/uvio.rs
@@ -69,7 +69,7 @@ impl EventLoop for UvEventLoop {
         }
     }
 
-    fn io(&mut self) -> Option<&self/mut IoFactoryObject> {
+    fn io(&mut self) -> Option<&'self mut IoFactoryObject> {
         Some(&mut self.uvio)
     }
 }
@@ -91,7 +91,7 @@ fn test_callback_run_once() {
 pub struct UvIoFactory(Loop);
 
 pub impl UvIoFactory {
-    fn uv_loop(&mut self) -> &self/mut Loop {
+    fn uv_loop(&mut self) -> &'self mut Loop {
         match self { &UvIoFactory(ref mut ptr) => ptr }
     }
 }