vendor: Update everything

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4620
This commit is contained in:
Jakob Borg
2017-12-29 11:38:00 +00:00
parent 1296a22069
commit c24bf7ea55
1070 changed files with 294926 additions and 488191 deletions

View File

@@ -20,7 +20,6 @@ import _ "github.com/gogo/protobuf/gogoproto"
import bytes "bytes"
import io "io"
import github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto"
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto1.Marshal
@@ -55,10 +54,7 @@ func init() {
}
func (this *Foo) Equal(that interface{}) bool {
if that == nil {
if this == nil {
return true
}
return false
return this == nil
}
that1, ok := that.(*Foo)
@@ -71,10 +67,7 @@ func (this *Foo) Equal(that interface{}) bool {
}
}
if that1 == nil {
if this == nil {
return true
}
return false
return this == nil
} else if this == nil {
return false
}
@@ -242,7 +235,7 @@ func (m *Foo) Unmarshal(dAtA []byte) error {
}
}
if hasFields[0]&uint64(0x00000001) == 0 {
return github_com_gogo_protobuf_proto.NewRequiredNotSetError("bar")
return proto1.NewRequiredNotSetError("bar")
}
if iNdEx > l {