Skip to content

Commit f914ea3

Browse files
committed
gocontext -> context
Signed-off-by: apostasie <[email protected]>
1 parent 775a005 commit f914ea3

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

pkg/consoleutil/consoleutil_unix.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
package consoleutil
2020

2121
import (
22-
gocontext "context"
22+
"context"
2323
"os"
2424
"os/signal"
2525

@@ -31,7 +31,7 @@ import (
3131

3232
// HandleConsoleResize resizes the console.
3333
// From https://github.com/containerd/containerd/blob/v1.7.0-rc.2/cmd/ctr/commands/tasks/tasks_unix.go#L43-L68
34-
func HandleConsoleResize(ctx gocontext.Context, task resizer, con console.Console) error {
34+
func HandleConsoleResize(ctx context.Context, task resizer, con console.Console) error {
3535
// do an initial resize of the console
3636
size, err := con.Size()
3737
if err != nil {

pkg/consoleutil/consoleutil_windows.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package consoleutil
1818

1919
import (
20-
gocontext "context"
20+
"context"
2121
"time"
2222

2323
"github.com/containerd/console"
@@ -26,7 +26,7 @@ import (
2626

2727
// HandleConsoleResize resizes the console.
2828
// From https://github.com/containerd/containerd/blob/v1.7.0-rc.2/cmd/ctr/commands/tasks/tasks_windows.go#L34-L61
29-
func HandleConsoleResize(ctx gocontext.Context, task resizer, con console.Console) error {
29+
func HandleConsoleResize(ctx context.Context, task resizer, con console.Console) error {
3030
// do an initial resize of the console
3131
size, err := con.Size()
3232
if err != nil {

pkg/signalutil/signals.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package signalutil
1818

1919
import (
20-
gocontext "context"
20+
"context"
2121
"os"
2222
"os/signal"
2323
"syscall"
@@ -29,12 +29,12 @@ import (
2929

3030
// killer is from https://github.com/containerd/containerd/blob/v1.7.0-rc.2/cmd/ctr/commands/signals.go#L30-L32
3131
type killer interface {
32-
Kill(gocontext.Context, syscall.Signal, ...containerd.KillOpts) error
32+
Kill(context.Context, syscall.Signal, ...containerd.KillOpts) error
3333
}
3434

3535
// ForwardAllSignals forwards signals.
3636
// From https://github.com/containerd/containerd/blob/v1.7.0-rc.2/cmd/ctr/commands/signals.go#L34-L55
37-
func ForwardAllSignals(ctx gocontext.Context, task killer) chan os.Signal {
37+
func ForwardAllSignals(ctx context.Context, task killer) chan os.Signal {
3838
sigc := make(chan os.Signal, 128)
3939
signal.Notify(sigc)
4040
go func() {

0 commit comments

Comments
 (0)