Merge pull request #4 from muyiwaolurin/master

Unreachable code section
armon · Jan 15, 2016 · 4239b77 · 4239b77
2 parents fbd82e8 + 6e88641
commit 4239b77
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 28 deletions.
diff --git a/radix.go b/radix.go
@@ -155,14 +155,14 @@ func (t *Tree) Insert(s string, v interface{}) (interface{}, bool) {
 				old := n.leaf.val
 				n.leaf.val = v
 				return old, true
-			} else {
-				n.leaf = &leafNode{
-					key: s,
-					val: v,
-				}
-				t.size++
-				return nil, false
 			}
+
+			n.leaf = &leafNode{
+				key: s,
+				val: v,
+			}
+			t.size++
+			return nil, false
 		}
 
 		// Look for the edge
@@ -233,7 +233,6 @@ func (t *Tree) Insert(s string, v interface{}) (interface{}, bool) {
 		})
 		return nil, false
 	}
-	return nil, false
 }
 
 // Delete is used to delete a key, returning the previous
@@ -393,9 +392,8 @@ func (t *Tree) Maximum() (string, interface{}, bool) {
 		}
 		if n.isLeaf() {
 			return n.leaf.key, n.leaf.val, true
-		} else {
-			break
 		}
+		break
 	}
 	return "", nil, false
 }

diff --git a/radix_test.go b/radix_test.go
@@ -174,43 +174,43 @@ func TestWalkPrefix(t *testing.T) {
 		out []string
 	}
 	cases := []exp{
-		exp{
+		{
 			"f",
 			[]string{"foobar", "foo/bar/baz", "foo/baz/bar", "foo/zip/zap"},
 		},
-		exp{
+		{
 			"foo",
 			[]string{"foobar", "foo/bar/baz", "foo/baz/bar", "foo/zip/zap"},
 		},
-		exp{
+		{
 			"foob",
 			[]string{"foobar"},
 		},
-		exp{
+		{
 			"foo/",
 			[]string{"foo/bar/baz", "foo/baz/bar", "foo/zip/zap"},
 		},
-		exp{
+		{
 			"foo/b",
 			[]string{"foo/bar/baz", "foo/baz/bar"},
 		},
-		exp{
+		{
 			"foo/ba",
 			[]string{"foo/bar/baz", "foo/baz/bar"},
 		},
-		exp{
+		{
 			"foo/bar",
 			[]string{"foo/bar/baz"},
 		},
-		exp{
+		{
 			"foo/bar/baz",
 			[]string{"foo/bar/baz"},
 		},
-		exp{
+		{
 			"foo/bar/bazoo",
 			[]string{},
 		},
-		exp{
+		{
 			"z",
 			[]string{"zipzap"},
 		},
@@ -254,35 +254,35 @@ func TestWalkPath(t *testing.T) {
 		out []string
 	}
 	cases := []exp{
-		exp{
+		{
 			"f",
 			[]string{},
 		},
-		exp{
+		{
 			"foo",
 			[]string{"foo"},
 		},
-		exp{
+		{
 			"foo/",
 			[]string{"foo"},
 		},
-		exp{
+		{
 			"foo/ba",
 			[]string{"foo"},
 		},
-		exp{
+		{
 			"foo/bar",
 			[]string{"foo", "foo/bar"},
 		},
-		exp{
+		{
 			"foo/bar/baz",
 			[]string{"foo", "foo/bar", "foo/bar/baz"},
 		},
-		exp{
+		{
 			"foo/bar/bazoo",
 			[]string{"foo", "foo/bar", "foo/bar/baz"},
 		},
-		exp{
+		{
 			"z",
 			[]string{},
 		},