diff options
| author | Karel Pazdera <pazderak@gmail.com> | 2017-08-24 00:36:28 +0200 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2017-08-24 00:55:59 +0000 |
| commit | 6e9e9dfa46e032657af06aaea669e4d2264cb79e (patch) | |
| tree | 968364302d390e72a92a37b87cf99dcf10c85d18 /src/encoding/xml/typeinfo.go | |
| parent | 77b4beba2fd892a3f8e9da527fdad031f6ecc613 (diff) | |
| download | go-6e9e9dfa46e032657af06aaea669e4d2264cb79e.tar.xz | |
encoding/xml: improve package based on the suggestions from metalinter
Existing code in encoding/xml packages contains code which breaks
various linter rules (comments, constant and variable naming, variable
shadowing, etc).
Fixes #21578
Change-Id: Id4bd9a9be6d5728ce88fb6efe33030ef943c078c
Reviewed-on: https://go-review.googlesource.com/58210
Reviewed-by: Sam Whited <sam@samwhited.com>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Run-TryBot: Sam Whited <sam@samwhited.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Diffstat (limited to 'src/encoding/xml/typeinfo.go')
| -rw-r--r-- | src/encoding/xml/typeinfo.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/encoding/xml/typeinfo.go b/src/encoding/xml/typeinfo.go index 751caa97aa..2e7ae935a8 100644 --- a/src/encoding/xml/typeinfo.go +++ b/src/encoding/xml/typeinfo.go @@ -40,6 +40,8 @@ const ( fOmitEmpty fMode = fElement | fAttr | fCDATA | fCharData | fInnerXml | fComment | fAny + + xmlName = "XMLName" ) var tinfoMap sync.Map // map[reflect.Type]*typeInfo @@ -91,7 +93,7 @@ func getTypeInfo(typ reflect.Type) (*typeInfo, error) { return nil, err } - if f.Name == "XMLName" { + if f.Name == xmlName { tinfo.xmlname = finfo continue } @@ -148,7 +150,7 @@ func structFieldInfo(typ reflect.Type, f *reflect.StructField) (*fieldInfo, erro case 0: finfo.flags |= fElement case fAttr, fCDATA, fCharData, fInnerXml, fComment, fAny, fAny | fAttr: - if f.Name == "XMLName" || tag != "" && mode != fAttr { + if f.Name == xmlName || tag != "" && mode != fAttr { valid = false } default: @@ -173,7 +175,7 @@ func structFieldInfo(typ reflect.Type, f *reflect.StructField) (*fieldInfo, erro f.Name, typ, f.Tag.Get("xml")) } - if f.Name == "XMLName" { + if f.Name == xmlName { // The XMLName field records the XML element name. Don't // process it as usual because its name should default to // empty rather than to the field name. @@ -235,7 +237,7 @@ func lookupXMLName(typ reflect.Type) (xmlname *fieldInfo) { } for i, n := 0, typ.NumField(); i < n; i++ { f := typ.Field(i) - if f.Name != "XMLName" { + if f.Name != xmlName { continue } finfo, err := structFieldInfo(typ, &f) |