Fix `go vet` issues
Test: go vet ./...
Change-Id: Ifb936ccc5e2b5a2c3fcbbbcb54f680e2973ea1b3
diff --git a/android/config_test.go b/android/config_test.go
index 72942eb..274d59f 100644
--- a/android/config_test.go
+++ b/android/config_test.go
@@ -50,7 +50,7 @@
}
type configType struct {
- populateMe *bool `json:"omitempty"`
+ PopulateMe *bool `json:"omitempty"`
}
func (c *configType) SetDefaultConfig() {
@@ -60,7 +60,7 @@
func TestValidateConfigAnnotations(t *testing.T) {
config := configType{}
err := validateConfigAnnotations(&config)
- expectedError := `Field configType.populateMe has tag json:"omitempty" which specifies to change its json field name to "omitempty".
+ expectedError := `Field configType.PopulateMe has tag json:"omitempty" which specifies to change its json field name to "omitempty".
Did you mean to use an annotation of ",omitempty"?
(Alternatively, to change the json name of the field, rename the field in source instead.)`
if err.Error() != expectedError {
diff --git a/android/makevars.go b/android/makevars.go
index accc4d3..3a7ec6e 100644
--- a/android/makevars.go
+++ b/android/makevars.go
@@ -153,7 +153,7 @@
func (s *makeVarsSingleton) writeVars(vars []makeVarsVariable) []byte {
buf := &bytes.Buffer{}
- fmt.Fprintln(buf, `# Autogenerated file
+ fmt.Fprint(buf, `# Autogenerated file
# Compares SOONG_$(1) against $(1), and warns if they are not equal.
#
@@ -201,7 +201,7 @@
fmt.Fprintf(buf, "$(eval $(call soong-compare-var,%s,%s,my_check_failed := true))\n\n", v.name, sort)
}
- fmt.Fprintln(buf, `
+ fmt.Fprint(buf, `
ifneq ($(my_check_failed),false)
$(error Soong variable check failed)
endif
diff --git a/android/namespace.go b/android/namespace.go
index 0230524..b027ceb 100644
--- a/android/namespace.go
+++ b/android/namespace.go
@@ -94,10 +94,8 @@
}
func NewNameResolver(namespaceExportFilter func(*Namespace) bool) *NameResolver {
- namespacesByDir := sync.Map{}
-
r := &NameResolver{
- namespacesByDir: namespacesByDir,
+ namespacesByDir: sync.Map{},
namespaceExportFilter: namespaceExportFilter,
}
r.rootNamespace = r.newNamespace(".")