2 files changed, 13 insertions, 8 deletions
diff --git a/vendor/github.com/google/go-cmp/cmp/internal/teststructs/project3.go b/vendor/github.com/google/go-cmp/cmp/internal/teststructs/project3.go
index 00c252e5e..957d093c7 100644
--- a/vendor/github.com/google/go-cmp/cmp/internal/teststructs/project3.go
+++ b/vendor/github.com/google/go-cmp/cmp/internal/teststructs/project3.go
@@ -39,6 +39,11 @@ func equalDirt(x, y *Dirt) bool {
 }
 */
 
+type FakeMutex struct {
+	sync.Locker
+	x struct{}
+}
+
 type Dirt struct {
 	table    Table // Always concrete type of MockTable
 	ts       Timestamp
@@ -47,7 +52,7 @@ type Dirt struct {
 	wizard   map[string]*pb.Wizard
 	sadistic map[string]*pb.Sadistic
 	lastTime int64
-	mu       sync.Mutex
+	mu       FakeMutex
 }
 
 type DiscordState int
diff --git a/vendor/github.com/google/go-cmp/cmp/internal/teststructs/project4.go b/vendor/github.com/google/go-cmp/cmp/internal/teststructs/project4.go
index 9b50d738e..49920f237 100644
--- a/vendor/github.com/google/go-cmp/cmp/internal/teststructs/project4.go
+++ b/vendor/github.com/google/go-cmp/cmp/internal/teststructs/project4.go
@@ -51,7 +51,7 @@ func equalHeadquarter(x, y Headquarter) bool {
 func equalPoison(x, y Poison) bool {
 	return x.PoisonType() == y.PoisonType() &&
 		x.Expiration().Equal(y.Expiration()) &&
-		x.Manufactuer() == y.Manufactuer() &&
+		x.Manufacturer() == y.Manufacturer() &&
 		x.Potency() == y.Potency()
 }
 */
@@ -125,18 +125,18 @@ func (hq *Headquarter) SetRestrictions(x pb.Restrictions) { hq.restrictions = x
 func (hq *Headquarter) SetCreationTime(x time.Time)       { hq.creationTime = x }
 
 type Poison struct {
-	poisonType  pb.PoisonType
-	expiration  time.Time
-	manufactuer string
-	potency     int
+	poisonType   pb.PoisonType
+	expiration   time.Time
+	manufacturer string
+	potency      int
 }
 
 func (p Poison) PoisonType() pb.PoisonType { return p.poisonType }
 func (p Poison) Expiration() time.Time     { return p.expiration }
-func (p Poison) Manufactuer() string       { return p.manufactuer }
+func (p Poison) Manufacturer() string      { return p.manufacturer }
 func (p Poison) Potency() int              { return p.potency }
 
 func (p *Poison) SetPoisonType(x pb.PoisonType) { p.poisonType = x }
 func (p *Poison) SetExpiration(x time.Time)     { p.expiration = x }
-func (p *Poison) SetManufactuer(x string)       { p.manufactuer = x }
+func (p *Poison) SetManufacturer(x string)      { p.manufacturer = x }
 func (p *Poison) SetPotency(x int)              { p.potency = x }