add iteratorsize(::Type{StreamMapIterator}) and cleanup from rebase

JuliaLang · Mar 18, 2016 · f22e84e · f22e84e
1 parent 48340a8
commit f22e84e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/base/iterator.jl b/base/iterator.jl
@@ -10,7 +10,7 @@ _min_length(a, b, A, B) = min(length(a),length(b))
 _diff_length(a, b, A, ::IsInfinite) = 0
 _diff_length(a, b, ::IsInfinite, ::IsInfinite) = 0
 _diff_length(a, b, ::IsInfinite, B) = length(a) # inherit behaviour, error
-_diff_length(a, b, A, B) = max(length(a)-length(b), 0) 
+_diff_length(a, b, A, B) = max(length(a)-length(b), 0)
 
 # enumerate
 

diff --git a/base/mapiterator.jl b/base/mapiterator.jl
@@ -144,3 +144,5 @@ function next(itr::StreamMapIterator, state::StreamMapState)
 
     return (r, state)
 end
+
+iteratorsize(::Type{StreamMapIterator}) = SizeUnknown()
diff --git a/test/functional.jl b/test/functional.jl
@@ -88,7 +88,7 @@ let s = "hello"
     @test collect(rest(s, st)) == ['e','l','l','o']
 end
 
-@test_throws MethodError collect(rest(countfrom(1), 5)) 
+@test_throws MethodError collect(rest(countfrom(1), 5))
 
 # countfrom
 # ---------
Original file line number	Diff line number	Diff line change
Expand Up		@@ -144,3 +144,5 @@ function next(itr::StreamMapIterator, state::StreamMapState)

		return (r, state)
		end

		iteratorsize(::Type{StreamMapIterator}) = SizeUnknown()