Skip to content

Commit 1dfacf9

Browse files
committed
packages renames to *fs to avoid name colisions
1 parent 97730a4 commit 1dfacf9

File tree

4 files changed

+11
-12
lines changed

4 files changed

+11
-12
lines changed

memory/memory.go renamed to memfs/memory.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Package memory provides a billy filesystem base on meomry.
2-
package memory // import "srcd.works/go-billy.v1/memory"
1+
// Package memfs provides a billy filesystem base on memory.
2+
package memfs // import "srcd.works/go-billy.v1/memfs"
33

44
import (
55
"errors"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package memory
1+
package memfs
22

33
import (
44
"testing"

os/os.go renamed to osfs/os.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Package os provides a billy filesystem for the OS.
2-
package os // import "srcd.works/go-billy.v1/os"
2+
package osfs // import "srcd.works/go-billy.v1/osfs"
33

44
import (
55
"io/ioutil"
Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
package os_test
1+
package osfs
22

33
import (
44
"io/ioutil"
5-
stdos "os"
5+
"os"
66
"path/filepath"
77
"testing"
88

99
. "gopkg.in/check.v1"
10-
"srcd.works/go-billy.v1/os"
1110
"srcd.works/go-billy.v1/test"
1211
)
1312

@@ -21,17 +20,17 @@ type OSSuite struct {
2120
var _ = Suite(&OSSuite{})
2221

2322
func (s *OSSuite) SetUpTest(c *C) {
24-
s.path, _ = ioutil.TempDir(stdos.TempDir(), "go-git-os-fs-test")
25-
s.FilesystemSuite.Fs = os.New(s.path)
23+
s.path, _ = ioutil.TempDir(os.TempDir(), "go-git-os-fs-test")
24+
s.FilesystemSuite.Fs = New(s.path)
2625
}
2726
func (s *OSSuite) TearDownTest(c *C) {
28-
err := stdos.RemoveAll(s.path)
27+
err := os.RemoveAll(s.path)
2928
c.Assert(err, IsNil)
3029
}
3130

3231
func (s *OSSuite) TestOpenDoesNotCreateDir(c *C) {
3332
_, err := s.Fs.Open("dir/non-existent")
3433
c.Assert(err, NotNil)
35-
_, err = stdos.Stat(filepath.Join(s.path, "dir"))
36-
c.Assert(stdos.IsNotExist(err), Equals, true)
34+
_, err = os.Stat(filepath.Join(s.path, "dir"))
35+
c.Assert(os.IsNotExist(err), Equals, true)
3736
}

0 commit comments

Comments
 (0)