Remove code unreachable using Go 1.1

anshulr · Jun 21, 2013 · 50b70ee · 50b70ee
1 parent 09dd7f1
commit 50b70ee
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 8 deletions.
diff --git a/container.go b/container.go
@@ -632,7 +632,6 @@ func (container *Container) waitLxc() error {
 		}
 		time.Sleep(500 * time.Millisecond)
 	}
-	panic("Unreachable")
 }
 
 func (container *Container) monitor() {
@@ -821,8 +820,6 @@ func (container *Container) WaitTimeout(timeout time.Duration) error {
 	case <-done:
 		return nil
 	}
-
-	panic("Unreachable")
 }
 
 func (container *Container) EnsureMounted() error {

diff --git a/contrib/crashTest.go b/contrib/crashTest.go
@@ -116,7 +116,6 @@ func crashTest() error {
 			return err
 		}
 	}
-	return nil
 }
 
 func main() {

diff --git a/network.go b/network.go
@@ -257,7 +257,6 @@ func proxy(listener net.Listener, proto, address string) error {
 		utils.Debugf("Connected to backend, splicing")
 		splice(src, dst)
 	}
-	panic("Unreachable")
 }
 
 func halfSplice(dst, src net.Conn) error {

diff --git a/utils/utils.go b/utils/utils.go
@@ -236,7 +236,6 @@ func (r *bufReader) Read(p []byte) (n int, err error) {
 		}
 		r.wait.Wait()
 	}
-	panic("unreachable")
 }
 
 func (r *bufReader) Close() error {
@@ -678,5 +677,3 @@ func ParseHost(host string, port int, addr string) string {
 	}
 	return fmt.Sprintf("tcp://%s:%d", host, port)
 }
-
-