Merge pull request #7 from jonhoo/add-extract

sfackler · sfackler · commit 7a4dd92c1fd0 · 2016-04-18T19:03:33.000-07:00
Add .extract() for extracting underlying Vec
diff --git a/src/array.rs b/src/array.rs
@@ -144,6 +144,12 @@ impl<T> Array<T>{
 pub fn iter_mut<'a>(&'a mut self) -> IterMut<'a, T>{
 IterMut{inner: self.data.iter_mut() }
 }
+
+ /// Returns the underlying data vector for this Array in the
+ /// higher-dimensional equivalent of row-major order.
+ pub fn into_inner(self) -> Vec<T>{
+ self.data
+ }
 }
 
 /// A trait implemented by types that can index into an `Array`.
diff --git a/src/lib.rs b/src/lib.rs
@@ -48,6 +48,16 @@ mod tests{
 assert_eq!(2, a[1]);
 }
 
+ #[test]
+ fn test_into_inner(){
+ let a = Array::from_vec(vec![0i32, 1, 2], -1);
+ let a = a.into_inner();
+ assert_eq!(a.len(), 3);
+ assert_eq!(0, a[0]);
+ assert_eq!(1, a[1]);
+ assert_eq!(2, a[2]);
+ }
+
 #[test]
 fn test_2d_slice_get(){
 let mut a = Array::from_vec(vec![0i32, 1, 2], -1);

Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,12 @@ impl<T> Array<T>{`
`144`	`144`	`pubfniter_mut<'a>(&'amutself) -> IterMut<'a,T>{`
`145`	`145`	`IterMut{inner:self.data.iter_mut()}`
`146`	`146`	`}`
	`147`	`+`
	`148`	`+/// Returns the underlying data vector for this Array in the`
	`149`	`+/// higher-dimensional equivalent of row-major order.`
	`150`	`+pubfninto_inner(self) -> Vec<T>{`
	`151`	`+self.data`
	`152`	`+}`
`147`	`153`	`}`
`148`	`154`
`149`	`155`	/// A trait implemented by types that can index into an `Array`.
-Original file line number
+Diff line change
 assert_eq!(2, a[1]);
+}
 +#[test]
 +fntest_into_inner(){
 +let a = Array::from_vec(vec![0i32,1,2], -1);
 +let a = a.into_inner();
 +assert_eq!(a.len(),3);
 +assert_eq!(0, a[0]);
 +assert_eq!(1, a[1]);
 +assert_eq!(2, a[2]);
 +}
++
 #[test]
 fntest_2d_slice_get(){
 letmut a = Array::from_vec(vec![0i32,1,2], -1);