Fixed tautological error conditions

Drop error & nil checks where the value can not have changed.

diff --git a/common/herrors/error_locator.go b/common/herrors/error_locator.go
index 15de6d318f1b379a3cae81ed51094cdee3ce594a..3778a3729bdc0d3ed13b5bb9848c7e299b087061 100644 (file)
--- a/common/herrors/error_locator.go
+++ b/common/herrors/error_locator.go
@@ -206,7 +206,7 @@ func locateError(r io.Reader, le FileError, matches LineMatcherFn) ErrorContext
 
        lines := strings.Split(string(b), "\n")
 
-       if le != nil && lepos.ColumnNumber >= 0 {
+       if lepos.ColumnNumber >= 0 {
                pos.ColumnNumber = lepos.ColumnNumber
        }
 

diff --git a/deploy/deploy.go b/deploy/deploy.go
index 0512e352e95bbc03cb00f8ed52807f3cd89f55c0..6abb9e24e5c695f81d455b04ce22cbbc6eca48d8 100644 (file)
--- a/deploy/deploy.go
+++ b/deploy/deploy.go
@@ -143,9 +143,6 @@ func (d *Deployer) Deploy(ctx context.Context) error {
 
        // Diff local vs remote to see what changes need to be applied.
        uploads, deletes := findDiffs(local, remote, d.force)
-       if err != nil {
-               return err
-       }
        d.summary.NumUploads = len(uploads)
        d.summary.NumDeletes = len(deletes)
        if len(uploads)+len(deletes) == 0 {

diff --git a/resources/smartcrop.go b/resources/smartcrop.go
index 05bc55cd727bba07d9ea6beb9ba80e748904092c..d28a8dd03878245657ea7e302b614d5b4ec3485c 100644 (file)
--- a/resources/smartcrop.go
+++ b/resources/smartcrop.go
@@ -70,10 +70,7 @@ func smartCrop(img image.Image, width, height int, anchor imaging.Anchor, filter
 
        b := img.Bounds().Intersect(rect)
 
-       cropped, err := imaging.Crop(img, b), nil
-       if err != nil {
-               return nil, err
-       }
+       cropped := imaging.Crop(img, b)
 
        return imaging.Resize(cropped, width, height, filter), nil