use posener/diff instead of rcs.io/diff

See modules issue golang/go#31173. Fixes #28
posener · Jan 17, 2020 · 38da827 · 38da827
1 parent f9828d5
commit 38da827
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/fsutil/diff.go b/fsutil/diff.go
@@ -9,7 +9,7 @@ import (
 	"text/template"
 
 	"github.com/pkg/errors"
-	"rsc.io/diff"
+	"github.com/posener/diff"
 )
 
 const (

diff --git a/go.mod b/go.mod
@@ -7,14 +7,14 @@ require (
 	github.com/google/go-querystring v1.0.0 // indirect
 	github.com/kr/fs v0.1.0
 	github.com/pkg/errors v0.8.1
+	github.com/posener/diff v0.0.1
 	github.com/stretchr/testify v1.3.0
 	golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 // indirect
 	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
 	golang.org/x/tools v0.0.0-20190716150014-919acb9f1ffd
 	google.golang.org/appengine v1.6.1 // indirect
 	gopkg.in/src-d/go-billy.v4 v4.3.1
 	gopkg.in/src-d/go-git.v4 v4.12.0
-	rsc.io/diff v0.0.0-20190621135850-fe3479844c3c
 )
 
 replace rsc.io/diff => github.com/posener/diff v0.0.0-20190808172948-eff7f6d9b194
diff --git a/go.sum b/go.sum
@@ -44,8 +44,8 @@ github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/posener/diff v0.0.0-20190808172948-eff7f6d9b194 h1:IucB+3+bnCm6cKa8VdXYegUWqjbE5wlcKU+BbICYmko=
-github.com/posener/diff v0.0.0-20190808172948-eff7f6d9b194/go.mod h1:AB6TWADCiFzYx4nzfwjeNQBxOA+FM7yLQGFe0PKx38k=
+github.com/posener/diff v0.0.1 h1:rjxZ4l6g5DixF+LKqFFEZpTXY2kitoiGfph/sVRjqoM=
+github.com/posener/diff v0.0.1/go.mod h1:hZraNYAlXkt6AyFW523B2inR/zd+gmL9WNJB45sKFzQ=
 github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4=
@@ -106,5 +106,3 @@ gopkg.in/src-d/go-git.v4 v4.12.0 h1:CKgvBCJCcdfNnyXPYI4Cp8PaDDAmAPEN0CtfEdEAbd8=
 gopkg.in/src-d/go-git.v4 v4.12.0/go.mod h1:zjlNnzc1Wjn43v3Mtii7RVxiReNP0fIu9npcXKzuNp4=
 gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
 gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
-rsc.io/diff v0.0.0-20190621135850-fe3479844c3c h1:/WCDjRGIVDjKlhtSc1PEApp2fR58gfSVK62dr/yQNyQ=
-rsc.io/diff v0.0.0-20190621135850-fe3479844c3c/go.mod h1:AB6TWADCiFzYx4nzfwjeNQBxOA+FM7yLQGFe0PKx38k=