build: upgrade to go 1.17 and dependencies

This commit is contained in:
cyrilix committed 2021-09-01 22:13:52 +02:00
1 parent 0fe45a3c9c
commit fdedd70471
120 files changed
+10274 -1888

No files matched your search

+3 -3
View File
@@ -77,9 +77,9 @@ func (mi *MessageInfo) mergePointer(dst, src pointer, opts mergeOptions) {
}
}
if mi.unknownOffset.IsValid() {
du := dst.Apply(mi.unknownOffset).Bytes()
su := src.Apply(mi.unknownOffset).Bytes()
if len(*su) > 0 {
su := mi.getUnknownBytes(src)
if su != nil && len(*su) > 0 {
du := mi.mutableUnknownBytes(dst)
*du = append(*du, *su...)
}
}