change channel reads to use 'for v := range ch {}' idiom

client.go

@@ -41,11 +41,7 @@ func main() {
 
 	// set up a goroutine to do parsey things with the stuff from stdin
 	go func() {
-		for {
+		for cmd := range in {
-			if closed(in) {
-				break
-			}
-			cmd := <-in
 			if cmd[0] == ':' {
 				switch idx := strings.Index(cmd, " "); {
 				case idx == -1:
@@ -68,22 +64,16 @@ func main() {
 
 	// stall here waiting for asplode on error channel
 	for {
-		if closed(c.Err) {
+		for err := range c.Err {
-			// c.Err being closed indicates we've been disconnected from the
+			fmt.Printf("goirc error: %s\n", err)
-			// server for some reason (e.g. quit, kill or ping timeout)
+		}
-			// if we don't really want to quit, reconnect!
+		if reallyquit {
-			if !reallyquit {
+			break
+		}
 		fmt.Println("Reconnecting...")
 		if err := c.Connect("irc.freenode.net", ""); err != nil {
 			fmt.Printf("Connection error: %s\n", err)
 			break
 		}
-				continue
-			}
-			break
-		}
-		if err := <-c.Err; err != nil {
-			fmt.Printf("goirc error: %s\n", err)
-		}
 	}
 }

irc/connection.go

@@ -115,11 +115,7 @@ func hasPort(s string) bool { return strings.LastIndex(s, ":") > strings.LastInd
 // dispatch input from channel as \r\n terminated line to peer
 // flood controlled using hybrid's algorithm if conn.Flood is true
 func (conn *Conn) send() {
-	for {
+	for line := range conn.out {
-		if closed(conn.out) {
-			break
-		}
-		line := <-conn.out
 		if err := conn.io.WriteString(line + "\r\n"); err != nil {
 			conn.error("irc.send(): %s", err.String())
 			conn.shutdown()
@@ -191,15 +187,9 @@ func (conn *Conn) recv() {
 }
 
 func (conn *Conn) runLoop() {
-	for {
+	for line := range conn.in {
-		if closed(conn.in) {
-			break
-		}
-		select {
-		case line := <-conn.in:
 			conn.dispatchEvent(line)
 	}
-	}
 	// if we fall off the end here due to shutdown,
 	// reinit everything once the runloop is done
 	// so that Connect() can be called again.