aboutsummaryrefslogtreecommitdiffstats
path: root/utils/merkletrie
diff options
context:
space:
mode:
authorMáximo Cuadros <mcuadros@gmail.com>2019-07-29 17:46:48 +0200
committerGitHub <noreply@github.com>2019-07-29 17:46:48 +0200
commitd6c4b113c17a011530e93f179b7ac27eb3f17b9b (patch)
treee779d0a6defd166816da90ecbce3179636f30000 /utils/merkletrie
parentb294aa1351a9c1e9388d7901033596514cf5eaa9 (diff)
parentab19315b3137e0e10a4e638c8ea37610adc592ba (diff)
downloadgo-git-d6c4b113c17a011530e93f179b7ac27eb3f17b9b.tar.gz
Merge pull request #1199 from src-d/clean-up
*: code quality improvements
Diffstat (limited to 'utils/merkletrie')
-rw-r--r--utils/merkletrie/difftree_test.go2
-rw-r--r--utils/merkletrie/noder/path_test.go4
2 files changed, 3 insertions, 3 deletions
diff --git a/utils/merkletrie/difftree_test.go b/utils/merkletrie/difftree_test.go
index ac86145..f725bcf 100644
--- a/utils/merkletrie/difftree_test.go
+++ b/utils/merkletrie/difftree_test.go
@@ -177,7 +177,7 @@ func newChangesFromString(s string) (changes, error) {
for _, chunk := range strings.Split(s, " ") {
change := change{
- path: string(chunk[1:]),
+ path: chunk[1:],
}
switch chunk[0] {
diff --git a/utils/merkletrie/noder/path_test.go b/utils/merkletrie/noder/path_test.go
index f49f028..f65b1d5 100644
--- a/utils/merkletrie/noder/path_test.go
+++ b/utils/merkletrie/noder/path_test.go
@@ -154,8 +154,8 @@ func (s *PathSuite) TestCompareMixedDepths(c *C) {
}
func (s *PathSuite) TestCompareNormalization(c *C) {
- p1 := Path([]Noder{&noderMock{name: norm.Form(norm.NFKC).String("페")}})
- p2 := Path([]Noder{&noderMock{name: norm.Form(norm.NFKD).String("페")}})
+ p1 := Path([]Noder{&noderMock{name: norm.NFKC.String("페")}})
+ p2 := Path([]Noder{&noderMock{name: norm.NFKD.String("페")}})
c.Assert(p1.Compare(p2), Equals, 1)
c.Assert(p2.Compare(p1), Equals, -1)
p1 = Path([]Noder{&noderMock{name: "TestAppWithUnicodéPath"}})