Skip to content

Commit dce6d04

Browse files
Fix lint issues
- Handle unchecked error returns with explicit ignores - Remove unused codeExecTimes variable - Convert if-else chain to switch statement - Remove empty branches in tests
1 parent 6d7b159 commit dce6d04

5 files changed

Lines changed: 26 additions & 31 deletions

File tree

‎cmd/rlm-viewer/main.go‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ func parseLog(filename string) (*LogData, error) {
219219
if err != nil {
220220
return nil, fmt.Errorf("open file: %w", err)
221221
}
222-
defer file.Close()
222+
defer func() { _ = file.Close() }()
223223

224224
data := &LogData{Filename: filename}
225225
scanner := bufio.NewScanner(file)
@@ -540,7 +540,6 @@ func printDetailedStats(data *LogData) {
540540
var totalCodeBlocks, totalLLMCalls int
541541
var totalPromptTokens, totalCompletionTokens int
542542
var iterTimes []float64
543-
var codeExecTimes []float64
544543
var llmCallTimes []float64
545544

546545
for _, iter := range data.Iterations {
@@ -549,7 +548,6 @@ func printDetailedStats(data *LogData) {
549548
totalCodeBlocks += len(iter.CodeBlocks)
550549

551550
for _, block := range iter.CodeBlocks {
552-
codeExecTimes = append(codeExecTimes, block.Result.ExecutionTime)
553551
for _, call := range block.Result.RLMCalls {
554552
totalLLMCalls++
555553
totalPromptTokens += call.PromptTokens
@@ -691,7 +689,7 @@ func runInteractive(data *LogData, cfg ViewerConfig) {
691689
viewLog(data, cfg)
692690
return
693691
}
694-
defer term.Restore(int(os.Stdin.Fd()), oldState)
692+
defer func() { _ = term.Restore(int(os.Stdin.Fd()), oldState) }()
695693

696694
currentIdx := 0
697695
expanded := !cfg.Compact
@@ -716,7 +714,8 @@ func runInteractive(data *LogData, cfg ViewerConfig) {
716714
break
717715
}
718716

719-
if n == 1 {
717+
switch n {
718+
case 1:
720719
switch buf[0] {
721720
case 'q', 3: // q or Ctrl+C
722721
clearScreen()
@@ -746,7 +745,7 @@ func runInteractive(data *LogData, cfg ViewerConfig) {
746745
currentIdx = searchResults[searchIdx]
747746
}
748747
case '/':
749-
term.Restore(int(os.Stdin.Fd()), oldState)
748+
_ = term.Restore(int(os.Stdin.Fd()), oldState)
750749
fmt.Print("\r\033[K/")
751750
reader := bufio.NewReader(os.Stdin)
752751
query, _ := reader.ReadString('\n')
@@ -756,25 +755,25 @@ func runInteractive(data *LogData, cfg ViewerConfig) {
756755
if len(searchResults) > 0 {
757756
currentIdx = searchResults[0]
758757
}
759-
term.MakeRaw(int(os.Stdin.Fd()))
758+
_, _ = term.MakeRaw(int(os.Stdin.Fd()))
760759
case 's':
761760
// Show stats
762-
term.Restore(int(os.Stdin.Fd()), oldState)
761+
_ = term.Restore(int(os.Stdin.Fd()), oldState)
763762
clearScreen()
764763
printDetailedStats(data)
765764
fmt.Print("\nPress any key to continue...")
766-
os.Stdin.Read(make([]byte, 1))
767-
term.MakeRaw(int(os.Stdin.Fd()))
765+
_, _ = os.Stdin.Read(make([]byte, 1))
766+
_, _ = term.MakeRaw(int(os.Stdin.Fd()))
768767
case '?':
769768
// Show help
770-
term.Restore(int(os.Stdin.Fd()), oldState)
769+
_ = term.Restore(int(os.Stdin.Fd()), oldState)
771770
clearScreen()
772771
printInteractiveHelp()
773772
fmt.Print("\nPress any key to continue...")
774-
os.Stdin.Read(make([]byte, 1))
775-
term.MakeRaw(int(os.Stdin.Fd()))
773+
_, _ = os.Stdin.Read(make([]byte, 1))
774+
_, _ = term.MakeRaw(int(os.Stdin.Fd()))
776775
}
777-
} else if n == 3 {
776+
case 3:
778777
// Arrow keys
779778
if buf[0] == 27 && buf[1] == 91 {
780779
switch buf[2] {

‎examples/basic/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ func (c *AnthropicClient) doRequest(ctx context.Context, reqBody anthropicReques
167167
if err != nil {
168168
return "", 0, 0, fmt.Errorf("http request: %w", err)
169169
}
170-
defer resp.Body.Close()
170+
defer func() { _ = resp.Body.Close() }()
171171
httpTime := time.Since(httpStart)
172172

173173
readStart := time.Now()
@@ -242,7 +242,7 @@ func main() {
242242
if err != nil {
243243
fmt.Printf("Warning: could not create logger: %v\n", err)
244244
} else {
245-
defer log.Close()
245+
defer func() { _ = log.Close() }()
246246
fmt.Printf("Logging to: %s\n", log.Path())
247247
}
248248

‎pkg/core/types_test.go‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,6 @@ func TestExecutionResult(t *testing.T) {
5252

5353
for _, tt := range tests {
5454
t.Run(tt.name, func(t *testing.T) {
55-
// Test that fields are accessible
56-
if tt.result.Stdout == "" && tt.result.Stderr == "" {
57-
// Empty result is valid
58-
}
59-
6055
hasError := tt.result.Stderr != ""
6156
if hasError != tt.hasError {
6257
t.Errorf("hasError = %v, want %v", hasError, tt.hasError)
@@ -335,11 +330,12 @@ func TestUsageStats(t *testing.T) {
335330

336331
for _, tt := range tests {
337332
t.Run(tt.name, func(t *testing.T) {
338-
// Verify total is sum of parts (if that's the invariant)
339-
expectedTotal := tt.stats.PromptTokens + tt.stats.CompletionTokens
340-
if tt.stats.TotalTokens != expectedTotal && tt.stats.TotalTokens != 0 {
341-
// Note: This only validates if TotalTokens is set correctly
342-
// The actual struct doesn't enforce this invariant
333+
// Verify fields are accessible and have expected values
334+
if tt.stats.PromptTokens < 0 {
335+
t.Errorf("PromptTokens should not be negative: %d", tt.stats.PromptTokens)
336+
}
337+
if tt.stats.CompletionTokens < 0 {
338+
t.Errorf("CompletionTokens should not be negative: %d", tt.stats.CompletionTokens)
343339
}
344340
})
345341
}

‎pkg/logger/logger.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ func New(logDir string, cfg Config) (*Logger, error) {
126126
}
127127

128128
if err := l.writeEntry(metadata); err != nil {
129-
file.Close()
129+
_ = file.Close()
130130
return nil, fmt.Errorf("write metadata: %w", err)
131131
}
132132

‎pkg/logger/logger_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func TestNewLogger(t *testing.T) {
6666
if err != nil {
6767
t.Fatalf("unexpected error: %v", err)
6868
}
69-
defer logger.Close()
69+
defer func() { _ = logger.Close() }()
7070

7171
// Verify log file was created
7272
path := logger.Path()
@@ -140,7 +140,7 @@ func TestLogIteration(t *testing.T) {
140140
if err != nil {
141141
t.Fatalf("failed to create logger: %v", err)
142142
}
143-
defer logger.Close()
143+
defer func() { _ = logger.Close() }()
144144

145145
// Test logging iteration with code blocks
146146
prompt := []core.Message{
@@ -257,7 +257,7 @@ func TestLogIterationWithFinalAnswer(t *testing.T) {
257257
if err != nil {
258258
t.Fatalf("failed to create logger: %v", err)
259259
}
260-
defer logger.Close()
260+
defer func() { _ = logger.Close() }()
261261

262262
err = logger.LogIteration(
263263
1,
@@ -340,7 +340,7 @@ func TestLoggerPath(t *testing.T) {
340340
if err != nil {
341341
t.Fatalf("failed to create logger: %v", err)
342342
}
343-
defer logger.Close()
343+
defer func() { _ = logger.Close() }()
344344

345345
path := logger.Path()
346346

0 commit comments

Comments
 (0)