Skip to content

Commit 276c63a

Browse files
mateusz834mateusz834
committed
update
Change-Id: Id4dee4addf708a5c9c2d9b780414306fe0171de4
1 parent a032fdd commit 276c63a

File tree

7 files changed

+49
-50
lines changed

7 files changed

+49
-50
lines changed

‎api/go1.21.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ pkg debug/elf, method (DynFlag1) GoString() string #56887
162162
pkg debug/elf, method (DynFlag1) String() string #56887
163163
pkg debug/elf, method (*File) DynValue(DynTag) ([]uint64, error) #56892
164164
pkg debug/elf, type DynFlag1 uint32 #56887
165-
pkg encoding/binary, var NativeEndian binarylite.nativeEndian #57237
165+
pkg encoding/binary, var NativeEndian nativeEndian #57237
166166
pkg errors, var ErrUnsupported error #41198
167167
pkg flag, func BoolFunc(string, string, func(string) error) #53747
168168
pkg flag, method (*FlagSet) BoolFunc(string, string, func(string) error) #53747

‎api/go1.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2294,8 +2294,8 @@ pkg encoding/binary, type ByteOrder interface, String() string
22942294
pkg encoding/binary, type ByteOrder interface, Uint16([]uint8) uint16
22952295
pkg encoding/binary, type ByteOrder interface, Uint32([]uint8) uint32
22962296
pkg encoding/binary, type ByteOrder interface, Uint64([]uint8) uint64
2297-
pkg encoding/binary, var BigEndian binarylite.bigEndian
2298-
pkg encoding/binary, var LittleEndian binarylite.littleEndian
2297+
pkg encoding/binary, var BigEndian bigEndian
2298+
pkg encoding/binary, var LittleEndian littleEndian
22992299
pkg encoding/csv, func NewReader(io.Reader) *Reader
23002300
pkg encoding/csv, func NewWriter(io.Writer) *Writer
23012301
pkg encoding/csv, method (*ParseError) Error() string

‎src/cmd/compile/internal/inline/inl.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -533,12 +533,12 @@ opSwitch:
533533
// budgeting system does not see that. See issue 42958.
534534
if base.Ctxt.Arch.CanMergeLoads && s.Pkg.Path == "internal/binarylite" {
535535
switch s.Name {
536-
case "littleEndian.Uint64", "littleEndian.Uint32", "littleEndian.Uint16",
537-
"bigEndian.Uint64", "bigEndian.Uint32", "bigEndian.Uint16",
538-
"littleEndian.PutUint64", "littleEndian.PutUint32", "littleEndian.PutUint16",
539-
"bigEndian.PutUint64", "bigEndian.PutUint32", "bigEndian.PutUint16",
540-
"littleEndian.AppendUint64", "littleEndian.AppendUint32", "littleEndian.AppendUint16",
541-
"bigEndian.AppendUint64", "bigEndian.AppendUint32", "bigEndian.AppendUint16":
536+
case "LittleEndianOrder.Uint64", "LittleEndianOrder.Uint32", "LittleEndianOrder.Uint16",
537+
"BigEndianOrder.Uint64", "BigEndianOrder.Uint32", "BigEndianOrder.Uint16",
538+
"LittleEndianOrder.PutUint64", "LittleEndianOrder.PutUint32", "LittleEndianOrder.PutUint16",
539+
"BigEndianOrder.PutUint64", "BigEndianOrder.PutUint32", "BigEndianOrder.PutUint16",
540+
"LittleEndianOrder.AppendUint64", "LittleEndianOrder.AppendUint32", "LittleEndianOrder.AppendUint16",
541+
"BigEndianOrder.AppendUint64", "BigEndianOrder.AppendUint32", "BigEndianOrder.AppendUint16":
542542
cheap = true
543543
}
544544
}

‎src/encoding/binary/binary.go

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,20 +57,19 @@ type AppendByteOrder interface {
5757

5858
var (
5959
// LittleEndian is the little-endian implementation of [ByteOrder] and [AppendByteOrder].
60-
LittleEndian = littleEndian
60+
LittleEndian littleEndian
6161

6262
// BigEndian is the big-endian implementation of [ByteOrder] and [AppendByteOrder].
63-
BigEndian = bigEndian
63+
BigEndian bigEndian
6464

6565
// NativeEndian is the native-endian implementation of [ByteOrder] and [AppendByteOrder].
66-
NativeEndian = nativeEndian
66+
NativeEndian nativeEndian
6767
)
6868

69-
// Definitions to hide the internal/binarylite package from docs.
70-
var (
71-
littleEndian = binarylite.LittleEndian
72-
bigEndian = binarylite.BigEndian
73-
nativeEndian = binarylite.NativeEndian
69+
type (
70+
littleEndian = binarylite.LittleEndianOrder
71+
bigEndian = binarylite.BigEndianOrder
72+
nativeEndian = binarylite.NativeEndianOrder
7473
)
7574

7675
// Read reads structured binary data from r into data.

‎src/internal/binarylite/binary.go

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
11
package binarylite
22

33
var (
4-
LittleEndian littleEndian
5-
BigEndian bigEndian
6-
NativeEndian nativeEndian
4+
LittleEndian LittleEndianOrder
5+
BigEndian BigEndianOrder
6+
NativeEndian NativeEndianOrder
77
)
88

9-
type littleEndian struct{}
9+
type LittleEndianOrder struct{}
1010

11-
func (littleEndian) Uint16(b []byte) uint16 {
11+
func (LittleEndianOrder) Uint16(b []byte) uint16 {
1212
_ = b[1] // bounds check hint to compiler; see golang.org/issue/14808
1313
return uint16(b[0]) | uint16(b[1])<<8
1414
}
1515

16-
func (littleEndian) PutUint16(b []byte, v uint16) {
16+
func (LittleEndianOrder) PutUint16(b []byte, v uint16) {
1717
_ = b[1] // early bounds check to guarantee safety of writes below
1818
b[0] = byte(v)
1919
b[1] = byte(v >> 8)
2020
}
2121

22-
func (littleEndian) AppendUint16(b []byte, v uint16) []byte {
22+
func (LittleEndianOrder) AppendUint16(b []byte, v uint16) []byte {
2323
return append(b,
2424
byte(v),
2525
byte(v>>8),
2626
)
2727
}
2828

29-
func (littleEndian) Uint32(b []byte) uint32 {
29+
func (LittleEndianOrder) Uint32(b []byte) uint32 {
3030
_ = b[3] // bounds check hint to compiler; see golang.org/issue/14808
3131
return uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24
3232
}
3333

34-
func (littleEndian) PutUint32(b []byte, v uint32) {
34+
func (LittleEndianOrder) PutUint32(b []byte, v uint32) {
3535
_ = b[3] // early bounds check to guarantee safety of writes below
3636
b[0] = byte(v)
3737
b[1] = byte(v >> 8)
3838
b[2] = byte(v >> 16)
3939
b[3] = byte(v >> 24)
4040
}
4141

42-
func (littleEndian) AppendUint32(b []byte, v uint32) []byte {
42+
func (LittleEndianOrder) AppendUint32(b []byte, v uint32) []byte {
4343
return append(b,
4444
byte(v),
4545
byte(v>>8),
@@ -48,13 +48,13 @@ func (littleEndian) AppendUint32(b []byte, v uint32) []byte {
4848
)
4949
}
5050

51-
func (littleEndian) Uint64(b []byte) uint64 {
51+
func (LittleEndianOrder) Uint64(b []byte) uint64 {
5252
_ = b[7] // bounds check hint to compiler; see golang.org/issue/14808
5353
return uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 |
5454
uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56
5555
}
5656

57-
func (littleEndian) PutUint64(b []byte, v uint64) {
57+
func (LittleEndianOrder) PutUint64(b []byte, v uint64) {
5858
_ = b[7] // early bounds check to guarantee safety of writes below
5959
b[0] = byte(v)
6060
b[1] = byte(v >> 8)
@@ -66,7 +66,7 @@ func (littleEndian) PutUint64(b []byte, v uint64) {
6666
b[7] = byte(v >> 56)
6767
}
6868

69-
func (littleEndian) AppendUint64(b []byte, v uint64) []byte {
69+
func (LittleEndianOrder) AppendUint64(b []byte, v uint64) []byte {
7070
return append(b,
7171
byte(v),
7272
byte(v>>8),
@@ -79,44 +79,44 @@ func (littleEndian) AppendUint64(b []byte, v uint64) []byte {
7979
)
8080
}
8181

82-
func (littleEndian) String() string { return "LittleEndian" }
82+
func (LittleEndianOrder) String() string { return "LittleEndian" }
8383

84-
func (littleEndian) GoString() string { return "binary.LittleEndian" }
84+
func (LittleEndianOrder) GoString() string { return "binary.LittleEndian" }
8585

86-
type bigEndian struct{}
86+
type BigEndianOrder struct{}
8787

88-
func (bigEndian) Uint16(b []byte) uint16 {
88+
func (BigEndianOrder) Uint16(b []byte) uint16 {
8989
_ = b[1] // bounds check hint to compiler; see golang.org/issue/14808
9090
return uint16(b[1]) | uint16(b[0])<<8
9191
}
9292

93-
func (bigEndian) PutUint16(b []byte, v uint16) {
93+
func (BigEndianOrder) PutUint16(b []byte, v uint16) {
9494
_ = b[1] // early bounds check to guarantee safety of writes below
9595
b[0] = byte(v >> 8)
9696
b[1] = byte(v)
9797
}
9898

99-
func (bigEndian) AppendUint16(b []byte, v uint16) []byte {
99+
func (BigEndianOrder) AppendUint16(b []byte, v uint16) []byte {
100100
return append(b,
101101
byte(v>>8),
102102
byte(v),
103103
)
104104
}
105105

106-
func (bigEndian) Uint32(b []byte) uint32 {
106+
func (BigEndianOrder) Uint32(b []byte) uint32 {
107107
_ = b[3] // bounds check hint to compiler; see golang.org/issue/14808
108108
return uint32(b[3]) | uint32(b[2])<<8 | uint32(b[1])<<16 | uint32(b[0])<<24
109109
}
110110

111-
func (bigEndian) PutUint32(b []byte, v uint32) {
111+
func (BigEndianOrder) PutUint32(b []byte, v uint32) {
112112
_ = b[3] // early bounds check to guarantee safety of writes below
113113
b[0] = byte(v >> 24)
114114
b[1] = byte(v >> 16)
115115
b[2] = byte(v >> 8)
116116
b[3] = byte(v)
117117
}
118118

119-
func (bigEndian) AppendUint32(b []byte, v uint32) []byte {
119+
func (BigEndianOrder) AppendUint32(b []byte, v uint32) []byte {
120120
return append(b,
121121
byte(v>>24),
122122
byte(v>>16),
@@ -125,13 +125,13 @@ func (bigEndian) AppendUint32(b []byte, v uint32) []byte {
125125
)
126126
}
127127

128-
func (bigEndian) Uint64(b []byte) uint64 {
128+
func (BigEndianOrder) Uint64(b []byte) uint64 {
129129
_ = b[7] // bounds check hint to compiler; see golang.org/issue/14808
130130
return uint64(b[7]) | uint64(b[6])<<8 | uint64(b[5])<<16 | uint64(b[4])<<24 |
131131
uint64(b[3])<<32 | uint64(b[2])<<40 | uint64(b[1])<<48 | uint64(b[0])<<56
132132
}
133133

134-
func (bigEndian) PutUint64(b []byte, v uint64) {
134+
func (BigEndianOrder) PutUint64(b []byte, v uint64) {
135135
_ = b[7] // early bounds check to guarantee safety of writes below
136136
b[0] = byte(v >> 56)
137137
b[1] = byte(v >> 48)
@@ -143,7 +143,7 @@ func (bigEndian) PutUint64(b []byte, v uint64) {
143143
b[7] = byte(v)
144144
}
145145

146-
func (bigEndian) AppendUint64(b []byte, v uint64) []byte {
146+
func (BigEndianOrder) AppendUint64(b []byte, v uint64) []byte {
147147
return append(b,
148148
byte(v>>56),
149149
byte(v>>48),
@@ -156,10 +156,10 @@ func (bigEndian) AppendUint64(b []byte, v uint64) []byte {
156156
)
157157
}
158158

159-
func (bigEndian) String() string { return "BigEndian" }
159+
func (BigEndianOrder) String() string { return "BigEndian" }
160160

161-
func (bigEndian) GoString() string { return "binary.BigEndian" }
161+
func (BigEndianOrder) GoString() string { return "binary.BigEndian" }
162162

163-
func (nativeEndian) String() string { return "NativeEndian" }
163+
func (NativeEndianOrder) String() string { return "NativeEndian" }
164164

165-
func (nativeEndian) GoString() string { return "binary.NativeEndian" }
165+
func (NativeEndianOrder) GoString() string { return "binary.NativeEndian" }

‎src/internal/binarylite/native_endian_big.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66

77
package binarylite
88

9-
type nativeEndian struct {
10-
bigEndian
9+
type NativeEndianOrder struct {
10+
BigEndianOrder
1111
}

‎src/internal/binarylite/native_endian_little.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66

77
package binarylite
88

9-
type nativeEndian struct {
10-
littleEndian
9+
type NativeEndianOrder struct {
10+
LittleEndianOrder
1111
}

0 commit comments

Comments
 (0)