Merge pull request kodecocodes#200 from nemanjavlahovic/linear-search-nemanja

Chris Pilcher · web-flow · commit 59314d44ad20 · 2016-09-06T21:07:54.000+12:00
Updating Linear Search to Swift 3
diff --git a/Linear Search/LinearSearch.playground/Contents.swift b/Linear Search/LinearSearch.playground/Contents.swift
@@ -1,7 +1,7 @@
 //: Playground - noun: a place where people can play
 
-func linearSearch<T: Equatable>(array: [T], _ object: T) -> Int? {
-  for (index, obj) in array.enumerate() where obj == object {
+func linearSearch<T: Equatable>(_ array: [T], _ object: T) -> Int? {
+  for (index, obj) in array.enumerated() where obj == object {
     return index
   }
   return nil
diff --git a/Linear Search/LinearSearch.swift b/Linear Search/LinearSearch.swift
@@ -1,5 +1,5 @@
-func linearSearch<T: Equatable>(array: [T], _ object: T) -> Int? {
-  for (index, obj) in array.enumerate() where obj == object {
+func linearSearch<T: Equatable>(_ array: [T], _ object: T) -> Int? {
+  for (index, obj) in array.enumerated() where obj == object {
     return index
   }
   return nil
diff --git a/Linear Search/README.markdown b/Linear Search/README.markdown
@@ -17,8 +17,8 @@ We compare the number `2` from the array to our number `2` and notice they are e
 Here is a simple implementation of linear search in Swift:
 
 ```swift
-func linearSearch<T: Equatable>(array: [T], _ object: T) -> Int? {
-  for (index, obj) in array.enumerate() where obj == object {
+func linearSearch<T: Equatable>(_ array: [T], _ object: T) -> Int? {
+  for (index, obj) in array.enumerated() where obj == object {
     return index
   }
   return nil

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`//: Playground - noun: a place where people can play`
`2`	`2`
`3`		`-func linearSearch<T: Equatable>(array: [T], _ object: T) -> Int? {`
`4`		`- for (index, obj) in array.enumerate() where obj == object {`
	`3`	`+func linearSearch<T: Equatable>(_ array: [T], _ object: T) -> Int? {`
	`4`	`+ for (index, obj) in array.enumerated() where obj == object {`
`5`	`5`	`return index`
`6`	`6`	`}`
`7`	`7`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-func linearSearch<T: Equatable>(array: [T], _ object: T) -> Int? {`
`2`		`- for (index, obj) in array.enumerate() where obj == object {`
	`1`	`+func linearSearch<T: Equatable>(_ array: [T], _ object: T) -> Int? {`
	`2`	`+ for (index, obj) in array.enumerated() where obj == object {`
`3`	`3`	`return index`
`4`	`4`	`}`
`5`	`5`	`return nil`