From c555478b540ffcab91c30364e63ec67b482f86d3 Mon Sep 17 00:00:00 2001
From: James Shubin <james@shubin.ca>
Date: Mon, 9 Aug 2021 16:55:31 -0400
Subject: [PATCH] engine, lang: Misc fixes for golang lint

---
 engine/resources/nspawn.go | 5 +----
 engine/resources/pippet.go | 5 +----
 lang/funcs/funcgen/func.go | 7 ++-----
 lang/interfaces/const.go   | 2 +-
 lang/structs.go            | 4 ++++
 5 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/engine/resources/nspawn.go b/engine/resources/nspawn.go
index 477d107c..87099af4 100644
--- a/engine/resources/nspawn.go
+++ b/engine/resources/nspawn.go
@@ -128,10 +128,7 @@ func (obj *NspawnRes) Init(init *engine.Init) error {
 	}
 	obj.svc = svc
 	// TODO: we could build a new init that adds a prefix to the logger...
-	if err := obj.svc.Init(init); err != nil {
-		return err
-	}
-	return nil
+	return obj.svc.Init(init)
 }
 
 // Close is run by the engine to clean up after the resource is done.
diff --git a/engine/resources/pippet.go b/engine/resources/pippet.go
index e09ef1b6..2693e65b 100644
--- a/engine/resources/pippet.go
+++ b/engine/resources/pippet.go
@@ -83,10 +83,7 @@ func (obj *PippetRes) Validate() error {
 func (obj *PippetRes) Init(init *engine.Init) error {
 	obj.init = init // save for later
 	obj.runner = getPippetReceiverInstance()
-	if err := obj.runner.Register(); err != nil {
-		return err
-	}
-	return nil
+	return obj.runner.Register()
 }
 
 // Close is run by the engine to clean up after the resource is done.
diff --git a/lang/funcs/funcgen/func.go b/lang/funcs/funcgen/func.go
index 2ef6d9b8..c50bed63 100644
--- a/lang/funcs/funcgen/func.go
+++ b/lang/funcs/funcgen/func.go
@@ -88,16 +88,13 @@ func generateTemplate(c config, f functions, path, templateFile, finalName strin
 	if err != nil {
 		return err
 	}
-	if err = t.Execute(finalFile, struct {
+	return t.Execute(finalFile, struct {
 		Packages  golangPackages
 		Functions []function
 	}{
 		c.Packages,
 		f,
-	}); err != nil {
-		return err
-	}
-	return nil
+	})
 }
 
 // MakeGolangArgs translates the func args to golang args.
diff --git a/lang/interfaces/const.go b/lang/interfaces/const.go
index 1c1f5dc8..1f91879b 100644
--- a/lang/interfaces/const.go
+++ b/lang/interfaces/const.go
@@ -23,6 +23,6 @@ const (
 	ModuleSep = "."
 
 	// VarPrefix is the prefix character that precedes the variables
-	// identifer. For example, `$foo` or for a lambda, `$fn(42)`.
+	// identifier. For example, `$foo` or for a lambda, `$fn(42)`.
 	VarPrefix = "$"
 )
diff --git a/lang/structs.go b/lang/structs.go
index 41210e05..2c3dc1a3 100644
--- a/lang/structs.go
+++ b/lang/structs.go
@@ -3841,6 +3841,7 @@ func (obj *StmtFunc) Init(data *interfaces.Data) error {
 	if err := obj.Func.Init(data); err != nil {
 		return err
 	}
+	// no errors
 	return nil
 }
 
@@ -4395,6 +4396,7 @@ func (obj *StmtInclude) SetScope(scope *interfaces.Scope) error {
 		return err
 	}
 
+	// no errors
 	return nil
 }
 
@@ -8650,6 +8652,8 @@ func (obj *ExprIf) Init(data *interfaces.Data) error {
 	if err := obj.ElseBranch.Init(data); err != nil {
 		return err
 	}
+
+	// no errors
 	return nil
 }