@@ -48,7 +48,7 @@ impl ReaderOptions {
48
48
49
49
type SegmentId = u32 ;
50
50
51
- pub trait MessageReader < ' a > {
51
+ pub trait MessageReader {
52
52
fn get_segment ( & self , id : uint ) -> & [ Word ] ;
53
53
fn arena ( & self ) -> & ReaderArena ;
54
54
fn mut_arena ( & mut self ) -> & mut ReaderArena ;
@@ -65,7 +65,7 @@ pub trait MessageReader<'a> {
65
65
}
66
66
}
67
67
68
- fn get_root < T : layout:: FromStructReader < ' a > > ( & ' a self ) -> T {
68
+ fn get_root < ' a , T : layout:: FromStructReader < ' a > > ( & ' a self ) -> T {
69
69
self . get_root_internal ( ) . get_as_struct ( )
70
70
}
71
71
@@ -81,7 +81,7 @@ pub struct SegmentArrayMessageReader<'a> {
81
81
}
82
82
83
83
84
- impl < ' a > MessageReader < ' a > for SegmentArrayMessageReader < ' a > {
84
+ impl < ' a > MessageReader for SegmentArrayMessageReader < ' a > {
85
85
fn get_segment < ' b > ( & ' b self , id : uint ) -> & ' b [ Word ] {
86
86
self . segments [ id]
87
87
}
@@ -147,13 +147,13 @@ impl BuilderOptions {
147
147
}
148
148
149
149
150
- pub trait MessageBuilder < ' a > {
150
+ pub trait MessageBuilder {
151
151
fn mut_arena ( & mut self ) -> & mut BuilderArena ;
152
152
fn arena ( & self ) -> & BuilderArena ;
153
153
154
154
155
155
// 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 > {
157
157
let root_segment = & mut self . mut_arena ( ) . segment0 as * mut SegmentBuilder ;
158
158
159
159
if self . arena ( ) . segment0 . current_size ( ) == 0 {
@@ -175,15 +175,15 @@ pub trait MessageBuilder<'a> {
175
175
176
176
}
177
177
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 {
179
179
self . get_root_internal ( ) . init_as_struct ( )
180
180
}
181
181
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 {
183
183
self . get_root_internal ( ) . get_as_struct ( )
184
184
}
185
185
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 ) {
187
187
self . get_root_internal ( ) . set_as_struct ( value) ;
188
188
}
189
189
@@ -220,7 +220,7 @@ impl MallocMessageBuilder {
220
220
221
221
}
222
222
223
- impl < ' a > MessageBuilder < ' a > for MallocMessageBuilder {
223
+ impl MessageBuilder for MallocMessageBuilder {
224
224
fn mut_arena ( & mut self ) -> & mut BuilderArena {
225
225
& mut * self . arena
226
226
}
@@ -266,7 +266,7 @@ impl <'a> ScratchSpaceMallocMessageBuilder<'a> {
266
266
267
267
}
268
268
269
- impl < ' a , ' b > MessageBuilder < ' a > for ScratchSpaceMallocMessageBuilder < ' b > {
269
+ impl < ' b > MessageBuilder for ScratchSpaceMallocMessageBuilder < ' b > {
270
270
fn mut_arena ( & mut self ) -> & mut BuilderArena {
271
271
& mut * self . arena
272
272
}
0 commit comments