go mod and vendor/ update

vendor/github.com/blevesearch/bleve/registry/analyzer.go

@@ -1,11 +1,16 @@
 //  Copyright (c) 2014 Couchbase, Inc.
-//  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
-//  except in compliance with the License. You may obtain a copy of the License at
-//    http://www.apache.org/licenses/LICENSE-2.0
-//  Unless required by applicable law or agreed to in writing, software distributed under the
-//  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-//  either express or implied. See the License for the specific language governing permissions
-//  and limitations under the License.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 		http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package registry
 
@@ -61,9 +66,8 @@ func (c *AnalyzerCache) DefineAnalyzer(name string, typ string, config map[strin
 	if err != nil {
 		if err == ErrAlreadyDefined {
 			return nil, fmt.Errorf("analyzer named '%s' already defined", name)
-		} else {
-			return nil, err
 		}
+		return nil, err
 	}
 	return item.(*analysis.Analyzer), nil
 }
@@ -71,8 +75,8 @@ func (c *AnalyzerCache) DefineAnalyzer(name string, typ string, config map[strin
 func AnalyzerTypesAndInstances() ([]string, []string) {
 	emptyConfig := map[string]interface{}{}
 	emptyCache := NewCache()
-	types := make([]string, 0)
-	instances := make([]string, 0)
+	var types []string
+	var instances []string
 	for name, cons := range analyzers {
 		_, err := cons(emptyConfig, emptyCache)
 		if err == nil {

vendor/github.com/blevesearch/bleve/registry/cache.go

@@ -1,11 +1,16 @@
 //  Copyright (c) 2016 Couchbase, Inc.
-//  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
-//  except in compliance with the License. You may obtain a copy of the License at
-//    http://www.apache.org/licenses/LICENSE-2.0
-//  Unless required by applicable law or agreed to in writing, software distributed under the
-//  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-//  either express or implied. See the License for the specific language governing permissions
-//  and limitations under the License.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 		http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package registry
 

vendor/github.com/blevesearch/bleve/registry/char_filter.go

@@ -1,11 +1,16 @@
 //  Copyright (c) 2014 Couchbase, Inc.
-//  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
-//  except in compliance with the License. You may obtain a copy of the License at
-//    http://www.apache.org/licenses/LICENSE-2.0
-//  Unless required by applicable law or agreed to in writing, software distributed under the
-//  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-//  either express or implied. See the License for the specific language governing permissions
-//  and limitations under the License.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 		http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package registry
 
@@ -61,9 +66,8 @@ func (c *CharFilterCache) DefineCharFilter(name string, typ string, config map[s
 	if err != nil {
 		if err == ErrAlreadyDefined {
 			return nil, fmt.Errorf("char filter named '%s' already defined", name)
-		} else {
-			return nil, err
 		}
+		return nil, err
 	}
 	return item.(analysis.CharFilter), nil
 }
@@ -71,8 +75,8 @@ func (c *CharFilterCache) DefineCharFilter(name string, typ string, config map[s
 func CharFilterTypesAndInstances() ([]string, []string) {
 	emptyConfig := map[string]interface{}{}
 	emptyCache := NewCache()
-	types := make([]string, 0)
-	instances := make([]string, 0)
+	var types []string
+	var instances []string
 	for name, cons := range charFilters {
 		_, err := cons(emptyConfig, emptyCache)
 		if err == nil {

vendor/github.com/blevesearch/bleve/registry/datetime_parser.go

@@ -1,11 +1,16 @@
 //  Copyright (c) 2014 Couchbase, Inc.
-//  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
-//  except in compliance with the License. You may obtain a copy of the License at
-//    http://www.apache.org/licenses/LICENSE-2.0
-//  Unless required by applicable law or agreed to in writing, software distributed under the
-//  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-//  either express or implied. See the License for the specific language governing permissions
-//  and limitations under the License.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 		http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package registry
 
@@ -61,9 +66,8 @@ func (c *DateTimeParserCache) DefineDateTimeParser(name string, typ string, conf
 	if err != nil {
 		if err == ErrAlreadyDefined {
 			return nil, fmt.Errorf("date time parser named '%s' already defined", name)
-		} else {
-			return nil, err
 		}
+		return nil, err
 	}
 	return item.(analysis.DateTimeParser), nil
 }
@@ -71,8 +75,8 @@ func (c *DateTimeParserCache) DefineDateTimeParser(name string, typ string, conf
 func DateTimeParserTypesAndInstances() ([]string, []string) {
 	emptyConfig := map[string]interface{}{}
 	emptyCache := NewCache()
-	types := make([]string, 0)
-	instances := make([]string, 0)
+	var types []string
+	var instances []string
 	for name, cons := range dateTimeParsers {
 		_, err := cons(emptyConfig, emptyCache)
 		if err == nil {

vendor/github.com/blevesearch/bleve/registry/fragment_formatter.go

@@ -1,11 +1,16 @@
 //  Copyright (c) 2014 Couchbase, Inc.
-//  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
-//  except in compliance with the License. You may obtain a copy of the License at
-//    http://www.apache.org/licenses/LICENSE-2.0
-//  Unless required by applicable law or agreed to in writing, software distributed under the
-//  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-//  either express or implied. See the License for the specific language governing permissions
-//  and limitations under the License.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 		http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package registry
 
@@ -61,9 +66,8 @@ func (c *FragmentFormatterCache) DefineFragmentFormatter(name string, typ string
 	if err != nil {
 		if err == ErrAlreadyDefined {
 			return nil, fmt.Errorf("fragment formatter named '%s' already defined", name)
-		} else {
-			return nil, err
 		}
+		return nil, err
 	}
 	return item.(highlight.FragmentFormatter), nil
 }
@@ -71,8 +75,8 @@ func (c *FragmentFormatterCache) DefineFragmentFormatter(name string, typ string
 func FragmentFormatterTypesAndInstances() ([]string, []string) {
 	emptyConfig := map[string]interface{}{}
 	emptyCache := NewCache()
-	types := make([]string, 0)
-	instances := make([]string, 0)
+	var types []string
+	var instances []string
 	for name, cons := range fragmentFormatters {
 		_, err := cons(emptyConfig, emptyCache)
 		if err == nil {

vendor/github.com/blevesearch/bleve/registry/fragmenter.go

@@ -1,11 +1,16 @@
 //  Copyright (c) 2014 Couchbase, Inc.
-//  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
-//  except in compliance with the License. You may obtain a copy of the License at
-//    http://www.apache.org/licenses/LICENSE-2.0
-//  Unless required by applicable law or agreed to in writing, software distributed under the
-//  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-//  either express or implied. See the License for the specific language governing permissions
-//  and limitations under the License.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 		http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package registry
 
@@ -61,9 +66,8 @@ func (c *FragmenterCache) DefineFragmenter(name string, typ string, config map[s
 	if err != nil {
 		if err == ErrAlreadyDefined {
 			return nil, fmt.Errorf("fragmenter named '%s' already defined", name)
-		} else {
-			return nil, err
 		}
+		return nil, err
 	}
 	return item.(highlight.Fragmenter), nil
 }
@@ -71,8 +75,8 @@ func (c *FragmenterCache) DefineFragmenter(name string, typ string, config map[s
 func FragmenterTypesAndInstances() ([]string, []string) {
 	emptyConfig := map[string]interface{}{}
 	emptyCache := NewCache()
-	types := make([]string, 0)
-	instances := make([]string, 0)
+	var types []string
+	var instances []string
 	for name, cons := range fragmenters {
 		_, err := cons(emptyConfig, emptyCache)
 		if err == nil {

vendor/github.com/blevesearch/bleve/registry/highlighter.go

@@ -1,11 +1,16 @@
 //  Copyright (c) 2014 Couchbase, Inc.
-//  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
-//  except in compliance with the License. You may obtain a copy of the License at
-//    http://www.apache.org/licenses/LICENSE-2.0
-//  Unless required by applicable law or agreed to in writing, software distributed under the
-//  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-//  either express or implied. See the License for the specific language governing permissions
-//  and limitations under the License.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 		http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package registry
 
@@ -61,9 +66,8 @@ func (c *HighlighterCache) DefineHighlighter(name string, typ string, config map
 	if err != nil {
 		if err == ErrAlreadyDefined {
 			return nil, fmt.Errorf("highlighter named '%s' already defined", name)
-		} else {
-			return nil, err
 		}
+		return nil, err
 	}
 	return item.(highlight.Highlighter), nil
 }
@@ -71,8 +75,8 @@ func (c *HighlighterCache) DefineHighlighter(name string, typ string, config map
 func HighlighterTypesAndInstances() ([]string, []string) {
 	emptyConfig := map[string]interface{}{}
 	emptyCache := NewCache()
-	types := make([]string, 0)
-	instances := make([]string, 0)
+	var types []string
+	var instances []string
 	for name, cons := range highlighters {
 		_, err := cons(emptyConfig, emptyCache)
 		if err == nil {

vendor/github.com/blevesearch/bleve/registry/index_type.go

@@ -1,11 +1,16 @@
 //  Copyright (c) 2015 Couchbase, Inc.
-//  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
-//  except in compliance with the License. You may obtain a copy of the License at
-//    http://www.apache.org/licenses/LICENSE-2.0
-//  Unless required by applicable law or agreed to in writing, software distributed under the
-//  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-//  either express or implied. See the License for the specific language governing permissions
-//  and limitations under the License.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 		http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package registry
 
@@ -16,23 +21,23 @@ import (
 )
 
 func RegisterIndexType(name string, constructor IndexTypeConstructor) {
-	_, exists := index_types[name]
+	_, exists := indexTypes[name]
 	if exists {
 		panic(fmt.Errorf("attempted to register duplicate index encoding named '%s'", name))
 	}
-	index_types[name] = constructor
+	indexTypes[name] = constructor
 }
 
 type IndexTypeConstructor func(storeName string, storeConfig map[string]interface{}, analysisQueue *index.AnalysisQueue) (index.Index, error)
 type IndexTypeRegistry map[string]IndexTypeConstructor
 
 func IndexTypeConstructorByName(name string) IndexTypeConstructor {
-	return index_types[name]
+	return indexTypes[name]
 }
 
 func IndexTypesAndInstances() ([]string, []string) {
-	types := make([]string, 0)
-	instances := make([]string, 0)
+	var types []string
+	var instances []string
 	for name := range stores {
 		types = append(types, name)
 	}

vendor/github.com/blevesearch/bleve/registry/registry.go

@@ -1,11 +1,16 @@
 //  Copyright (c) 2014 Couchbase, Inc.
-//  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
-//  except in compliance with the License. You may obtain a copy of the License at
-//    http://www.apache.org/licenses/LICENSE-2.0
-//  Unless required by applicable law or agreed to in writing, software distributed under the
-//  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-//  either express or implied. See the License for the specific language governing permissions
-//  and limitations under the License.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 		http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package registry
 
@@ -17,7 +22,7 @@ import (
 )
 
 var stores = make(KVStoreRegistry, 0)
-var index_types = make(IndexTypeRegistry, 0)
+var indexTypes = make(IndexTypeRegistry, 0)
 
 // highlight
 var fragmentFormatters = make(FragmentFormatterRegistry, 0)

vendor/github.com/blevesearch/bleve/registry/store.go

@@ -1,11 +1,16 @@
 //  Copyright (c) 2014 Couchbase, Inc.
-//  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
-//  except in compliance with the License. You may obtain a copy of the License at
-//    http://www.apache.org/licenses/LICENSE-2.0
-//  Unless required by applicable law or agreed to in writing, software distributed under the
-//  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-//  either express or implied. See the License for the specific language governing permissions
-//  and limitations under the License.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 		http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package registry
 
@@ -23,6 +28,12 @@ func RegisterKVStore(name string, constructor KVStoreConstructor) {
 	stores[name] = constructor
 }
 
+// KVStoreConstructor is used to build a KVStore of a specific type when
+// specificied by the index configuration. In addition to meeting the
+// store.KVStore interface, KVStores must also support this constructor.
+// Note that currently the values of config must
+// be able to be marshaled and unmarshaled using the encoding/json library (used
+// when reading/writing the index metadata file).
 type KVStoreConstructor func(mo store.MergeOperator, config map[string]interface{}) (store.KVStore, error)
 type KVStoreRegistry map[string]KVStoreConstructor
 
@@ -31,8 +42,8 @@ func KVStoreConstructorByName(name string) KVStoreConstructor {
 }
 
 func KVStoreTypesAndInstances() ([]string, []string) {
-	types := make([]string, 0)
-	instances := make([]string, 0)
+	var types []string
+	var instances []string
 	for name := range stores {
 		types = append(types, name)
 	}

vendor/github.com/blevesearch/bleve/registry/token_filter.go

@@ -1,11 +1,16 @@
 //  Copyright (c) 2014 Couchbase, Inc.
-//  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
-//  except in compliance with the License. You may obtain a copy of the License at
-//    http://www.apache.org/licenses/LICENSE-2.0
-//  Unless required by applicable law or agreed to in writing, software distributed under the
-//  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-//  either express or implied. See the License for the specific language governing permissions
-//  and limitations under the License.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 		http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package registry
 
@@ -61,9 +66,8 @@ func (c *TokenFilterCache) DefineTokenFilter(name string, typ string, config map
 	if err != nil {
 		if err == ErrAlreadyDefined {
 			return nil, fmt.Errorf("token filter named '%s' already defined", name)
-		} else {
-			return nil, err
 		}
+		return nil, err
 	}
 	return item.(analysis.TokenFilter), nil
 }
@@ -71,8 +75,8 @@ func (c *TokenFilterCache) DefineTokenFilter(name string, typ string, config map
 func TokenFilterTypesAndInstances() ([]string, []string) {
 	emptyConfig := map[string]interface{}{}
 	emptyCache := NewCache()
-	types := make([]string, 0)
-	instances := make([]string, 0)
+	var types []string
+	var instances []string
 	for name, cons := range tokenFilters {
 		_, err := cons(emptyConfig, emptyCache)
 		if err == nil {

vendor/github.com/blevesearch/bleve/registry/token_maps.go

@@ -1,11 +1,16 @@
 //  Copyright (c) 2014 Couchbase, Inc.
-//  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
-//  except in compliance with the License. You may obtain a copy of the License at
-//    http://www.apache.org/licenses/LICENSE-2.0
-//  Unless required by applicable law or agreed to in writing, software distributed under the
-//  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-//  either express or implied. See the License for the specific language governing permissions
-//  and limitations under the License.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 		http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package registry
 
@@ -61,9 +66,8 @@ func (c *TokenMapCache) DefineTokenMap(name string, typ string, config map[strin
 	if err != nil {
 		if err == ErrAlreadyDefined {
 			return nil, fmt.Errorf("token map named '%s' already defined", name)
-		} else {
-			return nil, err
 		}
+		return nil, err
 	}
 	return item.(analysis.TokenMap), nil
 }
@@ -71,8 +75,8 @@ func (c *TokenMapCache) DefineTokenMap(name string, typ string, config map[strin
 func TokenMapTypesAndInstances() ([]string, []string) {
 	emptyConfig := map[string]interface{}{}
 	emptyCache := NewCache()
-	types := make([]string, 0)
-	instances := make([]string, 0)
+	var types []string
+	var instances []string
 	for name, cons := range tokenMaps {
 		_, err := cons(emptyConfig, emptyCache)
 		if err == nil {

vendor/github.com/blevesearch/bleve/registry/tokenizer.go

@@ -1,11 +1,16 @@
 //  Copyright (c) 2014 Couchbase, Inc.
-//  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
-//  except in compliance with the License. You may obtain a copy of the License at
-//    http://www.apache.org/licenses/LICENSE-2.0
-//  Unless required by applicable law or agreed to in writing, software distributed under the
-//  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-//  either express or implied. See the License for the specific language governing permissions
-//  and limitations under the License.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 		http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 package registry
 
@@ -61,9 +66,8 @@ func (c *TokenizerCache) DefineTokenizer(name string, typ string, config map[str
 	if err != nil {
 		if err == ErrAlreadyDefined {
 			return nil, fmt.Errorf("tokenizer named '%s' already defined", name)
-		} else {
-			return nil, err
 		}
+		return nil, err
 	}
 	return item.(analysis.Tokenizer), nil
 }
@@ -71,8 +75,8 @@ func (c *TokenizerCache) DefineTokenizer(name string, typ string, config map[str
 func TokenizerTypesAndInstances() ([]string, []string) {
 	emptyConfig := map[string]interface{}{}
 	emptyCache := NewCache()
-	types := make([]string, 0)
-	instances := make([]string, 0)
+	var types []string
+	var instances []string
 	for name, cons := range tokenizers {
 		_, err := cons(emptyConfig, emptyCache)
 		if err == nil {