[dev.power64] code review 160200044: build: merge default into dev.power64

src/pkg/path/path.go

 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 // Package path implements utility routines for manipulating slash-separated
 // paths.
 package path
 
 import (
         "strings"
@@ skipping 188 matching lines @@
 
 // Dir returns all but the last element of path, typically the path's directory.
 // After dropping the final element using Split, the path is Cleaned and trailing
 // slashes are removed.
 // If the path is empty, Dir returns ".".
 // If the path consists entirely of slashes followed by non-slash bytes, Dir
 // returns a single slash. In any other case, the returned path does not end in a
 // slash.
 func Dir(path string) string {
         dir, _ := Split(path)
-        dir = Clean(dir)
-        last := len(dir) - 1
-        if last > 0 && dir[last] == '/' {
-                dir = dir[:last]
-        }
-        if dir == "" {
-                dir = "."
-        }
-        return dir
-}
+        return Clean(dir)
+}