match func doesn't need err anymore

cmaglie · cmaglie · commit 821c03a60749 · 2021-08-26T11:28:16.000+02:00
diff --git a/commands/board/listall.go b/commands/board/listall.go
@@ -41,17 +41,17 @@ func ListAll(ctx context.Context, req *rpc.BoardListAllRequest) (*rpc.BoardListA
 		searchArgs = append(searchArgs, strings.Trim(s, " "))
 	}
 
-	match := func(toTest []string) (bool, error) {
+	match := func(toTest []string) bool {
 		if len(searchArgs) == 0 {
-			return true, nil
+			return true
 		}
 
 		for _, t := range toTest {
 			if utils.Match(t, searchArgs) {
-				return true, nil
+				return true
 			}
 		}
-		return false, nil
+		return false
 	}
 
 	list := &rpc.BoardListAllResponse{Boards: []*rpc.BoardListItem{}}
@@ -96,9 +96,7 @@ func ListAll(ctx context.Context, req *rpc.BoardListAllRequest) (*rpc.BoardListA
 
 				toTest := append(toTest, board.Name())
 				toTest = append(toTest, board.FQBN())
-				if ok, err := match(toTest); err != nil {
-					return nil, err
-				} else if !ok {
+				if !match(toTest) {
 					continue
 				}
 
diff --git a/commands/board/search.go b/commands/board/search.go
@@ -38,17 +38,17 @@ func Search(ctx context.Context, req *rpc.BoardSearchRequest) (*rpc.BoardSearchR
 
 	searchArgs := strings.Split(strings.Trim(req.SearchArgs, " "), " ")
 
-	match := func(toTest []string) (bool, error) {
+	match := func(toTest []string) bool {
 		if len(searchArgs) == 0 {
-			return true, nil
+			return true
 		}
 
 		for _, t := range toTest {
 			if utils.Match(t, searchArgs) {
-				return true, nil
+				return true
 			}
 		}
-		return false, nil
+		return false
 	}
 
 	res := &rpc.BoardSearchResponse{Boards: []*rpc.BoardListItem{}}
@@ -89,9 +89,7 @@ func Search(ctx context.Context, req *rpc.BoardSearchRequest) (*rpc.BoardSearchR
 					}
 
 					toTest := append(strings.Split(board.Name(), " "), board.Name(), board.FQBN())
-					if ok, err := match(toTest); err != nil {
-						return nil, err
-					} else if !ok {
+					if !match(toTest) {
 						continue
 					}
 
@@ -105,9 +103,7 @@ func Search(ctx context.Context, req *rpc.BoardSearchRequest) (*rpc.BoardSearchR
 			} else if latestPlatformRelease != nil {
 				for _, board := range latestPlatformRelease.BoardsManifest {
 					toTest := append(strings.Split(board.Name, " "), board.Name)
-					if ok, err := match(toTest); err != nil {
-						return nil, err
-					} else if !ok {
+					if !match(toTest) {
 						continue
 					}
 
diff --git a/commands/core/search.go b/commands/core/search.go
@@ -48,17 +48,17 @@ func PlatformSearch(req *rpc.PlatformSearchRequest) (*rpc.PlatformSearchResponse
 
 		searchArgs := strings.Split(searchArgs, " ")
 
-		match := func(toTest []string) (bool, error) {
+		match := func(toTest []string) bool {
 			if len(searchArgs) == 0 {
-				return true, nil
+				return true
 			}
 
 			for _, t := range toTest {
 				if utils.Match(t, searchArgs) {
-					return true, nil
+					return true
 				}
 			}
-			return false, nil
+			return false
 		}
 
 		for _, targetPackage := range pm.Packages {
@@ -91,9 +91,7 @@ func PlatformSearch(req *rpc.PlatformSearchRequest) (*rpc.PlatformSearchResponse
 				}
 
 				// Search
-				if ok, err := match(toTest); err != nil {
-					return nil, err
-				} else if !ok {
+				if !match(toTest) {
 					continue
 				}
 
diff --git a/commands/lib/search.go b/commands/lib/search.go
@@ -45,24 +45,22 @@ func searchLibrary(req *rpc.LibrarySearchRequest, lm *librariesmanager.Libraries
 
 	searchArgs := strings.Split(strings.Trim(query, " "), " ")
 
-	match := func(toTest []string) (bool, error) {
+	match := func(toTest []string) bool {
 		if len(searchArgs) == 0 {
-			return true, nil
+			return true
 		}
 
 		for _, t := range toTest {
 			if utils.Match(t, searchArgs) {
-				return true, nil
+				return true
 			}
 		}
-		return false, nil
+		return false
 	}
 
 	for _, lib := range lm.Index.Libraries {
 		toTest := []string{lib.Name, lib.Latest.Paragraph, lib.Latest.Sentence}
-		if ok, err := match(toTest); err != nil {
-			return nil, err
-		} else if !ok {
+		if !match(toTest) {
 			continue
 		}
 		res = append(res, indexLibraryToRPCSearchLibrary(lib))

Original file line number	Diff line number	Diff line change
`@@ -41,17 +41,17 @@ func ListAll(ctx context.Context, req rpc.BoardListAllRequest) (rpc.BoardListA`
`41`	`41`	`searchArgs = append(searchArgs, strings.Trim(s, " "))`
`42`	`42`	`}`
`43`	`43`
`44`		`- match := func(toTest []string) (bool, error) {`
	`44`	`+ match := func(toTest []string) bool {`
`45`	`45`	`if len(searchArgs) == 0 {`
`46`		`- return true, nil`
	`46`	`+ return true`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`for _, t := range toTest {`
`50`	`50`	`if utils.Match(t, searchArgs) {`
`51`		`- return true, nil`
	`51`	`+ return true`
`52`	`52`	`}`
`53`	`53`	`}`
`54`		`- return false, nil`
	`54`	`+ return false`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`list := &rpc.BoardListAllResponse{Boards: []*rpc.BoardListItem{}}`
`@@ -96,9 +96,7 @@ func ListAll(ctx context.Context, req rpc.BoardListAllRequest) (rpc.BoardListA`
`96`	`96`
`97`	`97`	`toTest := append(toTest, board.Name())`
`98`	`98`	`toTest = append(toTest, board.FQBN())`
`99`		`- if ok, err := match(toTest); err != nil {`
`100`		`- return nil, err`
`101`		`- } else if !ok {`
	`99`	`+ if !match(toTest) {`
`102`	`100`	`continue`
`103`	`101`	`}`
`104`	`102`
Original file line number	Diff line number	Diff line change
`@@ -38,17 +38,17 @@ func Search(ctx context.Context, req rpc.BoardSearchRequest) (rpc.BoardSearchR`
`38`	`38`
`39`	`39`	`searchArgs := strings.Split(strings.Trim(req.SearchArgs, " "), " ")`
`40`	`40`
`41`		`- match := func(toTest []string) (bool, error) {`
	`41`	`+ match := func(toTest []string) bool {`
`42`	`42`	`if len(searchArgs) == 0 {`
`43`		`- return true, nil`
	`43`	`+ return true`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`for _, t := range toTest {`
`47`	`47`	`if utils.Match(t, searchArgs) {`
`48`		`- return true, nil`
	`48`	`+ return true`
`49`	`49`	`}`
`50`	`50`	`}`
`51`		`- return false, nil`
	`51`	`+ return false`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`res := &rpc.BoardSearchResponse{Boards: []*rpc.BoardListItem{}}`
`@@ -89,9 +89,7 @@ func Search(ctx context.Context, req rpc.BoardSearchRequest) (rpc.BoardSearchR`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`toTest := append(strings.Split(board.Name(), " "), board.Name(), board.FQBN())`
`92`		`- if ok, err := match(toTest); err != nil {`
`93`		`- return nil, err`
`94`		`- } else if !ok {`
	`92`	`+ if !match(toTest) {`
`95`	`93`	`continue`
`96`	`94`	`}`
`97`	`95`
`@@ -105,9 +103,7 @@ func Search(ctx context.Context, req rpc.BoardSearchRequest) (rpc.BoardSearchR`
`105`	`103`	`} else if latestPlatformRelease != nil {`
`106`	`104`	`for _, board := range latestPlatformRelease.BoardsManifest {`
`107`	`105`	`toTest := append(strings.Split(board.Name, " "), board.Name)`
`108`		`- if ok, err := match(toTest); err != nil {`
`109`		`- return nil, err`
`110`		`- } else if !ok {`
	`106`	`+ if !match(toTest) {`
`111`	`107`	`continue`
`112`	`108`	`}`
`113`	`109`
Original file line number	Diff line number	Diff line change
`@@ -48,17 +48,17 @@ func PlatformSearch(req rpc.PlatformSearchRequest) (rpc.PlatformSearchResponse`
`48`	`48`
`49`	`49`	`searchArgs := strings.Split(searchArgs, " ")`
`50`	`50`
`51`		`- match := func(toTest []string) (bool, error) {`
	`51`	`+ match := func(toTest []string) bool {`
`52`	`52`	`if len(searchArgs) == 0 {`
`53`		`- return true, nil`
	`53`	`+ return true`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`for _, t := range toTest {`
`57`	`57`	`if utils.Match(t, searchArgs) {`
`58`		`- return true, nil`
	`58`	`+ return true`
`59`	`59`	`}`
`60`	`60`	`}`
`61`		`- return false, nil`
	`61`	`+ return false`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`for _, targetPackage := range pm.Packages {`
`@@ -91,9 +91,7 @@ func PlatformSearch(req rpc.PlatformSearchRequest) (rpc.PlatformSearchResponse`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`// Search`
`94`		`- if ok, err := match(toTest); err != nil {`
`95`		`- return nil, err`
`96`		`- } else if !ok {`
	`94`	`+ if !match(toTest) {`
`97`	`95`	`continue`
`98`	`96`	`}`
`99`	`97`
Original file line number	Diff line number	Diff line change
`@@ -45,24 +45,22 @@ func searchLibrary(req rpc.LibrarySearchRequest, lm librariesmanager.Libraries`
`45`	`45`
`46`	`46`	`searchArgs := strings.Split(strings.Trim(query, " "), " ")`
`47`	`47`
`48`		`- match := func(toTest []string) (bool, error) {`
	`48`	`+ match := func(toTest []string) bool {`
`49`	`49`	`if len(searchArgs) == 0 {`
`50`		`- return true, nil`
	`50`	`+ return true`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`for _, t := range toTest {`
`54`	`54`	`if utils.Match(t, searchArgs) {`
`55`		`- return true, nil`
	`55`	`+ return true`
`56`	`56`	`}`
`57`	`57`	`}`
`58`		`- return false, nil`
	`58`	`+ return false`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`for _, lib := range lm.Index.Libraries {`
`62`	`62`	`toTest := []string{lib.Name, lib.Latest.Paragraph, lib.Latest.Sentence}`
`63`		`- if ok, err := match(toTest); err != nil {`
`64`		`- return nil, err`
`65`		`- } else if !ok {`
	`63`	`+ if !match(toTest) {`
`66`	`64`	`continue`
`67`	`65`	`}`
`68`	`66`	`res = append(res, indexLibraryToRPCSearchLibrary(lib))`