diff options
Diffstat (limited to '')
| -rw-r--r-- | forged/internal/common/bare/LICENSE (renamed from LICENSE.APACHE) | 0 | ||||
| -rw-r--r-- | forged/internal/common/bare/doc.go (renamed from forged/internal/bare/package.go) | 0 | ||||
| -rw-r--r-- | forged/internal/common/bare/errors.go (renamed from forged/internal/bare/errors.go) | 4 | ||||
| -rw-r--r-- | forged/internal/common/bare/limit.go (renamed from forged/internal/bare/limit.go) | 2 | ||||
| -rw-r--r-- | forged/internal/common/bare/marshal.go (renamed from forged/internal/bare/marshal.go) | 2 | ||||
| -rw-r--r-- | forged/internal/common/bare/reader.go (renamed from forged/internal/bare/reader.go) | 4 | ||||
| -rw-r--r-- | forged/internal/common/bare/unions.go (renamed from forged/internal/bare/unions.go) | 6 | ||||
| -rw-r--r-- | forged/internal/common/bare/unmarshal.go (renamed from forged/internal/bare/unmarshal.go) | 0 | ||||
| -rw-r--r-- | forged/internal/common/bare/varint.go (renamed from forged/internal/bare/varint.go) | 0 | ||||
| -rw-r--r-- | forged/internal/common/bare/writer.go (renamed from forged/internal/bare/writer.go) | 6 |
10 files changed, 13 insertions, 11 deletions
diff --git a/LICENSE.APACHE b/forged/internal/common/bare/LICENSE index 6b0b127..6b0b127 100644 --- a/LICENSE.APACHE +++ b/forged/internal/common/bare/LICENSE diff --git a/forged/internal/bare/package.go b/forged/internal/common/bare/doc.go index 2f12f55..2f12f55 100644 --- a/forged/internal/bare/package.go +++ b/forged/internal/common/bare/doc.go diff --git a/forged/internal/bare/errors.go b/forged/internal/common/bare/errors.go index 39c951a..4634f0c 100644 --- a/forged/internal/bare/errors.go +++ b/forged/internal/common/bare/errors.go @@ -9,12 +9,12 @@ import ( "reflect" ) -var ErrInvalidStr = errors.New("String contains invalid UTF-8 sequences") +var ErrInvalidStr = errors.New("string contains invalid UTF-8 sequences") type UnsupportedTypeError struct { Type reflect.Type } func (e *UnsupportedTypeError) Error() string { - return fmt.Sprintf("Unsupported type for marshaling: %s\n", e.Type.String()) + return fmt.Sprintf("unsupported type for marshaling: %s\n", e.Type.String()) } diff --git a/forged/internal/bare/limit.go b/forged/internal/common/bare/limit.go index 212bc05..7eece8c 100644 --- a/forged/internal/bare/limit.go +++ b/forged/internal/common/bare/limit.go @@ -32,7 +32,7 @@ func MaxMapSize(size uint64) { // Use MaxUnmarshalBytes to prevent this error from occuring on messages which // are large by design. -var ErrLimitExceeded = errors.New("Maximum message size exceeded") +var ErrLimitExceeded = errors.New("maximum message size exceeded") // Identical to io.LimitedReader, except it returns our custom error instead of // EOF if the limit is reached. diff --git a/forged/internal/bare/marshal.go b/forged/internal/common/bare/marshal.go index 1ce942d..d4c338e 100644 --- a/forged/internal/bare/marshal.go +++ b/forged/internal/common/bare/marshal.go @@ -54,7 +54,7 @@ func MarshalWriter(w *Writer, val interface{}) error { t := reflect.TypeOf(val) v := reflect.ValueOf(val) if t.Kind() != reflect.Ptr { - return errors.New("Expected val to be pointer type") + return errors.New("expected val to be pointer type") } return getEncoder(t.Elem())(w, v.Elem()) diff --git a/forged/internal/bare/reader.go b/forged/internal/common/bare/reader.go index 58325e3..7e872f4 100644 --- a/forged/internal/bare/reader.go +++ b/forged/internal/common/bare/reader.go @@ -10,7 +10,7 @@ import ( "math" "unicode/utf8" - "go.lindenii.runxiyu.org/forge/forged/internal/misc" + "go.lindenii.runxiyu.org/forge/forged/internal/common/misc" ) type byteReader interface { @@ -157,7 +157,7 @@ func (r *Reader) ReadString() (string, error) { // Reads a fixed amount of arbitrary data, defined by the length of the slice. func (r *Reader) ReadDataFixed(dest []byte) error { - var amt int = 0 + var amt int for amt < len(dest) { n, err := r.base.Read(dest[amt:]) if err != nil { diff --git a/forged/internal/bare/unions.go b/forged/internal/common/bare/unions.go index 0270a5f..1020fa0 100644 --- a/forged/internal/bare/unions.go +++ b/forged/internal/common/bare/unions.go @@ -21,8 +21,10 @@ type UnionTags struct { types map[uint64]reflect.Type } -var unionInterface = reflect.TypeOf((*Union)(nil)).Elem() -var unionRegistry map[reflect.Type]*UnionTags +var ( + unionInterface = reflect.TypeOf((*Union)(nil)).Elem() + unionRegistry map[reflect.Type]*UnionTags +) func init() { unionRegistry = make(map[reflect.Type]*UnionTags) diff --git a/forged/internal/bare/unmarshal.go b/forged/internal/common/bare/unmarshal.go index d55f32c..d55f32c 100644 --- a/forged/internal/bare/unmarshal.go +++ b/forged/internal/common/bare/unmarshal.go diff --git a/forged/internal/bare/varint.go b/forged/internal/common/bare/varint.go index a185ac8..a185ac8 100644 --- a/forged/internal/bare/varint.go +++ b/forged/internal/common/bare/varint.go diff --git a/forged/internal/bare/writer.go b/forged/internal/common/bare/writer.go index bada045..1b23c9f 100644 --- a/forged/internal/bare/writer.go +++ b/forged/internal/common/bare/writer.go @@ -9,7 +9,7 @@ import ( "io" "math" - "go.lindenii.runxiyu.org/forge/forged/internal/misc" + "go.lindenii.runxiyu.org/forge/forged/internal/common/misc" ) // A Writer for BARE primitive types. @@ -92,7 +92,7 @@ func (w *Writer) WriteString(str string) error { // Writes a fixed amount of arbitrary data, defined by the length of the slice. func (w *Writer) WriteDataFixed(data []byte) error { - var amt int = 0 + var amt int for amt < len(data) { n, err := w.base.Write(data[amt:]) if err != nil { @@ -109,7 +109,7 @@ func (w *Writer) WriteData(data []byte) error { if err != nil { return err } - var amt int = 0 + var amt int for amt < len(data) { n, err := w.base.Write(data[amt:]) if err != nil { |