From 1cb1359759dc647aa6bb7cd8bfa079a0f6daed5f Mon Sep 17 00:00:00 2001 From: James Aguilar Date: Fri, 28 Aug 2015 15:09:49 -0700 Subject: [PATCH] Remove unnecessary branches. reflect.DeepEqual already returns exactly what we want in both of these cases. --- assert/assertions.go | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/assert/assertions.go b/assert/assertions.go index 023b1c39a..fc675037e 100644 --- a/assert/assertions.go +++ b/assert/assertions.go @@ -35,11 +35,7 @@ func ObjectsAreEqual(expected, actual interface{}) bool { return expected == actual } - if reflect.DeepEqual(expected, actual) { - return true - } - - return false + return reflect.DeepEqual(expected, actual) } @@ -54,9 +50,7 @@ func ObjectsAreEqualValues(expected, actual interface{}) bool { expectedValue := reflect.ValueOf(expected) if expectedValue.Type().ConvertibleTo(actualType) { // Attempt comparison after type conversion - if reflect.DeepEqual(expectedValue.Convert(actualType).Interface(), actual) { - return true - } + return reflect.DeepEqual(expectedValue.Convert(actualType).Interface(), actual) } return false