From: Shenghou Ma <minux.ma@gmail.com>
Date: Tue, 10 Dec 2013 04:46:21 +0000 (-0500)
Subject: os: fix build.
X-Git-Tag: go1.3beta1~1278
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=a4b66b770386ddb699574b28cd0a86a7c88ecc66;p=gostls13.git

os: fix build.
CL 36800043 and CL 36930044 have a merge conflict that I overlooked.

R=golang-dev
CC=golang-dev
https://golang.org/cl/39850043
---

diff --git a/src/pkg/os/file.go b/src/pkg/os/file.go
index 18cd61d3a8..b4a7458016 100644
--- a/src/pkg/os/file.go
+++ b/src/pkg/os/file.go
@@ -250,3 +250,8 @@ func Create(name string) (file *File, err error) {
 
 // lstat is overridden in tests.
 var lstat = Lstat
+
+// Rename renames (moves) a file. OS-specific restrictions might apply.
+func Rename(oldpath, newpath string) error {
+	return rename(oldpath, newpath)
+}