remove explicit lifetimes where they can be elided

Author: danieleades

capnp-futures/src/serialize.rs

@@ -139,18 +139,18 @@ fn parse_segment_table_first(buf: &[u8]) -> Result<(usize, usize)>
 
 /// Something that contains segments ready to be written out.
 pub trait AsOutputSegments {
-    fn as_output_segments<'a>(&'a self) -> OutputSegments<'a>;
+    fn as_output_segments(&self) -> OutputSegments;
 }
 
 
 impl <'a, M> AsOutputSegments for &'a M where M: AsOutputSegments {
-    fn as_output_segments<'b>(&'b self) -> OutputSegments<'b> {
+    fn as_output_segments(&self) -> OutputSegments {
         (*self).as_output_segments()
     }
 }
 
 impl <A> AsOutputSegments for message::Builder<A> where A: message::Allocator {
-    fn as_output_segments<'a>(&'a self) -> OutputSegments<'a> {
+    fn as_output_segments(&self) -> OutputSegments {
         self.get_segments_for_output()
     }
 }
@@ -162,7 +162,7 @@ impl <A> AsOutputSegments for message::Builder<A> where A: message::Allocator {
 }*/
 
 impl <A> AsOutputSegments for ::std::rc::Rc<message::Builder<A>> where A: message::Allocator {
-    fn as_output_segments<'a>(&'a self) -> OutputSegments<'a> {
+    fn as_output_segments(&self) -> OutputSegments {
         self.get_segments_for_output()
     }
 }
@@ -394,7 +394,7 @@ pub mod test {
     }
 
     impl AsOutputSegments for Vec<Vec<capnp::Word>> {
-        fn as_output_segments<'a>(&'a self) -> OutputSegments<'a> {
+        fn as_output_segments(&self) -> OutputSegments {
             if self.is_empty() {
                 OutputSegments::SingleSegment([&[]])
             } else if self.len() == 1 {

capnp-rpc/src/broken.rs

@@ -65,7 +65,7 @@ impl Request {
 }
 
 impl RequestHook for Request {
-    fn get<'a>(&'a mut self) -> any_pointer::Builder<'a> {
+    fn get(&mut self) -> any_pointer::Builder {
         let mut result: any_pointer::Builder = self.message.get_root().unwrap();
         result.imbue_mut(&mut self.cap_table);
         result

capnp-rpc/src/lib.rs

@@ -106,8 +106,8 @@ mod task_set;
 pub mod twoparty;
 
 pub trait OutgoingMessage {
-    fn get_body<'a>(&'a mut self) -> ::capnp::Result<::capnp::any_pointer::Builder<'a>>;
-    fn get_body_as_reader<'a>(&'a self) -> ::capnp::Result<::capnp::any_pointer::Reader<'a>>;
+    fn get_body(&mut self) -> ::capnp::Result<::capnp::any_pointer::Builder>;
+    fn get_body_as_reader(&self) -> ::capnp::Result<::capnp::any_pointer::Reader>;
 
     /// Sends the message. Returns a promise for the message that resolves once the send has completed.
     /// Dropping the returned promise does *not* cancel the send.
@@ -119,7 +119,7 @@ pub trait OutgoingMessage {
 }
 
 pub trait IncomingMessage {
-    fn get_body<'a>(&'a self) -> ::capnp::Result<::capnp::any_pointer::Reader<'a>>;
+    fn get_body(&self) -> ::capnp::Result<::capnp::any_pointer::Reader>;
 }
 
 pub trait Connection<VatId> {

capnp-rpc/src/local.rs

@@ -34,7 +34,7 @@ use std::mem;
 
 pub trait ResultsDoneHook {
     fn add_ref(&self) -> Box<dyn ResultsDoneHook>;
-    fn get<'a>(&'a self) -> ::capnp::Result<any_pointer::Reader<'a>>;
+    fn get(&self) -> ::capnp::Result<any_pointer::Reader>;
 }
 
 impl Clone for Box<dyn ResultsDoneHook> {
@@ -56,7 +56,7 @@ impl Response {
 }
 
 impl ResponseHook for Response {
-    fn get<'a>(&'a self) -> ::capnp::Result<any_pointer::Reader<'a>> {
+    fn get(&self) -> ::capnp::Result<any_pointer::Reader> {
         self.results.get()
     }
 }
@@ -79,7 +79,7 @@ impl Params {
 }
 
 impl ParamsHook for Params {
-    fn get<'a>(&'a self) -> ::capnp::Result<any_pointer::Reader<'a>> {
+    fn get(&self) -> ::capnp::Result<any_pointer::Reader> {
         let mut result: any_pointer::Reader = self.request.get_root_as_reader()?;
         result.imbue(&self.cap_table);
         Ok(result)
@@ -114,7 +114,7 @@ impl Drop for Results {
 }
 
 impl ResultsHook for Results {
-    fn get<'a>(&'a mut self) -> ::capnp::Result<any_pointer::Builder<'a>> {
+    fn get(&mut self) -> ::capnp::Result<any_pointer::Builder> {
         match *self {
             Results { message: Some(ref mut message), ref mut cap_table, .. } => {
                 let mut result: any_pointer::Builder = message.get_root()?;
@@ -168,7 +168,7 @@ impl ResultsDoneHook for ResultsDone {
     fn add_ref(&self) -> Box<dyn ResultsDoneHook> {
         Box::new(ResultsDone { inner: self.inner.clone() })
     }
-    fn get<'a>(&'a self) -> ::capnp::Result<any_pointer::Reader<'a>> {
+    fn get(&self) -> ::capnp::Result<any_pointer::Reader> {
         let mut result: any_pointer::Reader = self.inner.message.get_root_as_reader()?;
         result.imbue(&self.inner.cap_table);
         Ok(result)
@@ -201,7 +201,7 @@ impl Request {
 }
 
 impl RequestHook for Request {
-    fn get<'a>(&'a mut self) -> any_pointer::Builder<'a> {
+    fn get(&mut self) -> any_pointer::Builder {
         let mut result: any_pointer::Builder = self.message.get_root().unwrap();
         result.imbue_mut(&mut self.cap_table);
         result

capnp-rpc/src/rpc.rs

@@ -127,7 +127,7 @@ impl <T> ExportTable<T> {
         }
     }
 
-    pub fn find<'a>(&'a mut self, id: u32) -> Option<&'a mut T> {
+    pub fn find(&mut self, id: u32) -> Option<&mut T> {
         let idx = id as usize;
         if idx < self.slots.len() {
             match self.slots[idx] {
@@ -139,7 +139,7 @@ impl <T> ExportTable<T> {
         }
     }
 
-    pub fn iter<'a>(&'a self) -> ExportTableIter<'a, T> {
+    pub fn iter(&self) -> ExportTableIter<T> {
         ExportTableIter {
             table: self,
             idx: 0
@@ -1586,7 +1586,7 @@ impl <VatId> Clone for Response<VatId> {
 }
 
 impl <VatId> ResponseHook for Response<VatId> {
-    fn get<'a>(&'a self) -> ::capnp::Result<any_pointer::Reader<'a>> {
+    fn get(&self) -> ::capnp::Result<any_pointer::Reader> {
         match *self.variant {
             ResponseVariant::Rpc(ref state) => {
                 match state.message.get_body()?.get_as::<message::Reader>()?.which()? {
@@ -1617,8 +1617,8 @@ struct Request<VatId> where VatId: 'static {
     cap_table: Vec<Option<Box<dyn ClientHook>>>,
 }
 
-fn get_call<'a>(message: &'a mut Box<dyn crate::OutgoingMessage>)
-                -> ::capnp::Result<call::Builder<'a>>
+fn get_call(message: &mut Box<dyn crate::OutgoingMessage>)
+                -> ::capnp::Result<call::Builder>
 {
     let message_root: message::Builder = message.get_body()?.get_as()?;
     match message_root.which()? {
@@ -1645,7 +1645,7 @@ impl <VatId> Request<VatId> where VatId: 'static {
         })
     }
 
-    fn init_call<'a>(&'a mut self) -> call::Builder<'a> {
+    fn init_call(&mut self) -> call::Builder {
         let message_root: message::Builder = self.message.get_body().unwrap().get_as().unwrap();
         message_root.init_call()
     }
@@ -1697,7 +1697,7 @@ impl <VatId> Request<VatId> where VatId: 'static {
 }
 
 impl <VatId> RequestHook for Request<VatId> {
-    fn get<'a>(&'a mut self) -> any_pointer::Builder<'a> {
+    fn get(&mut self) -> any_pointer::Builder {
         use ::capnp::traits::ImbueMut;
         let mut builder = get_call(&mut self.message).unwrap().get_params().unwrap().get_content();
         builder.imbue_mut(&mut self.cap_table);
@@ -1964,7 +1964,7 @@ impl Params {
 }
 
 impl ParamsHook for Params {
-    fn get<'a>(&'a self) -> ::capnp::Result<any_pointer::Reader<'a>> {
+    fn get(&self) -> ::capnp::Result<any_pointer::Reader> {
         let root: message::Reader = self.request.get_body()?.get_as()?;
         match root.which()? {
             message::Call(call) => {
@@ -2062,7 +2062,7 @@ impl <VatId> Drop for Results<VatId> {
 }
 
 impl <VatId> ResultsHook for Results<VatId> {
-    fn get<'a>(&'a mut self) -> ::capnp::Result<any_pointer::Builder<'a>> {
+    fn get(&mut self) -> ::capnp::Result<any_pointer::Builder> {
         use ::capnp::traits::ImbueMut;
         if let Some(ref mut inner) = self.inner {
             inner.ensure_initialized();
@@ -2287,7 +2287,7 @@ impl ResultsDoneHook for ResultsDone {
     fn add_ref(&self) -> Box<dyn ResultsDoneHook> {
         Box::new(ResultsDone { inner: self.inner.clone() })
     }
-    fn get<'a>(&'a self) -> ::capnp::Result<any_pointer::Reader<'a>> {
+    fn get(&self) -> ::capnp::Result<any_pointer::Reader> {
         use ::capnp::traits::Imbue;
         match *self.inner {
             ResultsDoneVariant::Rpc(ref message, ref cap_table) => {

capnp-rpc/src/twoparty.rs

@@ -42,7 +42,7 @@ impl IncomingMessage {
 }
 
 impl crate::IncomingMessage for IncomingMessage {
-    fn get_body<'a>(&'a self) -> ::capnp::Result<::capnp::any_pointer::Reader<'a>> {
+    fn get_body(&self) -> ::capnp::Result<::capnp::any_pointer::Reader> {
         self.message.get_root()
     }
 }
@@ -53,11 +53,11 @@ struct OutgoingMessage {
 }
 
 impl crate::OutgoingMessage for OutgoingMessage {
-    fn get_body<'a>(&'a mut self) -> ::capnp::Result<::capnp::any_pointer::Builder<'a>> {
+    fn get_body(&mut self) -> ::capnp::Result<::capnp::any_pointer::Builder> {
         self.message.get_root()
     }
 
-    fn get_body_as_reader<'a>(&'a self) -> ::capnp::Result<::capnp::any_pointer::Reader<'a>> {
+    fn get_body_as_reader(&self) -> ::capnp::Result<::capnp::any_pointer::Reader> {
         self.message.get_root_as_reader()
     }
 

capnp/src/capability.rs

@@ -182,7 +182,7 @@ impl <T> Params <T> {
     pub fn new(hook: Box<dyn ParamsHook>) -> Params<T> {
         Params { marker: PhantomData, hook }
     }
-    pub fn get<'a>(&'a self) -> crate::Result<T::Reader<'a>>
+    pub fn get(&self) -> crate::Result<T::Reader<'_>>
         where T: Owned
     {
         self.hook.get()?.get_as()

capnp/src/message.rs

@@ -434,7 +434,7 @@ impl <A> Builder<A> where A: Allocator {
         Ok(())
     }
 
-    pub fn get_segments_for_output(&self) -> OutputSegments<'_> {
+    pub fn get_segments_for_output(&self) -> OutputSegments {
         self.arena.get_segments_for_output()
     }
 

capnp/src/private/arena.rs

@@ -179,7 +179,7 @@ impl <A> BuilderArenaImpl<A> where A: Allocator {
         self.inner.borrow_mut().allocate_segment(minimum_size)
     }
 
-    pub fn get_segments_for_output(&self) -> OutputSegments<'_> {
+    pub fn get_segments_for_output(&self) -> OutputSegments {
         let reff = self.inner.borrow();
         if reff.segments.len() == 1 {
             let seg = &reff.segments[0];

capnpc/src/codegen.rs

@@ -200,7 +200,7 @@ impl <'a> GeneratorContext<'a> {
         Ok(gen)
     }
 
-    fn get_last_name<'b>(&'b self, id: u64) -> ::capnp::Result<&'b str> {
+    fn get_last_name(&self, id: u64) -> ::capnp::Result<&str> {
         match self.scope_map.get(&id) {
             None => Err(Error::failed(format!("node not found: {}", id))),
             Some(v) => match v.last() {