make staticcheck happy

Author: sanjit-bhat

cmd/goose/main.go

@@ -23,7 +23,7 @@ func writeFileIfChanged(name string, data []byte, perm os.FileMode) error {
 		return os.WriteFile(name, data, perm)
 	}
 	// file has correct contents, return
-	if bytes.Compare(contents, data) == 0 {
+	if bytes.Equal(contents, data) {
 		return nil
 	}
 	return os.WriteFile(name, data, perm)

errors.go

@@ -99,7 +99,7 @@ type ConversionError struct {
 func (e *ConversionError) Error() string {
 	lines := []string{
 		fmt.Sprintf("[%s]: %s", e.Category, e.Message),
-		fmt.Sprintf("%s", e.GoCode),
+		e.GoCode,
 		fmt.Sprintf("  %s", e.GooseCaller),
 		fmt.Sprintf("  src: %s", e.GoSrcFile),
 	}

goose.go

@@ -901,7 +901,7 @@ func (ctx Ctx) basicLiteral(e *ast.BasicLit) coq.Expr {
 		return coq.StringLiteral{Value: s}
 	}
 	if e.Kind == token.INT {
-		info, ok := getIntegerType(ctx.typeOf(e))
+		info, _ := getIntegerType(ctx.typeOf(e))
 		v := ctx.info.Types[e].Value
 		n, ok := constant.Uint64Val(v)
 		if !ok {
@@ -1259,7 +1259,6 @@ func (ctx Ctx) stmts(ss []ast.Stmt, usage ExprValUsage) coq.BlockExpr {
 		case *ast.IfStmt:
 			bindings = append(bindings, ctx.ifStmt(s, c.Remainder(), usage))
 			finalized = true
-			break // This would happen anyway since we consumed the iterator via "Remainder"
 		default:
 			// All other statements are translated one-by-one
 			if c.HasNext() {
@@ -2165,7 +2164,7 @@ func (ctx Ctx) maybeDecls(d ast.Decl) []coq.Decl {
 			cvs = ctx.stmtInterface(cvs, stmt, d)
 		}
 		fd := ctx.funcDecl(d)
-		results := []coq.Decl{}
+		var results []coq.Decl
 		if len(cvs) > 0 {
 			results = append(cvs, fd)
 		} else {

idents.go

@@ -34,17 +34,6 @@ func newIdentCtx() identCtx {
 	return identCtx{info: make(map[scopedName]identInfo)}
 }
 
-func (ctx Ctx) lookupIdentScope(ident *ast.Ident) scopedName {
-	obj, ok := ctx.info.Uses[ident]
-	if !ok {
-		return scopedName{nil, ""}
-	}
-	useScope := obj.Parent()
-	name := ident.Name
-	defScope, _ := useScope.LookupParent(name, ident.Pos())
-	return scopedName{scope: defScope, name: name}
-}
-
 func (idents identCtx) lookupName(scope *types.Scope, name string) identInfo {
 	if scope == types.Universe {
 		return identInfo{

interface.go

@@ -118,8 +118,7 @@ func (ctx Ctx) Decls(fs ...NamedFile) (imports coq.ImportDecls, decls []coq.Decl
 
 	for fi, f := range fs {
 		if len(fs) > 1 {
-			decls = append(decls,
-				coq.NewComment(fmt.Sprintf("%s", f.Name())))
+			decls = append(decls, coq.NewComment(f.Name()))
 		}
 		if f.Ast.Doc != nil {
 			decls = append(decls, coq.NewComment(f.Ast.Doc.Text()))

internal/coq/coq.go

@@ -315,15 +315,11 @@ type FuncType struct {
 
 func (t FuncType) Coq(needs_paren bool) string {
 	var args []string
-	for _, a := range t.Params {
-		args = append(args, a)
-	}
+	args = append(args, t.Params...)
 	if len(t.Params) == 0 {
 		args = []string{"unitT"}
 	}
-	for _, a := range t.Results {
-		args = append(args, a)
-	}
+	args = append(args, t.Results...)
 	if len(args) == 0 {
 		args = []string{"<>"}
 	}
@@ -1160,15 +1156,6 @@ func (f File) autogeneratedNotice() CommentDecl {
 	return CommentDecl(comment)
 }
 
-func stringInSlice(a string, list []string) bool {
-	for _, b := range list {
-		if b == a {
-			return true
-		}
-	}
-	return false
-}
-
 // Write outputs the Coq source for a File.
 // noinspection GoUnhandledErrorResult
 func (f File) Write(w io.Writer) {

internal/go_test/go_test.go

@@ -24,8 +24,6 @@ func TestGoPassingArrayCopies(t *testing.T) {
 
 type S struct {
 	a uint64
-	b uint32
-	c bool
 }
 
 func (s *S) SetA() {
@@ -178,7 +176,7 @@ func TestGoSendBlocks(t *testing.T) {
 	time.Sleep(200 * time.Millisecond)
 	x := <-c
 	assert.Equal(t, chanV, x)
-	assert.Greater(t, time.Now().Sub(start).Milliseconds(), int64(100))
+	assert.Greater(t, time.Since(start).Milliseconds(), int64(100))
 }
 
 func TestGoRecvBlocks(t *testing.T) {
@@ -190,7 +188,7 @@ func TestGoRecvBlocks(t *testing.T) {
 	}()
 	x := <-c
 	assert.Equal(t, chanV, x)
-	assert.Greater(t, time.Now().Sub(start).Milliseconds(), int64(100))
+	assert.Greater(t, time.Since(start).Milliseconds(), int64(100))
 }
 
 func TestGoRecvOnNil(t *testing.T) {

machine/proph.go

@@ -6,6 +6,8 @@ package machine
 // does not actually carry any data, but in GooseLang we store the ProphId.
 // However, making a type opaque in Go seems to be tricky. Let's hope adding a
 // private field helps.
+//
+//lint:ignore U1000 p is unused, see above comment.
 type prophId struct{ p struct{} }
 type ProphId = *prophId