diff options
author | Jakob Unterwurzacher | 2017-03-05 17:44:14 +0100 |
---|---|---|
committer | Jakob Unterwurzacher | 2017-03-05 17:44:14 +0100 |
commit | 966308eeb7793a4a8ca578e160981e3b059b82e6 (patch) | |
tree | 36b0b6d192b26b7c3addcd74bbc566a40736773c /internal/nametransform | |
parent | e6461634422e7713d1863b416934297a8f6c4244 (diff) |
Drop Go 1.4 compatability code everywhere
Yields a nice reduction in code size.
Diffstat (limited to 'internal/nametransform')
-rw-r--r-- | internal/nametransform/names.go | 2 | ||||
-rw-r--r-- | internal/nametransform/raw64_go1.4.go | 18 | ||||
-rw-r--r-- | internal/nametransform/raw64_go1.5.go | 16 |
3 files changed, 1 insertions, 35 deletions
diff --git a/internal/nametransform/names.go b/internal/nametransform/names.go index feec017..83724fb 100644 --- a/internal/nametransform/names.go +++ b/internal/nametransform/names.go @@ -24,7 +24,7 @@ type NameTransform struct { func New(e *eme.EMECipher, longNames bool, raw64 bool) *NameTransform { b64 := base64.URLEncoding if raw64 { - b64 = getRaw64Encoding() + b64 = base64.RawURLEncoding } return &NameTransform{ emeCipher: e, diff --git a/internal/nametransform/raw64_go1.4.go b/internal/nametransform/raw64_go1.4.go deleted file mode 100644 index bbffb69..0000000 --- a/internal/nametransform/raw64_go1.4.go +++ /dev/null @@ -1,18 +0,0 @@ -//+build !go1.5 - -package nametransform - -import ( - "encoding/base64" - "log" -) - -const ( - HaveRaw64 = false -) - -func getRaw64Encoding() *base64.Encoding { - log.Panicf("Tried to use base64.RawURLEncoding but your Go version does not provide it.\n" + - "You need Go 1.5 or higher.") - return nil -} diff --git a/internal/nametransform/raw64_go1.5.go b/internal/nametransform/raw64_go1.5.go deleted file mode 100644 index 1896be3..0000000 --- a/internal/nametransform/raw64_go1.5.go +++ /dev/null @@ -1,16 +0,0 @@ -//+build go1.5 - -package nametransform - -import ( - "encoding/base64" -) - -const ( - // HaveRaw64 is true when Go is new enough to have base64.RawURLEncoding - HaveRaw64 = true -) - -func getRaw64Encoding() *base64.Encoding { - return base64.RawURLEncoding -} |