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

@@ -1,12 +1,25 @@
package issue260
import "time"
import (
"encoding/json"
"time"
"github.com/gogo/protobuf/jsonpb"
)
type Dropped struct {
Name string
Age int32
}
func (d *Dropped) UnmarshalJSONPB(u *jsonpb.Unmarshaler, b []byte) error {
return json.Unmarshal(b, d)
}
func (d *Dropped) MarshalJSONPB(*jsonpb.Marshaler) ([]byte, error) {
return json.Marshal(d)
}
func (d *Dropped) Drop() bool {
return true
}
@@ -17,3 +30,11 @@ type DroppedWithoutGetters struct {
Timestamp time.Time `protobuf:"bytes,3,opt,name=timestamp,stdtime" json:"timestamp"`
NullableTimestamp *time.Time `protobuf:"bytes,4,opt,name=nullable_timestamp,json=nullableTimestamp,stdtime" json:"nullable_timestamp,omitempty"`
}
func (d *DroppedWithoutGetters) UnmarshalJSONPB(u *jsonpb.Unmarshaler, b []byte) error {
return json.Unmarshal(b, d)
}
func (d *DroppedWithoutGetters) MarshalJSONPB(*jsonpb.Marshaler) ([]byte, error) {
return json.Marshal(d)
}