Merge pull request #461 from PatrickPijnappel/patch-1

lattner · lattner · commit 68b3fe891688 · 2015-12-12T13:59:13.000-08:00
[stdlib] Unabbreviate local variable names
diff --git a/stdlib/public/core/Zip.swift b/stdlib/public/core/Zip.swift
@@ -48,12 +48,12 @@ public struct Zip2Generator<
       return nil
     }
 
-    guard let e0 = _baseStreams.0.next(), e1 = _baseStreams.1.next() else {
+    guard let element0 = _baseStreams.0.next(), element1 = _baseStreams.1.next() else {
       _reachedEnd = true
       return nil
     }
 
-    return .Some((e0, e1))
+    return .Some((element0, element1))
   }
 
   internal var _baseStreams: (Generator1, Generator2)

Original file line number	Diff line number	Diff line change
`@@ -48,12 +48,12 @@ public struct Zip2Generator<`
`48`	`48`	`return nil`
`49`	`49`	`}`
`50`	`50`
`51`		`- guard let e0 = _baseStreams.0.next(), e1 = _baseStreams.1.next() else {`
	`51`	`+ guard let element0 = _baseStreams.0.next(), element1 = _baseStreams.1.next() else {`
`52`	`52`	`_reachedEnd = true`
`53`	`53`	`return nil`
`54`	`54`	`}`
`55`	`55`
`56`		`- return .Some((e0, e1))`
	`56`	`+ return .Some((element0, element1))`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`internal var _baseStreams: (Generator1, Generator2)`