From 966308eeb7793a4a8ca578e160981e3b059b82e6 Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Sun, 5 Mar 2017 17:44:14 +0100
Subject: Drop Go 1.4 compatability code everywhere

Yields a nice reduction in code size.
---
 internal/nametransform/names.go       |  2 +-
 internal/nametransform/raw64_go1.4.go | 18 ------------------
 internal/nametransform/raw64_go1.5.go | 16 ----------------
 3 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 internal/nametransform/raw64_go1.4.go
 delete mode 100644 internal/nametransform/raw64_go1.5.go

(limited to 'internal/nametransform')

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
-}
-- 
cgit v1.2.3