From 00105d649e8892d1300545b031f49167447d46fc Mon Sep 17 00:00:00 2001 From: Erik Arvidsson Date: Wed, 20 Jul 2016 14:53:09 -0700 Subject: [PATCH] Diff: We can never get nil as a Value (#2108) ...so remove the handling of that and panic. --- cmd/noms/diff/diff.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/cmd/noms/diff/diff.go b/cmd/noms/diff/diff.go index f6338a05a2..d1dbce96b6 100644 --- a/cmd/noms/diff/diff.go +++ b/cmd/noms/diff/diff.go @@ -34,12 +34,7 @@ func Diff(w io.Writer, v1, v2 types.Value) (err error) { err = d.Try(func() { for di, ok := dq.PopFront(); ok; di, ok = dq.PopFront() { p, key, v1, v2 := di.path, di.key, di.v1, di.v2 - if v1 == nil && v2 != nil { - line(w, addPrefix, key, v2) - } - if v1 != nil && v2 == nil { - line(w, subPrefix, key, v1) - } + d.Chk.True(v1 != nil && v2 != nil) // nil is not a valid types.Value and we should never get one if !v1.Equals(v2) { if !canCompare(v1, v2) { line(w, subPrefix, key, v1)