From 4351a2e6e9f57c623f3c217783f764010558352b Mon Sep 17 00:00:00 2001
From: Tao Wen <taowen@gmail.com>
Date: Sun, 9 Jul 2017 11:55:58 +0800
Subject: [PATCH] fix golint: do not export test types
---
output_tests/json_marshal/string_alias/types.go | 14 +++++++-------
output_tests/json_marshal/struct/types.go | 8 ++++----
output_tests/json_marshal/struct_alias/types.go | 6 +++---
output_tests/json_marshal/struct_field/types.go | 6 +++---
.../json_marshal/struct_field_alias/types.go | 6 +++---
.../anonymous/no_overlap/json_marshal/types.go | 12 ++++++------
.../anonymous/no_overlap/text_marshal/types.go | 12 ++++++------
.../anonymous/overlap/ignore_deeper_level/types.go | 14 +++++++-------
.../overlap/same_level_1_both_tagged/types.go | 8 ++++----
.../overlap/same_level_1_no_tags/types.go | 8 ++++----
.../anonymous/overlap/same_level_1_tagged/types.go | 8 ++++----
.../overlap/same_level_2_both_tagged/types.go | 8 ++++----
.../overlap/same_level_2_no_tags/types.go | 8 ++++----
.../anonymous/overlap/same_level_2_tagged/types.go | 8 ++++----
.../omitempty/string_json_marshal/types.go | 8 ++++----
output_tests/text_marshal/string_alias/types.go | 14 +++++++-------
output_tests/text_marshal/struct/types.go | 12 ++++++------
output_tests/text_marshal/struct_alias/types.go | 12 ++++++------
output_tests/text_marshal/struct_field/types.go | 12 ++++++------
.../text_marshal/struct_field_alias/types.go | 12 ++++++------
20 files changed, 98 insertions(+), 98 deletions(-)
diff --git a/output_tests/json_marshal/string_alias/types.go b/output_tests/json_marshal/string_alias/types.go
index 0997680..1f04529 100644
--- a/output_tests/json_marshal/string_alias/types.go
+++ b/output_tests/json_marshal/string_alias/types.go
@@ -7,7 +7,7 @@ import (
"strings"
)
-type Marshaler string
+type marshalerForTest string
func encode(str string) string {
buf := bytes.Buffer{}
@@ -35,16 +35,16 @@ func decode(str string) string {
return string(bs)
}
-func (m Marshaler) MarshalJSON() ([]byte, error) {
+func (m marshalerForTest) MarshalJSON() ([]byte, error) {
return []byte(`"MANUAL__` + encode(string(m)) + `"`), nil
}
-func (m *Marshaler) UnmarshalJSON(text []byte) error {
- *m = Marshaler(decode(strings.TrimPrefix(strings.Trim(string(text), `"`), "MANUAL__")))
+func (m *marshalerForTest) UnmarshalJSON(text []byte) error {
+ *m = marshalerForTest(decode(strings.TrimPrefix(strings.Trim(string(text), `"`), "MANUAL__")))
return nil
}
-var _ json.Marshaler = *new(Marshaler)
-var _ json.Unmarshaler = new(Marshaler)
+var _ json.Marshaler = *new(marshalerForTest)
+var _ json.Unmarshaler = new(marshalerForTest)
-type typeForTest Marshaler
+type typeForTest marshalerForTest
diff --git a/output_tests/json_marshal/struct/types.go b/output_tests/json_marshal/struct/types.go
index 9a9f12a..5bc68a8 100644
--- a/output_tests/json_marshal/struct/types.go
+++ b/output_tests/json_marshal/struct/types.go
@@ -7,7 +7,7 @@ import (
"strings"
)
-type Marshaler struct {
+type marshalerForTest struct {
X string
}
@@ -37,11 +37,11 @@ func decode(str string) string {
return string(bs)
}
-func (m Marshaler) MarshalJSON() ([]byte, error) {
+func (m marshalerForTest) MarshalJSON() ([]byte, error) {
return []byte(`"MANUAL__` + encode(m.X) + `"`), nil
}
-func (m *Marshaler) UnmarshalJSON(text []byte) error {
+func (m *marshalerForTest) UnmarshalJSON(text []byte) error {
m.X = decode(strings.TrimPrefix(strings.Trim(string(text), `"`), "MANUAL__"))
return nil
}
@@ -49,4 +49,4 @@ func (m *Marshaler) UnmarshalJSON(text []byte) error {
var _ json.Marshaler = Marshaler{}
var _ json.Unmarshaler = &Marshaler{}
-type typeForTest Marshaler
+type typeForTest marshalerForTest
diff --git a/output_tests/json_marshal/struct_alias/types.go b/output_tests/json_marshal/struct_alias/types.go
index 0797222..d1d860a 100644
--- a/output_tests/json_marshal/struct_alias/types.go
+++ b/output_tests/json_marshal/struct_alias/types.go
@@ -7,7 +7,7 @@ import (
"strings"
)
-type Marshaler struct {
+type marshalerForTest struct {
X string
}
@@ -37,11 +37,11 @@ func decode(str string) string {
return string(bs)
}
-func (m Marshaler) MarshalJSON() ([]byte, error) {
+func (m marshalerForTest) MarshalJSON() ([]byte, error) {
return []byte(`"MANUAL__` + encode(m.X) + `"`), nil
}
-func (m *Marshaler) UnmarshalJSON(text []byte) error {
+func (m *marshalerForTest) UnmarshalJSON(text []byte) error {
m.X = decode(strings.TrimPrefix(strings.Trim(string(text), `"`), "MANUAL__"))
return nil
}
diff --git a/output_tests/json_marshal/struct_field/types.go b/output_tests/json_marshal/struct_field/types.go
index caca688..91eb345 100644
--- a/output_tests/json_marshal/struct_field/types.go
+++ b/output_tests/json_marshal/struct_field/types.go
@@ -7,7 +7,7 @@ import (
"strings"
)
-type Marshaler struct {
+type marshalerForTest struct {
X string
}
@@ -37,11 +37,11 @@ func decode(str string) string {
return string(bs)
}
-func (m Marshaler) MarshalJSON() ([]byte, error) {
+func (m marshalerForTest) MarshalJSON() ([]byte, error) {
return []byte(`"MANUAL__` + encode(m.X) + `"`), nil
}
-func (m *Marshaler) UnmarshalJSON(text []byte) error {
+func (m *marshalerForTest) UnmarshalJSON(text []byte) error {
m.X = decode(strings.TrimPrefix(strings.Trim(string(text), `"`), "MANUAL__"))
return nil
}
diff --git a/output_tests/json_marshal/struct_field_alias/types.go b/output_tests/json_marshal/struct_field_alias/types.go
index b641cfe..1636e86 100644
--- a/output_tests/json_marshal/struct_field_alias/types.go
+++ b/output_tests/json_marshal/struct_field_alias/types.go
@@ -7,7 +7,7 @@ import (
"strings"
)
-type Marshaler struct {
+type marshalerForTest struct {
X string
}
@@ -37,11 +37,11 @@ func decode(str string) string {
return string(bs)
}
-func (m Marshaler) MarshalJSON() ([]byte, error) {
+func (m marshalerForTest) MarshalJSON() ([]byte, error) {
return []byte(`"MANUAL__` + encode(m.X) + `"`), nil
}
-func (m *Marshaler) UnmarshalJSON(text []byte) error {
+func (m *marshalerForTest) UnmarshalJSON(text []byte) error {
m.X = decode(strings.TrimPrefix(strings.Trim(string(text), `"`), "MANUAL__"))
return nil
}
diff --git a/output_tests/struct/anonymous/no_overlap/json_marshal/types.go b/output_tests/struct/anonymous/no_overlap/json_marshal/types.go
index 98a3822..ea92f5e 100644
--- a/output_tests/struct/anonymous/no_overlap/json_marshal/types.go
+++ b/output_tests/struct/anonymous/no_overlap/json_marshal/types.go
@@ -7,7 +7,7 @@ import (
"strings"
)
-type Marshaler string
+type marshalerForTest string
func encode(str string) string {
buf := bytes.Buffer{}
@@ -35,17 +35,17 @@ func decode(str string) string {
return string(bs)
}
-func (m Marshaler) MarshalJSON() ([]byte, error) {
+func (m marshalerForTest) MarshalJSON() ([]byte, error) {
return []byte(`"MANUAL__` + encode(string(m)) + `"`), nil
}
-func (m *Marshaler) UnmarshalJSON(text []byte) error {
- *m = Marshaler(decode(strings.TrimPrefix(strings.Trim(string(text), `"`), "MANUAL__")))
+func (m *marshalerForTest) UnmarshalJSON(text []byte) error {
+ *m = marshalerForTest(decode(strings.TrimPrefix(strings.Trim(string(text), `"`), "MANUAL__")))
return nil
}
-var _ json.Marshaler = *new(Marshaler)
-var _ json.Unmarshaler = new(Marshaler)
+var _ json.Marshaler = *new(marshalerForTest)
+var _ json.Unmarshaler = new(marshalerForTest)
type typeForTest struct {
F1 float64
diff --git a/output_tests/struct/anonymous/no_overlap/text_marshal/types.go b/output_tests/struct/anonymous/no_overlap/text_marshal/types.go
index ee0f28f..7dff054 100644
--- a/output_tests/struct/anonymous/no_overlap/text_marshal/types.go
+++ b/output_tests/struct/anonymous/no_overlap/text_marshal/types.go
@@ -7,7 +7,7 @@ import (
"strings"
)
-type Marshaler string
+type marshalerForTest string
func encode(str string) string {
buf := bytes.Buffer{}
@@ -35,17 +35,17 @@ func decode(str string) string {
return string(bs)
}
-func (m Marshaler) MarshalText() ([]byte, error) {
+func (m marshalerForTest) MarshalText() ([]byte, error) {
return []byte(`MANUAL__` + encode(string(m))), nil
}
-func (m *Marshaler) UnmarshalText(text []byte) error {
- *m = Marshaler(decode(strings.TrimPrefix(string(text), "MANUAL__")))
+func (m *marshalerForTest) UnmarshalText(text []byte) error {
+ *m = marshalerForTest(decode(strings.TrimPrefix(string(text), "MANUAL__")))
return nil
}
-var _ encoding.TextMarshaler = *new(Marshaler)
-var _ encoding.TextUnmarshaler = new(Marshaler)
+var _ encoding.TextMarshaler = *new(marshalerForTest)
+var _ encoding.TextUnmarshaler = new(marshalerForTest)
type typeForTest struct {
F1 float64
diff --git a/output_tests/struct/anonymous/overlap/ignore_deeper_level/types.go b/output_tests/struct/anonymous/overlap/ignore_deeper_level/types.go
index a1ad22e..956ae9f 100644
--- a/output_tests/struct/anonymous/overlap/ignore_deeper_level/types.go
+++ b/output_tests/struct/anonymous/overlap/ignore_deeper_level/types.go
@@ -1,20 +1,20 @@
package test
-type DoubleEmbedded struct {
+type doubleEmbedded struct {
F1 int32 `json:"F1"`
}
-type Embedded1 struct {
- DoubleEmbedded
+type embedded1 struct {
+ doubleEmbedded
F1 int32
}
-type Embedded2 struct {
+type embedded2 struct {
F1 int32 `json:"F1"`
- DoubleEmbedded
+ doubleEmbedded
}
type typeForTest struct {
- Embedded1
- Embedded2
+ embedded1
+ embedded2
}
diff --git a/output_tests/struct/anonymous/overlap/same_level_1_both_tagged/types.go b/output_tests/struct/anonymous/overlap/same_level_1_both_tagged/types.go
index 88ce4ca..a442d98 100644
--- a/output_tests/struct/anonymous/overlap/same_level_1_both_tagged/types.go
+++ b/output_tests/struct/anonymous/overlap/same_level_1_both_tagged/types.go
@@ -1,14 +1,14 @@
package test
-type Embedded1 struct {
+type embedded1 struct {
F1 int32 `json:"F1"`
}
-type Embedded2 struct {
+type embedded2 struct {
F1 int32 `json:"F1"`
}
type typeForTest struct {
- Embedded1
- Embedded2
+ embedded1
+ embedded2
}
diff --git a/output_tests/struct/anonymous/overlap/same_level_1_no_tags/types.go b/output_tests/struct/anonymous/overlap/same_level_1_no_tags/types.go
index 97b62a2..711af13 100644
--- a/output_tests/struct/anonymous/overlap/same_level_1_no_tags/types.go
+++ b/output_tests/struct/anonymous/overlap/same_level_1_no_tags/types.go
@@ -1,14 +1,14 @@
package test
-type Embedded1 struct {
+type embedded1 struct {
F1 int32
}
-type Embedded2 struct {
+type embedded2 struct {
F1 int32
}
type typeForTest struct {
- Embedded1
- Embedded2
+ embedded1
+ embedded2
}
diff --git a/output_tests/struct/anonymous/overlap/same_level_1_tagged/types.go b/output_tests/struct/anonymous/overlap/same_level_1_tagged/types.go
index 33dbb1c..7863f11 100644
--- a/output_tests/struct/anonymous/overlap/same_level_1_tagged/types.go
+++ b/output_tests/struct/anonymous/overlap/same_level_1_tagged/types.go
@@ -1,14 +1,14 @@
package test
-type Embedded1 struct {
+type embedded1 struct {
F1 int32
}
-type Embedded2 struct {
+type embedded2 struct {
F1 int32 `json:"F1"`
}
type typeForTest struct {
- Embedded1
- Embedded2
+ embedded1
+ embedded2
}
diff --git a/output_tests/struct/anonymous/overlap/same_level_2_both_tagged/types.go b/output_tests/struct/anonymous/overlap/same_level_2_both_tagged/types.go
index dff8262..94c2fae 100644
--- a/output_tests/struct/anonymous/overlap/same_level_2_both_tagged/types.go
+++ b/output_tests/struct/anonymous/overlap/same_level_2_both_tagged/types.go
@@ -4,7 +4,7 @@ type DoubleEmbedded1 struct {
F1 int32 `json:"F1"`
}
-type Embedded1 struct {
+type embedded1 struct {
DoubleEmbedded1
}
@@ -12,11 +12,11 @@ type DoubleEmbedded2 struct {
F1 int32 `json:"F1"`
}
-type Embedded2 struct {
+type embedded2 struct {
DoubleEmbedded2
}
type typeForTest struct {
- Embedded1
- Embedded2
+ embedded1
+ embedded2
}
diff --git a/output_tests/struct/anonymous/overlap/same_level_2_no_tags/types.go b/output_tests/struct/anonymous/overlap/same_level_2_no_tags/types.go
index 4a1aeb8..e504ffa 100644
--- a/output_tests/struct/anonymous/overlap/same_level_2_no_tags/types.go
+++ b/output_tests/struct/anonymous/overlap/same_level_2_no_tags/types.go
@@ -4,7 +4,7 @@ type DoubleEmbedded1 struct {
F1 int32
}
-type Embedded1 struct {
+type embedded1 struct {
DoubleEmbedded1
}
@@ -12,11 +12,11 @@ type DoubleEmbedded2 struct {
F1 int32
}
-type Embedded2 struct {
+type embedded2 struct {
DoubleEmbedded2
}
type typeForTest struct {
- Embedded1
- Embedded2
+ embedded1
+ embedded2
}
diff --git a/output_tests/struct/anonymous/overlap/same_level_2_tagged/types.go b/output_tests/struct/anonymous/overlap/same_level_2_tagged/types.go
index dd74e28..673b2bc 100644
--- a/output_tests/struct/anonymous/overlap/same_level_2_tagged/types.go
+++ b/output_tests/struct/anonymous/overlap/same_level_2_tagged/types.go
@@ -4,7 +4,7 @@ type DoubleEmbedded1 struct {
F1 int32
}
-type Embedded1 struct {
+type embedded1 struct {
DoubleEmbedded1
}
@@ -12,11 +12,11 @@ type DoubleEmbedded2 struct {
F1 int32 `json:"F1"`
}
-type Embedded2 struct {
+type embedded2 struct {
DoubleEmbedded2
}
type typeForTest struct {
- Embedded1
- Embedded2
+ embedded1
+ embedded2
}
diff --git a/output_tests/struct_tags/omitempty/string_json_marshal/types.go b/output_tests/struct_tags/omitempty/string_json_marshal/types.go
index af2cac6..6a33ddf 100644
--- a/output_tests/struct_tags/omitempty/string_json_marshal/types.go
+++ b/output_tests/struct_tags/omitempty/string_json_marshal/types.go
@@ -1,15 +1,15 @@
package test
type typeForTest struct {
- F JM `json:"f,omitempty"`
+ F jm `json:"f,omitempty"`
}
-type JM string
+type jm string
-func (t *JM) UnmarshalJSON(b []byte) error {
+func (t *jm) UnmarshalJSON(b []byte) error {
return nil
}
-func (t JM) MarshalJSON() ([]byte, error) {
+func (t jm) MarshalJSON() ([]byte, error) {
return []byte(`""`), nil
}
diff --git a/output_tests/text_marshal/string_alias/types.go b/output_tests/text_marshal/string_alias/types.go
index 5a7d1d0..0dd9ba9 100644
--- a/output_tests/text_marshal/string_alias/types.go
+++ b/output_tests/text_marshal/string_alias/types.go
@@ -7,7 +7,7 @@ import (
"strings"
)
-type Marshaler string
+type marshalerForTest string
func encode(str string) string {
buf := bytes.Buffer{}
@@ -35,16 +35,16 @@ func decode(str string) string {
return string(bs)
}
-func (m Marshaler) MarshalText() ([]byte, error) {
+func (m marshalerForTest) MarshalText() ([]byte, error) {
return []byte(`MANUAL__` + encode(string(m))), nil
}
-func (m *Marshaler) UnmarshalText(text []byte) error {
- *m = Marshaler(decode(strings.TrimPrefix(string(text), "MANUAL__")))
+func (m *marshalerForTest) UnmarshalText(text []byte) error {
+ *m = marshalerForTest(decode(strings.TrimPrefix(string(text), "MANUAL__")))
return nil
}
-var _ encoding.TextMarshaler = *new(Marshaler)
-var _ encoding.TextUnmarshaler = new(Marshaler)
+var _ encoding.TextMarshaler = *new(marshalerForTest)
+var _ encoding.TextUnmarshaler = new(marshalerForTest)
-type typeForTest Marshaler
+type typeForTest marshalerForTest
diff --git a/output_tests/text_marshal/struct/types.go b/output_tests/text_marshal/struct/types.go
index 6431f5c..482f41f 100644
--- a/output_tests/text_marshal/struct/types.go
+++ b/output_tests/text_marshal/struct/types.go
@@ -7,7 +7,7 @@ import (
"strings"
)
-type Marshaler struct {
+type marshalerForTest struct {
X string
}
@@ -37,16 +37,16 @@ func decode(str string) string {
return string(bs)
}
-func (m Marshaler) MarshalText() ([]byte, error) {
+func (m marshalerForTest) MarshalText() ([]byte, error) {
return []byte(`MANUAL__` + encode(m.X)), nil
}
-func (m *Marshaler) UnmarshalText(text []byte) error {
+func (m *marshalerForTest) UnmarshalText(text []byte) error {
m.X = decode(strings.TrimPrefix(string(text), "MANUAL__"))
return nil
}
-var _ encoding.TextMarshaler = Marshaler{}
-var _ encoding.TextUnmarshaler = &Marshaler{}
+var _ encoding.TextMarshaler = marshalerForTest{}
+var _ encoding.TextUnmarshaler = &marshalerForTest{}
-type typeForTest Marshaler
+type typeForTest marshalerForTest
diff --git a/output_tests/text_marshal/struct_alias/types.go b/output_tests/text_marshal/struct_alias/types.go
index 4a856c1..7458276 100644
--- a/output_tests/text_marshal/struct_alias/types.go
+++ b/output_tests/text_marshal/struct_alias/types.go
@@ -7,7 +7,7 @@ import (
"strings"
)
-type Marshaler struct {
+type marshalerForTest struct {
X string
}
@@ -37,18 +37,18 @@ func decode(str string) string {
return string(bs)
}
-func (m Marshaler) MarshalText() ([]byte, error) {
+func (m marshalerForTest) MarshalText() ([]byte, error) {
return []byte(`MANUAL__` + encode(m.X)), nil
}
-func (m *Marshaler) UnmarshalText(text []byte) error {
+func (m *marshalerForTest) UnmarshalText(text []byte) error {
m.X = decode(strings.TrimPrefix(string(text), "MANUAL__"))
return nil
}
-var _ encoding.TextMarshaler = Marshaler{}
-var _ encoding.TextUnmarshaler = &Marshaler{}
+var _ encoding.TextMarshaler = marshalerForTest{}
+var _ encoding.TextUnmarshaler = &marshalerForTest{}
-type A Marshaler
+type A marshalerForTest
type typeForTest A
diff --git a/output_tests/text_marshal/struct_field/types.go b/output_tests/text_marshal/struct_field/types.go
index a724e9d..371aacb 100644
--- a/output_tests/text_marshal/struct_field/types.go
+++ b/output_tests/text_marshal/struct_field/types.go
@@ -7,7 +7,7 @@ import (
"strings"
)
-type Marshaler struct {
+type marshalerForTest struct {
X string
}
@@ -37,20 +37,20 @@ func decode(str string) string {
return string(bs)
}
-func (m Marshaler) MarshalText() ([]byte, error) {
+func (m marshalerForTest) MarshalText() ([]byte, error) {
return []byte(`MANUAL__` + encode(m.X)), nil
}
-func (m *Marshaler) UnmarshalText(text []byte) error {
+func (m *marshalerForTest) UnmarshalText(text []byte) error {
m.X = decode(strings.TrimPrefix(string(text), "MANUAL__"))
return nil
}
-var _ encoding.TextMarshaler = Marshaler{}
-var _ encoding.TextUnmarshaler = &Marshaler{}
+var _ encoding.TextMarshaler = marshalerForTest{}
+var _ encoding.TextUnmarshaler = &marshalerForTest{}
type typeForTest struct {
S string
- M Marshaler
+ M marshalerForTest
I int8
}
diff --git a/output_tests/text_marshal/struct_field_alias/types.go b/output_tests/text_marshal/struct_field_alias/types.go
index 801084f..0e2e02e 100644
--- a/output_tests/text_marshal/struct_field_alias/types.go
+++ b/output_tests/text_marshal/struct_field_alias/types.go
@@ -7,7 +7,7 @@ import (
"strings"
)
-type Marshaler struct {
+type marshalerForTest struct {
X string
}
@@ -37,19 +37,19 @@ func decode(str string) string {
return string(bs)
}
-func (m Marshaler) MarshalText() ([]byte, error) {
+func (m marshalerForTest) MarshalText() ([]byte, error) {
return []byte(`MANUAL__` + encode(m.X)), nil
}
-func (m *Marshaler) UnmarshalText(text []byte) error {
+func (m *marshalerForTest) UnmarshalText(text []byte) error {
m.X = decode(strings.TrimPrefix(string(text), "MANUAL__"))
return nil
}
-var _ encoding.TextMarshaler = Marshaler{}
-var _ encoding.TextUnmarshaler = &Marshaler{}
+var _ encoding.TextMarshaler = marshalerForTest{}
+var _ encoding.TextUnmarshaler = &marshalerForTest{}
-type A Marshaler
+type A marshalerForTest
type typeForTest struct {
S string