net/rpc: use conventional `err` in example

It is conventional to use `err` for error variables, so change the example to use `err` instead of `e`.

Change-Id: I53bc3c5384fe608b322a55c564e9aee228b43329
GitHub-Last-Rev: 3e2ed84eefad7104b952bc6eab1c3b0af6f8f80e
GitHub-Pull-Request: golang/go#61375
Reviewed-on: https://go-review.googlesource.com/c/go/+/510075
Reviewed-by: Rob Pike <r@golang.org>
Run-TryBot: Ian Lance Taylor <iant@google.com>
Run-TryBot: Rob Pike <r@golang.org>
Reviewed-by: Allen Li <ayatane@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Auto-Submit: Ian Lance Taylor <iant@google.com>

diff --git a/src/net/rpc/server.go b/src/net/rpc/server.go
index 109ebba5413e5cfa749f1b627b71b94ff15410e4..5cea2cc50732ca12fd1fb459292d6f93cd39bf6c 100644 (file)
--- a/src/net/rpc/server.go
+++ b/src/net/rpc/server.go
@@ -86,9 +86,9 @@ The server calls (for HTTP service):
        arith := new(Arith)
        rpc.Register(arith)
        rpc.HandleHTTP()
-       l, e := net.Listen("tcp", ":1234")
-       if e != nil {
-               log.Fatal("listen error:", e)
+       l, err := net.Listen("tcp", ":1234")
+       if err != nil {
+               log.Fatal("listen error:", err)
        }
        go http.Serve(l, nil)
 

diff --git a/src/net/rpc/server_test.go b/src/net/rpc/server_test.go
index dc5f5decc770b3db090e3339ff1308db42344cb2..6a94d6ebe82da6d0c0c4efcdc593a44966ebd4f8 100644 (file)
--- a/src/net/rpc/server_test.go
+++ b/src/net/rpc/server_test.go
@@ -110,9 +110,9 @@ func (BuiltinTypes) Array(args *Args, reply *[2]int) error {
 }
 
 func listenTCP() (net.Listener, string) {
-       l, e := net.Listen("tcp", "127.0.0.1:0") // any available address
-       if e != nil {
-               log.Fatalf("net.Listen tcp :0: %v", e)
+       l, err := net.Listen("tcp", "127.0.0.1:0") // any available address
+       if err != nil {
+               log.Fatalf("net.Listen tcp :0: %v", err)
        }
        return l, l.Addr().String()
 }