Skip to content

Commit 7589c48

Browse files
committed
looks like rust-lang/rust#13853 is fixed
1 parent 3f6f762 commit 7589c48

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

src/capnp/message.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ impl ReaderOptions {
4848

4949
type SegmentId = u32;
5050

51-
pub trait MessageReader<'a> {
51+
pub trait MessageReader {
5252
fn get_segment(&self, id : uint) -> &[Word];
5353
fn arena(&self) -> &ReaderArena;
5454
fn mut_arena(&mut self) -> &mut ReaderArena;
@@ -65,7 +65,7 @@ pub trait MessageReader<'a> {
6565
}
6666
}
6767

68-
fn get_root<T : layout::FromStructReader<'a>>(&'a self) -> T {
68+
fn get_root<'a, T : layout::FromStructReader<'a>>(&'a self) -> T {
6969
self.get_root_internal().get_as_struct()
7070
}
7171

@@ -81,7 +81,7 @@ pub struct SegmentArrayMessageReader<'a> {
8181
}
8282

8383

84-
impl <'a> MessageReader<'a> for SegmentArrayMessageReader<'a> {
84+
impl <'a> MessageReader for SegmentArrayMessageReader<'a> {
8585
fn get_segment<'b>(&'b self, id : uint) -> &'b [Word] {
8686
self.segments[id]
8787
}
@@ -147,13 +147,13 @@ impl BuilderOptions {
147147
}
148148

149149

150-
pub trait MessageBuilder<'a> {
150+
pub trait MessageBuilder {
151151
fn mut_arena(&mut self) -> &mut BuilderArena;
152152
fn arena(&self) -> &BuilderArena;
153153

154154

155155
// XXX is there a way to make this private?
156-
fn get_root_internal(&mut self) -> any_pointer::Builder<'a> {
156+
fn get_root_internal<'a>(&mut self) -> any_pointer::Builder<'a> {
157157
let root_segment = &mut self.mut_arena().segment0 as *mut SegmentBuilder;
158158

159159
if self.arena().segment0.current_size() == 0 {
@@ -175,15 +175,15 @@ pub trait MessageBuilder<'a> {
175175

176176
}
177177

178-
fn init_root<T : FromStructBuilder<'a> + HasStructSize>(&'a mut self) -> T {
178+
fn init_root<'a, T : FromStructBuilder<'a> + HasStructSize>(&'a mut self) -> T {
179179
self.get_root_internal().init_as_struct()
180180
}
181181

182-
fn get_root<T : FromStructBuilder<'a> + HasStructSize>(&'a mut self) -> T {
182+
fn get_root<'a, T : FromStructBuilder<'a> + HasStructSize>(&'a mut self) -> T {
183183
self.get_root_internal().get_as_struct()
184184
}
185185

186-
fn set_root<T : layout::ToStructReader<'a>>(&'a mut self, value : &T) {
186+
fn set_root<'a, T : layout::ToStructReader<'a>>(&'a mut self, value : &T) {
187187
self.get_root_internal().set_as_struct(value);
188188
}
189189

@@ -220,7 +220,7 @@ impl MallocMessageBuilder {
220220

221221
}
222222

223-
impl <'a> MessageBuilder<'a> for MallocMessageBuilder {
223+
impl MessageBuilder for MallocMessageBuilder {
224224
fn mut_arena(&mut self) -> &mut BuilderArena {
225225
&mut *self.arena
226226
}
@@ -266,7 +266,7 @@ impl <'a> ScratchSpaceMallocMessageBuilder<'a> {
266266

267267
}
268268

269-
impl <'a, 'b> MessageBuilder<'a> for ScratchSpaceMallocMessageBuilder<'b> {
269+
impl <'b> MessageBuilder for ScratchSpaceMallocMessageBuilder<'b> {
270270
fn mut_arena(&mut self) -> &mut BuilderArena {
271271
&mut *self.arena
272272
}

src/capnp/serialize.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pub struct OwnedSpaceMessageReader {
2020
owned_space : Vec<Word>,
2121
}
2222

23-
impl <'a> MessageReader<'a> for OwnedSpaceMessageReader {
23+
impl MessageReader for OwnedSpaceMessageReader {
2424
fn get_segment(&self, id : uint) -> &[Word] {
2525
let (a,b) = self.segment_slices.as_slice()[id];
2626
self.owned_space.slice(a, b)
@@ -130,7 +130,7 @@ pub fn new_reader<U : std::io::Reader>(input_stream : &mut U,
130130
}
131131

132132

133-
pub fn write_message<'a, T : std::io::Writer, U : MessageBuilder<'a>>(
133+
pub fn write_message<T : std::io::Writer, U : MessageBuilder>(
134134
output_stream : &mut T,
135135
message : &U) -> std::io::IoResult<()> {
136136

src/capnp/serialize_packed.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,14 +349,14 @@ impl <'a, W : io::BufferedOutputStream> std::io::Writer for PackedOutputStream<'
349349
fn flush(&mut self) -> std::io::IoResult<()> { self.inner.flush() }
350350
}
351351

352-
pub fn write_packed_message<'a, T: io::BufferedOutputStream, U: MessageBuilder<'a>>(
352+
pub fn write_packed_message<T: io::BufferedOutputStream, U: MessageBuilder>(
353353
output : &mut T, message : &U) -> std::io::IoResult<()> {
354354
let mut packed_output_stream = PackedOutputStream {inner : output};
355355
serialize::write_message(&mut packed_output_stream, message)
356356
}
357357

358358

359-
pub fn write_packed_message_unbuffered<'a, T: std::io::Writer, U: MessageBuilder<'a>>(
359+
pub fn write_packed_message_unbuffered<T: std::io::Writer, U: MessageBuilder>(
360360
output : &mut T, message : &U) -> std::io::IoResult<()> {
361361
let mut buffered = io::BufferedOutputStreamWrapper::new(output);
362362
try!(write_packed_message(&mut buffered, message));

0 commit comments

Comments
 (0)