Removed now useless error from IsInsideDir

Author: cmaglie

Diff for: paths.go

@@ -188,15 +188,17 @@ func (p *Path) Clean() *Path {
 
 // IsInsideDir returns true if the current path is inside the provided
 // dir
-func (p *Path) IsInsideDir(dir *Path) (bool, error) {
+func (p *Path) IsInsideDir(dir *Path) bool {
 	rel, err := filepath.Rel(dir.path, p.path)
 	if err != nil {
 		// If the dir cannot be made relative to this path it means
 		// that it belong to a different filesystems, so it cannot be
 		// inside this path.
-		return false, nil
+		return false
 	}
-	return !strings.Contains(rel, ".."+string(os.PathSeparator)) && rel != ".." && rel != ".", nil
+	return !strings.Contains(rel, ".."+string(os.PathSeparator)) &&
+		rel != ".." &&
+		rel != "."
 }
 
 // Parent returns all but the last element of path, typically the path's

Diff for: paths_test.go

@@ -155,15 +155,11 @@ func TestResetStatCacheWhenFollowingSymlink(t *testing.T) {
 
 func TestIsInsideDir(t *testing.T) {
 	notInside := func(a, b *Path) {
-		in, err := a.IsInsideDir(b)
-		require.NoError(t, err)
-		require.False(t, in, "%s is inside %s", a, b)
+		require.False(t, a.IsInsideDir(b), "%s is inside %s", a, b)
 	}
 
 	inside := func(a, b *Path) {
-		in, err := a.IsInsideDir(b)
-		require.NoError(t, err)
-		require.True(t, in, "%s is inside %s", a, b)
+		require.True(t, a.IsInsideDir(b), "%s is inside %s", a, b)
 		notInside(b, a)
 	}
 
@@ -381,9 +377,7 @@ func TestWriteToTempFile(t *testing.T) {
 	defer tmp.Remove()
 	require.NoError(t, err)
 	require.True(t, strings.HasPrefix(tmp.Base(), "prefix"))
-	inside, err := tmp.IsInsideDir(tmpDir)
-	require.NoError(t, err)
-	require.True(t, inside)
+	require.True(t, tmp.IsInsideDir(tmpDir))
 	data, err := tmp.ReadFile()
 	require.NoError(t, err)
 	require.Equal(t, tmpData, data)