diff options
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/comm.rs | 8 | ||||
| -rw-r--r-- | src/libstd/rt/crate_map.rs | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/libstd/rt/comm.rs b/src/libstd/rt/comm.rs index 2b1e7865a73..2fa34994292 100644 --- a/src/libstd/rt/comm.rs +++ b/src/libstd/rt/comm.rs @@ -510,7 +510,7 @@ impl<T: Send> Peekable<T> for Port<T> { // of them, but a &Port<T> should also be selectable so you can select2 on it // alongside a PortOne<U> without passing the port by value in recv_ready. -impl<'self, T: Send> SelectInner for &'self Port<T> { +impl<'a, T: Send> SelectInner for &'a Port<T> { #[inline] fn optimistic_check(&mut self) -> bool { self.next.with_mut(|pone| { pone.get_mut_ref().optimistic_check() }) @@ -528,7 +528,7 @@ impl<'self, T: Send> SelectInner for &'self Port<T> { } } -impl<'self, T: Send> Select for &'self Port<T> { } +impl<'a, T: Send> Select for &'a Port<T> { } impl<T: Send> SelectInner for Port<T> { #[inline] @@ -549,7 +549,7 @@ impl<T: Send> SelectInner for Port<T> { impl<T: Send> Select for Port<T> { } -impl<'self, T: Send> SelectPortInner<T> for &'self Port<T> { +impl<'a, T: Send> SelectPortInner<T> for &'a Port<T> { fn recv_ready(self) -> Option<T> { let mut b = self.next.borrow_mut(); match b.get().take_unwrap().recv_ready() { @@ -562,7 +562,7 @@ impl<'self, T: Send> SelectPortInner<T> for &'self Port<T> { } } -impl<'self, T: Send> SelectPort<T> for &'self Port<T> { } +impl<'a, T: Send> SelectPort<T> for &'a Port<T> { } pub struct SharedChan<T> { // Just like Chan, but a shared AtomicOption diff --git a/src/libstd/rt/crate_map.rs b/src/libstd/rt/crate_map.rs index 6dcbd4a129e..22fc3f0ab56 100644 --- a/src/libstd/rt/crate_map.rs +++ b/src/libstd/rt/crate_map.rs @@ -21,15 +21,15 @@ use rt::rtio::EventLoop; #[link_args = "-Wl,-U,__rust_crate_map_toplevel"] extern {} -pub struct ModEntry<'self> { - name: &'self str, +pub struct ModEntry<'a> { + name: &'a str, log_level: *mut u32 } -pub struct CrateMap<'self> { +pub struct CrateMap<'a> { version: i32, - entries: &'self [ModEntry<'self>], - children: &'self [&'self CrateMap<'self>], + entries: &'a [ModEntry<'a>], + children: &'a [&'a CrateMap<'a>], event_loop_factory: Option<extern "C" fn() -> ~EventLoop>, } |
