Improve field alignment

Author: oschwald

errors.go

@@ -26,8 +26,8 @@ func (e InvalidDatabaseError) Error() string {
 // UnmarshalTypeError is returned when the value in the database cannot be
 // assigned to the specified data type.
 type UnmarshalTypeError struct {
-	Value string       // stringified copy of the database value that caused the error
-	Type  reflect.Type // type of the value that could not be assign to
+	Type  reflect.Type
+	Value string
 }
 
 func newUnmarshalTypeError(value interface{}, rType reflect.Type) UnmarshalTypeError {

reader.go

@@ -25,28 +25,28 @@ var metadataStartMarker = []byte("\xAB\xCD\xEFMaxMind.com")
 // All of the methods on Reader are thread-safe. The struct may be safely
 // shared across goroutines.
 type Reader struct {
-	hasMappedFile     bool
-	buffer            []byte
 	nodeReader        nodeReader
+	buffer            []byte
 	decoder           decoder
 	Metadata          Metadata
 	ipv4Start         uint
 	ipv4StartBitDepth int
 	nodeOffsetMult    uint
+	hasMappedFile     bool
 }
 
 // Metadata holds the metadata decoded from the MaxMind DB file. In particular
 // it has the format version, the build time as Unix epoch time, the database
 // type and description, the IP version supported, and a slice of the natural
 // languages included.
 type Metadata struct {
+	Description              map[string]string `maxminddb:"description"`
+	DatabaseType             string            `maxminddb:"database_type"`
+	Languages                []string          `maxminddb:"languages"`
 	BinaryFormatMajorVersion uint              `maxminddb:"binary_format_major_version"`
 	BinaryFormatMinorVersion uint              `maxminddb:"binary_format_minor_version"`
 	BuildEpoch               uint              `maxminddb:"build_epoch"`
-	DatabaseType             string            `maxminddb:"database_type"`
-	Description              map[string]string `maxminddb:"description"`
 	IPVersion                uint              `maxminddb:"ip_version"`
-	Languages                []string          `maxminddb:"languages"`
 	NodeCount                uint              `maxminddb:"node_count"`
 	RecordSize               uint              `maxminddb:"record_size"`
 }

traverse.go

@@ -14,11 +14,10 @@ type netNode struct {
 
 // Networks represents a set of subnets that we are iterating over.
 type Networks struct {
-	reader   *Reader
-	nodes    []netNode // Nodes we still have to visit.
-	lastNode netNode
-	err      error
-
+	err                 error
+	reader              *Reader
+	nodes               []netNode
+	lastNode            netNode
 	skipAliasedNetworks bool
 }