Typo, naming

dannykopping · dannykopping · commit 4df8a3b37c64 · 2024-03-15T15:57:43.000+02:00
Signed-off-by: Danny Kopping &lt;danny@coder.com&gt;
diff --git a/cli/cliui/provisionerjob.go b/cli/cliui/provisionerjob.go
@@ -128,7 +128,7 @@ func ProvisionerJob(ctx context.Context, wr io.Writer, opts ProvisionerJobOption
 			currentQueuePos = job.QueuePosition
 			// Print an update when the queue position changes, but:
 			//   - not initially, because the stage is printed at startup
-			//   - not when we first in the queue, because it's redundant
+			//   - not when we're first in the queue, because it's redundant
 			if !initialState && currentQueuePos != 0 {
 				printStage()
 			}
diff --git a/pty/ptytest/ptytest.go b/pty/ptytest/ptytest.go
@@ -153,13 +153,13 @@ func (e *outExpecter) ExpectRegexMatch(str string) string {
 	return e.expectMatchContextFunc(str, e.ExpectRegexMatchContext)
 }
 
-func (e *outExpecter) expectMatchContextFunc(str string, impl func(ctx context.Context, str string) string) string {
+func (e *outExpecter) expectMatchContextFunc(str string, fn func(ctx context.Context, str string) string) string {
 	e.t.Helper()
 
 	timeout, cancel := context.WithTimeout(context.Background(), testutil.WaitMedium)
 	defer cancel()
 
-	return impl(timeout, str)
+	return fn(timeout, str)
 }
 
 // TODO(mafredri): Rename this to ExpectMatch when refactoring.
@@ -175,7 +175,7 @@ func (e *outExpecter) ExpectRegexMatchContext(ctx context.Context, str string) s
 	})
 }
 
-func (e *outExpecter) expectMatcherFunc(ctx context.Context, str string, matchFn func(src, pattern string) bool) string {
+func (e *outExpecter) expectMatcherFunc(ctx context.Context, str string, fn func(src, pattern string) bool) string {
 	e.t.Helper()
 
 	var buffer bytes.Buffer
@@ -189,7 +189,7 @@ func (e *outExpecter) expectMatcherFunc(ctx context.Context, str string, matchFn
 			if err != nil {
 				return err
 			}
-			if matchFn(buffer.String(), str) {
+			if fn(buffer.String(), str) {
 				return nil
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ func ProvisionerJob(ctx context.Context, wr io.Writer, opts ProvisionerJobOption`
`128`	`128`	`currentQueuePos = job.QueuePosition`
`129`	`129`	`// Print an update when the queue position changes, but:`
`130`	`130`	`// - not initially, because the stage is printed at startup`
`131`		`- // - not when we first in the queue, because it's redundant`
	`131`	`+ // - not when we're first in the queue, because it's redundant`
`132`	`132`	`if !initialState && currentQueuePos != 0 {`
`133`	`133`	`printStage()`
`134`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -153,13 +153,13 @@ func (e *outExpecter) ExpectRegexMatch(str string) string {`
`153`	`153`	`return e.expectMatchContextFunc(str, e.ExpectRegexMatchContext)`
`154`	`154`	`}`
`155`	`155`
`156`		`-func (e *outExpecter) expectMatchContextFunc(str string, impl func(ctx context.Context, str string) string) string {`
	`156`	`+func (e *outExpecter) expectMatchContextFunc(str string, fn func(ctx context.Context, str string) string) string {`
`157`	`157`	`e.t.Helper()`
`158`	`158`
`159`	`159`	`timeout, cancel := context.WithTimeout(context.Background(), testutil.WaitMedium)`
`160`	`160`	`defer cancel()`
`161`	`161`
`162`		`- return impl(timeout, str)`
	`162`	`+ return fn(timeout, str)`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`// TODO(mafredri): Rename this to ExpectMatch when refactoring.`
`@@ -175,7 +175,7 @@ func (e *outExpecter) ExpectRegexMatchContext(ctx context.Context, str string) s`
`175`	`175`	`})`
`176`	`176`	`}`
`177`	`177`
`178`		`-func (e *outExpecter) expectMatcherFunc(ctx context.Context, str string, matchFn func(src, pattern string) bool) string {`
	`178`	`+func (e *outExpecter) expectMatcherFunc(ctx context.Context, str string, fn func(src, pattern string) bool) string {`
`179`	`179`	`e.t.Helper()`
`180`	`180`
`181`	`181`	`var buffer bytes.Buffer`
`@@ -189,7 +189,7 @@ func (e *outExpecter) expectMatcherFunc(ctx context.Context, str string, matchFn`
`189`	`189`	`if err != nil {`
`190`	`190`	`return err`
`191`	`191`	`}`
`192`		`- if matchFn(buffer.String(), str) {`
	`192`	`+ if fn(buffer.String(), str) {`
`193`	`193`	`return nil`
`194`	`194`	`}`
`195`	`195`	`}`