Merge pull request #103 from daniel-vainsencher/master

Allow &a @ &b to have different lifetimes
rust-ndarray · Mar 1, 2016 · f0628c3 · f0628c3
2 parents 08b6e35 + 73ea381
commit f0628c3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/impl_ops.rs b/src/impl_ops.rs
@@ -95,7 +95,7 @@ impl<'a, A, S, S2, D, E> $trt<&'a ArrayBase<S2, E>> for ArrayBase<S, D>
 /// If their shapes disagree, `rhs` is broadcast to the shape of `self`.
 ///
 /// **Panics** if broadcasting isn’t possible.
-impl<'a, A, S, S2, D, E> $trt<&'a ArrayBase<S2, E>> for &'a ArrayBase<S, D>
+impl<'a, 'b, A, S, S2, D, E> $trt<&'a ArrayBase<S2, E>> for &'b ArrayBase<S, D>
     where A: Clone + $trt<A, Output=A>,
           S: Data<Elem=A>,
           S2: Data<Elem=A>,

diff --git a/src/lib.rs b/src/lib.rs
@@ -682,4 +682,3 @@ enum ElementsRepr<S, C> {
     Slice(S),
     Counted(C),
 }
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -682,4 +682,3 @@ enum ElementsRepr<S, C> {
		Slice(S),
		Counted(C),
		}