aboutsummaryrefslogtreecommitdiff
path: root/src/context
diff options
context:
space:
mode:
Diffstat (limited to 'src/context')
-rw-r--r--src/context/context.go2
-rw-r--r--src/context/x_test.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/context/context.go b/src/context/context.go
index e95f553804..30adfe987d 100644
--- a/src/context/context.go
+++ b/src/context/context.go
@@ -295,7 +295,7 @@ func Cause(c Context) error {
}
// AfterFunc arranges to call f in its own goroutine after ctx is done
-// (cancelled or timed out).
+// (canceled or timed out).
// If ctx is already done, AfterFunc calls f immediately in its own goroutine.
//
// Multiple calls to AfterFunc on a context operate independently;
diff --git a/src/context/x_test.go b/src/context/x_test.go
index e9b0576281..2c66ed42b2 100644
--- a/src/context/x_test.go
+++ b/src/context/x_test.go
@@ -1064,7 +1064,7 @@ func TestAfterFuncNotCalledAfterStop(t *testing.T) {
}
}
-// This test verifies that cancelling a context does not block waiting for AfterFuncs to finish.
+// This test verifies that canceling a context does not block waiting for AfterFuncs to finish.
func TestAfterFuncCalledAsynchronously(t *testing.T) {
ctx, cancel := WithCancel(Background())
donec := make(chan struct{})