From 6dd79d02f8b39639dbf9e2d667722245d7345ba8 Mon Sep 17 00:00:00 2001 From: David Chase Date: Wed, 22 May 2024 15:39:03 -0400 Subject: [PATCH] runtime,cmd/compile: fix wording of rangefunc panic messages Change-Id: I883e7b6554646f32ad44e4ea6583440c33f02b84 Reviewed-on: https://go-review.googlesource.com/c/go/+/587595 Reviewed-by: Robert Griesemer LUCI-TryBot-Result: Go LUCI --- src/cmd/compile/internal/rangefunc/rangefunc_test.go | 2 +- src/runtime/panic.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cmd/compile/internal/rangefunc/rangefunc_test.go b/src/cmd/compile/internal/rangefunc/rangefunc_test.go index c50059fe18..cd180f95a1 100644 --- a/src/cmd/compile/internal/rangefunc/rangefunc_test.go +++ b/src/cmd/compile/internal/rangefunc/rangefunc_test.go @@ -264,7 +264,7 @@ func (e errorString) Error() string { const ( // RERR_ is for runtime error, and may be regexps/substrings, to simplify use of tests with tools - RERR_DONE = "runtime error: range function continued iteration after loop body exit" + RERR_DONE = "runtime error: range function continued iteration after function for loop body returned false" RERR_PANIC = "runtime error: range function continued iteration after loop body panic" RERR_EXHAUSTED = "runtime error: range function continued iteration after whole loop exit" RERR_MISSING = "runtime error: range function recovered a loop body panic and did not resume panicking" diff --git a/src/runtime/panic.go b/src/runtime/panic.go index 8bbb769df7..e68d857c6d 100644 --- a/src/runtime/panic.go +++ b/src/runtime/panic.go @@ -297,7 +297,7 @@ func deferproc(fn func()) { // been set and must not be clobbered. } -var rangeDoneError = error(errorString("range function continued iteration after loop body exit")) +var rangeDoneError = error(errorString("range function continued iteration after function for loop body returned false")) var rangePanicError = error(errorString("range function continued iteration after loop body panic")) var rangeExhaustedError = error(errorString("range function continued iteration after whole loop exit")) var rangeMissingPanicError = error(errorString("range function recovered a loop body panic and did not resume panicking")) -- 2.48.1