Loosen lifetime restrictions on slices

sfackler · sfackler · commit 2f5b08144d49 · 2015-05-19T22:21:10.000-07:00
diff --git a/src/lib.rs b/src/lib.rs
@@ -6,8 +6,6 @@ extern crate postgres;
 extern crate byteorder;
 
 use std::mem;
-use std::slice;
-use std::vec;
 
 #[doc(inline)]
 pub use base::ArrayBase;
@@ -81,14 +79,14 @@ trait InternalMutableArray<T>: MutableArray<T> {
     fn raw_get_mut<'a>(&'a mut self, idx: usize, size: usize) -> &'a mut T;
 }
 
-enum ArrayParent<'parent, T:'static> {
-    Slice(&'parent ArraySlice<'static, T>),
-    MutSlice(&'parent MutArraySlice<'static, T>),
+enum ArrayParent<'parent, T:'parent> {
+    Slice(&'parent ArraySlice<'parent, T>),
+    MutSlice(&'parent MutArraySlice<'parent, T>),
     Base(&'parent ArrayBase<T>),
 }
 
 /// An immutable slice of a multi-dimensional array
-pub struct ArraySlice<'parent, T:'static> {
+pub struct ArraySlice<'parent, T:'parent> {
     parent: ArrayParent<'parent, T>,
     idx: usize,
 }
@@ -133,13 +131,13 @@ impl<'parent, T> InternalArray<T> for ArraySlice<'parent, T> {
     }
 }
 
-enum MutArrayParent<'parent, T:'static> {
-    Slice(&'parent mut MutArraySlice<'static, T>),
+enum MutArrayParent<'parent, T:'parent> {
+    Slice(&'parent mut MutArraySlice<'parent, T>),
     Base(&'parent mut ArrayBase<T>),
 }
 
 /// A mutable slice of a multi-dimensional array
-pub struct MutArraySlice<'parent, T:'static> {
+pub struct MutArraySlice<'parent, T:'parent> {
     parent: MutArrayParent<'parent, T>,
     idx: usize,
 }

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,6 @@ extern crate postgres;`
`6`	`6`	`extern crate byteorder;`
`7`	`7`
`8`	`8`	`use std::mem;`
`9`		`-use std::slice;`
`10`		`-use std::vec;`
`11`	`9`
`12`	`10`	`#[doc(inline)]`
`13`	`11`	`pub use base::ArrayBase;`
`@@ -81,14 +79,14 @@ trait InternalMutableArray<T>: MutableArray<T> {`
`81`	`79`	`fn raw_get_mut<'a>(&'a mut self, idx: usize, size: usize) -> &'a mut T;`
`82`	`80`	`}`
`83`	`81`
`84`		`-enum ArrayParent<'parent, T:'static> {`
`85`		`- Slice(&'parent ArraySlice<'static, T>),`
`86`		`- MutSlice(&'parent MutArraySlice<'static, T>),`
	`82`	`+enum ArrayParent<'parent, T:'parent> {`
	`83`	`+ Slice(&'parent ArraySlice<'parent, T>),`
	`84`	`+ MutSlice(&'parent MutArraySlice<'parent, T>),`
`87`	`85`	`Base(&'parent ArrayBase<T>),`
`88`	`86`	`}`
`89`	`87`
`90`	`88`	`/// An immutable slice of a multi-dimensional array`
`91`		`-pub struct ArraySlice<'parent, T:'static> {`
	`89`	`+pub struct ArraySlice<'parent, T:'parent> {`
`92`	`90`	`parent: ArrayParent<'parent, T>,`
`93`	`91`	`idx: usize,`
`94`	`92`	`}`
`@@ -133,13 +131,13 @@ impl<'parent, T> InternalArray<T> for ArraySlice<'parent, T> {`
`133`	`131`	`}`
`134`	`132`	`}`
`135`	`133`
`136`		`-enum MutArrayParent<'parent, T:'static> {`
`137`		`- Slice(&'parent mut MutArraySlice<'static, T>),`
	`134`	`+enum MutArrayParent<'parent, T:'parent> {`
	`135`	`+ Slice(&'parent mut MutArraySlice<'parent, T>),`
`138`	`136`	`Base(&'parent mut ArrayBase<T>),`
`139`	`137`	`}`
`140`	`138`
`141`	`139`	`/// A mutable slice of a multi-dimensional array`
`142`		`-pub struct MutArraySlice<'parent, T:'static> {`
	`140`	`+pub struct MutArraySlice<'parent, T:'parent> {`
`143`	`141`	`parent: MutArrayParent<'parent, T>,`
`144`	`142`	`idx: usize,`
`145`	`143`	`}`