rename borrow() to reborrow()

Author: dwrensha

capnp/src/any_pointer.rs

@@ -122,7 +122,7 @@ impl <'a> Builder<'a> {
     }
 
     pub fn reborrow<'b>(&'b mut self) -> Builder<'b> {
-        Builder { builder: self.builder.borrow() }
+        Builder { builder: self.builder.reborrow() }
     }
 
     pub fn is_null(&self) -> bool {

capnp/src/any_pointer_list.rs

@@ -93,7 +93,7 @@ impl <'a> Builder<'a> {
     }
 
     pub fn reborrow<'b>(&'b mut self) -> Builder<'b> {
-        Builder {builder: self.builder.borrow()}
+        Builder {builder: self.builder.reborrow()}
     }
 }
 

capnp/src/capability_list.rs

@@ -103,7 +103,7 @@ impl <'a, T> Builder<'a, T> where T: FromClientHook {
 
     pub fn set(&mut self, index: u32, value: Box<dyn ClientHook>) {
         assert!(index < self.len());
-        self.builder.borrow().get_pointer_element(index).set_capability(value);
+        self.builder.reborrow().get_pointer_element(index).set_capability(value);
     }
 }
 

capnp/src/data_list.rs

@@ -93,11 +93,11 @@ impl <'a> Builder<'a> {
 
     pub fn set(&mut self, index: u32, value: crate::data::Reader) {
         assert!(index < self.len());
-        self.builder.borrow().get_pointer_element(index).set_data(value);
+        self.builder.reborrow().get_pointer_element(index).set_data(value);
     }
 
     pub fn reborrow<'b>(&'b mut self) -> Builder<'b> {
-        Builder {builder: self.builder.borrow()}
+        Builder {builder: self.builder.reborrow()}
     }
 }
 

capnp/src/list_list.rs

@@ -97,7 +97,7 @@ impl <'a, T> Builder<'a, T> where T: for<'b> crate::traits::Owned<'b> {
 
 impl <'a, T> Builder<'a, T> where T: for<'b> crate::traits::Owned<'b> {
     pub fn reborrow<'b>(&'b mut self) -> Builder<'b, T> {
-        Builder {builder: self.builder.borrow(), marker: ::core::marker::PhantomData}
+        Builder {builder: self.builder.reborrow(), marker: ::core::marker::PhantomData}
     }
 }
 

capnp/src/private/layout.rs

@@ -2453,7 +2453,7 @@ impl <'a> PointerReader<'a> {
         })
     }
 
-    pub fn borrow<'b>(&'b self) -> PointerReader<'b> {
+    pub fn reborrow<'b>(&'b self) -> PointerReader<'b> {
         PointerReader { arena: self.arena, .. *self }
     }
 
@@ -2615,7 +2615,7 @@ impl <'a> PointerBuilder<'a> {
         }
     }
 
-    pub fn borrow<'b>(&'b mut self) -> PointerBuilder<'b> {
+    pub fn reborrow<'b>(&'b mut self) -> PointerBuilder<'b> {
         PointerBuilder { arena: self.arena, .. *self }
     }
 
@@ -3380,7 +3380,7 @@ impl <'a> ListBuilder<'a> {
         }
     }
 
-    pub fn borrow<'b>(&'b mut self) -> ListBuilder<'b> {
+    pub fn reborrow<'b>(&'b mut self) -> ListBuilder<'b> {
         ListBuilder { arena: self.arena, ..*self }
     }
 

capnp/src/text_list.rs

@@ -89,15 +89,15 @@ impl <'a> Builder<'a> {
 
     pub fn set(&mut self, index: u32, value: crate::text::Reader) {
         assert!(index < self.len());
-        self.builder.borrow().get_pointer_element(index).set_text(value);
+        self.builder.reborrow().get_pointer_element(index).set_text(value);
     }
 
     pub fn into_reader(self) -> Reader<'a> {
         Reader { reader: self.builder.into_reader() }
     }
 
     pub fn reborrow<'b>(&'b mut self) -> Builder<'b> {
-        Builder::<'b> { builder: self.builder.borrow() }
+        Builder::<'b> { builder: self.builder.reborrow() }
     }
 }