Skip to content

Commit 33ae99b

Browse files
committed
ugh, lifetimes are broken again. this should at least compile once rust-lang/rust#18235 lands
1 parent 1656b93 commit 33ae99b

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

compiler_tests/test.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,5 +462,4 @@ mod tests {
462462
assert_eq!(new_version.get_new3().get_int8_field(), -123);
463463
}
464464
}
465-
466465
}

src/capnp/message.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ pub trait MessageReader {
5454
fn mut_arena<'a>(&'a mut self) -> &'a mut ReaderArena;
5555
fn get_options<'a>(&'a self) -> &'a ReaderOptions;
5656

57-
fn get_root_internal<'a> (&'a self) -> any_pointer::Reader<'a> {
57+
fn get_root_internal(&self) -> any_pointer::Reader<'static> {
5858
unsafe {
5959
let segment : *const SegmentReader = &self.arena().segment0;
6060

@@ -65,7 +65,7 @@ pub trait MessageReader {
6565
}
6666
}
6767

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

@@ -153,7 +153,7 @@ pub trait MessageBuilder {
153153

154154

155155
// XXX is there a way to make this private?
156-
fn get_root_internal<'a>(&mut self) -> any_pointer::Builder<'a> {
156+
fn get_root_internal(&mut self) -> any_pointer::Builder<'static> {
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 {
175175

176176
}
177177

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

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

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

0 commit comments

Comments
 (0)