Make compilable with Go 1.8

egonelbre · Feb 17, 2017 · e734b34 · e734b34
1 parent d77704b
commit e734b34
Show file tree

Hide file tree

Showing 37 changed files with 6 additions and 5 deletions.
diff --git a/conf.go b/conf.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"regexp"
 
-	"github.com/egonelbre/spexs2/vendor/rjson"
+	"launchpad.net/rjson"
 )
 
 const baseConfiguration = `{

diff --git a/features.go b/features.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"regexp"
 
-	"github.com/egonelbre/spexs2/vendor/rjson"
+	"launchpad.net/rjson"
 
 	. "github.com/egonelbre/spexs2/search"
 	"github.com/egonelbre/spexs2/search/features"

diff --git a/setup.go b/setup.go
@@ -6,7 +6,7 @@ import (
 	"log"
 	"regexp"
 
-	"github.com/egonelbre/spexs2/vendor/rjson"
+	"launchpad.net/rjson"
 
 	. "github.com/egonelbre/spexs2/search"
 	"github.com/egonelbre/spexs2/search/extenders"

diff --git a/stats/binom/binom.go b/stats/binom/binom.go
@@ -1,7 +1,7 @@
 package binom
 
 import (
-	"github.com/egonelbre/spexs2/vendor/go-fn/fn"
+	"github.com/ematvey/go-fn/fn"
 )
 
 // the probability

diff --git a/utils/delta.go b/utils/delta.go
@@ -2,8 +2,9 @@ package utils
 
 import (
 	"bytes"
-	"github.com/egonelbre/spexs2/vendor/rjson"
 	"log"
+
+	"launchpad.net/rjson"
 )
 
 func ApplyObject(src interface{}, dest interface{}) {

diff --git a/vendor/go-fn/fn/100fact.go → ...or/github.com/ematvey/go-fn/fn/100fact.go b/vendor/go-fn/fn/100fact.go → ...or/github.com/ematvey/go-fn/fn/100fact.go
diff --git a/vendor/go-fn/fn/100fact.txt → ...r/github.com/ematvey/go-fn/fn/100fact.txt b/vendor/go-fn/fn/100fact.txt → ...r/github.com/ematvey/go-fn/fn/100fact.txt
diff --git a/vendor/go-fn/fn/R2GoNames.txt → ...github.com/ematvey/go-fn/fn/R2GoNames.txt b/vendor/go-fn/fn/R2GoNames.txt → ...github.com/ematvey/go-fn/fn/R2GoNames.txt
diff --git a/vendor/go-fn/fn/beta.go → vendor/github.com/ematvey/go-fn/fn/beta.go b/vendor/go-fn/fn/beta.go → vendor/github.com/ematvey/go-fn/fn/beta.go
diff --git a/vendor/go-fn/fn/binom_coeff.go → ...ithub.com/ematvey/go-fn/fn/binom_coeff.go b/vendor/go-fn/fn/binom_coeff.go → ...ithub.com/ematvey/go-fn/fn/binom_coeff.go
diff --git a/vendor/go-fn/fn/chebyshev.go → .../github.com/ematvey/go-fn/fn/chebyshev.go b/vendor/go-fn/fn/chebyshev.go → .../github.com/ematvey/go-fn/fn/chebyshev.go
diff --git a/vendor/go-fn/fn/choose.go → vendor/github.com/ematvey/go-fn/fn/choose.go b/vendor/go-fn/fn/choose.go → vendor/github.com/ematvey/go-fn/fn/choose.go
diff --git a/vendor/go-fn/fn/doc.go → vendor/github.com/ematvey/go-fn/fn/doc.go b/vendor/go-fn/fn/doc.go → vendor/github.com/ematvey/go-fn/fn/doc.go
diff --git a/vendor/go-fn/fn/fact.go → vendor/github.com/ematvey/go-fn/fn/fact.go b/vendor/go-fn/fn/fact.go → vendor/github.com/ematvey/go-fn/fn/fact.go
diff --git a/vendor/go-fn/fn/fn.go → vendor/github.com/ematvey/go-fn/fn/fn.go b/vendor/go-fn/fn/fn.go → vendor/github.com/ematvey/go-fn/fn/fn.go
diff --git a/vendor/go-fn/fn/gamma.go → vendor/github.com/ematvey/go-fn/fn/gamma.go b/vendor/go-fn/fn/gamma.go → vendor/github.com/ematvey/go-fn/fn/gamma.go
diff --git a/vendor/go-fn/fn/inv_gamma.go → .../github.com/ematvey/go-fn/fn/inv_gamma.go b/vendor/go-fn/fn/inv_gamma.go → .../github.com/ematvey/go-fn/fn/inv_gamma.go
diff --git a/vendor/go-fn/fn/lgammacor.go → .../github.com/ematvey/go-fn/fn/lgammacor.go b/vendor/go-fn/fn/lgammacor.go → .../github.com/ematvey/go-fn/fn/lgammacor.go
diff --git a/vendor/go-fn/fn/matrix.go → vendor/github.com/ematvey/go-fn/fn/matrix.go b/vendor/go-fn/fn/matrix.go → vendor/github.com/ematvey/go-fn/fn/matrix.go
diff --git a/vendor/go-fn/fn/zeta.go → vendor/github.com/ematvey/go-fn/fn/zeta.go b/vendor/go-fn/fn/zeta.go → vendor/github.com/ematvey/go-fn/fn/zeta.go
diff --git a/vendor/rjson/LICENSE → vendor/launchpad.net/rjson/LICENSE b/vendor/rjson/LICENSE → vendor/launchpad.net/rjson/LICENSE
diff --git a/vendor/rjson/bench_test.go → vendor/launchpad.net/rjson/bench_test.go b/vendor/rjson/bench_test.go → vendor/launchpad.net/rjson/bench_test.go
diff --git a/vendor/rjson/cmd/rjson/main.go → vendor/launchpad.net/rjson/cmd/rjson/main.go b/vendor/rjson/cmd/rjson/main.go → vendor/launchpad.net/rjson/cmd/rjson/main.go
diff --git a/vendor/rjson/decode.go → vendor/launchpad.net/rjson/decode.go b/vendor/rjson/decode.go → vendor/launchpad.net/rjson/decode.go
diff --git a/vendor/rjson/decode_test.go → vendor/launchpad.net/rjson/decode_test.go b/vendor/rjson/decode_test.go → vendor/launchpad.net/rjson/decode_test.go
diff --git a/vendor/rjson/encode.go → vendor/launchpad.net/rjson/encode.go b/vendor/rjson/encode.go → vendor/launchpad.net/rjson/encode.go
diff --git a/vendor/rjson/encode_test.go → vendor/launchpad.net/rjson/encode_test.go b/vendor/rjson/encode_test.go → vendor/launchpad.net/rjson/encode_test.go
diff --git a/vendor/rjson/example_test.go → vendor/launchpad.net/rjson/example_test.go b/vendor/rjson/example_test.go → vendor/launchpad.net/rjson/example_test.go
diff --git a/vendor/rjson/indent.go → vendor/launchpad.net/rjson/indent.go b/vendor/rjson/indent.go → vendor/launchpad.net/rjson/indent.go
diff --git a/vendor/rjson/scanner.go → vendor/launchpad.net/rjson/scanner.go b/vendor/rjson/scanner.go → vendor/launchpad.net/rjson/scanner.go
diff --git a/vendor/rjson/scanner_test.go → vendor/launchpad.net/rjson/scanner_test.go b/vendor/rjson/scanner_test.go → vendor/launchpad.net/rjson/scanner_test.go
diff --git a/vendor/rjson/stream.go → vendor/launchpad.net/rjson/stream.go b/vendor/rjson/stream.go → vendor/launchpad.net/rjson/stream.go
diff --git a/vendor/rjson/stream_test.go → vendor/launchpad.net/rjson/stream_test.go b/vendor/rjson/stream_test.go → vendor/launchpad.net/rjson/stream_test.go
diff --git a/vendor/rjson/tagkey_test.go → vendor/launchpad.net/rjson/tagkey_test.go b/vendor/rjson/tagkey_test.go → vendor/launchpad.net/rjson/tagkey_test.go
diff --git a/vendor/rjson/tags.go → vendor/launchpad.net/rjson/tags.go b/vendor/rjson/tags.go → vendor/launchpad.net/rjson/tags.go
diff --git a/vendor/rjson/tags_test.go → vendor/launchpad.net/rjson/tags_test.go b/vendor/rjson/tags_test.go → vendor/launchpad.net/rjson/tags_test.go
diff --git a/vendor/rjson/testdata/code.json.gz → ...launchpad.net/rjson/testdata/code.json.gz b/vendor/rjson/testdata/code.json.gz → ...launchpad.net/rjson/testdata/code.json.gz