chore(lint): satisfy golangci-lint v2.5 (gofmt, misspell, nlreturn, staticcheck, unused, wsl)

Author: Azer0s

backend.go

@@ -26,14 +26,9 @@ import (
 // Kept minimal and additive so call sites can default-zero fields they
 // don't need. ltoMode is "thin" or "" (no LTO).
 type compileIROpts struct {
-	optLevel        string // -O0/-O1/-O2/-O3
-	ltoMode         string // "thin" or ""
-	debug           bool
-	functionSecs    bool   // -ffunction-sections
-	dataSecs        bool   // -fdata-sections
-	noUnwindTables  bool   // -fno-unwind-tables -fno-asynchronous-unwind-tables
-	gLineTablesOnly bool   // -gline-tables-only (stacktrace path)
-	targetFlags     []string
+	optLevel    string // -O0/-O1/-O2/-O3
+	ltoMode     string // "thin" or ""
+	targetFlags []string
 }
 
 type linkOpts struct {
@@ -43,8 +38,8 @@ type linkOpts struct {
 	standaloneDebugMacOS bool
 	functionSecs         bool
 	dataSecs             bool
-	gcSections           bool   // -Wl,--gc-sections / -Wl,-dead_strip
-	useLld               bool   // -fuse-ld=lld (cross-compile)
+	gcSections           bool // -Wl,--gc-sections / -Wl,-dead_strip
+	useLld               bool // -fuse-ld=lld (cross-compile)
 	rdynamic             bool
 	targetGOOS           string
 	targetFlags          []string
@@ -131,7 +126,7 @@ func linkBinary(inputs []string, outBin string, opts linkOpts) error {
 
 	prefix := entry.prefix
 	if opts.targetGOOS != "darwin" {
-		prefix = forceBuildIdSha1(prefix)
+		prefix = forceBuildIDSha1(prefix)
 	}
 
 	argv := append([]string{}, prefix...)
@@ -155,11 +150,11 @@ func linkBinary(inputs []string, outBin string, opts linkOpts) error {
 	return nil
 }
 
-// forceBuildIdSha1 rewrites any `--build-id` (default: timestamp hash)
+// forceBuildIDSha1 rewrites any `--build-id` (default: timestamp hash)
 // into `--build-id=sha1` so the note is content-derived and stable
 // across rebuilds. Leaves an explicit `--build-id=...` choice alone.
 // ELF-only -- callers skip this on Mach-O.
-func forceBuildIdSha1(args []string) []string {
+func forceBuildIDSha1(args []string) []string {
 	out := make([]string, 0, len(args))
 	for _, a := range args {
 		if a == "--build-id" {
@@ -216,34 +211,42 @@ func lldArgvFor(opts linkOpts) *lldArgvEntry {
 		useLld:   opts.useLld,
 	}
 
-	lldArgvCacheMu.Lock()
-	entry, ok := lldArgvCache[key]
-	lldArgvCacheMu.Unlock()
-
-	if ok {
+	if entry, ok := lookupLldArgv(key); ok {
 		return entry
 	}
 
 	if disk := readLldArgvFromDisk(key); disk != nil {
-		lldArgvCacheMu.Lock()
-		lldArgvCache[key] = disk
-		lldArgvCacheMu.Unlock()
+		storeLldArgv(key, disk)
 
 		return disk
 	}
 
-	entry = probeLldArgv(opts)
+	entry := probeLldArgv(opts)
 	if entry.err == nil {
 		writeLldArgvToDisk(key, entry)
 	}
 
-	lldArgvCacheMu.Lock()
-	lldArgvCache[key] = entry
-	lldArgvCacheMu.Unlock()
+	storeLldArgv(key, entry)
 
 	return entry
 }
 
+func lookupLldArgv(key lldArgvKey) (*lldArgvEntry, bool) {
+	lldArgvCacheMu.Lock()
+	defer lldArgvCacheMu.Unlock()
+
+	e, ok := lldArgvCache[key]
+
+	return e, ok
+}
+
+func storeLldArgv(key lldArgvKey, entry *lldArgvEntry) {
+	lldArgvCacheMu.Lock()
+	defer lldArgvCacheMu.Unlock()
+
+	lldArgvCache[key] = entry
+}
+
 // lldProbeCacheDir is the on-disk cache root for linker-argv probe
 // results. Lives under .build/host-info alongside the host clang
 // metadata so a single `rm -rf .build/host-info` clears every host-
@@ -285,6 +288,7 @@ func readLldArgvFromDisk(k lldArgvKey) *lldArgvEntry {
 
 	pf := strings.Split(strings.TrimRight(parts[1], "\n"), "\n")
 	sf := strings.Split(strings.TrimRight(parts[2], "\n"), "\n")
+
 	if len(pf) == 1 && pf[0] == "" {
 		pf = nil
 	}
@@ -536,7 +540,7 @@ func isClangTempForBase(t, base string) bool {
 	}
 
 	for _, c := range rest {
-		if !((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F')) {
+		if (c < '0' || c > '9') && (c < 'a' || c > 'f') && (c < 'A' || c > 'F') {
 			return false
 		}
 	}

codegen/check_const_writes.go

@@ -19,7 +19,7 @@ package codegen
 //      "may-mutate" set per function name.
 //
 //   2. Body pass: for each function, mark every binding tainted that
-//      is initialised from `&top_level_const` or aliases another
+//      is initialized from `&top_level_const` or aliases another
 //      tainted binding. Warn when:
 //      - `*p = ...`, `*p += ...`, `*p++` is performed on a tainted p,
 //        or
@@ -165,6 +165,7 @@ func scanMutatingParams(fn *ast.FuncDecl, mutators map[string]map[int]bool) map[
 	}
 
 	var walk func(node ast.Node)
+
 	walk = func(node ast.Node) {
 		switch v := node.(type) {
 		case *ast.Block:
@@ -224,6 +225,7 @@ func scanMutatingParams(fn *ast.FuncDecl, mutators map[string]map[int]bool) map[
 			walk(v.Body)
 		case *ast.MatchStmt:
 			walk(v.Expr)
+
 			for _, c := range v.Cases {
 				walk(c.Body)
 			}
@@ -311,6 +313,7 @@ func (cg *CodeGen) checkFuncForConstWrites(
 	tainted := map[string]bool{}
 
 	var walk func(node ast.Node)
+
 	walk = func(node ast.Node) {
 		switch v := node.(type) {
 		case *ast.Block:
@@ -384,6 +387,7 @@ func (cg *CodeGen) checkFuncForConstWrites(
 			walk(v.Body)
 		case *ast.MatchStmt:
 			walk(v.Expr)
+
 			for _, c := range v.Cases {
 				walk(c.Body)
 			}

codegen/check_unwrapped.go

@@ -118,6 +118,7 @@ func (cg *CodeGen) computeFnsTouchingExtern() {
 	// Propagate: any caller of a touching-fn is itself touching.
 	// callGraph maps caller -> []callee; flip it once for the worklist.
 	callers := map[string][]string{}
+
 	for caller, callees := range cg.callGraph {
 		for _, c := range callees {
 			callers[c] = append(callers[c], caller)

codegen/decls.go

@@ -2518,6 +2518,7 @@ func (cg *CodeGen) lookupTemplateFile(tmplName string) string {
 	}
 
 	suffix := "__" + tmplName
+
 	for k, v := range cg.structDeclFiles {
 		if v == "" {
 			continue
@@ -2628,7 +2629,7 @@ func (cg *CodeGen) ambiguousMethodError(structName string, methods []*ast.FuncDe
 		details.WriteString(" with ")
 		details.WriteString(whereGuardSummary(m.Constraints))
 		details.WriteString(" (declared at ")
-		details.WriteString(fmt.Sprintf("%s:%d:%d", declFile, m.Pos().Line, m.Pos().Col))
+		fmt.Fprintf(&details, "%s:%d:%d", declFile, m.Pos().Line, m.Pos().Col)
 		details.WriteByte(')')
 	}
 

codegen/diag_snippet.go

@@ -54,11 +54,11 @@ func ansi(code, s string) string {
 	return code + s + ansiReset
 }
 
-func ansiBoldText(s string) string  { return ansi(ansiBold, s) }
-func ansiRedText(s string) string   { return ansi(ansiRed, s) }
+func ansiBoldText(s string) string   { return ansi(ansiBold, s) }
+func ansiRedText(s string) string    { return ansi(ansiRed, s) }
 func ansiYellowText(s string) string { return ansi(ansiYellow, s) }
-func ansiCyanText(s string) string  { return ansi(ansiCyan, s) }
-func ansiDimText(s string) string   { return ansi(ansiDim, s) }
+func ansiCyanText(s string) string   { return ansi(ansiCyan, s) }
+func ansiDimText(s string) string    { return ansi(ansiDim, s) }
 
 // diagHeader matches the standard `file:line:col[-endcol]: ...`
 // prefix produced by every codegen / parser error. The file group
@@ -165,9 +165,11 @@ func formatHeader(level, msg, flag string, file string, lineNum, col int) string
 	var b strings.Builder
 
 	colorize := ansiRedText
-	if level == "warning" {
+
+	switch level {
+	case "warning":
 		colorize = ansiYellowText
-	} else if level == "note" {
+	case "note":
 		colorize = ansiCyanText
 	}
 
@@ -183,7 +185,7 @@ func formatHeader(level, msg, flag string, file string, lineNum, col int) string
 	b.WriteString("\n")
 	b.WriteString(strings.Repeat(" ", numWidth(lineNum)+1))
 	b.WriteString(ansiCyanText("--> "))
-	b.WriteString(fmt.Sprintf("%s:%d:%d", file, lineNum, col))
+	fmt.Fprintf(&b, "%s:%d:%d", file, lineNum, col)
 
 	return b.String()
 }
@@ -227,7 +229,7 @@ func formatSnippet(level, msg, flag, file string, lineNum, col, endCol int, sour
 
 	b.WriteString(gutter)
 	b.WriteString(ansiCyanText("--> "))
-	b.WriteString(fmt.Sprintf("%s:%d:%d\n", file, lineNum, col))
+	fmt.Fprintf(&b, "%s:%d:%d\n", file, lineNum, col)
 
 	b.WriteString(gutter)
 	b.WriteString(ansiCyanText("|\n"))
@@ -293,10 +295,12 @@ func caretSpan(source string, col int) int {
 			ch := source[col-1+n]
 			if ch == '\\' && col-1+n+1 < len(source) {
 				n += 2 // skip the escaped char as a unit
+
 				continue
 			}
 
 			n++
+
 			if ch == quote {
 				break
 			}

codegen/exprs.go

@@ -1051,6 +1051,7 @@ func (cg *CodeGen) genBinExpr(block *ir.Block, e *ast.BinExpr) (value.Value, err
 		hint := ""
 		if e.Op == "+" && isStringType(lt) && isStringType(rt) {
 			hint = " (use %q to concatenate strings)"
+
 			return nil, cg.nodeErr(e,
 				"binary operator %q is not defined for operands of type %s and %s"+hint,
 				e.Op, cg.tinTypeDisplay(lt), cg.tinTypeDisplay(rt), "++")

codegen/exprs_call.go

@@ -568,6 +568,7 @@ func (cg *CodeGen) genCallExpr(block *ir.Block, e *ast.CallExpr) (value.Value, e
 		if pt, ok := objVal.Type().(*irtypes.PointerType); ok {
 			if traitName, ok2 := cg.isTraitFatPtr(pt.ElemType); ok2 {
 				loaded := block.NewLoad(pt.ElemType, objVal)
+
 				result, err := cg.callTraitMethod(block, loaded, traitName, fn.Field, e.Args)
 				if err != nil {
 					return nil, cg.nodeErr(e, "%v", err)

codegen/globals.go

@@ -674,23 +674,6 @@ func (cg *CodeGen) inferTopLevelVarType(n ast.Node) ast.TypeExpr {
 	return nil
 }
 
-// inferTopLevelVarType is the function-free wrapper kept for callers
-// that don't have a *CodeGen handy.
-func inferTopLevelVarType(n ast.Node) ast.TypeExpr {
-	switch n.(type) {
-	case *ast.IntLit:
-		return &ast.SimpleType{Name: "i64"}
-	case *ast.FloatLit:
-		return &ast.SimpleType{Name: "f64"}
-	case *ast.BoolLit:
-		return &ast.SimpleType{Name: "bool"}
-	case *ast.StringLit:
-		return &ast.SimpleType{Name: "string"}
-	}
-
-	return nil
-}
-
 // topLevelVarKindWord returns the source-keyword form ("const" / "var")
 // for a TopLevelVar so error messages match what the user wrote.
 func topLevelVarKindWord(tv *ast.TopLevelVar) string {

codegen/runtime.go

@@ -466,6 +466,7 @@ func (cg *CodeGen) staticCallIRName(fn *ast.FieldAccess) string {
 	}
 
 	concrete := bareName
+
 	if typeArg != "" {
 		parts := strings.Split(typeArg, ",")
 		for i := range parts {
@@ -482,13 +483,13 @@ func (cg *CodeGen) staticCallIRName(fn *ast.FieldAccess) string {
 // fat-ptr value whose `data` field is an escape-promoted heap block. Two
 // shapes qualify:
 //
-//   1. Direct: `let p *Trait = &b` where b is in cg.curFnEscapingVars.
-//      buildPtrToTraitBorrow heap-allocs the iface here; b's heap block
-//      becomes iface.data.
-//   2. Forwarded: `let s = make()` where make() was recorded as
-//      fnReturnsOwningIface -- make's body created an owning iface and
-//      returned it. The flag must hop across the call so the caller's
-//      scope-exit can release both the iface and its data.
+//  1. Direct: `let p *Trait = &b` where b is in cg.curFnEscapingVars.
+//     buildPtrToTraitBorrow heap-allocs the iface here; b's heap block
+//     becomes iface.data.
+//  2. Forwarded: `let s = make()` where make() was recorded as
+//     fnReturnsOwningIface -- make's body created an owning iface and
+//     returned it. The flag must hop across the call so the caller's
+//     scope-exit can release both the iface and its data.
 //
 // Returns true on either shape so emitScopeRelease cascades through the
 // data field on drop.
@@ -632,9 +633,7 @@ func (cg *CodeGen) curFnOwnsStruct(structName string) bool {
 	// "<Bare>__<typeArgs>" (Bare carries the same #closed tag in noCopyStructs/
 	// closedStructs since genStructDecl is re-run on the concrete decl).
 	// "<StructName>$coro" is the async-method coro variant; trim the suffix.
-	if strings.HasSuffix(fnName, "$coro") {
-		fnName = strings.TrimSuffix(fnName, "$coro")
-	}
+	fnName = strings.TrimSuffix(fnName, "$coro")
 
 	prefix := structName + "_"
 	if strings.HasPrefix(fnName, prefix) {

codegen/scope.go

@@ -170,18 +170,3 @@ func (s *scope) eachReverse(fn func(name string, e *scopeEntry)) {
 		}
 	}
 }
-
-// declKind returns the source-level keyword ("let" / "const" / "var")
-// corresponding to this entry's declaredConst / declaredLet flags.
-// Used by diagnostics that need to mention how the user spelled the
-// declaration. Returns "var" as the fallback when neither flag is set.
-func (e *scopeEntry) declKind() string {
-	switch {
-	case e.declaredConst:
-		return "const"
-	case e.declaredLet:
-		return "let"
-	default:
-		return "var"
-	}
-}