sync

kshvakov · kshvakov · commit 7ea535556cf0 · 2022-02-05T13:59:29.000+02:00
diff --git a/contributors/list b/contributors/list
@@ -47,6 +47,7 @@ Michael Vigovsky <upliner@gmail.com>
 Nay Linn <nlinn@arista.com>
 Oleg Strokachuk <oleg.strokachuk@vizor-games.com>
 Richard Artoul <richardartoul@gmail.com>
+Robert Sköld <robert@department.se>
 Robin Hahling <robin.hahling@gw-computing.net>
 Sergei Sobolev <ssobolev@ozon.ru>
 Sergey Melekhin <sergey@melekhin.me>
diff --git a/tests/std/custom_dial_test.go b/tests/std/custom_dial_test.go
@@ -18,6 +18,7 @@
 package std
 
 import (
+	"context"
 	"net"
 	"testing"
 
@@ -35,7 +36,7 @@ func TestStdCustomDial(t *testing.T) {
 				Username: "default",
 				Password: "",
 			},
-			Dial: func(addr string) (net.Conn, error) {
+			DialContext: func(ctx context.Context, addr string) (net.Conn, error) {
 				dialCount++
 				return net.Dial("tcp", addr)
 			},

-Original file line number
+Diff line change
 Nay Linn <[email protected]>
 Oleg Strokachuk <[email protected]>
 Richard Artoul <[email protected]>
 +Robert Sköld <[email protected]>
 Robin Hahling <[email protected]>
 Sergei Sobolev <[email protected]>
 Sergey Melekhin <[email protected]>