error return value is unnecessary

Author: bgentry

netrc/netrc.go

@@ -3,7 +3,6 @@ package netrc
 import (
 	"bufio"
 	"bytes"
-	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -46,23 +45,23 @@ type Netrc struct {
 
 // FindMachine returns the Machine in n named by name. If a machine named by
 // name exists, it is returned. If no Machine with name name is found and there
-// is a ``default'' machine, the ``default'' machine is returned . Otherwise, an
-// error is returned.
-func (n *Netrc) FindMachine(name string) (m *Machine, err error) {
+// is a ``default'' machine, the ``default'' machine is returned. Otherwise, nil
+// is returned.
+func (n *Netrc) FindMachine(name string) (m *Machine) {
 	// TODO(bgentry): not safe for concurrency
 	var def *Machine
 	for _, m = range n.machines {
 		if m.Name == name {
-			return m, nil
+			return m
 		}
 		if m.IsDefault() {
 			def = m
 		}
 	}
 	if def == nil {
-		return nil, errors.New("no machine found")
+		return nil
 	}
-	return def, nil
+	return def
 }
 
 // MarshalText implements the encoding.TextMarshaler interface to encode a
@@ -462,13 +461,14 @@ func Parse(r io.Reader) (*Netrc, error) {
 }
 
 // FindMachine parses the netrc file identified by filename and returns the
-// Machine named by name. If a machine named by name exists, it is returned. If
-// no Machine with name name is found and there is a ``default'' machine, the
-// ``default'' machine is returned. Otherwise, an error is returned.
+// Machine named by name. If a problem occurs parsing the file at filename, an
+// error is returned. If a machine named by name exists, it is returned. If no
+// Machine with name name is found and there is a ``default'' machine, the
+// ``default'' machine is returned. Otherwise, nil is returned.
 func FindMachine(filename, name string) (m *Machine, err error) {
 	n, err := ParseFile(filename)
 	if err != nil {
 		return nil, err
 	}
-	return n.FindMachine(name)
+	return n.FindMachine(name), nil
 }

netrc/netrc_test.go

@@ -151,16 +151,19 @@ func TestNetrcFindMachine(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	m, err := n.FindMachine("ray")
-	if err != nil {
-		t.Fatal(err)
-	}
+	m := n.FindMachine("ray")
 	if !eqMachine(m, expectedMachines[1]) {
 		t.Errorf("bad machine; expected %v, got %v\n", expectedMachines[1], m)
 	}
 	if m.IsDefault() {
 		t.Errorf("expected def to be false")
 	}
+
+	n = &Netrc{}
+	m = n.FindMachine("nonexistent")
+	if m != nil {
+		t.Errorf("expected nil, got %v", m)
+	}
 }
 
 func TestMarshalText(t *testing.T) {
@@ -347,10 +350,7 @@ func TestUpdateLogin(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		m, err := n.FindMachine(test.name)
-		if err != nil {
-			t.Fatal(err)
-		}
+		m := n.FindMachine(test.name)
 		if m.IsDefault() == test.exists {
 			t.Errorf("expected machine %s to not exist, but it did", test.name)
 		} else {
@@ -362,10 +362,7 @@ func TestUpdateLogin(t *testing.T) {
 				continue
 			}
 			m.UpdateLogin(test.newlogin)
-			m, err := n.FindMachine(test.name)
-			if err != nil {
-				t.Fatal(err)
-			}
+			m := n.FindMachine(test.name)
 			if m.Login != test.newlogin {
 				t.Errorf("expected new login %q, got %q", test.newlogin, m.Login)
 			}
@@ -415,10 +412,7 @@ func TestUpdatePassword(t *testing.T) {
 	}
 
 	for _, test := range tests {
-		m, err := n.FindMachine(test.name)
-		if err != nil {
-			t.Fatal(err)
-		}
+		m := n.FindMachine(test.name)
 		if m.IsDefault() == test.exists {
 			t.Errorf("expected machine %s to not exist, but it did", test.name)
 		} else {
@@ -430,10 +424,7 @@ func TestUpdatePassword(t *testing.T) {
 				continue
 			}
 			m.UpdatePassword(test.newpassword)
-			m, err := n.FindMachine(test.name)
-			if err != nil {
-				t.Fatal(err)
-			}
+			m = n.FindMachine(test.name)
 			if m.Password != test.newpassword {
 				t.Errorf("expected new password %q, got %q", test.newpassword, m.Password)
 			}