From e734b34e40fca01661fb660787574868dbccf63d Mon Sep 17 00:00:00 2001 From: Egon Elbre Date: Fri, 17 Feb 2017 23:15:18 +0200 Subject: [PATCH] Make compilable with Go 1.8 --- conf.go | 2 +- features.go | 2 +- setup.go | 2 +- stats/binom/binom.go | 2 +- utils/delta.go | 3 ++- vendor/{ => github.com/ematvey}/go-fn/fn/100fact.go | 0 .../{ => github.com/ematvey}/go-fn/fn/100fact.txt | 0 .../{ => github.com/ematvey}/go-fn/fn/R2GoNames.txt | 0 vendor/{ => github.com/ematvey}/go-fn/fn/beta.go | 0 .../ematvey}/go-fn/fn/binom_coeff.go | 0 .../{ => github.com/ematvey}/go-fn/fn/chebyshev.go | 0 vendor/{ => github.com/ematvey}/go-fn/fn/choose.go | 0 vendor/{ => github.com/ematvey}/go-fn/fn/doc.go | 0 vendor/{ => github.com/ematvey}/go-fn/fn/fact.go | 0 vendor/{ => github.com/ematvey}/go-fn/fn/fn.go | 0 vendor/{ => github.com/ematvey}/go-fn/fn/gamma.go | 0 .../{ => github.com/ematvey}/go-fn/fn/inv_gamma.go | 0 .../{ => github.com/ematvey}/go-fn/fn/lgammacor.go | 0 vendor/{ => github.com/ematvey}/go-fn/fn/matrix.go | 0 vendor/{ => github.com/ematvey}/go-fn/fn/zeta.go | 0 vendor/{ => launchpad.net}/rjson/LICENSE | 0 vendor/{ => launchpad.net}/rjson/bench_test.go | 0 vendor/{ => launchpad.net}/rjson/cmd/rjson/main.go | 0 vendor/{ => launchpad.net}/rjson/decode.go | 0 vendor/{ => launchpad.net}/rjson/decode_test.go | 0 vendor/{ => launchpad.net}/rjson/encode.go | 0 vendor/{ => launchpad.net}/rjson/encode_test.go | 0 vendor/{ => launchpad.net}/rjson/example_test.go | 0 vendor/{ => launchpad.net}/rjson/indent.go | 0 vendor/{ => launchpad.net}/rjson/scanner.go | 0 vendor/{ => launchpad.net}/rjson/scanner_test.go | 0 vendor/{ => launchpad.net}/rjson/stream.go | 0 vendor/{ => launchpad.net}/rjson/stream_test.go | 0 vendor/{ => launchpad.net}/rjson/tagkey_test.go | 0 vendor/{ => launchpad.net}/rjson/tags.go | 0 vendor/{ => launchpad.net}/rjson/tags_test.go | 0 .../{ => launchpad.net}/rjson/testdata/code.json.gz | Bin 37 files changed, 6 insertions(+), 5 deletions(-) rename vendor/{ => github.com/ematvey}/go-fn/fn/100fact.go (100%) rename vendor/{ => github.com/ematvey}/go-fn/fn/100fact.txt (100%) rename vendor/{ => github.com/ematvey}/go-fn/fn/R2GoNames.txt (100%) rename vendor/{ => github.com/ematvey}/go-fn/fn/beta.go (100%) rename vendor/{ => github.com/ematvey}/go-fn/fn/binom_coeff.go (100%) rename vendor/{ => github.com/ematvey}/go-fn/fn/chebyshev.go (100%) rename vendor/{ => github.com/ematvey}/go-fn/fn/choose.go (100%) rename vendor/{ => github.com/ematvey}/go-fn/fn/doc.go (100%) rename vendor/{ => github.com/ematvey}/go-fn/fn/fact.go (100%) rename vendor/{ => github.com/ematvey}/go-fn/fn/fn.go (100%) rename vendor/{ => github.com/ematvey}/go-fn/fn/gamma.go (100%) rename vendor/{ => github.com/ematvey}/go-fn/fn/inv_gamma.go (100%) rename vendor/{ => github.com/ematvey}/go-fn/fn/lgammacor.go (100%) rename vendor/{ => github.com/ematvey}/go-fn/fn/matrix.go (100%) rename vendor/{ => github.com/ematvey}/go-fn/fn/zeta.go (100%) rename vendor/{ => launchpad.net}/rjson/LICENSE (100%) rename vendor/{ => launchpad.net}/rjson/bench_test.go (100%) rename vendor/{ => launchpad.net}/rjson/cmd/rjson/main.go (100%) rename vendor/{ => launchpad.net}/rjson/decode.go (100%) rename vendor/{ => launchpad.net}/rjson/decode_test.go (100%) rename vendor/{ => launchpad.net}/rjson/encode.go (100%) rename vendor/{ => launchpad.net}/rjson/encode_test.go (100%) rename vendor/{ => launchpad.net}/rjson/example_test.go (100%) rename vendor/{ => launchpad.net}/rjson/indent.go (100%) rename vendor/{ => launchpad.net}/rjson/scanner.go (100%) rename vendor/{ => launchpad.net}/rjson/scanner_test.go (100%) rename vendor/{ => launchpad.net}/rjson/stream.go (100%) rename vendor/{ => launchpad.net}/rjson/stream_test.go (100%) rename vendor/{ => launchpad.net}/rjson/tagkey_test.go (100%) rename vendor/{ => launchpad.net}/rjson/tags.go (100%) rename vendor/{ => launchpad.net}/rjson/tags_test.go (100%) rename vendor/{ => launchpad.net}/rjson/testdata/code.json.gz (100%) diff --git a/conf.go b/conf.go index 05b8a97..0aea8c2 100644 --- 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 index 0014869..9f34c27 100644 --- 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 index b63fef3..9408d76 100644 --- 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 index 8b3c725..d126006 100644 --- 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 index d9a82eb..8a919e7 100644 --- 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 b/vendor/github.com/ematvey/go-fn/fn/100fact.go similarity index 100% rename from vendor/go-fn/fn/100fact.go rename to vendor/github.com/ematvey/go-fn/fn/100fact.go diff --git a/vendor/go-fn/fn/100fact.txt b/vendor/github.com/ematvey/go-fn/fn/100fact.txt similarity index 100% rename from vendor/go-fn/fn/100fact.txt rename to vendor/github.com/ematvey/go-fn/fn/100fact.txt diff --git a/vendor/go-fn/fn/R2GoNames.txt b/vendor/github.com/ematvey/go-fn/fn/R2GoNames.txt similarity index 100% rename from vendor/go-fn/fn/R2GoNames.txt rename to vendor/github.com/ematvey/go-fn/fn/R2GoNames.txt diff --git a/vendor/go-fn/fn/beta.go b/vendor/github.com/ematvey/go-fn/fn/beta.go similarity index 100% rename from vendor/go-fn/fn/beta.go rename to vendor/github.com/ematvey/go-fn/fn/beta.go diff --git a/vendor/go-fn/fn/binom_coeff.go b/vendor/github.com/ematvey/go-fn/fn/binom_coeff.go similarity index 100% rename from vendor/go-fn/fn/binom_coeff.go rename to vendor/github.com/ematvey/go-fn/fn/binom_coeff.go diff --git a/vendor/go-fn/fn/chebyshev.go b/vendor/github.com/ematvey/go-fn/fn/chebyshev.go similarity index 100% rename from vendor/go-fn/fn/chebyshev.go rename to vendor/github.com/ematvey/go-fn/fn/chebyshev.go diff --git a/vendor/go-fn/fn/choose.go b/vendor/github.com/ematvey/go-fn/fn/choose.go similarity index 100% rename from vendor/go-fn/fn/choose.go rename to vendor/github.com/ematvey/go-fn/fn/choose.go diff --git a/vendor/go-fn/fn/doc.go b/vendor/github.com/ematvey/go-fn/fn/doc.go similarity index 100% rename from vendor/go-fn/fn/doc.go rename to vendor/github.com/ematvey/go-fn/fn/doc.go diff --git a/vendor/go-fn/fn/fact.go b/vendor/github.com/ematvey/go-fn/fn/fact.go similarity index 100% rename from vendor/go-fn/fn/fact.go rename to vendor/github.com/ematvey/go-fn/fn/fact.go diff --git a/vendor/go-fn/fn/fn.go b/vendor/github.com/ematvey/go-fn/fn/fn.go similarity index 100% rename from vendor/go-fn/fn/fn.go rename to vendor/github.com/ematvey/go-fn/fn/fn.go diff --git a/vendor/go-fn/fn/gamma.go b/vendor/github.com/ematvey/go-fn/fn/gamma.go similarity index 100% rename from vendor/go-fn/fn/gamma.go rename to vendor/github.com/ematvey/go-fn/fn/gamma.go diff --git a/vendor/go-fn/fn/inv_gamma.go b/vendor/github.com/ematvey/go-fn/fn/inv_gamma.go similarity index 100% rename from vendor/go-fn/fn/inv_gamma.go rename to vendor/github.com/ematvey/go-fn/fn/inv_gamma.go diff --git a/vendor/go-fn/fn/lgammacor.go b/vendor/github.com/ematvey/go-fn/fn/lgammacor.go similarity index 100% rename from vendor/go-fn/fn/lgammacor.go rename to vendor/github.com/ematvey/go-fn/fn/lgammacor.go diff --git a/vendor/go-fn/fn/matrix.go b/vendor/github.com/ematvey/go-fn/fn/matrix.go similarity index 100% rename from vendor/go-fn/fn/matrix.go rename to vendor/github.com/ematvey/go-fn/fn/matrix.go diff --git a/vendor/go-fn/fn/zeta.go b/vendor/github.com/ematvey/go-fn/fn/zeta.go similarity index 100% rename from vendor/go-fn/fn/zeta.go rename to vendor/github.com/ematvey/go-fn/fn/zeta.go diff --git a/vendor/rjson/LICENSE b/vendor/launchpad.net/rjson/LICENSE similarity index 100% rename from vendor/rjson/LICENSE rename to vendor/launchpad.net/rjson/LICENSE diff --git a/vendor/rjson/bench_test.go b/vendor/launchpad.net/rjson/bench_test.go similarity index 100% rename from vendor/rjson/bench_test.go rename to vendor/launchpad.net/rjson/bench_test.go diff --git a/vendor/rjson/cmd/rjson/main.go b/vendor/launchpad.net/rjson/cmd/rjson/main.go similarity index 100% rename from vendor/rjson/cmd/rjson/main.go rename to vendor/launchpad.net/rjson/cmd/rjson/main.go diff --git a/vendor/rjson/decode.go b/vendor/launchpad.net/rjson/decode.go similarity index 100% rename from vendor/rjson/decode.go rename to vendor/launchpad.net/rjson/decode.go diff --git a/vendor/rjson/decode_test.go b/vendor/launchpad.net/rjson/decode_test.go similarity index 100% rename from vendor/rjson/decode_test.go rename to vendor/launchpad.net/rjson/decode_test.go diff --git a/vendor/rjson/encode.go b/vendor/launchpad.net/rjson/encode.go similarity index 100% rename from vendor/rjson/encode.go rename to vendor/launchpad.net/rjson/encode.go diff --git a/vendor/rjson/encode_test.go b/vendor/launchpad.net/rjson/encode_test.go similarity index 100% rename from vendor/rjson/encode_test.go rename to vendor/launchpad.net/rjson/encode_test.go diff --git a/vendor/rjson/example_test.go b/vendor/launchpad.net/rjson/example_test.go similarity index 100% rename from vendor/rjson/example_test.go rename to vendor/launchpad.net/rjson/example_test.go diff --git a/vendor/rjson/indent.go b/vendor/launchpad.net/rjson/indent.go similarity index 100% rename from vendor/rjson/indent.go rename to vendor/launchpad.net/rjson/indent.go diff --git a/vendor/rjson/scanner.go b/vendor/launchpad.net/rjson/scanner.go similarity index 100% rename from vendor/rjson/scanner.go rename to vendor/launchpad.net/rjson/scanner.go diff --git a/vendor/rjson/scanner_test.go b/vendor/launchpad.net/rjson/scanner_test.go similarity index 100% rename from vendor/rjson/scanner_test.go rename to vendor/launchpad.net/rjson/scanner_test.go diff --git a/vendor/rjson/stream.go b/vendor/launchpad.net/rjson/stream.go similarity index 100% rename from vendor/rjson/stream.go rename to vendor/launchpad.net/rjson/stream.go diff --git a/vendor/rjson/stream_test.go b/vendor/launchpad.net/rjson/stream_test.go similarity index 100% rename from vendor/rjson/stream_test.go rename to vendor/launchpad.net/rjson/stream_test.go diff --git a/vendor/rjson/tagkey_test.go b/vendor/launchpad.net/rjson/tagkey_test.go similarity index 100% rename from vendor/rjson/tagkey_test.go rename to vendor/launchpad.net/rjson/tagkey_test.go diff --git a/vendor/rjson/tags.go b/vendor/launchpad.net/rjson/tags.go similarity index 100% rename from vendor/rjson/tags.go rename to vendor/launchpad.net/rjson/tags.go diff --git a/vendor/rjson/tags_test.go b/vendor/launchpad.net/rjson/tags_test.go similarity index 100% rename from vendor/rjson/tags_test.go rename to vendor/launchpad.net/rjson/tags_test.go diff --git a/vendor/rjson/testdata/code.json.gz b/vendor/launchpad.net/rjson/testdata/code.json.gz similarity index 100% rename from vendor/rjson/testdata/code.json.gz rename to vendor/launchpad.net/rjson/testdata/code.json.gz