From f4e29e7e9aa1da4fc91a6074b0e4df44a2986517 Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Thu, 20 Nov 2014 15:08:02 -0500 Subject: Fixup various places that were doing `&T+'a` and do `&(T+'a)` --- src/libstd/comm/select.rs | 2 +- src/libstd/failure.rs | 2 +- src/libstd/io/mod.rs | 4 ++-- src/libstd/rt/backtrace.rs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/libstd') diff --git a/src/libstd/comm/select.rs b/src/libstd/comm/select.rs index 621556f75ce..3191519815a 100644 --- a/src/libstd/comm/select.rs +++ b/src/libstd/comm/select.rs @@ -84,7 +84,7 @@ pub struct Handle<'rx, T:'rx> { next: *mut Handle<'static, ()>, prev: *mut Handle<'static, ()>, added: bool, - packet: &'rx Packet+'rx, + packet: &'rx (Packet+'rx), // due to our fun transmutes, we be sure to place this at the end. (nothing // previous relies on T) diff --git a/src/libstd/failure.rs b/src/libstd/failure.rs index 32a8be22902..d839c1484e5 100644 --- a/src/libstd/failure.rs +++ b/src/libstd/failure.rs @@ -40,7 +40,7 @@ impl Writer for Stdio { } } -pub fn on_fail(obj: &Any + Send, file: &'static str, line: uint) { +pub fn on_fail(obj: &(Any+Send), file: &'static str, line: uint) { let msg = match obj.downcast_ref::<&'static str>() { Some(s) => *s, None => match obj.downcast_ref::() { diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index 681400e9db5..311cbe6ece8 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -911,7 +911,7 @@ impl<'a> Reader for Box { } } -impl<'a> Reader for &'a mut Reader+'a { +impl<'a> Reader for &'a mut (Reader+'a) { fn read(&mut self, buf: &mut [u8]) -> IoResult { (*self).read(buf) } } @@ -1279,7 +1279,7 @@ impl<'a> Writer for Box { } } -impl<'a> Writer for &'a mut Writer+'a { +impl<'a> Writer for &'a mut (Writer+'a) { #[inline] fn write(&mut self, buf: &[u8]) -> IoResult<()> { (**self).write(buf) } diff --git a/src/libstd/rt/backtrace.rs b/src/libstd/rt/backtrace.rs index 81022994387..d47256b1d18 100644 --- a/src/libstd/rt/backtrace.rs +++ b/src/libstd/rt/backtrace.rs @@ -288,7 +288,7 @@ mod imp { struct Context<'a> { idx: int, - writer: &'a mut Writer+'a, + writer: &'a mut (Writer+'a), last_error: Option, } -- cgit 1.4.1-3-g733a5