From 7f10816c9395d22ff32f384f79d07d8ef6feb698 Mon Sep 17 00:00:00 2001 From: Mike Auclair Date: Tue, 25 Jun 2024 11:50:49 +0000 Subject: [PATCH] review feedback --- assert/assertions.go | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/assert/assertions.go b/assert/assertions.go index 4611822..9edddc7 100644 --- a/assert/assertions.go +++ b/assert/assertions.go @@ -222,11 +222,12 @@ func CallerInfo() []string { pcs := make([]uintptr, stackFrameBufferSize) offset := 1 n := runtime.Callers(offset, pcs) - maybeMore := n == stackFrameBufferSize if n == 0 { return []string{} } + + maybeMore := n == stackFrameBufferSize frames := runtime.CallersFrames(pcs[:n]) for { @@ -273,21 +274,22 @@ func CallerInfo() []string { break } - if !more { - // We know we already have less than a buffer's worth of frames - if !maybeMore { - break - } - offset += stackFrameBufferSize - n = runtime.Callers(offset, pcs) - if n == 0 { - break - } - - maybeMore = n == stackFrameBufferSize - - frames = runtime.CallersFrames(pcs[:n]) + if more { + continue } + // We know we already have less than a buffer's worth of frames + if !maybeMore { + break + } + offset += stackFrameBufferSize + n = runtime.Callers(offset, pcs) + if n == 0 { + break + } + + maybeMore = n == stackFrameBufferSize + + frames = runtime.CallersFrames(pcs[:n]) }