TrueCloudLab/frostfs-api-go
21
0
Fork 14
Code Issues 9 Pull requests Projects Releases Activity Actions

Bump support/2.16 branch #92

Closed
fyrchik wants to merge 12 commits from fyrchik:fix-support-2.16 into support/v2.16
pull from: fyrchik:fix-support-2.16
merge into: TrueCloudLab:support/v2.16
Conversation 0 Commits 12 Files changed 16 +4 -4
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 6ee75ac1bd - Show all commits

8
util/proto/marshal.go
View file

@ -15,7 +15,7 @@ import (
)
type (
stableMarshaller interface {
stableMarshaler interface {
StableMarshal([]byte) []byte
StableSize() int
}
@ -256,7 +256,7 @@ func VarUIntSize(x uint64) int {
}
type ptrStableMarshaler[T any] interface {
stableMarshaller
stableMarshaler
~*T
}
@ -268,7 +268,7 @@ func NestedStructureMarshal[T any, M ptrStableMarshaler[T]](field int64, buf []b
return NestedStructureMarshalUnchecked(field, buf, v)
}
func NestedStructureMarshalUnchecked[T stableMarshaller](field int64, buf []byte, v T) int {
func NestedStructureMarshalUnchecked[T stableMarshaler](field int64, buf []byte, v T) int {
n := v.StableSize()
prefix := protowire.EncodeTag(protowire.Number(field), protowire.BytesType)
offset := binary.PutUvarint(buf, prefix)
@ -306,7 +306,7 @@ func NestedStructureSize[T any, M ptrStableMarshaler[T]](field int64, v M) (size
return NestedStructureSizeUnchecked(field, v)
}
func NestedStructureSizeUnchecked[T stableMarshaller](field int64, v T) int {
func NestedStructureSizeUnchecked[T stableMarshaler](field int64, v T) int {
n := v.StableSize()
return protowire.SizeGroup(protowire.Number(field), protowire.SizeBytes(n))
}