diff --git a/Gopkg.lock b/Gopkg.lock
index 7280b37f..fd56825f 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -2,142 +2,185 @@
 
 
 [[projects]]
+  digest = "1:b16fbfbcc20645cb419f78325bb2e85ec729b338e996a228124d68931a6f2a37"
   name = "github.com/BurntSushi/toml"
   packages = ["."]
+  pruneopts = "UT"
   revision = "b26d9c308763d68093482582cea63d69be07a0f0"
   version = "v0.3.0"
 
 [[projects]]
+  digest = "1:e626376fab8608a972d47e91b3c1bbbddaecaf1d42b82be6dcc52d10a7557893"
   name = "github.com/VividCortex/ewma"
   packages = ["."]
+  pruneopts = "UT"
   revision = "b24eb346a94c3ba12c1da1e564dbac1b498a77ce"
   version = "v1.1.1"
 
 [[projects]]
   branch = "master"
+  digest = "1:6d6d9309d10d5dffaaf3a56c4b2570dec62152f978ac3566b13bdfafd63f32fb"
   name = "github.com/aead/chacha20"
   packages = ["chacha"]
-  revision = "e2538746bfea853aaa589feb8ec46bd46ee78f86"
+  pruneopts = "UT"
+  revision = "8b13a72661dae6e9e5dea04f344f0dc95ea29547"
 
 [[projects]]
   branch = "master"
+  digest = "1:82df2686fe2e0cc2894fbec00098fe2efeacbda08af8087a86d9eeea58699d49"
   name = "github.com/aead/poly1305"
   packages = ["."]
-  revision = "969857f48f7ae439b6d2449ed1dcd9aaabc49c67"
+  pruneopts = "UT"
+  revision = "3fee0db0b63511234f7230da50b72414f6258f10"
 
 [[projects]]
   branch = "master"
+  digest = "1:47ea4fbe2ab4aeb9808502c51e657041c2e49b36b83fc1c1a349135cdf16342f"
   name = "github.com/agl/ed25519"
   packages = [
     ".",
-    "edwards25519"
+    "edwards25519",
   ]
+  pruneopts = "UT"
   revision = "5312a61534124124185d41f09206b9fef1d88403"
 
 [[projects]]
+  digest = "1:9ddcd6732e302feb09865d8bfbebd55c295d95915ee0a530fd22b51851d852e4"
   name = "github.com/coreos/go-systemd"
   packages = [
     "activation",
-    "daemon"
+    "daemon",
   ]
+  pruneopts = "UT"
   revision = "39ca1b05acc7ad1220e09f133283b8859a8b71ab"
   version = "v17"
 
 [[projects]]
   branch = "master"
+  digest = "1:b78a58e00a1b951af4803ddfefbbcae14c7cacce3940ebad359c9d5582bf74a0"
   name = "github.com/dchest/safefile"
   packages = ["."]
+  pruneopts = "UT"
   revision = "855e8d98f1852d48dde521e0522408d1fe7e836a"
 
 [[projects]]
   branch = "master"
+  digest = "1:c183111eaf02a9e6bb39c213bdfb5472b16f1955dd4c9dab82db83f114c64a63"
   name = "github.com/facebookgo/atomicfile"
   packages = ["."]
+  pruneopts = "UT"
   revision = "2de1f203e7d5e386a6833233882782932729f27e"
 
 [[projects]]
   branch = "master"
+  digest = "1:b0b75ab0829ae3769f1f221486da0c40c8dc0680fb93d072b5df5a39d56c996c"
   name = "github.com/facebookgo/pidfile"
   packages = ["."]
+  pruneopts = "UT"
   revision = "f242e2999868dcd267a2b86e49ce1f9cf9e15b16"
 
 [[projects]]
   branch = "master"
+  digest = "1:2394f5a25132b3868eff44599cc28d44bdd0330806e34c495d754dd052df612b"
   name = "github.com/hashicorp/go-immutable-radix"
   packages = ["."]
+  pruneopts = "UT"
   revision = "7f3cd4390caab3250a57f30efdb2a65dd7649ecf"
 
 [[projects]]
   branch = "master"
+  digest = "1:4d9d876a856ada3b553062ac8e50331a9a539e12893c0c4a50d8ae2af4242685"
   name = "github.com/hashicorp/go-syslog"
   packages = ["."]
+  pruneopts = "UT"
   revision = "326bf4a7f709d263f964a6a96558676b103f3534"
 
 [[projects]]
   branch = "master"
+  digest = "1:cf296baa185baae04a9a7004efee8511d08e2f5f51d4cbe5375da89722d681db"
   name = "github.com/hashicorp/golang-lru"
   packages = [
     ".",
-    "simplelru"
+    "simplelru",
   ]
+  pruneopts = "UT"
   revision = "0fb14efe8c47ae851c0034ed7a448854d3d34cf3"
 
 [[projects]]
   branch = "master"
+  digest = "1:d7b8c19830aedc4fec0c843fd3ada94eeb47f7c4f43149f90e6e9623627480d7"
   name = "github.com/jedisct1/dlog"
   packages = ["."]
+  pruneopts = "UT"
   revision = "f81e5af176e59fc11674b2777fe465fc506c27fe"
 
 [[projects]]
   branch = "master"
+  digest = "1:6874350bad25169257ca2ccfe929d852d0f866b841908632d3b94b1a100178df"
   name = "github.com/jedisct1/go-clocksmith"
   packages = ["."]
+  pruneopts = "UT"
   revision = "c35da9bed550558a4797c74e34957071214342e7"
 
 [[projects]]
   branch = "master"
+  digest = "1:2c8c475bb86fe1b4cdb134c3b4649385daafcd37fa56b970957d98814db7b3ea"
   name = "github.com/jedisct1/go-dnsstamps"
   packages = ["."]
+  pruneopts = "UT"
   revision = "1e4999280f861b465e03e21e4f84d838f2f02b38"
 
 [[projects]]
   branch = "master"
+  digest = "1:d1d9e8794639828c2953fae54ef5f25eb0dbc42032f9a8700ebabbc42d70130d"
   name = "github.com/jedisct1/go-minisign"
   packages = ["."]
+  pruneopts = "UT"
   revision = "f4dbde220b4f73d450949b9ba27fa941faa05a78"
 
 [[projects]]
   branch = "master"
+  digest = "1:9eb6e583742b094222b15794641e0e5fac69078147b82f4a5c971bb0b8938671"
   name = "github.com/jedisct1/xsecretbox"
   packages = ["."]
+  pruneopts = "UT"
   revision = "7a679c0bcd9a5bbfe097fb7d48497bc06d17be76"
 
 [[projects]]
+  digest = "1:9d85ab479918f5d22a449601d35ff4e94115e31db534e22b8431e2c7b152bc4d"
   name = "github.com/k-sone/critbitgo"
   packages = ["."]
+  pruneopts = "UT"
   revision = "658116ef1e826b72c603cfe2091b12503f9bca43"
   version = "v1.2.0"
 
 [[projects]]
   branch = "master"
+  digest = "1:caf6db28595425c0e0f2301a00257d11712f65c1878e12cffc42f6b9a9cf3f23"
   name = "github.com/kardianos/osext"
   packages = ["."]
+  pruneopts = "UT"
   revision = "ae77be60afb1dcacde03767a8c37337fad28ac14"
 
 [[projects]]
   branch = "master"
+  digest = "1:2c4470d47613daac5ff660ff9b67a6f8dca489845bb867186e3fcda742a3e53f"
   name = "github.com/kardianos/service"
   packages = ["."]
+  pruneopts = "UT"
   revision = "615a14ed75099c9eaac6949e22ac2341bf9d3197"
 
 [[projects]]
+  digest = "1:463e4140189f8194f9121ca1c7fe3b8e9e9a2ab3d949b43c835c21034927dc62"
   name = "github.com/miekg/dns"
   packages = ["."]
+  pruneopts = "UT"
   revision = "5a2b9fab83ff0f8bfc99684bd5f43a37abe560f1"
   version = "v1.0.8"
 
 [[projects]]
   branch = "master"
+  digest = "1:fb92a63e4dcf1d88c58efdbc028d0b91bcaeddd8633758056beb376f13531147"
   name = "golang.org/x/crypto"
   packages = [
     "curve25519",
@@ -147,12 +190,14 @@
     "nacl/box",
     "nacl/secretbox",
     "poly1305",
-    "salsa20/salsa"
+    "salsa20/salsa",
   ]
-  revision = "a49355c7e3f8fe157a85be2f77e6e269a0f89602"
+  pruneopts = "UT"
+  revision = "de0752318171da717af4ce24d0a2e8626afaeb11"
 
 [[projects]]
   branch = "master"
+  digest = "1:b6a4877dbd8d954aebfe3c6e4b8f674f0564aaf7ac2bb99ea1d9e190410f46c4"
   name = "golang.org/x/net"
   packages = [
     "bpf",
@@ -165,12 +210,14 @@
     "internal/socks",
     "ipv4",
     "ipv6",
-    "proxy"
+    "proxy",
   ]
-  revision = "32a936f46389aa10549d60bd7833e54b01685d09"
+  pruneopts = "UT"
+  revision = "f9ce57c11b242f0f1599cf25c89d8cb02c45295a"
 
 [[projects]]
   branch = "master"
+  digest = "1:86c7b355731b7a7eb6cb38f1af9c7e025412c081ba76bffed9ba5381802d275a"
   name = "golang.org/x/sys"
   packages = [
     "cpu",
@@ -179,11 +226,13 @@
     "windows/registry",
     "windows/svc",
     "windows/svc/eventlog",
-    "windows/svc/mgr"
+    "windows/svc/mgr",
   ]
-  revision = "3c6ecd8f22c6f40fbeec94c000a069d7d87c7624"
+  pruneopts = "UT"
+  revision = "904bdc257025c7b3f43c19360ad3ab85783fad78"
 
 [[projects]]
+  digest = "1:a2ab62866c75542dd18d2b069fec854577a20211d7c0ea6ae746072a1dccdd18"
   name = "golang.org/x/text"
   packages = [
     "collate",
@@ -199,20 +248,50 @@
     "unicode/bidi",
     "unicode/cldr",
     "unicode/norm",
-    "unicode/rangetable"
+    "unicode/rangetable",
   ]
+  pruneopts = "UT"
   revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"
   version = "v0.3.0"
 
 [[projects]]
+  digest = "1:c805e517269b0ba4c21ded5836019ed7d16953d4026cb7d00041d039c7906be9"
   name = "gopkg.in/natefinch/lumberjack.v2"
   packages = ["."]
+  pruneopts = "UT"
   revision = "a96e63847dc3c67d17befa69c303767e2f84e54f"
   version = "v2.1"
 
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "2e3662737bdfec3295cf1f397f5584d97fbfd99973ab0351fafe66049bfa79bb"
+  input-imports = [
+    "github.com/BurntSushi/toml",
+    "github.com/VividCortex/ewma",
+    "github.com/agl/ed25519",
+    "github.com/coreos/go-systemd/activation",
+    "github.com/coreos/go-systemd/daemon",
+    "github.com/dchest/safefile",
+    "github.com/facebookgo/pidfile",
+    "github.com/hashicorp/go-immutable-radix",
+    "github.com/hashicorp/golang-lru",
+    "github.com/jedisct1/dlog",
+    "github.com/jedisct1/go-clocksmith",
+    "github.com/jedisct1/go-dnsstamps",
+    "github.com/jedisct1/go-minisign",
+    "github.com/jedisct1/xsecretbox",
+    "github.com/k-sone/critbitgo",
+    "github.com/kardianos/service",
+    "github.com/miekg/dns",
+    "golang.org/x/crypto/curve25519",
+    "golang.org/x/crypto/ed25519",
+    "golang.org/x/crypto/nacl/box",
+    "golang.org/x/crypto/nacl/secretbox",
+    "golang.org/x/net/http2",
+    "golang.org/x/net/proxy",
+    "golang.org/x/sys/unix",
+    "golang.org/x/sys/windows/svc/mgr",
+    "gopkg.in/natefinch/lumberjack.v2",
+  ]
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index ac15356a..0a4f18f1 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -1,3 +1,7 @@
+[prune]
+  go-tests = true
+  unused-packages = true
+
 [[constraint]]
   name = "github.com/BurntSushi/toml"
   version = "0.3.0"
diff --git a/vendor/github.com/BurntSushi/toml/cmd/toml-test-decoder/COPYING b/vendor/github.com/BurntSushi/toml/cmd/toml-test-decoder/COPYING
new file mode 100644
index 00000000..5a8e3325
--- /dev/null
+++ b/vendor/github.com/BurntSushi/toml/cmd/toml-test-decoder/COPYING
@@ -0,0 +1,14 @@
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                    Version 2, December 2004
+
+ Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. You just DO WHAT THE FUCK YOU WANT TO.
+
diff --git a/vendor/github.com/BurntSushi/toml/cmd/toml-test-encoder/COPYING b/vendor/github.com/BurntSushi/toml/cmd/toml-test-encoder/COPYING
new file mode 100644
index 00000000..5a8e3325
--- /dev/null
+++ b/vendor/github.com/BurntSushi/toml/cmd/toml-test-encoder/COPYING
@@ -0,0 +1,14 @@
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                    Version 2, December 2004
+
+ Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. You just DO WHAT THE FUCK YOU WANT TO.
+
diff --git a/vendor/github.com/BurntSushi/toml/cmd/tomlv/COPYING b/vendor/github.com/BurntSushi/toml/cmd/tomlv/COPYING
new file mode 100644
index 00000000..5a8e3325
--- /dev/null
+++ b/vendor/github.com/BurntSushi/toml/cmd/tomlv/COPYING
@@ -0,0 +1,14 @@
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                    Version 2, December 2004
+
+ Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. You just DO WHAT THE FUCK YOU WANT TO.
+
diff --git a/vendor/github.com/BurntSushi/toml/decode_test.go b/vendor/github.com/BurntSushi/toml/decode_test.go
deleted file mode 100644
index 0c36b33e..00000000
--- a/vendor/github.com/BurntSushi/toml/decode_test.go
+++ /dev/null
@@ -1,1447 +0,0 @@
-package toml
-
-import (
-	"fmt"
-	"log"
-	"math"
-	"reflect"
-	"strings"
-	"testing"
-	"time"
-)
-
-func TestDecodeSimple(t *testing.T) {
-	var testSimple = `
-age = 250
-andrew = "gallant"
-kait = "brady"
-now = 1987-07-05T05:45:00Z
-yesOrNo = true
-pi = 3.14
-colors = [
-	["red", "green", "blue"],
-	["cyan", "magenta", "yellow", "black"],
-]
-
-[My.Cats]
-plato = "cat 1"
-cauchy = "cat 2"
-`
-
-	type cats struct {
-		Plato  string
-		Cauchy string
-	}
-	type simple struct {
-		Age     int
-		Colors  [][]string
-		Pi      float64
-		YesOrNo bool
-		Now     time.Time
-		Andrew  string
-		Kait    string
-		My      map[string]cats
-	}
-
-	var val simple
-	_, err := Decode(testSimple, &val)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	now, err := time.Parse("2006-01-02T15:04:05", "1987-07-05T05:45:00")
-	if err != nil {
-		panic(err)
-	}
-	var answer = simple{
-		Age:     250,
-		Andrew:  "gallant",
-		Kait:    "brady",
-		Now:     now,
-		YesOrNo: true,
-		Pi:      3.14,
-		Colors: [][]string{
-			{"red", "green", "blue"},
-			{"cyan", "magenta", "yellow", "black"},
-		},
-		My: map[string]cats{
-			"Cats": {Plato: "cat 1", Cauchy: "cat 2"},
-		},
-	}
-	if !reflect.DeepEqual(val, answer) {
-		t.Fatalf("Expected\n-----\n%#v\n-----\nbut got\n-----\n%#v\n",
-			answer, val)
-	}
-}
-
-func TestDecodeEmbedded(t *testing.T) {
-	type Dog struct{ Name string }
-	type Age int
-	type cat struct{ Name string }
-
-	for _, test := range []struct {
-		label       string
-		input       string
-		decodeInto  interface{}
-		wantDecoded interface{}
-	}{
-		{
-			label:       "embedded struct",
-			input:       `Name = "milton"`,
-			decodeInto:  &struct{ Dog }{},
-			wantDecoded: &struct{ Dog }{Dog{"milton"}},
-		},
-		{
-			label:       "embedded non-nil pointer to struct",
-			input:       `Name = "milton"`,
-			decodeInto:  &struct{ *Dog }{},
-			wantDecoded: &struct{ *Dog }{&Dog{"milton"}},
-		},
-		{
-			label:       "embedded nil pointer to struct",
-			input:       ``,
-			decodeInto:  &struct{ *Dog }{},
-			wantDecoded: &struct{ *Dog }{nil},
-		},
-		{
-			label:       "unexported embedded struct",
-			input:       `Name = "socks"`,
-			decodeInto:  &struct{ cat }{},
-			wantDecoded: &struct{ cat }{cat{"socks"}},
-		},
-		{
-			label:       "embedded int",
-			input:       `Age = -5`,
-			decodeInto:  &struct{ Age }{},
-			wantDecoded: &struct{ Age }{-5},
-		},
-	} {
-		_, err := Decode(test.input, test.decodeInto)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if !reflect.DeepEqual(test.wantDecoded, test.decodeInto) {
-			t.Errorf("%s: want decoded == %+v, got %+v",
-				test.label, test.wantDecoded, test.decodeInto)
-		}
-	}
-}
-
-func TestDecodeIgnoredFields(t *testing.T) {
-	type simple struct {
-		Number int `toml:"-"`
-	}
-	const input = `
-Number = 123
-- = 234
-`
-	var s simple
-	if _, err := Decode(input, &s); err != nil {
-		t.Fatal(err)
-	}
-	if s.Number != 0 {
-		t.Errorf("got: %d; want 0", s.Number)
-	}
-}
-
-func TestTableArrays(t *testing.T) {
-	var tomlTableArrays = `
-[[albums]]
-name = "Born to Run"
-
-  [[albums.songs]]
-  name = "Jungleland"
-
-  [[albums.songs]]
-  name = "Meeting Across the River"
-
-[[albums]]
-name = "Born in the USA"
-
-  [[albums.songs]]
-  name = "Glory Days"
-
-  [[albums.songs]]
-  name = "Dancing in the Dark"
-`
-
-	type Song struct {
-		Name string
-	}
-
-	type Album struct {
-		Name  string
-		Songs []Song
-	}
-
-	type Music struct {
-		Albums []Album
-	}
-
-	expected := Music{[]Album{
-		{"Born to Run", []Song{{"Jungleland"}, {"Meeting Across the River"}}},
-		{"Born in the USA", []Song{{"Glory Days"}, {"Dancing in the Dark"}}},
-	}}
-	var got Music
-	if _, err := Decode(tomlTableArrays, &got); err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(expected, got) {
-		t.Fatalf("\n%#v\n!=\n%#v\n", expected, got)
-	}
-}
-
-func TestTableNesting(t *testing.T) {
-	for _, tt := range []struct {
-		t    string
-		want []string
-	}{
-		{"[a.b.c]", []string{"a", "b", "c"}},
-		{`[a."b.c"]`, []string{"a", "b.c"}},
-		{`[a.'b.c']`, []string{"a", "b.c"}},
-		{`[a.' b ']`, []string{"a", " b "}},
-		{"[ d.e.f ]", []string{"d", "e", "f"}},
-		{"[ g . h . i ]", []string{"g", "h", "i"}},
-		{`[ j . "ʞ" . 'l' ]`, []string{"j", "ʞ", "l"}},
-	} {
-		var m map[string]interface{}
-		if _, err := Decode(tt.t, &m); err != nil {
-			t.Errorf("Decode(%q): got error: %s", tt.t, err)
-			continue
-		}
-		if keys := extractNestedKeys(m); !reflect.DeepEqual(keys, tt.want) {
-			t.Errorf("Decode(%q): got nested keys %#v; want %#v",
-				tt.t, keys, tt.want)
-		}
-	}
-}
-
-func extractNestedKeys(v map[string]interface{}) []string {
-	var result []string
-	for {
-		if len(v) != 1 {
-			return result
-		}
-		for k, m := range v {
-			result = append(result, k)
-			var ok bool
-			v, ok = m.(map[string]interface{})
-			if !ok {
-				return result
-			}
-		}
-
-	}
-}
-
-// Case insensitive matching tests.
-// A bit more comprehensive than needed given the current implementation,
-// but implementations change.
-// Probably still missing demonstrations of some ugly corner cases regarding
-// case insensitive matching and multiple fields.
-func TestCase(t *testing.T) {
-	var caseToml = `
-tOpString = "string"
-tOpInt = 1
-tOpFloat = 1.1
-tOpBool = true
-tOpdate = 2006-01-02T15:04:05Z
-tOparray = [ "array" ]
-Match = "i should be in Match only"
-MatcH = "i should be in MatcH only"
-once = "just once"
-[nEst.eD]
-nEstedString = "another string"
-`
-
-	type InsensitiveEd struct {
-		NestedString string
-	}
-
-	type InsensitiveNest struct {
-		Ed InsensitiveEd
-	}
-
-	type Insensitive struct {
-		TopString string
-		TopInt    int
-		TopFloat  float64
-		TopBool   bool
-		TopDate   time.Time
-		TopArray  []string
-		Match     string
-		MatcH     string
-		Once      string
-		OncE      string
-		Nest      InsensitiveNest
-	}
-
-	tme, err := time.Parse(time.RFC3339, time.RFC3339[:len(time.RFC3339)-5])
-	if err != nil {
-		panic(err)
-	}
-	expected := Insensitive{
-		TopString: "string",
-		TopInt:    1,
-		TopFloat:  1.1,
-		TopBool:   true,
-		TopDate:   tme,
-		TopArray:  []string{"array"},
-		MatcH:     "i should be in MatcH only",
-		Match:     "i should be in Match only",
-		Once:      "just once",
-		OncE:      "",
-		Nest: InsensitiveNest{
-			Ed: InsensitiveEd{NestedString: "another string"},
-		},
-	}
-	var got Insensitive
-	if _, err := Decode(caseToml, &got); err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(expected, got) {
-		t.Fatalf("\n%#v\n!=\n%#v\n", expected, got)
-	}
-}
-
-func TestPointers(t *testing.T) {
-	type Object struct {
-		Type        string
-		Description string
-	}
-
-	type Dict struct {
-		NamedObject map[string]*Object
-		BaseObject  *Object
-		Strptr      *string
-		Strptrs     []*string
-	}
-	s1, s2, s3 := "blah", "abc", "def"
-	expected := &Dict{
-		Strptr:  &s1,
-		Strptrs: []*string{&s2, &s3},
-		NamedObject: map[string]*Object{
-			"foo": {"FOO", "fooooo!!!"},
-			"bar": {"BAR", "ba-ba-ba-ba-barrrr!!!"},
-		},
-		BaseObject: &Object{"BASE", "da base"},
-	}
-
-	ex1 := `
-Strptr = "blah"
-Strptrs = ["abc", "def"]
-
-[NamedObject.foo]
-Type = "FOO"
-Description = "fooooo!!!"
-
-[NamedObject.bar]
-Type = "BAR"
-Description = "ba-ba-ba-ba-barrrr!!!"
-
-[BaseObject]
-Type = "BASE"
-Description = "da base"
-`
-	dict := new(Dict)
-	_, err := Decode(ex1, dict)
-	if err != nil {
-		t.Errorf("Decode error: %v", err)
-	}
-	if !reflect.DeepEqual(expected, dict) {
-		t.Fatalf("\n%#v\n!=\n%#v\n", expected, dict)
-	}
-}
-
-func TestDecodeDatetime(t *testing.T) {
-	const noTimestamp = "2006-01-02T15:04:05"
-	for _, tt := range []struct {
-		s      string
-		t      string
-		format string
-	}{
-		{"1979-05-27T07:32:00Z", "1979-05-27T07:32:00Z", time.RFC3339},
-		{"1979-05-27T00:32:00-07:00", "1979-05-27T00:32:00-07:00", time.RFC3339},
-		{
-			"1979-05-27T00:32:00.999999-07:00",
-			"1979-05-27T00:32:00.999999-07:00",
-			time.RFC3339,
-		},
-		{"1979-05-27T07:32:00", "1979-05-27T07:32:00", noTimestamp},
-		{
-			"1979-05-27T00:32:00.999999",
-			"1979-05-27T00:32:00.999999",
-			noTimestamp,
-		},
-		{"1979-05-27", "1979-05-27T00:00:00", noTimestamp},
-	} {
-		var x struct{ D time.Time }
-		input := "d = " + tt.s
-		if _, err := Decode(input, &x); err != nil {
-			t.Errorf("Decode(%q): got error: %s", input, err)
-			continue
-		}
-		want, err := time.ParseInLocation(tt.format, tt.t, time.Local)
-		if err != nil {
-			panic(err)
-		}
-		if !x.D.Equal(want) {
-			t.Errorf("Decode(%q): got %s; want %s", input, x.D, want)
-		}
-	}
-}
-
-func TestDecodeBadDatetime(t *testing.T) {
-	var x struct{ T time.Time }
-	for _, s := range []string{
-		"123",
-		"2006-01-50T00:00:00Z",
-		"2006-01-30T00:00",
-		"2006-01-30T",
-	} {
-		input := "T = " + s
-		if _, err := Decode(input, &x); err == nil {
-			t.Errorf("Expected invalid DateTime error for %q", s)
-		}
-	}
-}
-
-func TestDecodeMultilineStrings(t *testing.T) {
-	var x struct {
-		S string
-	}
-	const s0 = `s = """
-a b \n c
-d e f
-"""`
-	if _, err := Decode(s0, &x); err != nil {
-		t.Fatal(err)
-	}
-	if want := "a b \n c\nd e f\n"; x.S != want {
-		t.Errorf("got: %q; want: %q", x.S, want)
-	}
-	const s1 = `s = """a b c\
-"""`
-	if _, err := Decode(s1, &x); err != nil {
-		t.Fatal(err)
-	}
-	if want := "a b c"; x.S != want {
-		t.Errorf("got: %q; want: %q", x.S, want)
-	}
-}
-
-type sphere struct {
-	Center [3]float64
-	Radius float64
-}
-
-func TestDecodeSimpleArray(t *testing.T) {
-	var s1 sphere
-	if _, err := Decode(`center = [0.0, 1.5, 0.0]`, &s1); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestDecodeArrayWrongSize(t *testing.T) {
-	var s1 sphere
-	if _, err := Decode(`center = [0.1, 2.3]`, &s1); err == nil {
-		t.Fatal("Expected array type mismatch error")
-	}
-}
-
-func TestDecodeLargeIntoSmallInt(t *testing.T) {
-	type table struct {
-		Value int8
-	}
-	var tab table
-	if _, err := Decode(`value = 500`, &tab); err == nil {
-		t.Fatal("Expected integer out-of-bounds error.")
-	}
-}
-
-func TestDecodeSizedInts(t *testing.T) {
-	type table struct {
-		U8  uint8
-		U16 uint16
-		U32 uint32
-		U64 uint64
-		U   uint
-		I8  int8
-		I16 int16
-		I32 int32
-		I64 int64
-		I   int
-	}
-	answer := table{1, 1, 1, 1, 1, -1, -1, -1, -1, -1}
-	toml := `
-	u8 = 1
-	u16 = 1
-	u32 = 1
-	u64 = 1
-	u = 1
-	i8 = -1
-	i16 = -1
-	i32 = -1
-	i64 = -1
-	i = -1
-	`
-	var tab table
-	if _, err := Decode(toml, &tab); err != nil {
-		t.Fatal(err.Error())
-	}
-	if answer != tab {
-		t.Fatalf("Expected %#v but got %#v", answer, tab)
-	}
-}
-
-func TestDecodeInts(t *testing.T) {
-	for _, tt := range []struct {
-		s    string
-		want int64
-	}{
-		{"0", 0},
-		{"+99", 99},
-		{"-10", -10},
-		{"1_234_567", 1234567},
-		{"1_2_3_4", 1234},
-		{"-9_223_372_036_854_775_808", math.MinInt64},
-		{"9_223_372_036_854_775_807", math.MaxInt64},
-	} {
-		var x struct{ N int64 }
-		input := "n = " + tt.s
-		if _, err := Decode(input, &x); err != nil {
-			t.Errorf("Decode(%q): got error: %s", input, err)
-			continue
-		}
-		if x.N != tt.want {
-			t.Errorf("Decode(%q): got %d; want %d", input, x.N, tt.want)
-		}
-	}
-}
-
-func TestDecodeFloats(t *testing.T) {
-	for _, tt := range []struct {
-		s    string
-		want float64
-	}{
-		{"+1.0", 1},
-		{"3.1415", 3.1415},
-		{"-0.01", -0.01},
-		{"5e+22", 5e22},
-		{"1e6", 1e6},
-		{"-2E-2", -2e-2},
-		{"6.626e-34", 6.626e-34},
-		{"9_224_617.445_991_228_313", 9224617.445991228313},
-		{"9_876.54_32e1_0", 9876.5432e10},
-	} {
-		var x struct{ N float64 }
-		input := "n = " + tt.s
-		if _, err := Decode(input, &x); err != nil {
-			t.Errorf("Decode(%q): got error: %s", input, err)
-			continue
-		}
-		if x.N != tt.want {
-			t.Errorf("Decode(%q): got %f; want %f", input, x.N, tt.want)
-		}
-	}
-}
-
-func TestDecodeMalformedNumbers(t *testing.T) {
-	for _, tt := range []struct {
-		s    string
-		want string
-	}{
-		{"++99", "expected a digit"},
-		{"0..1", "must be followed by one or more digits"},
-		{"0.1.2", "Invalid float value"},
-		{"1e2.3", "Invalid float value"},
-		{"1e2e3", "Invalid float value"},
-		{"_123", "expected value"},
-		{"123_", "surrounded by digits"},
-		{"1._23", "surrounded by digits"},
-		{"1e__23", "surrounded by digits"},
-		{"123.", "must be followed by one or more digits"},
-		{"1.e2", "must be followed by one or more digits"},
-	} {
-		var x struct{ N interface{} }
-		input := "n = " + tt.s
-		_, err := Decode(input, &x)
-		if err == nil {
-			t.Errorf("Decode(%q): got nil, want error containing %q",
-				input, tt.want)
-			continue
-		}
-		if !strings.Contains(err.Error(), tt.want) {
-			t.Errorf("Decode(%q): got %q, want error containing %q",
-				input, err, tt.want)
-		}
-	}
-}
-
-func TestDecodeBadValues(t *testing.T) {
-	for _, tt := range []struct {
-		v    interface{}
-		want string
-	}{
-		{3, "non-pointer int"},
-		{(*int)(nil), "nil"},
-	} {
-		_, err := Decode(`x = 3`, tt.v)
-		if err == nil {
-			t.Errorf("Decode(%v): got nil; want error containing %q",
-				tt.v, tt.want)
-			continue
-		}
-		if !strings.Contains(err.Error(), tt.want) {
-			t.Errorf("Decode(%v): got %q; want error containing %q",
-				tt.v, err, tt.want)
-		}
-	}
-}
-
-func TestUnmarshaler(t *testing.T) {
-
-	var tomlBlob = `
-[dishes.hamboogie]
-name = "Hamboogie with fries"
-price = 10.99
-
-[[dishes.hamboogie.ingredients]]
-name = "Bread Bun"
-
-[[dishes.hamboogie.ingredients]]
-name = "Lettuce"
-
-[[dishes.hamboogie.ingredients]]
-name = "Real Beef Patty"
-
-[[dishes.hamboogie.ingredients]]
-name = "Tomato"
-
-[dishes.eggsalad]
-name = "Egg Salad with rice"
-price = 3.99
-
-[[dishes.eggsalad.ingredients]]
-name = "Egg"
-
-[[dishes.eggsalad.ingredients]]
-name = "Mayo"
-
-[[dishes.eggsalad.ingredients]]
-name = "Rice"
-`
-	m := &menu{}
-	if _, err := Decode(tomlBlob, m); err != nil {
-		t.Fatal(err)
-	}
-
-	if len(m.Dishes) != 2 {
-		t.Log("two dishes should be loaded with UnmarshalTOML()")
-		t.Errorf("expected %d but got %d", 2, len(m.Dishes))
-	}
-
-	eggSalad := m.Dishes["eggsalad"]
-	if _, ok := interface{}(eggSalad).(dish); !ok {
-		t.Errorf("expected a dish")
-	}
-
-	if eggSalad.Name != "Egg Salad with rice" {
-		t.Errorf("expected the dish to be named 'Egg Salad with rice'")
-	}
-
-	if len(eggSalad.Ingredients) != 3 {
-		t.Log("dish should be loaded with UnmarshalTOML()")
-		t.Errorf("expected %d but got %d", 3, len(eggSalad.Ingredients))
-	}
-
-	found := false
-	for _, i := range eggSalad.Ingredients {
-		if i.Name == "Rice" {
-			found = true
-			break
-		}
-	}
-	if !found {
-		t.Error("Rice was not loaded in UnmarshalTOML()")
-	}
-
-	// test on a value - must be passed as *
-	o := menu{}
-	if _, err := Decode(tomlBlob, &o); err != nil {
-		t.Fatal(err)
-	}
-
-}
-
-func TestDecodeInlineTable(t *testing.T) {
-	input := `
-[CookieJar]
-Types = {Chocolate = "yummy", Oatmeal = "best ever"}
-
-[Seasons]
-Locations = {NY = {Temp = "not cold", Rating = 4}, MI = {Temp = "freezing", Rating = 9}}
-`
-	type cookieJar struct {
-		Types map[string]string
-	}
-	type properties struct {
-		Temp   string
-		Rating int
-	}
-	type seasons struct {
-		Locations map[string]properties
-	}
-	type wrapper struct {
-		CookieJar cookieJar
-		Seasons   seasons
-	}
-	var got wrapper
-
-	meta, err := Decode(input, &got)
-	if err != nil {
-		t.Fatal(err)
-	}
-	want := wrapper{
-		CookieJar: cookieJar{
-			Types: map[string]string{
-				"Chocolate": "yummy",
-				"Oatmeal":   "best ever",
-			},
-		},
-		Seasons: seasons{
-			Locations: map[string]properties{
-				"NY": {
-					Temp:   "not cold",
-					Rating: 4,
-				},
-				"MI": {
-					Temp:   "freezing",
-					Rating: 9,
-				},
-			},
-		},
-	}
-	if !reflect.DeepEqual(got, want) {
-		t.Fatalf("after decode, got:\n\n%#v\n\nwant:\n\n%#v", got, want)
-	}
-	if len(meta.keys) != 12 {
-		t.Errorf("after decode, got %d meta keys; want 12", len(meta.keys))
-	}
-	if len(meta.types) != 12 {
-		t.Errorf("after decode, got %d meta types; want 12", len(meta.types))
-	}
-}
-
-func TestDecodeInlineTableArray(t *testing.T) {
-	type point struct {
-		X, Y, Z int
-	}
-	var got struct {
-		Points []point
-	}
-	// Example inline table array from the spec.
-	const in = `
-points = [ { x = 1, y = 2, z = 3 },
-           { x = 7, y = 8, z = 9 },
-           { x = 2, y = 4, z = 8 } ]
-
-`
-	if _, err := Decode(in, &got); err != nil {
-		t.Fatal(err)
-	}
-	want := []point{
-		{X: 1, Y: 2, Z: 3},
-		{X: 7, Y: 8, Z: 9},
-		{X: 2, Y: 4, Z: 8},
-	}
-	if !reflect.DeepEqual(got.Points, want) {
-		t.Errorf("got %#v; want %#v", got.Points, want)
-	}
-}
-
-func TestDecodeMalformedInlineTable(t *testing.T) {
-	for _, tt := range []struct {
-		s    string
-		want string
-	}{
-		{"{,}", "unexpected comma"},
-		{"{x = 3 y = 4}", "expected a comma or an inline table terminator"},
-		{"{x=3,,y=4}", "unexpected comma"},
-		{"{x=3,\ny=4}", "newlines not allowed"},
-		{"{x=3\n,y=4}", "newlines not allowed"},
-	} {
-		var x struct{ A map[string]int }
-		input := "a = " + tt.s
-		_, err := Decode(input, &x)
-		if err == nil {
-			t.Errorf("Decode(%q): got nil, want error containing %q",
-				input, tt.want)
-			continue
-		}
-		if !strings.Contains(err.Error(), tt.want) {
-			t.Errorf("Decode(%q): got %q, want error containing %q",
-				input, err, tt.want)
-		}
-	}
-}
-
-type menu struct {
-	Dishes map[string]dish
-}
-
-func (m *menu) UnmarshalTOML(p interface{}) error {
-	m.Dishes = make(map[string]dish)
-	data, _ := p.(map[string]interface{})
-	dishes := data["dishes"].(map[string]interface{})
-	for n, v := range dishes {
-		if d, ok := v.(map[string]interface{}); ok {
-			nd := dish{}
-			nd.UnmarshalTOML(d)
-			m.Dishes[n] = nd
-		} else {
-			return fmt.Errorf("not a dish")
-		}
-	}
-	return nil
-}
-
-type dish struct {
-	Name        string
-	Price       float32
-	Ingredients []ingredient
-}
-
-func (d *dish) UnmarshalTOML(p interface{}) error {
-	data, _ := p.(map[string]interface{})
-	d.Name, _ = data["name"].(string)
-	d.Price, _ = data["price"].(float32)
-	ingredients, _ := data["ingredients"].([]map[string]interface{})
-	for _, e := range ingredients {
-		n, _ := interface{}(e).(map[string]interface{})
-		name, _ := n["name"].(string)
-		i := ingredient{name}
-		d.Ingredients = append(d.Ingredients, i)
-	}
-	return nil
-}
-
-type ingredient struct {
-	Name string
-}
-
-func TestDecodeSlices(t *testing.T) {
-	type T struct {
-		S []string
-	}
-	for i, tt := range []struct {
-		v     T
-		input string
-		want  T
-	}{
-		{T{}, "", T{}},
-		{T{[]string{}}, "", T{[]string{}}},
-		{T{[]string{"a", "b"}}, "", T{[]string{"a", "b"}}},
-		{T{}, "S = []", T{[]string{}}},
-		{T{[]string{}}, "S = []", T{[]string{}}},
-		{T{[]string{"a", "b"}}, "S = []", T{[]string{}}},
-		{T{}, `S = ["x"]`, T{[]string{"x"}}},
-		{T{[]string{}}, `S = ["x"]`, T{[]string{"x"}}},
-		{T{[]string{"a", "b"}}, `S = ["x"]`, T{[]string{"x"}}},
-	} {
-		if _, err := Decode(tt.input, &tt.v); err != nil {
-			t.Errorf("[%d] %s", i, err)
-			continue
-		}
-		if !reflect.DeepEqual(tt.v, tt.want) {
-			t.Errorf("[%d] got %#v; want %#v", i, tt.v, tt.want)
-		}
-	}
-}
-
-func TestDecodePrimitive(t *testing.T) {
-	type S struct {
-		P Primitive
-	}
-	type T struct {
-		S []int
-	}
-	slicep := func(s []int) *[]int { return &s }
-	arrayp := func(a [2]int) *[2]int { return &a }
-	mapp := func(m map[string]int) *map[string]int { return &m }
-	for i, tt := range []struct {
-		v     interface{}
-		input string
-		want  interface{}
-	}{
-		// slices
-		{slicep(nil), "", slicep(nil)},
-		{slicep([]int{}), "", slicep([]int{})},
-		{slicep([]int{1, 2, 3}), "", slicep([]int{1, 2, 3})},
-		{slicep(nil), "P = [1,2]", slicep([]int{1, 2})},
-		{slicep([]int{}), "P = [1,2]", slicep([]int{1, 2})},
-		{slicep([]int{1, 2, 3}), "P = [1,2]", slicep([]int{1, 2})},
-
-		// arrays
-		{arrayp([2]int{2, 3}), "", arrayp([2]int{2, 3})},
-		{arrayp([2]int{2, 3}), "P = [3,4]", arrayp([2]int{3, 4})},
-
-		// maps
-		{mapp(nil), "", mapp(nil)},
-		{mapp(map[string]int{}), "", mapp(map[string]int{})},
-		{mapp(map[string]int{"a": 1}), "", mapp(map[string]int{"a": 1})},
-		{mapp(nil), "[P]\na = 2", mapp(map[string]int{"a": 2})},
-		{mapp(map[string]int{}), "[P]\na = 2", mapp(map[string]int{"a": 2})},
-		{mapp(map[string]int{"a": 1, "b": 3}), "[P]\na = 2", mapp(map[string]int{"a": 2, "b": 3})},
-
-		// structs
-		{&T{nil}, "[P]", &T{nil}},
-		{&T{[]int{}}, "[P]", &T{[]int{}}},
-		{&T{[]int{1, 2, 3}}, "[P]", &T{[]int{1, 2, 3}}},
-		{&T{nil}, "[P]\nS = [1,2]", &T{[]int{1, 2}}},
-		{&T{[]int{}}, "[P]\nS = [1,2]", &T{[]int{1, 2}}},
-		{&T{[]int{1, 2, 3}}, "[P]\nS = [1,2]", &T{[]int{1, 2}}},
-	} {
-		var s S
-		md, err := Decode(tt.input, &s)
-		if err != nil {
-			t.Errorf("[%d] Decode error: %s", i, err)
-			continue
-		}
-		if err := md.PrimitiveDecode(s.P, tt.v); err != nil {
-			t.Errorf("[%d] PrimitiveDecode error: %s", i, err)
-			continue
-		}
-		if !reflect.DeepEqual(tt.v, tt.want) {
-			t.Errorf("[%d] got %#v; want %#v", i, tt.v, tt.want)
-		}
-	}
-}
-
-func TestDecodeErrors(t *testing.T) {
-	for _, s := range []string{
-		`x="`,
-		`x='`,
-		`x='''`,
-
-		// Cases found by fuzzing in
-		// https://github.com/BurntSushi/toml/issues/155.
-		`""�`,   // used to panic with index out of range
-		`e="""`, // used to hang
-	} {
-		var x struct{}
-		_, err := Decode(s, &x)
-		if err == nil {
-			t.Errorf("Decode(%q): got nil error", s)
-		}
-	}
-}
-
-// Test for https://github.com/BurntSushi/toml/pull/166.
-func TestDecodeBoolArray(t *testing.T) {
-	for _, tt := range []struct {
-		s    string
-		got  interface{}
-		want interface{}
-	}{
-		{
-			"a = [true, false]",
-			&struct{ A []bool }{},
-			&struct{ A []bool }{[]bool{true, false}},
-		},
-		{
-			"a = {a = true, b = false}",
-			&struct{ A map[string]bool }{},
-			&struct{ A map[string]bool }{map[string]bool{"a": true, "b": false}},
-		},
-	} {
-		if _, err := Decode(tt.s, tt.got); err != nil {
-			t.Errorf("Decode(%q): %s", tt.s, err)
-			continue
-		}
-		if !reflect.DeepEqual(tt.got, tt.want) {
-			t.Errorf("Decode(%q): got %#v; want %#v", tt.s, tt.got, tt.want)
-		}
-	}
-}
-
-func ExampleMetaData_PrimitiveDecode() {
-	var md MetaData
-	var err error
-
-	var tomlBlob = `
-ranking = ["Springsteen", "J Geils"]
-
-[bands.Springsteen]
-started = 1973
-albums = ["Greetings", "WIESS", "Born to Run", "Darkness"]
-
-[bands."J Geils"]
-started = 1970
-albums = ["The J. Geils Band", "Full House", "Blow Your Face Out"]
-`
-
-	type band struct {
-		Started int
-		Albums  []string
-	}
-	type classics struct {
-		Ranking []string
-		Bands   map[string]Primitive
-	}
-
-	// Do the initial decode. Reflection is delayed on Primitive values.
-	var music classics
-	if md, err = Decode(tomlBlob, &music); err != nil {
-		log.Fatal(err)
-	}
-
-	// MetaData still includes information on Primitive values.
-	fmt.Printf("Is `bands.Springsteen` defined? %v\n",
-		md.IsDefined("bands", "Springsteen"))
-
-	// Decode primitive data into Go values.
-	for _, artist := range music.Ranking {
-		// A band is a primitive value, so we need to decode it to get a
-		// real `band` value.
-		primValue := music.Bands[artist]
-
-		var aBand band
-		if err = md.PrimitiveDecode(primValue, &aBand); err != nil {
-			log.Fatal(err)
-		}
-		fmt.Printf("%s started in %d.\n", artist, aBand.Started)
-	}
-	// Check to see if there were any fields left undecoded.
-	// Note that this won't be empty before decoding the Primitive value!
-	fmt.Printf("Undecoded: %q\n", md.Undecoded())
-
-	// Output:
-	// Is `bands.Springsteen` defined? true
-	// Springsteen started in 1973.
-	// J Geils started in 1970.
-	// Undecoded: []
-}
-
-func ExampleDecode() {
-	var tomlBlob = `
-# Some comments.
-[alpha]
-ip = "10.0.0.1"
-
-	[alpha.config]
-	Ports = [ 8001, 8002 ]
-	Location = "Toronto"
-	Created = 1987-07-05T05:45:00Z
-
-[beta]
-ip = "10.0.0.2"
-
-	[beta.config]
-	Ports = [ 9001, 9002 ]
-	Location = "New Jersey"
-	Created = 1887-01-05T05:55:00Z
-`
-
-	type serverConfig struct {
-		Ports    []int
-		Location string
-		Created  time.Time
-	}
-
-	type server struct {
-		IP     string       `toml:"ip,omitempty"`
-		Config serverConfig `toml:"config"`
-	}
-
-	type servers map[string]server
-
-	var config servers
-	if _, err := Decode(tomlBlob, &config); err != nil {
-		log.Fatal(err)
-	}
-
-	for _, name := range []string{"alpha", "beta"} {
-		s := config[name]
-		fmt.Printf("Server: %s (ip: %s) in %s created on %s\n",
-			name, s.IP, s.Config.Location,
-			s.Config.Created.Format("2006-01-02"))
-		fmt.Printf("Ports: %v\n", s.Config.Ports)
-	}
-
-	// Output:
-	// Server: alpha (ip: 10.0.0.1) in Toronto created on 1987-07-05
-	// Ports: [8001 8002]
-	// Server: beta (ip: 10.0.0.2) in New Jersey created on 1887-01-05
-	// Ports: [9001 9002]
-}
-
-type duration struct {
-	time.Duration
-}
-
-func (d *duration) UnmarshalText(text []byte) error {
-	var err error
-	d.Duration, err = time.ParseDuration(string(text))
-	return err
-}
-
-// Example Unmarshaler shows how to decode TOML strings into your own
-// custom data type.
-func Example_unmarshaler() {
-	blob := `
-[[song]]
-name = "Thunder Road"
-duration = "4m49s"
-
-[[song]]
-name = "Stairway to Heaven"
-duration = "8m03s"
-`
-	type song struct {
-		Name     string
-		Duration duration
-	}
-	type songs struct {
-		Song []song
-	}
-	var favorites songs
-	if _, err := Decode(blob, &favorites); err != nil {
-		log.Fatal(err)
-	}
-
-	// Code to implement the TextUnmarshaler interface for `duration`:
-	//
-	// type duration struct {
-	// 	time.Duration
-	// }
-	//
-	// func (d *duration) UnmarshalText(text []byte) error {
-	// 	var err error
-	// 	d.Duration, err = time.ParseDuration(string(text))
-	// 	return err
-	// }
-
-	for _, s := range favorites.Song {
-		fmt.Printf("%s (%s)\n", s.Name, s.Duration)
-	}
-	// Output:
-	// Thunder Road (4m49s)
-	// Stairway to Heaven (8m3s)
-}
-
-// Example StrictDecoding shows how to detect whether there are keys in the
-// TOML document that weren't decoded into the value given. This is useful
-// for returning an error to the user if they've included extraneous fields
-// in their configuration.
-func Example_strictDecoding() {
-	var blob = `
-key1 = "value1"
-key2 = "value2"
-key3 = "value3"
-`
-	type config struct {
-		Key1 string
-		Key3 string
-	}
-
-	var conf config
-	md, err := Decode(blob, &conf)
-	if err != nil {
-		log.Fatal(err)
-	}
-	fmt.Printf("Undecoded keys: %q\n", md.Undecoded())
-	// Output:
-	// Undecoded keys: ["key2"]
-}
-
-// Example UnmarshalTOML shows how to implement a struct type that knows how to
-// unmarshal itself. The struct must take full responsibility for mapping the
-// values passed into the struct. The method may be used with interfaces in a
-// struct in cases where the actual type is not known until the data is
-// examined.
-func Example_unmarshalTOML() {
-
-	var blob = `
-[[parts]]
-type = "valve"
-id = "valve-1"
-size = 1.2
-rating = 4
-
-[[parts]]
-type = "valve"
-id = "valve-2"
-size = 2.1
-rating = 5
-
-[[parts]]
-type = "pipe"
-id = "pipe-1"
-length = 2.1
-diameter = 12
-
-[[parts]]
-type = "cable"
-id = "cable-1"
-length = 12
-rating = 3.1
-`
-	o := &order{}
-	err := Unmarshal([]byte(blob), o)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	fmt.Println(len(o.parts))
-
-	for _, part := range o.parts {
-		fmt.Println(part.Name())
-	}
-
-	// Code to implement UmarshalJSON.
-
-	// type order struct {
-	// 	// NOTE `order.parts` is a private slice of type `part` which is an
-	// 	// interface and may only be loaded from toml using the
-	// 	// UnmarshalTOML() method of the Umarshaler interface.
-	// 	parts parts
-	// }
-
-	// func (o *order) UnmarshalTOML(data interface{}) error {
-
-	// 	// NOTE the example below contains detailed type casting to show how
-	// 	// the 'data' is retrieved. In operational use, a type cast wrapper
-	// 	// may be preferred e.g.
-	// 	//
-	// 	// func AsMap(v interface{}) (map[string]interface{}, error) {
-	// 	// 		return v.(map[string]interface{})
-	// 	// }
-	// 	//
-	// 	// resulting in:
-	// 	// d, _ := AsMap(data)
-	// 	//
-
-	// 	d, _ := data.(map[string]interface{})
-	// 	parts, _ := d["parts"].([]map[string]interface{})
-
-	// 	for _, p := range parts {
-
-	// 		typ, _ := p["type"].(string)
-	// 		id, _ := p["id"].(string)
-
-	// 		// detect the type of part and handle each case
-	// 		switch p["type"] {
-	// 		case "valve":
-
-	// 			size := float32(p["size"].(float64))
-	// 			rating := int(p["rating"].(int64))
-
-	// 			valve := &valve{
-	// 				Type:   typ,
-	// 				ID:     id,
-	// 				Size:   size,
-	// 				Rating: rating,
-	// 			}
-
-	// 			o.parts = append(o.parts, valve)
-
-	// 		case "pipe":
-
-	// 			length := float32(p["length"].(float64))
-	// 			diameter := int(p["diameter"].(int64))
-
-	// 			pipe := &pipe{
-	// 				Type:     typ,
-	// 				ID:       id,
-	// 				Length:   length,
-	// 				Diameter: diameter,
-	// 			}
-
-	// 			o.parts = append(o.parts, pipe)
-
-	// 		case "cable":
-
-	// 			length := int(p["length"].(int64))
-	// 			rating := float32(p["rating"].(float64))
-
-	// 			cable := &cable{
-	// 				Type:   typ,
-	// 				ID:     id,
-	// 				Length: length,
-	// 				Rating: rating,
-	// 			}
-
-	// 			o.parts = append(o.parts, cable)
-
-	// 		}
-	// 	}
-
-	// 	return nil
-	// }
-
-	// type parts []part
-
-	// type part interface {
-	// 	Name() string
-	// }
-
-	// type valve struct {
-	// 	Type   string
-	// 	ID     string
-	// 	Size   float32
-	// 	Rating int
-	// }
-
-	// func (v *valve) Name() string {
-	// 	return fmt.Sprintf("VALVE: %s", v.ID)
-	// }
-
-	// type pipe struct {
-	// 	Type     string
-	// 	ID       string
-	// 	Length   float32
-	// 	Diameter int
-	// }
-
-	// func (p *pipe) Name() string {
-	// 	return fmt.Sprintf("PIPE: %s", p.ID)
-	// }
-
-	// type cable struct {
-	// 	Type   string
-	// 	ID     string
-	// 	Length int
-	// 	Rating float32
-	// }
-
-	// func (c *cable) Name() string {
-	// 	return fmt.Sprintf("CABLE: %s", c.ID)
-	// }
-
-	// Output:
-	// 4
-	// VALVE: valve-1
-	// VALVE: valve-2
-	// PIPE: pipe-1
-	// CABLE: cable-1
-
-}
-
-type order struct {
-	// NOTE `order.parts` is a private slice of type `part` which is an
-	// interface and may only be loaded from toml using the UnmarshalTOML()
-	// method of the Umarshaler interface.
-	parts parts
-}
-
-func (o *order) UnmarshalTOML(data interface{}) error {
-
-	// NOTE the example below contains detailed type casting to show how
-	// the 'data' is retrieved. In operational use, a type cast wrapper
-	// may be preferred e.g.
-	//
-	// func AsMap(v interface{}) (map[string]interface{}, error) {
-	// 		return v.(map[string]interface{})
-	// }
-	//
-	// resulting in:
-	// d, _ := AsMap(data)
-	//
-
-	d, _ := data.(map[string]interface{})
-	parts, _ := d["parts"].([]map[string]interface{})
-
-	for _, p := range parts {
-
-		typ, _ := p["type"].(string)
-		id, _ := p["id"].(string)
-
-		// detect the type of part and handle each case
-		switch p["type"] {
-		case "valve":
-
-			size := float32(p["size"].(float64))
-			rating := int(p["rating"].(int64))
-
-			valve := &valve{
-				Type:   typ,
-				ID:     id,
-				Size:   size,
-				Rating: rating,
-			}
-
-			o.parts = append(o.parts, valve)
-
-		case "pipe":
-
-			length := float32(p["length"].(float64))
-			diameter := int(p["diameter"].(int64))
-
-			pipe := &pipe{
-				Type:     typ,
-				ID:       id,
-				Length:   length,
-				Diameter: diameter,
-			}
-
-			o.parts = append(o.parts, pipe)
-
-		case "cable":
-
-			length := int(p["length"].(int64))
-			rating := float32(p["rating"].(float64))
-
-			cable := &cable{
-				Type:   typ,
-				ID:     id,
-				Length: length,
-				Rating: rating,
-			}
-
-			o.parts = append(o.parts, cable)
-
-		}
-	}
-
-	return nil
-}
-
-type parts []part
-
-type part interface {
-	Name() string
-}
-
-type valve struct {
-	Type   string
-	ID     string
-	Size   float32
-	Rating int
-}
-
-func (v *valve) Name() string {
-	return fmt.Sprintf("VALVE: %s", v.ID)
-}
-
-type pipe struct {
-	Type     string
-	ID       string
-	Length   float32
-	Diameter int
-}
-
-func (p *pipe) Name() string {
-	return fmt.Sprintf("PIPE: %s", p.ID)
-}
-
-type cable struct {
-	Type   string
-	ID     string
-	Length int
-	Rating float32
-}
-
-func (c *cable) Name() string {
-	return fmt.Sprintf("CABLE: %s", c.ID)
-}
diff --git a/vendor/github.com/BurntSushi/toml/encode_test.go b/vendor/github.com/BurntSushi/toml/encode_test.go
deleted file mode 100644
index 673b7b00..00000000
--- a/vendor/github.com/BurntSushi/toml/encode_test.go
+++ /dev/null
@@ -1,615 +0,0 @@
-package toml
-
-import (
-	"bytes"
-	"fmt"
-	"log"
-	"net"
-	"testing"
-	"time"
-)
-
-func TestEncodeRoundTrip(t *testing.T) {
-	type Config struct {
-		Age        int
-		Cats       []string
-		Pi         float64
-		Perfection []int
-		DOB        time.Time
-		Ipaddress  net.IP
-	}
-
-	var inputs = Config{
-		13,
-		[]string{"one", "two", "three"},
-		3.145,
-		[]int{11, 2, 3, 4},
-		time.Now(),
-		net.ParseIP("192.168.59.254"),
-	}
-
-	var firstBuffer bytes.Buffer
-	e := NewEncoder(&firstBuffer)
-	err := e.Encode(inputs)
-	if err != nil {
-		t.Fatal(err)
-	}
-	var outputs Config
-	if _, err := Decode(firstBuffer.String(), &outputs); err != nil {
-		t.Logf("Could not decode:\n-----\n%s\n-----\n",
-			firstBuffer.String())
-		t.Fatal(err)
-	}
-
-	// could test each value individually, but I'm lazy
-	var secondBuffer bytes.Buffer
-	e2 := NewEncoder(&secondBuffer)
-	err = e2.Encode(outputs)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if firstBuffer.String() != secondBuffer.String() {
-		t.Error(
-			firstBuffer.String(),
-			"\n\n is not identical to\n\n",
-			secondBuffer.String())
-	}
-}
-
-// XXX(burntsushi)
-// I think these tests probably should be removed. They are good, but they
-// ought to be obsolete by toml-test.
-func TestEncode(t *testing.T) {
-	type Embedded struct {
-		Int int `toml:"_int"`
-	}
-	type NonStruct int
-
-	date := time.Date(2014, 5, 11, 20, 30, 40, 0, time.FixedZone("IST", 3600))
-	dateStr := "2014-05-11T19:30:40Z"
-
-	tests := map[string]struct {
-		input      interface{}
-		wantOutput string
-		wantError  error
-	}{
-		"bool field": {
-			input: struct {
-				BoolTrue  bool
-				BoolFalse bool
-			}{true, false},
-			wantOutput: "BoolTrue = true\nBoolFalse = false\n",
-		},
-		"int fields": {
-			input: struct {
-				Int   int
-				Int8  int8
-				Int16 int16
-				Int32 int32
-				Int64 int64
-			}{1, 2, 3, 4, 5},
-			wantOutput: "Int = 1\nInt8 = 2\nInt16 = 3\nInt32 = 4\nInt64 = 5\n",
-		},
-		"uint fields": {
-			input: struct {
-				Uint   uint
-				Uint8  uint8
-				Uint16 uint16
-				Uint32 uint32
-				Uint64 uint64
-			}{1, 2, 3, 4, 5},
-			wantOutput: "Uint = 1\nUint8 = 2\nUint16 = 3\nUint32 = 4" +
-				"\nUint64 = 5\n",
-		},
-		"float fields": {
-			input: struct {
-				Float32 float32
-				Float64 float64
-			}{1.5, 2.5},
-			wantOutput: "Float32 = 1.5\nFloat64 = 2.5\n",
-		},
-		"string field": {
-			input:      struct{ String string }{"foo"},
-			wantOutput: "String = \"foo\"\n",
-		},
-		"string field and unexported field": {
-			input: struct {
-				String     string
-				unexported int
-			}{"foo", 0},
-			wantOutput: "String = \"foo\"\n",
-		},
-		"datetime field in UTC": {
-			input:      struct{ Date time.Time }{date},
-			wantOutput: fmt.Sprintf("Date = %s\n", dateStr),
-		},
-		"datetime field as primitive": {
-			// Using a map here to fail if isStructOrMap() returns true for
-			// time.Time.
-			input: map[string]interface{}{
-				"Date": date,
-				"Int":  1,
-			},
-			wantOutput: fmt.Sprintf("Date = %s\nInt = 1\n", dateStr),
-		},
-		"array fields": {
-			input: struct {
-				IntArray0 [0]int
-				IntArray3 [3]int
-			}{[0]int{}, [3]int{1, 2, 3}},
-			wantOutput: "IntArray0 = []\nIntArray3 = [1, 2, 3]\n",
-		},
-		"slice fields": {
-			input: struct{ IntSliceNil, IntSlice0, IntSlice3 []int }{
-				nil, []int{}, []int{1, 2, 3},
-			},
-			wantOutput: "IntSlice0 = []\nIntSlice3 = [1, 2, 3]\n",
-		},
-		"datetime slices": {
-			input: struct{ DatetimeSlice []time.Time }{
-				[]time.Time{date, date},
-			},
-			wantOutput: fmt.Sprintf("DatetimeSlice = [%s, %s]\n",
-				dateStr, dateStr),
-		},
-		"nested arrays and slices": {
-			input: struct {
-				SliceOfArrays         [][2]int
-				ArrayOfSlices         [2][]int
-				SliceOfArraysOfSlices [][2][]int
-				ArrayOfSlicesOfArrays [2][][2]int
-				SliceOfMixedArrays    [][2]interface{}
-				ArrayOfMixedSlices    [2][]interface{}
-			}{
-				[][2]int{{1, 2}, {3, 4}},
-				[2][]int{{1, 2}, {3, 4}},
-				[][2][]int{
-					{
-						{1, 2}, {3, 4},
-					},
-					{
-						{5, 6}, {7, 8},
-					},
-				},
-				[2][][2]int{
-					{
-						{1, 2}, {3, 4},
-					},
-					{
-						{5, 6}, {7, 8},
-					},
-				},
-				[][2]interface{}{
-					{1, 2}, {"a", "b"},
-				},
-				[2][]interface{}{
-					{1, 2}, {"a", "b"},
-				},
-			},
-			wantOutput: `SliceOfArrays = [[1, 2], [3, 4]]
-ArrayOfSlices = [[1, 2], [3, 4]]
-SliceOfArraysOfSlices = [[[1, 2], [3, 4]], [[5, 6], [7, 8]]]
-ArrayOfSlicesOfArrays = [[[1, 2], [3, 4]], [[5, 6], [7, 8]]]
-SliceOfMixedArrays = [[1, 2], ["a", "b"]]
-ArrayOfMixedSlices = [[1, 2], ["a", "b"]]
-`,
-		},
-		"empty slice": {
-			input:      struct{ Empty []interface{} }{[]interface{}{}},
-			wantOutput: "Empty = []\n",
-		},
-		"(error) slice with element type mismatch (string and integer)": {
-			input:     struct{ Mixed []interface{} }{[]interface{}{1, "a"}},
-			wantError: errArrayMixedElementTypes,
-		},
-		"(error) slice with element type mismatch (integer and float)": {
-			input:     struct{ Mixed []interface{} }{[]interface{}{1, 2.5}},
-			wantError: errArrayMixedElementTypes,
-		},
-		"slice with elems of differing Go types, same TOML types": {
-			input: struct {
-				MixedInts   []interface{}
-				MixedFloats []interface{}
-			}{
-				[]interface{}{
-					int(1), int8(2), int16(3), int32(4), int64(5),
-					uint(1), uint8(2), uint16(3), uint32(4), uint64(5),
-				},
-				[]interface{}{float32(1.5), float64(2.5)},
-			},
-			wantOutput: "MixedInts = [1, 2, 3, 4, 5, 1, 2, 3, 4, 5]\n" +
-				"MixedFloats = [1.5, 2.5]\n",
-		},
-		"(error) slice w/ element type mismatch (one is nested array)": {
-			input: struct{ Mixed []interface{} }{
-				[]interface{}{1, []interface{}{2}},
-			},
-			wantError: errArrayMixedElementTypes,
-		},
-		"(error) slice with 1 nil element": {
-			input:     struct{ NilElement1 []interface{} }{[]interface{}{nil}},
-			wantError: errArrayNilElement,
-		},
-		"(error) slice with 1 nil element (and other non-nil elements)": {
-			input: struct{ NilElement []interface{} }{
-				[]interface{}{1, nil},
-			},
-			wantError: errArrayNilElement,
-		},
-		"simple map": {
-			input:      map[string]int{"a": 1, "b": 2},
-			wantOutput: "a = 1\nb = 2\n",
-		},
-		"map with interface{} value type": {
-			input:      map[string]interface{}{"a": 1, "b": "c"},
-			wantOutput: "a = 1\nb = \"c\"\n",
-		},
-		"map with interface{} value type, some of which are structs": {
-			input: map[string]interface{}{
-				"a": struct{ Int int }{2},
-				"b": 1,
-			},
-			wantOutput: "b = 1\n\n[a]\n  Int = 2\n",
-		},
-		"nested map": {
-			input: map[string]map[string]int{
-				"a": {"b": 1},
-				"c": {"d": 2},
-			},
-			wantOutput: "[a]\n  b = 1\n\n[c]\n  d = 2\n",
-		},
-		"nested struct": {
-			input: struct{ Struct struct{ Int int } }{
-				struct{ Int int }{1},
-			},
-			wantOutput: "[Struct]\n  Int = 1\n",
-		},
-		"nested struct and non-struct field": {
-			input: struct {
-				Struct struct{ Int int }
-				Bool   bool
-			}{struct{ Int int }{1}, true},
-			wantOutput: "Bool = true\n\n[Struct]\n  Int = 1\n",
-		},
-		"2 nested structs": {
-			input: struct{ Struct1, Struct2 struct{ Int int } }{
-				struct{ Int int }{1}, struct{ Int int }{2},
-			},
-			wantOutput: "[Struct1]\n  Int = 1\n\n[Struct2]\n  Int = 2\n",
-		},
-		"deeply nested structs": {
-			input: struct {
-				Struct1, Struct2 struct{ Struct3 *struct{ Int int } }
-			}{
-				struct{ Struct3 *struct{ Int int } }{&struct{ Int int }{1}},
-				struct{ Struct3 *struct{ Int int } }{nil},
-			},
-			wantOutput: "[Struct1]\n  [Struct1.Struct3]\n    Int = 1" +
-				"\n\n[Struct2]\n",
-		},
-		"nested struct with nil struct elem": {
-			input: struct {
-				Struct struct{ Inner *struct{ Int int } }
-			}{
-				struct{ Inner *struct{ Int int } }{nil},
-			},
-			wantOutput: "[Struct]\n",
-		},
-		"nested struct with no fields": {
-			input: struct {
-				Struct struct{ Inner struct{} }
-			}{
-				struct{ Inner struct{} }{struct{}{}},
-			},
-			wantOutput: "[Struct]\n  [Struct.Inner]\n",
-		},
-		"struct with tags": {
-			input: struct {
-				Struct struct {
-					Int int `toml:"_int"`
-				} `toml:"_struct"`
-				Bool bool `toml:"_bool"`
-			}{
-				struct {
-					Int int `toml:"_int"`
-				}{1}, true,
-			},
-			wantOutput: "_bool = true\n\n[_struct]\n  _int = 1\n",
-		},
-		"embedded struct": {
-			input:      struct{ Embedded }{Embedded{1}},
-			wantOutput: "_int = 1\n",
-		},
-		"embedded *struct": {
-			input:      struct{ *Embedded }{&Embedded{1}},
-			wantOutput: "_int = 1\n",
-		},
-		"nested embedded struct": {
-			input: struct {
-				Struct struct{ Embedded } `toml:"_struct"`
-			}{struct{ Embedded }{Embedded{1}}},
-			wantOutput: "[_struct]\n  _int = 1\n",
-		},
-		"nested embedded *struct": {
-			input: struct {
-				Struct struct{ *Embedded } `toml:"_struct"`
-			}{struct{ *Embedded }{&Embedded{1}}},
-			wantOutput: "[_struct]\n  _int = 1\n",
-		},
-		"embedded non-struct": {
-			input:      struct{ NonStruct }{5},
-			wantOutput: "NonStruct = 5\n",
-		},
-		"array of tables": {
-			input: struct {
-				Structs []*struct{ Int int } `toml:"struct"`
-			}{
-				[]*struct{ Int int }{{1}, {3}},
-			},
-			wantOutput: "[[struct]]\n  Int = 1\n\n[[struct]]\n  Int = 3\n",
-		},
-		"array of tables order": {
-			input: map[string]interface{}{
-				"map": map[string]interface{}{
-					"zero": 5,
-					"arr": []map[string]int{
-						{
-							"friend": 5,
-						},
-					},
-				},
-			},
-			wantOutput: "[map]\n  zero = 5\n\n  [[map.arr]]\n    friend = 5\n",
-		},
-		"(error) top-level slice": {
-			input:     []struct{ Int int }{{1}, {2}, {3}},
-			wantError: errNoKey,
-		},
-		"(error) slice of slice": {
-			input: struct {
-				Slices [][]struct{ Int int }
-			}{
-				[][]struct{ Int int }{{{1}}, {{2}}, {{3}}},
-			},
-			wantError: errArrayNoTable,
-		},
-		"(error) map no string key": {
-			input:     map[int]string{1: ""},
-			wantError: errNonString,
-		},
-		"(error) empty key name": {
-			input:     map[string]int{"": 1},
-			wantError: errAnything,
-		},
-		"(error) empty map name": {
-			input: map[string]interface{}{
-				"": map[string]int{"v": 1},
-			},
-			wantError: errAnything,
-		},
-	}
-	for label, test := range tests {
-		encodeExpected(t, label, test.input, test.wantOutput, test.wantError)
-	}
-}
-
-func TestEncodeNestedTableArrays(t *testing.T) {
-	type song struct {
-		Name string `toml:"name"`
-	}
-	type album struct {
-		Name  string `toml:"name"`
-		Songs []song `toml:"songs"`
-	}
-	type springsteen struct {
-		Albums []album `toml:"albums"`
-	}
-	value := springsteen{
-		[]album{
-			{"Born to Run",
-				[]song{{"Jungleland"}, {"Meeting Across the River"}}},
-			{"Born in the USA",
-				[]song{{"Glory Days"}, {"Dancing in the Dark"}}},
-		},
-	}
-	expected := `[[albums]]
-  name = "Born to Run"
-
-  [[albums.songs]]
-    name = "Jungleland"
-
-  [[albums.songs]]
-    name = "Meeting Across the River"
-
-[[albums]]
-  name = "Born in the USA"
-
-  [[albums.songs]]
-    name = "Glory Days"
-
-  [[albums.songs]]
-    name = "Dancing in the Dark"
-`
-	encodeExpected(t, "nested table arrays", value, expected, nil)
-}
-
-func TestEncodeArrayHashWithNormalHashOrder(t *testing.T) {
-	type Alpha struct {
-		V int
-	}
-	type Beta struct {
-		V int
-	}
-	type Conf struct {
-		V int
-		A Alpha
-		B []Beta
-	}
-
-	val := Conf{
-		V: 1,
-		A: Alpha{2},
-		B: []Beta{{3}},
-	}
-	expected := "V = 1\n\n[A]\n  V = 2\n\n[[B]]\n  V = 3\n"
-	encodeExpected(t, "array hash with normal hash order", val, expected, nil)
-}
-
-func TestEncodeWithOmitEmpty(t *testing.T) {
-	type simple struct {
-		Bool   bool              `toml:"bool,omitempty"`
-		String string            `toml:"string,omitempty"`
-		Array  [0]byte           `toml:"array,omitempty"`
-		Slice  []int             `toml:"slice,omitempty"`
-		Map    map[string]string `toml:"map,omitempty"`
-	}
-
-	var v simple
-	encodeExpected(t, "fields with omitempty are omitted when empty", v, "", nil)
-	v = simple{
-		Bool:   true,
-		String: " ",
-		Slice:  []int{2, 3, 4},
-		Map:    map[string]string{"foo": "bar"},
-	}
-	expected := `bool = true
-string = " "
-slice = [2, 3, 4]
-
-[map]
-  foo = "bar"
-`
-	encodeExpected(t, "fields with omitempty are not omitted when non-empty",
-		v, expected, nil)
-}
-
-func TestEncodeWithOmitZero(t *testing.T) {
-	type simple struct {
-		Number   int     `toml:"number,omitzero"`
-		Real     float64 `toml:"real,omitzero"`
-		Unsigned uint    `toml:"unsigned,omitzero"`
-	}
-
-	value := simple{0, 0.0, uint(0)}
-	expected := ""
-
-	encodeExpected(t, "simple with omitzero, all zero", value, expected, nil)
-
-	value.Number = 10
-	value.Real = 20
-	value.Unsigned = 5
-	expected = `number = 10
-real = 20.0
-unsigned = 5
-`
-	encodeExpected(t, "simple with omitzero, non-zero", value, expected, nil)
-}
-
-func TestEncodeOmitemptyWithEmptyName(t *testing.T) {
-	type simple struct {
-		S []int `toml:",omitempty"`
-	}
-	v := simple{[]int{1, 2, 3}}
-	expected := "S = [1, 2, 3]\n"
-	encodeExpected(t, "simple with omitempty, no name, non-empty field",
-		v, expected, nil)
-}
-
-func TestEncodeAnonymousStruct(t *testing.T) {
-	type Inner struct{ N int }
-	type Outer0 struct{ Inner }
-	type Outer1 struct {
-		Inner `toml:"inner"`
-	}
-
-	v0 := Outer0{Inner{3}}
-	expected := "N = 3\n"
-	encodeExpected(t, "embedded anonymous untagged struct", v0, expected, nil)
-
-	v1 := Outer1{Inner{3}}
-	expected = "[inner]\n  N = 3\n"
-	encodeExpected(t, "embedded anonymous tagged struct", v1, expected, nil)
-}
-
-func TestEncodeAnonymousStructPointerField(t *testing.T) {
-	type Inner struct{ N int }
-	type Outer0 struct{ *Inner }
-	type Outer1 struct {
-		*Inner `toml:"inner"`
-	}
-
-	v0 := Outer0{}
-	expected := ""
-	encodeExpected(t, "nil anonymous untagged struct pointer field", v0, expected, nil)
-
-	v0 = Outer0{&Inner{3}}
-	expected = "N = 3\n"
-	encodeExpected(t, "non-nil anonymous untagged struct pointer field", v0, expected, nil)
-
-	v1 := Outer1{}
-	expected = ""
-	encodeExpected(t, "nil anonymous tagged struct pointer field", v1, expected, nil)
-
-	v1 = Outer1{&Inner{3}}
-	expected = "[inner]\n  N = 3\n"
-	encodeExpected(t, "non-nil anonymous tagged struct pointer field", v1, expected, nil)
-}
-
-func TestEncodeIgnoredFields(t *testing.T) {
-	type simple struct {
-		Number int `toml:"-"`
-	}
-	value := simple{}
-	expected := ""
-	encodeExpected(t, "ignored field", value, expected, nil)
-}
-
-func encodeExpected(
-	t *testing.T, label string, val interface{}, wantStr string, wantErr error,
-) {
-	var buf bytes.Buffer
-	enc := NewEncoder(&buf)
-	err := enc.Encode(val)
-	if err != wantErr {
-		if wantErr != nil {
-			if wantErr == errAnything && err != nil {
-				return
-			}
-			t.Errorf("%s: want Encode error %v, got %v", label, wantErr, err)
-		} else {
-			t.Errorf("%s: Encode failed: %s", label, err)
-		}
-	}
-	if err != nil {
-		return
-	}
-	if got := buf.String(); wantStr != got {
-		t.Errorf("%s: want\n-----\n%q\n-----\nbut got\n-----\n%q\n-----\n",
-			label, wantStr, got)
-	}
-}
-
-func ExampleEncoder_Encode() {
-	date, _ := time.Parse(time.RFC822, "14 Mar 10 18:00 UTC")
-	var config = map[string]interface{}{
-		"date":   date,
-		"counts": []int{1, 1, 2, 3, 5, 8},
-		"hash": map[string]string{
-			"key1": "val1",
-			"key2": "val2",
-		},
-	}
-	buf := new(bytes.Buffer)
-	if err := NewEncoder(buf).Encode(config); err != nil {
-		log.Fatal(err)
-	}
-	fmt.Println(buf.String())
-
-	// Output:
-	// counts = [1, 1, 2, 3, 5, 8]
-	// date = 2010-03-14T18:00:00Z
-	//
-	// [hash]
-	//   key1 = "val1"
-	//   key2 = "val2"
-}
diff --git a/vendor/github.com/VividCortex/ewma/ewma_test.go b/vendor/github.com/VividCortex/ewma/ewma_test.go
deleted file mode 100644
index 8060a859..00000000
--- a/vendor/github.com/VividCortex/ewma/ewma_test.go
+++ /dev/null
@@ -1,103 +0,0 @@
-package ewma
-
-// Copyright (c) 2013 VividCortex, Inc. All rights reserved.
-// Please see the LICENSE file for applicable license terms.
-
-import (
-	"math"
-	"testing"
-)
-
-const testMargin = 0.00000001
-
-var samples = [100]float64{
-	4599, 5711, 4746, 4621, 5037, 4218, 4925, 4281, 5207, 5203, 5594, 5149,
-	4948, 4994, 6056, 4417, 4973, 4714, 4964, 5280, 5074, 4913, 4119, 4522,
-	4631, 4341, 4909, 4750, 4663, 5167, 3683, 4964, 5151, 4892, 4171, 5097,
-	3546, 4144, 4551, 6557, 4234, 5026, 5220, 4144, 5547, 4747, 4732, 5327,
-	5442, 4176, 4907, 3570, 4684, 4161, 5206, 4952, 4317, 4819, 4668, 4603,
-	4885, 4645, 4401, 4362, 5035, 3954, 4738, 4545, 5433, 6326, 5927, 4983,
-	5364, 4598, 5071, 5231, 5250, 4621, 4269, 3953, 3308, 3623, 5264, 5322,
-	5395, 4753, 4936, 5315, 5243, 5060, 4989, 4921, 4480, 3426, 3687, 4220,
-	3197, 5139, 6101, 5279,
-}
-
-func withinMargin(a, b float64) bool {
-	return math.Abs(a-b) <= testMargin
-}
-
-func TestSimpleEWMA(t *testing.T) {
-	var e SimpleEWMA
-	for _, f := range samples {
-		e.Add(f)
-	}
-	if !withinMargin(e.Value(), 4734.500946466118) {
-		t.Errorf("e.Value() is %v, wanted %v", e.Value(), 4734.500946466118)
-	}
-	e.Set(1.0)
-	if e.Value() != 1.0 {
-		t.Errorf("e.Value() is %d", e.Value())
-	}
-}
-
-func TestVariableEWMA(t *testing.T) {
-	e := NewMovingAverage(30)
-	for _, f := range samples {
-		e.Add(f)
-	}
-	if !withinMargin(e.Value(), 4734.500946466118) {
-		t.Errorf("e.Value() is %v, wanted %v", e.Value(), 4734.500946466118)
-	}
-	e.Set(1.0)
-	if e.Value() != 1.0 {
-		t.Errorf("e.Value() is %d", e.Value())
-	}
-}
-
-func TestVariableEWMA2(t *testing.T) {
-	e := NewMovingAverage(5)
-	for _, f := range samples {
-		e.Add(f)
-	}
-	if !withinMargin(e.Value(), 5015.397367486725) {
-		t.Errorf("e.Value() is %v, wanted %v", e.Value(), 5015.397367486725)
-	}
-}
-
-func TestVariableEWMAWarmup(t *testing.T) {
-	e := NewMovingAverage(5)
-	for i, f := range samples {
-		e.Add(f)
-
-		// all values returned during warmup should be 0.0
-		if uint8(i) < WARMUP_SAMPLES {
-			if e.Value() != 0.0 {
-				t.Errorf("e.Value() is %v, expected %v", e.Value(), 0.0)
-			}
-		}
-	}
-	e = NewMovingAverage(5)
-	e.Set(5)
-	e.Add(1)
-	if e.Value() >= 5 {
-		t.Errorf("e.Value() is %d, expected it to decay towards 0", e.Value())
-	}
-}
-
-func TestVariableEWMAWarmup2(t *testing.T) {
-	e := NewMovingAverage(5)
-	testSamples := [12]float64{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 10000, 1}
-	for i, f := range testSamples {
-		e.Add(f)
-
-		// all values returned during warmup should be 0.0
-		if uint8(i) < WARMUP_SAMPLES {
-			if e.Value() != 0.0 {
-				t.Errorf("e.Value() is %v, expected %v", e.Value(), 0.0)
-			}
-		}
-	}
-	if val := e.Value(); val == 1.0 {
-		t.Errorf("e.Value() is expected to be greater than %v", 1.0)
-	}
-}
diff --git a/vendor/github.com/aead/chacha20/.gitignore b/vendor/github.com/aead/chacha20/.gitignore
deleted file mode 100644
index 9d3d8437..00000000
--- a/vendor/github.com/aead/chacha20/.gitignore
+++ /dev/null
@@ -1,25 +0,0 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-
-# Folders
-_obj
-_test
-.vscode
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
-*.test
-*.prof
diff --git a/vendor/github.com/aead/chacha20/.travis.yml b/vendor/github.com/aead/chacha20/.travis.yml
deleted file mode 100644
index 99199e09..00000000
--- a/vendor/github.com/aead/chacha20/.travis.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-language: go
-
-go:
-  - "1.8.x"
-  - "1.9.x"
-  - "1.10.x"
-
-env:
-   - TRAVIS_GOARCH=amd64
-   - TRAVIS_GOARCH=386 
- 
-before_install:
-- export GOARCH=$TRAVIS_GOARCH
-
-branches:
-  only:
-  - master
-
-before_script:
-- go get -u github.com/klauspost/asmfmt/cmd/asmfmt
-
-script:
-- diff -au <(gofmt -d .) <(printf "")
-- diff -au <(asmfmt -d .) <(printf "")
-- go test -v ./...
diff --git a/vendor/github.com/aead/chacha20/README.md b/vendor/github.com/aead/chacha20/README.md
deleted file mode 100644
index b3694249..00000000
--- a/vendor/github.com/aead/chacha20/README.md
+++ /dev/null
@@ -1,82 +0,0 @@
-[![Godoc Reference](https://godoc.org/github.com/aead/chacha20?status.svg)](https://godoc.org/github.com/aead/chacha20)
-[![Build Status](https://travis-ci.org/aead/chacha20.svg?branch=master)](https://travis-ci.org/aead/chacha20)
-[![Go Report Card](https://goreportcard.com/badge/aead/chacha20)](https://goreportcard.com/report/aead/chacha20)
-
-## The ChaCha20 stream cipher
-
-ChaCha is a stream cipher family created by Daniel J. Bernstein.  
-The most common ChaCha variant is ChaCha20 (20 rounds). ChaCha20 is
-standardized in [RFC 7539](https://tools.ietf.org/html/rfc7539 "RFC 7539").
-
-This package provides implementations of three ChaCha versions:
-- ChaCha20 with a 64 bit nonce (can en/decrypt up to 2^64 * 64 bytes for one key-nonce combination)  
-- ChaCha20 with a 96 bit nonce (can en/decrypt up to 2^32 * 64 bytes ~ 256 GB for one key-nonce combination)  
-- XChaCha20 with a 192 bit nonce (can en/decrypt up to 2^64 * 64 bytes for one key-nonce combination)  
-
-Furthermore the chacha sub package implements ChaCha20/12 and ChaCha20/8.
-These versions use 12 or 8 rounds instead of 20.
-But it's recommended to use ChaCha20 (with 20 rounds) - it will be fast enough for almost all purposes. 
-
-### Installation 
-Install in your GOPATH: `go get -u github.com/aead/chacha20`
-
-### Requirements
-All go versions >= 1.8.7 are supported.
-The code may also work on Go 1.7 but this is not tested.
-
-### Performance
-
-#### AMD64
-Hardware: Intel i7-6500U 2.50GHz x 2  
-System: Linux Ubuntu 16.04 - kernel: 4.4.0-62-generic  
-Go version: 1.8.0  
-```
-AVX2
-name                        speed              cpb
-ChaCha20_64-4                573MB/s ± 0%      4.16
-ChaCha20_1K-4               2.19GB/s ± 0%      1.06
-XChaCha20_64-4               261MB/s ± 0%      9.13
-XChaCha20_1K-4              1.69GB/s ± 4%      1.37
-XORKeyStream64-4             474MB/s ± 2%      5.02
-XORKeyStream1K-4            2.09GB/s ± 1%      1.11
-XChaCha20_XORKeyStream64-4   262MB/s ± 0%      9.09
-XChaCha20_XORKeyStream1K-4  1.71GB/s ± 1%      1.36
-
-SSSE3
-name                        speed              cpb
-ChaCha20_64-4                583MB/s ± 0%      4.08
-ChaCha20_1K-4               1.15GB/s ± 1%      2.02
-XChaCha20_64-4               267MB/s ± 0%      8.92
-XChaCha20_1K-4               984MB/s ± 5%      2.42
-XORKeyStream64-4             492MB/s ± 1%      4.84
-XORKeyStream1K-4            1.10GB/s ± 5%      2.11
-XChaCha20_XORKeyStream64-4   266MB/s ± 0%      8.96
-XChaCha20_XORKeyStream1K-4  1.00GB/s ± 2%      2.32
-```
-#### 386
-Hardware: Intel i7-6500U 2.50GHz x 2  
-System: Linux Ubuntu 16.04 - kernel: 4.4.0-62-generic  
-Go version: 1.8.0  
-```
-SSSE3
-name                        speed              cpb
-ChaCha20_64-4               570MB/s ± 0%       4.18
-ChaCha20_1K-4               650MB/s ± 0%       3.66
-XChaCha20_64-4              223MB/s ± 0%      10.69
-XChaCha20_1K-4              584MB/s ± 1%       4.08
-XORKeyStream64-4            392MB/s ± 1%       6.08
-XORKeyStream1K-4            629MB/s ± 1%       3.79
-XChaCha20_XORKeyStream64-4  222MB/s ± 0%      10.73
-XChaCha20_XORKeyStream1K-4  585MB/s ± 0%       4.07
-
-SSE2
-name                        speed              cpb
-ChaCha20_64-4               509MB/s ± 0%       4.68
-ChaCha20_1K-4               553MB/s ± 2%       4.31
-XChaCha20_64-4              201MB/s ± 0%      11.86
-XChaCha20_1K-4              498MB/s ± 4%       4.78
-XORKeyStream64-4            359MB/s ± 1%       6.64
-XORKeyStream1K-4            545MB/s ± 0%       4.37
-XChaCha20_XORKeyStream64-4  201MB/s ± 1%      11.86
-XChaCha20_XORKeyStream1K-4  507MB/s ± 0%       4.70
-```
diff --git a/vendor/github.com/aead/chacha20/chacha/chacha.go b/vendor/github.com/aead/chacha20/chacha/chacha.go
index 63ca2b0a..c2b39da4 100644
--- a/vendor/github.com/aead/chacha20/chacha/chacha.go
+++ b/vendor/github.com/aead/chacha20/chacha/chacha.go
@@ -9,6 +9,7 @@ package chacha // import "github.com/aead/chacha20/chacha"
 import (
 	"encoding/binary"
 	"errors"
+	"math"
 )
 
 const (
@@ -162,6 +163,21 @@ func (c *Cipher) XORKeyStream(dst, src []byte) {
 		c.off = 0
 	}
 
+	// check for counter overflow
+	blocksToXOR := len(src) / 64
+	if len(src)%64 != 0 {
+		blocksToXOR++
+	}
+	var overflow bool
+	if c.noncesize == INonceSize {
+		overflow = binary.LittleEndian.Uint32(c.state[48:]) > math.MaxUint32-uint32(blocksToXOR)
+	} else {
+		overflow = binary.LittleEndian.Uint64(c.state[48:]) > math.MaxUint64-uint64(blocksToXOR)
+	}
+	if overflow {
+		panic("chacha20/chacha: counter overflow")
+	}
+
 	c.off += xorKeyStream(dst, src, &(c.block), &(c.state), c.rounds)
 }
 
diff --git a/vendor/github.com/aead/chacha20/chacha/chacha_amd64.go b/vendor/github.com/aead/chacha20/chacha/chacha_amd64.go
index 5fd94654..635f7de8 100644
--- a/vendor/github.com/aead/chacha20/chacha/chacha_amd64.go
+++ b/vendor/github.com/aead/chacha20/chacha/chacha_amd64.go
@@ -12,7 +12,7 @@ func init() {
 	useSSE2 = cpu.X86.HasSSE2
 	useSSSE3 = cpu.X86.HasSSSE3
 	useAVX = cpu.X86.HasAVX
-	useAVX2 = cpu.X86.HasAVX2 && false // disable until #16 is fixed
+	useAVX2 = cpu.X86.HasAVX2
 }
 
 // This function is implemented in chacha_amd64.s
diff --git a/vendor/github.com/aead/chacha20/chacha/chacha_test.go b/vendor/github.com/aead/chacha20/chacha/chacha_test.go
deleted file mode 100644
index e0dec5e0..00000000
--- a/vendor/github.com/aead/chacha20/chacha/chacha_test.go
+++ /dev/null
@@ -1,397 +0,0 @@
-// Copyright (c) 2016 Andreas Auernhammer. All rights reserved.
-// Use of this source code is governed by a license that can be
-// found in the LICENSE file.
-
-package chacha
-
-import (
-	"bytes"
-	"encoding/hex"
-	"testing"
-)
-
-func toHex(bits []byte) string {
-	return hex.EncodeToString(bits)
-}
-
-func fromHex(bits string) []byte {
-	b, err := hex.DecodeString(bits)
-	if err != nil {
-		panic(err)
-	}
-	return b
-}
-
-func TestHChaCha20(t *testing.T) {
-	defer func(sse2, ssse3, avx, avx2 bool) {
-		useSSE2, useSSSE3, useAVX, useAVX2 = sse2, ssse3, avx, avx2
-	}(useSSE2, useSSSE3, useAVX, useAVX2)
-
-	if useAVX2 {
-		t.Log("AVX2 version")
-		testHChaCha20(t)
-		useAVX2 = false
-	}
-	if useAVX {
-		t.Log("AVX version")
-		testHChaCha20(t)
-		useAVX = false
-	}
-	if useSSSE3 {
-		t.Log("SSSE3 version")
-		testHChaCha20(t)
-		useSSSE3 = false
-	}
-	if useSSE2 {
-		t.Log("SSE2 version")
-		testHChaCha20(t)
-		useSSE2 = false
-	}
-	t.Log("generic version")
-	testHChaCha20(t)
-}
-
-func TestVectors(t *testing.T) {
-	defer func(sse2, ssse3, avx, avx2 bool) {
-		useSSE2, useSSSE3, useAVX, useAVX2 = sse2, ssse3, avx, avx2
-	}(useSSE2, useSSSE3, useAVX, useAVX2)
-
-	if useAVX2 {
-		t.Log("AVX2 version")
-		testVectors(t)
-		useAVX2 = false
-	}
-	if useAVX {
-		t.Log("AVX version")
-		testVectors(t)
-		useAVX = false
-	}
-	if useSSSE3 {
-		t.Log("SSSE3 version")
-		testVectors(t)
-		useSSSE3 = false
-	}
-	if useSSE2 {
-		t.Log("SSE2 version")
-		testVectors(t)
-		useSSE2 = false
-	}
-	t.Log("generic version")
-	testVectors(t)
-}
-
-func TestIncremental(t *testing.T) {
-	defer func(sse2, ssse3, avx, avx2 bool) {
-		useSSE2, useSSSE3, useAVX, useAVX2 = sse2, ssse3, avx, avx2
-	}(useSSE2, useSSSE3, useAVX, useAVX2)
-
-	if useAVX2 {
-		t.Log("AVX2 version")
-		testIncremental(t, 5, 2049)
-		useAVX2 = false
-	}
-	if useAVX {
-		t.Log("AVX version")
-		testIncremental(t, 5, 2049)
-		useAVX = false
-	}
-	if useSSSE3 {
-		t.Log("SSSE3 version")
-		testIncremental(t, 5, 2049)
-		useSSSE3 = false
-	}
-	if useSSE2 {
-		t.Log("SSE2 version")
-		testIncremental(t, 5, 2049)
-	}
-}
-
-func testHChaCha20(t *testing.T) {
-	for i, v := range hChaCha20Vectors {
-		var key [32]byte
-		var nonce [16]byte
-		copy(key[:], v.key)
-		copy(nonce[:], v.nonce)
-
-		hChaCha20(&key, &nonce, &key)
-		if !bytes.Equal(key[:], v.keystream) {
-			t.Errorf("Test %d: keystream mismatch:\n \t got:  %s\n \t want: %s", i, toHex(key[:]), toHex(v.keystream))
-		}
-	}
-}
-
-func testVectors(t *testing.T) {
-	for i, v := range vectors {
-		if len(v.plaintext) == 0 {
-			v.plaintext = make([]byte, len(v.ciphertext))
-		}
-
-		dst := make([]byte, len(v.ciphertext))
-
-		XORKeyStream(dst, v.plaintext, v.nonce, v.key, v.rounds)
-		if !bytes.Equal(dst, v.ciphertext) {
-			t.Errorf("Test %d: ciphertext mismatch:\n \t got:  %s\n \t want: %s", i, toHex(dst), toHex(v.ciphertext))
-		}
-
-		c, err := NewCipher(v.nonce, v.key, v.rounds)
-		if err != nil {
-			t.Fatal(err)
-		}
-		c.XORKeyStream(dst[:1], v.plaintext[:1])
-		c.XORKeyStream(dst[1:], v.plaintext[1:])
-		if !bytes.Equal(dst, v.ciphertext) {
-			t.Errorf("Test %d: ciphertext mismatch:\n \t got:  %s\n \t want: %s", i, toHex(dst), toHex(v.ciphertext))
-		}
-	}
-}
-
-func testIncremental(t *testing.T, iter int, size int) {
-	sse2, ssse3, avx, avx2 := useSSE2, useSSSE3, useAVX, useAVX2
-	msg, ref, stream := make([]byte, size), make([]byte, size), make([]byte, size)
-
-	for i := 0; i < iter; i++ {
-		var key [32]byte
-		var nonce []byte
-		switch i % 3 {
-		case 0:
-			nonce = make([]byte, 8)
-		case 1:
-			nonce = make([]byte, 12)
-		case 2:
-			nonce = make([]byte, 24)
-		}
-
-		for j := range key {
-			key[j] = byte(len(nonce) + i)
-		}
-		for j := range nonce {
-			nonce[j] = byte(i)
-		}
-
-		for j := 0; j <= len(msg); j++ {
-			useSSE2, useSSSE3, useAVX, useAVX2 = false, false, false, false
-			XORKeyStream(ref[:j], msg[:j], nonce, key[:], 20)
-
-			useSSE2, useSSSE3, useAVX, useAVX2 = sse2, ssse3, avx, avx2
-			XORKeyStream(stream[:j], msg[:j], nonce, key[:], 20)
-
-			if !bytes.Equal(ref[:j], stream[:j]) {
-				t.Fatalf("Iteration %d failed:\n Message length: %d\n\n got:  %s\nwant: %s", i, j, toHex(stream[:j]), toHex(ref[:j]))
-			}
-
-			useSSE2, useSSSE3, useAVX, useAVX2 = false, false, false, false
-			c, _ := NewCipher(nonce, key[:], 20)
-			c.XORKeyStream(stream[:j], msg[:j])
-
-			useSSE2, useSSSE3, useAVX, useAVX2 = sse2, ssse3, avx, avx2
-			c, _ = NewCipher(nonce, key[:], 20)
-			c.XORKeyStream(stream[:j], msg[:j])
-
-			if !bytes.Equal(ref[:j], stream[:j]) {
-				t.Fatalf("Iteration %d failed:\n Message length: %d\n\n got:  %s\nwant: %s", i, j, toHex(stream[:j]), toHex(ref[:j]))
-			}
-		}
-		copy(msg, stream)
-	}
-}
-
-var hChaCha20Vectors = []struct {
-	key, nonce, keystream []byte
-}{
-	{
-		fromHex("0000000000000000000000000000000000000000000000000000000000000000"),
-		fromHex("000000000000000000000000000000000000000000000000"),
-		fromHex("1140704c328d1d5d0e30086cdf209dbd6a43b8f41518a11cc387b669b2ee6586"),
-	},
-	{
-		fromHex("8000000000000000000000000000000000000000000000000000000000000000"),
-		fromHex("000000000000000000000000000000000000000000000000"),
-		fromHex("7d266a7fd808cae4c02a0a70dcbfbcc250dae65ce3eae7fc210f54cc8f77df86"),
-	},
-	{
-		fromHex("0000000000000000000000000000000000000000000000000000000000000001"),
-		fromHex("000000000000000000000000000000000000000000000002"),
-		fromHex("e0c77ff931bb9163a5460c02ac281c2b53d792b1c43fea817e9ad275ae546963"),
-	},
-	{
-		fromHex("000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f"),
-		fromHex("000102030405060708090a0b0c0d0e0f1011121314151617"),
-		fromHex("51e3ff45a895675c4b33b46c64f4a9ace110d34df6a2ceab486372bacbd3eff6"),
-	},
-}
-
-var vectors = []struct {
-	key, nonce, plaintext, ciphertext []byte
-	rounds                            int
-}{
-	{
-		fromHex("0000000000000000000000000000000000000000000000000000000000000000"),
-		fromHex("000000000000000000000000"),
-		nil,
-		fromHex("76b8e0ada0f13d90405d6ae55386bd28bdd219b8a08ded1aa836efcc8b770dc7da41597c5157488d7724e03fb8d84a376a43b8f41518a11cc387b669b2ee6586"),
-		20,
-	},
-	{
-		fromHex("0000000000000000000000000000000000000000000000000000000000000001"),
-		fromHex("000000000000000000000002"),
-		fromHex("00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" +
-			"416e79207375626d697373696f6e20746f20746865204945544620696e74656e6465642062792074686520436f6e7472696275746f7220666f72207075626c69" +
-			"636174696f6e20617320616c6c206f722070617274206f6620616e204945544620496e7465726e65742d4472616674206f722052464320616e6420616e792073" +
-			"746174656d656e74206d6164652077697468696e2074686520636f6e74657874206f6620616e204945544620616374697669747920697320636f6e7369646572" +
-			"656420616e20224945544620436f6e747269627574696f6e222e20537563682073746174656d656e747320696e636c756465206f72616c2073746174656d656e" +
-			"747320696e20494554462073657373696f6e732c2061732077656c6c206173207772697474656e20616e6420656c656374726f6e696320636f6d6d756e696361" +
-			"74696f6e73206d61646520617420616e792074696d65206f7220706c6163652c207768696368206172652061646472657373656420746f"),
-		fromHex("ecfa254f845f647473d3cb140da9e87606cb33066c447b87bc2666dde3fbb739a371c9ec7abcb4cfa9211f7d90f64c2d07f89e5cf9b93e330a6e4c08af5ba6d5" +
-			"a3fbf07df3fa2fde4f376ca23e82737041605d9f4f4f57bd8cff2c1d4b7955ec2a97948bd3722915c8f3d337f7d370050e9e96d647b7c39f56e031ca5eb6250d" +
-			"4042e02785ececfa4b4bb5e8ead0440e20b6e8db09d881a7c6132f420e52795042bdfa7773d8a9051447b3291ce1411c680465552aa6c405b7764d5e87bea85a" +
-			"d00f8449ed8f72d0d662ab052691ca66424bc86d2df80ea41f43abf937d3259dc4b2d0dfb48a6c9139ddd7f76966e928e635553ba76c5c879d7b35d49eb2e62b" +
-			"0871cdac638939e25e8a1e0ef9d5280fa8ca328b351c3c765989cbcf3daa8b6ccc3aaf9f3979c92b3720fc88dc95ed84a1be059c6499b9fda236e7e818b04b0b" +
-			"c39c1e876b193bfe5569753f88128cc08aaa9b63d1a16f80ef2554d7189c411f5869ca52c5b83fa36ff216b9c1d30062bebcfd2dc5bce0911934fda79a86f6e6" +
-			"98ced759c3ff9b6477338f3da4f9cd8514ea9982ccafb341b2384dd902f3d1ab7ac61dd29c6f21ba5b862f3730e37cfdc4fd806c22f221"),
-		20,
-	},
-	{
-		fromHex("8000000000000000000000000000000000000000000000000000000000000000"),
-		fromHex("000000000000000000000000"),
-		nil,
-		fromHex("e29edae0466dea17f2576ce95025dd2db2d34fc81b5153f1b70a87f315a35286"),
-		20,
-	},
-	{
-		fromHex("8000000000000000000000000000000000000000000000000000000000000000"),
-		fromHex("000000000000000000000000"),
-		nil,
-		fromHex("e29edae0466dea17f2576ce95025dd2db2d34fc81b5153f1b70a87f315a35286fb56db91e8dbf0a93faaa25777aad63450dae65ce3eae7fc210f54cc8f77df8662f8" +
-			"955228b2358d61d8c5ccf63a6c40203be5fb4541c39c52861de70b8a1416ddd3fe9a818bae8f0e8ff2288cede0459fbb00032fd85fef972fcb586c228d"),
-		20,
-	},
-	{
-		fromHex("0000000000000000000000000000000000000000000000000000000000000000"),
-		fromHex("0000000000000000"),
-		nil,
-		fromHex("76b8e0ada0f13d90405d6ae55386bd28bdd219b8a08ded1aa836efcc8b770dc7da41597c5157488d7724e03fb8d84a376a43b8f41518a11cc387b669b2ee65869f07" +
-			"e7be5551387a98ba977c732d080dcb0f29a048e3656912c6533e32ee7aed29b721769ce64e43d57133b074d839d531ed1f28510afb45ace10a1f4b794d6f2d09a0e663266ce1ae7ed1081968a0758e7" +
-			"18e997bd362c6b0c34634a9a0b35d012737681f7b5d0f281e3afde458bc1e73d2d313c9cf94c05ff3716240a248f21320a058d7b3566bd520daaa3ed2bf0ac5b8b120fb852773c3639734b45c91a42d" +
-			"d4cb83f8840d2eedb158131062ac3f1f2cf8ff6dcd1856e86a1e6c3167167ee5a688742b47c5adfb59d4df76fd1db1e51ee03b1ca9f82aca173edb8b7293474ebe980f904d10c916442b4783a0e9848" +
-			"60cb6c957b39c38ed8f51cffaa68a4de01025a39c504546b9dc1406a7eb28151e5150d7b204baa719d4f091021217db5cf1b5c84c4fa71a879610a1a695ac527c5b56774a6b8a21aae88685868e094c" +
-			"f29ef4090af7a90cc07e8817aa528763797d3c332b67ca4bc110642c2151ec47ee84cb8c42d85f10e2a8cb18c3b7335f26e8c39a12b1bcc1707177b7613873"),
-		20,
-	},
-	{
-		fromHex("0000000000000000000000000000000000000000000000000000000000000000"),
-		fromHex("0100000000000000"),
-		nil,
-		fromHex("ef3fdfd6c61578fbf5cf35bd3dd33b8009631634d21e42ac33960bd138e50d32111e4caf237ee53ca8ad6426194a88545ddc497a0b466e7d6bbdb0041b2f586b5305" +
-			"e5e44aff19b235936144675efbe4409eb7e8e5f1430f5f5836aeb49bb5328b017c4b9dc11f8a03863fa803dc71d5726b2b6b31aa32708afe5af1d6b690584d58792b271e5fdb92c486051c48b79a4d4" +
-			"8a109bb2d0477956e74c25e93c3c2db34bf779470464a033b8394517a5cf3576a6618c8551a456628b253ef0117c90cd46d8177a2a06d16e20e05c05f889bf87e95d6ee8a03807d1cd53d586872b125" +
-			"9d0647da7b7aae80af9b3aad41ad5a8141d2e156c9dd52a3bd2ae165bd7d6a2a4e2cf6938b8b390828ff20dc8fd60e2cd17fe368e35b467a70654ba93cfa62760a9d2f26da7818d4d863808e1add5ff" +
-			"db76d41efd524ded4246e03caa008950c91dedfc9a8e68173fe481c4d3d3c215fdf3af22aeab0097b835a84faabbbce094c6181a193ffeda067271ff7c10cce76542241116283842e31e922430211dc" +
-			"b38e556158fc2daaec367b705b75f782f8bc2c2c5e33a375390c3052f7e3446feb105fb47820f1d2539811c5b49bb76dc15f2d20a7e2c200b573db9f653ed7"),
-		20,
-	},
-	{
-		fromHex("000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f"),
-		fromHex("0001020304050607"),
-		nil,
-		fromHex("f798a189f195e66982105ffb640bb7757f579da31602fc93ec01ac56f85ac3c134a4547b733b46413042c9440049176905d3be59ea1c53f15916155c2be8241a3800" +
-			"8b9a26bc35941e2444177c8ade6689de95264986d95889fb60e84629c9bd9a5acb1cc118be563eb9b3a4a472f82e09a7e778492b562ef7130e88dfe031c79db9d4f7c7a899151b9a475032b63fc3852" +
-			"45fe054e3dd5a97a5f576fe064025d3ce042c566ab2c507b138db853e3d6959660996546cc9c4a6eafdc777c040d70eaf46f76dad3979e5c5360c3317166a1c894c94a371876a94df7628fe4eaaf2cc" +
-			"b27d5aaae0ad7ad0f9d4b6ad3b54098746d4524d38407a6deb3ab78fab78c94213668bbbd394c5de93b853178addd6b97f9fa1ec3e56c00c9ddff0a44a204241175a4cab0f961ba53ede9bdf960b94f" +
-			"9829b1f3414726429b362c5b538e391520f489b7ed8d20ae3fd49e9e259e44397514d618c96c4846be3c680bdc11c71dcbbe29ccf80d62a0938fa549391e6ea57ecbe2606790ec15d2224ae307c1442" +
-			"26b7c4e8c2f97d2a1d67852d29beba110edd445197012062a393a9c92803ad3b4f31d7bc6033ccf7932cfed3f019044d25905916777286f82f9a4cc1ffe430"),
-		20,
-	},
-	{
-		fromHex("0000000000000000000000000000000000000000000000000000000000000000"),
-		fromHex("000000000000000000000000"),
-		nil,
-		fromHex("9bf49a6a0755f953811fce125f2683d50429c3bb49e074147e0089a52eae155f0564f879d27ae3c02ce82834acfa8c793a629f2ca0de6919610be82f411326be0bd588" +
-			"41203e74fe86fc71338ce0173dc628ebb719bdcbcc151585214cc089b442258dcda14cf111c602b8971b8cc843e91e46ca905151c02744a6b017e69316b20cd67c4bdecc538e8be990c1b6425d68bfd3a" +
-			"6fe97693e4846351596cca8abf59fddd0b7f52dcc0c60a448cbf9511610b0a742f1e4d238a7a45cae054ec2"),
-		12,
-	},
-	{
-		fromHex("8000000000000000000000000000000000000000000000000000000000000000"),
-		fromHex("000000000000000000000000"),
-		nil,
-		fromHex("789cc357f0b6cda5395f08c8538f1226d08eb3e16ebd6b6db6cc9ca77d81d900bb9d21f6ef0b720550d161f1a80fab0468e48c086daad356edce3a3f988d8e"),
-		12,
-	},
-	{
-		fromHex("000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f"),
-		fromHex("0001020304050607"),
-		nil,
-		fromHex("6898eb04f3d151985e28e882f35daf28d2a1689f79081ffb08cdc48edbbd3dcd683c764f3dd7302293928ca3d4ef4194e6e22f41a72204a14b89115d06ca29fb0b9f6e" +
-			"ba3da6793a928afe76cdf62a5d5b0898bb9bb2348612189fdb825e5aa7559c9ec79ff80d05079fad81e9bc2521b2ebcb179cebeade91f20ff3e13192d60de2ee983ec07047e7827594773c28448d89e9b" +
-			"96bb0f8665b1a56f85abebd584a446e17d5a6fb847a1dbf341ece5124ff5f80d4a57fb7edf65a2907939b2f3c9654ccbfa2e5225edc8d799bf7ce296d6c8f9234cec0bd7b91b3d2ddc27f93ff8591ddb3" +
-			"62b54fab111a7da9d5b4187661ed0e691f7aa5959fb83112427a95bbeb"),
-		12,
-	},
-	{
-		fromHex("000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f"),
-		fromHex("0001020304050607"),
-		nil,
-		fromHex("40e1aaea1c843baa28b18eb728fec05dce47b0e824bf9a5d3f1bb1aad13b37fbbf0b0e146732c16380efeab70a1b6edff9acedc876b70d98b61f192290537973"),
-		8,
-	},
-	{
-		fromHex("0000000000000000000000000000000000000000000000000000000000000000"),
-		fromHex("000000000000000000000000000000000000000000000000"),
-		nil,
-		fromHex("bcd02a18bf3f01d19292de30a7a8fdaca4b65e50a6002cc72cd6d2f7c91ac3d5728f83e0aad2bfcf9abd2d2db58faedd65015dd83fc09b131e271043019e8e0f789e96" +
-			"89e5208d7fd9e1f3c5b5341f48ef18a13e418998addadd97a3693a987f8e82ecd5c1433bfed1af49750c0f1ff29c4174a05b119aa3a9e8333812e0c0fea49e1ee0134a70a9d49c24e0cbd8fc3ba27e97c" +
-			"3322ad487f778f8dc6a122fa59cbe33e7"),
-		20,
-	},
-	{
-		fromHex("8000000000000000000000000000000000000000000000000000000000000000"),
-		fromHex("000000000000000000000000000000000000000000000000"),
-		nil,
-		fromHex("ccfe8a9e93431bd582f07b3eb0f4a7afc22ef39337ddd84f0d3545b318a315a32b3abb96de0fc6acde48b248fe8a80e6fa72bfcdf9d8d2656b991676476f052d937308" +
-			"0e30d8c0e217126a3c64402e1d9404ba9d6b8ce4ad5ac9693f3660638c26ea2cd1b4a8d3348c1e179ead353ee72fee558e9994c51a27195e287d00ec2f8cfef8866d1f98714f40cbe4e18cebabf3cd1fd" +
-			"3bb65506e5dce1ad09f438bffe2c96d7f2f0827c8c3f2ca59dbaa393785c6b8da7c69c8a4a63ffd113dcc93de8f52dbcfaed5e4cbcc1dc310b1352868fab7b14d930a9f7a7d47bed0eaf5b151f6dac8bd" +
-			"45510698bdc205d70b944ea5450888dd3ec753da9708bf06c0714822dda74f285c361abd0cd1071324c253dc421905edca36e8808bffef091e7dbdecebdad98cf70b7cede72e9c3c4108e5b32ffae0f42" +
-			"151a8196939d8e3b8384be1"),
-		20,
-	},
-	{
-		fromHex("000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f"),
-		fromHex("000102030405060708090a0b0c0d0e0f1011121314151617"),
-		nil,
-		fromHex("e53a61cef151e81401067de33adfc02e90ab205361b49b539fda7f0e63b1bc7d68fbee56c9c20c39960e595f3ea76c979804d08cfa728e66cb5f766b840ec61f9ec20f" +
-			"7f90d28dae334426cecb52a8e84b4728a5fdd61deb7f1a3fb63dadf5595e06b6e441670964d595ae59cf21536271bae2594774fb19079b933d8fe744f4"),
-		20,
-	},
-	{
-		fromHex("FF00000000000000000000000000000000000000000000000000000000000000"),
-		fromHex("000000000000000000000000"),
-		nil,
-		fromHex("4fe0956ef81829ff96ef093f03c15dc0eaf4e6905eff9777a5db78348915689ed64204e8fce664cb71ea4016185d15e05be4329e02fcd472707508ef62fd89565ffa632effdb" +
-			"bf08394aa437d8ff093e6cea49b61672cf294474927a8150e06cec9fdec0f5cf26f257fe335a8d7dd6d208e6df6f0a83bb1b0b5c574edc2c9a604e4310acb970815a9819c91a5137794d1ee71ede3e5d59f27e76" +
-			"84d287d704fe3945de0a9b66be3d86e66980263602aeb600efaef243b1adf4c701dbf8f57427dee71dacd703d25317ffc7a67e7881ad13f0bf096d3b0486eec71fef5e0efb5964d14eb2cea0336e34ed4444cc2b" +
-			"bdbd8ef5ba89a0a5e9e35a2e23b38d3f9136f42aefb25c2e7eae0b42c1d1ada5618c5299aedd469ce4f9353ccbae3f89110922b669b8d1b62e72aaf893b83ca264707efbefdcf22ef2333b01f18a849653b52925" +
-			"63c37314bf34289b0636a2f8c24bc97fec554a9c31ec2cb4e30ba70fa965a17561e56739be138d86a4777f866ca24ba24f70913230e1b3ea34a9a90eea1b6a3a81b93286bb582a53e78557845a654775a18efb77" +
-			"eee098d2680bc4ceb866874f31c7fadd70262cca6039833522de03cb2527dc5cfc7072db48b6011b852d705c7b24ffedf52facf352ab2512c625811db7965edc87d08f7f27e02665c9a6a42968e4c58cd86aa847" +
-			"69658153b62f208b2dcfbcb364d63e6671cf60698640"),
-		20,
-	},
-	{
-		fromHex("0120000000000000000000000000007000000000000000000000000000000DEF"),
-		fromHex("000000000000000000000000"),
-		nil,
-		fromHex("ba6bce79c4f79c815b7fec53840ff0549ff5496378aa1f6ba481a48a5b9b8dbea8b820eccbc4eca37e1050fc53510a746037d2707f81e9683ec3f495b02ad0f848d7f9bf67bc" +
-			"6299be525d1bf3bfd9953caa12cc4e1d5a6969e6fcd5d3c3e3d9f2e735cd7808755ddda7b22a3ae6040e7f8d05d62661a97d84dad694c69637aea3ae0af9f73303ffce3ae6161281d7a3c7e50a5706d766b34ddd" +
-			"eab6974fdab10b3f48fb31f26df72e54c616edf1afc019f240c059a7c003677008227f49b021bc23c9c51d6f85ad136a4aa4950d9692f7094d344d88c05868691eb620d39bd8154986c971a8c9552ff0015fd78a" +
-			"6bdd33df94b0056786a1e0ceb9cc9a38a31fbba224c1fb82bf6af376f67e94337a730301a6365d49b0dd56328e0269cbdfb5bcbccf1c7c3f4922ec1310aa2ef8136be788a55190453d3d3153b1b960a16f79365a" +
-			"0bc7d6d2d5cda9f0993dbb815ee72f83b9d2ed296598fb21d91c29d1acf4ff0a549784a1d6a4f0935ee18efbf41fdc98d81c449544e9701d92648c06e5f416833b90d15fd4c04fc720a5ec6c6fc8b3d85a66826a" +
-			"5e6817e21c4c4c0d7151b128236c41397ad4c6549e827c42269659973c153db70ffc33951b19ff21428091cea3836f72f88082508bae1839b59fa9c2556bdf373419d3cf29a8fad4d1787d829ad884f9927228fc" +
-			"0b8bb7f1a067e7bdbf06c3885154f76f5be0cde8c7c59442b72b0e3f0341afe644e7eb4c29a467288aebc893e17b446c63da7551b8b59ebdd0cbcd65bc79a969bd3397f83d149840de731df4c09a833d5bd9feda" +
-			"e1cd78a09b233b020de86ab71b9fd425adf84e502cef7c62015eade66ca91b0a90306894b53c7c5147e524d7b919ccdd0731e4eef8fe476b6eed38c91b611cd1777b9acf6eee0a11eaff16ae872db92a5d133fe7" +
-			"bed999882da283893dd1e96f530be3cd36bf38c16deed2cd77651b6e0d3628de3cb86a78f1d07f6fc79434da5f73888be617b84595acef154f66b95ade1a3e120421a9dac6eec1e5b60139da3d604a03d4a9b7a3" +
-			"0810a9c7d551aa8df08e11544486ad33000bfe410e8e6f35cb9d22806a5fcacefc6a1257d373d426243576fad9b20ad5ba84befc1a47c79d7bd2923b5776d3df86c8ed98b700d317502849ec8c02ecb8513a7a32" +
-			"e2db15e75a814f12cfc20429ae06cae2021406b4f174ce56dca65f7994a3b2722e764520a52f87d0a887fc771dbfbf381b4f750dc074fedec1a43a4df37a5a2c148f89d9630ebbd1be1858bed10207cdacae9a0a" +
-			"b92df58de53de4718f929a83474fbcf9969f1d28a5b257cacd56f0ff0bc425c93d8c91ac833c2cfefb97d82fe6236f3ec3c29e0112a6cac5abfec733db41265f8ff486e7d7fa0b3d9766357377f089056c9408d8" +
-			"2f09f18700236cc1058ea1c273e287d07d521fdbb5e28d41cc1d95999eccee"),
-		20,
-	},
-}
diff --git a/vendor/github.com/aead/chacha20/chacha20.go b/vendor/github.com/aead/chacha20/chacha20.go
deleted file mode 100644
index df6ddd23..00000000
--- a/vendor/github.com/aead/chacha20/chacha20.go
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) 2016 Andreas Auernhammer. All rights reserved.
-// Use of this source code is governed by a license that can be
-// found in the LICENSE file.
-
-// Package chacha20 implements the ChaCha20 / XChaCha20 stream chipher.
-// Notice that one specific key-nonce combination must be unique for all time.
-//
-// There are three versions of ChaCha20:
-// - ChaCha20 with a 64 bit nonce (en/decrypt up to 2^64 * 64 bytes for one key-nonce combination)
-// - ChaCha20 with a 96 bit nonce (en/decrypt up to 2^32 * 64 bytes (~256 GB) for one key-nonce combination)
-// - XChaCha20 with a 192 bit nonce (en/decrypt up to 2^64 * 64 bytes for one key-nonce combination)
-package chacha20 // import "github.com/aead/chacha20"
-
-import (
-	"crypto/cipher"
-
-	"github.com/aead/chacha20/chacha"
-)
-
-// XORKeyStream crypts bytes from src to dst using the given nonce and key.
-// The length of the nonce determinds the version of ChaCha20:
-// - 8 bytes:  ChaCha20 with a 64 bit nonce and a 2^64 * 64 byte period.
-// - 12 bytes: ChaCha20 as defined in RFC 7539 and a 2^32 * 64 byte period.
-// - 24 bytes: XChaCha20 with a 192 bit nonce and a 2^64 * 64 byte period.
-// Src and dst may be the same slice but otherwise should not overlap.
-// If len(dst) < len(src) this function panics.
-// If the nonce is neither 64, 96 nor 192 bits long, this function panics.
-func XORKeyStream(dst, src, nonce, key []byte) {
-	chacha.XORKeyStream(dst, src, nonce, key, 20)
-}
-
-// NewCipher returns a new cipher.Stream implementing a ChaCha20 version.
-// The nonce must be unique for one key for all time.
-// The length of the nonce determinds the version of ChaCha20:
-// - 8 bytes:  ChaCha20 with a 64 bit nonce and a 2^64 * 64 byte period.
-// - 12 bytes: ChaCha20 as defined in RFC 7539 and a 2^32 * 64 byte period.
-// - 24 bytes: XChaCha20 with a 192 bit nonce and a 2^64 * 64 byte period.
-// If the nonce is neither 64, 96 nor 192 bits long, a non-nil error is returned.
-func NewCipher(nonce, key []byte) (cipher.Stream, error) {
-	return chacha.NewCipher(nonce, key, 20)
-}
diff --git a/vendor/github.com/aead/chacha20/chacha20_test.go b/vendor/github.com/aead/chacha20/chacha20_test.go
deleted file mode 100644
index 5dd5109a..00000000
--- a/vendor/github.com/aead/chacha20/chacha20_test.go
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright (c) 2016 Andreas Auernhammer. All rights reserved.
-// Use of this source code is governed by a license that can be
-// found in the LICENSE file.
-
-package chacha20
-
-import (
-	"bytes"
-	"encoding/hex"
-	"testing"
-
-	"github.com/aead/chacha20/chacha"
-)
-
-func toHex(bits []byte) string {
-	return hex.EncodeToString(bits)
-}
-
-func fromHex(bits string) []byte {
-	b, err := hex.DecodeString(bits)
-	if err != nil {
-		panic(err)
-	}
-	return b
-}
-
-func TestVectors(t *testing.T) {
-	for i, v := range vectors {
-		if len(v.plaintext) == 0 {
-			v.plaintext = make([]byte, len(v.ciphertext))
-		}
-
-		dst := make([]byte, len(v.ciphertext))
-
-		XORKeyStream(dst, v.plaintext, v.nonce, v.key)
-		if !bytes.Equal(dst, v.ciphertext) {
-			t.Errorf("Test %d: ciphertext mismatch:\n \t got:  %s\n \t want: %s", i, toHex(dst), toHex(v.ciphertext))
-		}
-
-		c, err := NewCipher(v.nonce, v.key)
-		if err != nil {
-			t.Fatal(err)
-		}
-		c.XORKeyStream(dst[:1], v.plaintext[:1])
-		c.XORKeyStream(dst[1:], v.plaintext[1:])
-		if !bytes.Equal(dst, v.ciphertext) {
-			t.Errorf("Test %d: ciphertext mismatch:\n \t got:  %s\n \t want: %s", i, toHex(dst), toHex(v.ciphertext))
-		}
-	}
-}
-
-func benchmarkCipher(b *testing.B, size int, nonceSize int) {
-	var key [32]byte
-	nonce := make([]byte, nonceSize)
-	c, _ := NewCipher(nonce, key[:])
-	buf := make([]byte, size)
-
-	b.SetBytes(int64(len(buf)))
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		c.XORKeyStream(buf, buf)
-	}
-}
-
-func benchmarkXORKeyStream(b *testing.B, size int, nonceSize int) {
-	var key [32]byte
-	nonce := make([]byte, nonceSize)
-	buf := make([]byte, size)
-	b.SetBytes(int64(len(buf)))
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		XORKeyStream(buf, buf, nonce[:], key[:])
-	}
-}
-
-func BenchmarkChaCha20_64(b *testing.B)              { benchmarkCipher(b, 64, chacha.NonceSize) }
-func BenchmarkChaCha20_1K(b *testing.B)              { benchmarkCipher(b, 1024, chacha.NonceSize) }
-func BenchmarkXChaCha20_64(b *testing.B)             { benchmarkXORKeyStream(b, 64, chacha.XNonceSize) }
-func BenchmarkXChaCha20_1K(b *testing.B)             { benchmarkXORKeyStream(b, 1024, chacha.XNonceSize) }
-func BenchmarkXORKeyStream64(b *testing.B)           { benchmarkXORKeyStream(b, 64, chacha.NonceSize) }
-func BenchmarkXORKeyStream1K(b *testing.B)           { benchmarkXORKeyStream(b, 1024, chacha.NonceSize) }
-func BenchmarkXChaCha20_XORKeyStream64(b *testing.B) { benchmarkXORKeyStream(b, 64, chacha.XNonceSize) }
-func BenchmarkXChaCha20_XORKeyStream1K(b *testing.B) {
-	benchmarkXORKeyStream(b, 1024, chacha.XNonceSize)
-}
-
-var vectors = []struct {
-	key, nonce, plaintext, ciphertext []byte
-}{
-	{
-		fromHex("0000000000000000000000000000000000000000000000000000000000000000"),
-		fromHex("0000000000000000"),
-		nil,
-		fromHex("76b8e0ada0f13d90405d6ae55386bd28bdd219b8a08ded1aa836efcc8b770dc7da41597c5157488d7724e03fb8d84a376a43b8f41518a11cc387b669b2ee6586"),
-	},
-	{
-		fromHex("0000000000000000000000000000000000000000000000000000000000000000"),
-		fromHex("000000000000000000000000"),
-		nil,
-		fromHex("76b8e0ada0f13d90405d6ae55386bd28bdd219b8a08ded1aa836efcc8b770dc7da41597c5157488d7724e03fb8d84a376a43b8f41518a11cc387b669b2ee6586"),
-	},
-	{
-		fromHex("0000000000000000000000000000000000000000000000000000000000000000"),
-		fromHex("000000000000000000000000000000000000000000000000"),
-		nil,
-		fromHex("bcd02a18bf3f01d19292de30a7a8fdaca4b65e50a6002cc72cd6d2f7c91ac3d5728f83e0aad2bfcf9abd2d2db58faedd65015dd83fc09b131e271043019e8e0f"),
-	},
-}
diff --git a/vendor/github.com/aead/poly1305/poly1305_amd64.go b/vendor/github.com/aead/poly1305/poly1305_amd64.go
index cd1a7174..41b630f1 100644
--- a/vendor/github.com/aead/poly1305/poly1305_amd64.go
+++ b/vendor/github.com/aead/poly1305/poly1305_amd64.go
@@ -7,13 +7,11 @@
 package poly1305
 
 import (
+	"golang.org/x/sys/cpu"
 	"io"
 )
 
-var useAVX2 = supportsAVX2()
-
-//go:noescape
-func supportsAVX2() bool
+var useAVX2 = cpu.X86.HasAVX2
 
 //go:noescape
 func initialize(state *[7]uint64, key *[32]byte)
diff --git a/vendor/github.com/aead/poly1305/poly1305_test.go b/vendor/github.com/aead/poly1305/poly1305_test.go
deleted file mode 100644
index 692e0a1c..00000000
--- a/vendor/github.com/aead/poly1305/poly1305_test.go
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright (c) 2016 Andreas Auernhammer. All rights reserved.
-// Use of this source code is governed by a license that can be
-// found in the LICENSE file.
-
-package poly1305
-
-import (
-	"bytes"
-	"encoding/hex"
-	"testing"
-)
-
-func fromHex(s string) []byte {
-	b, err := hex.DecodeString(s)
-	if err != nil {
-		panic(err)
-	}
-	return b
-}
-
-var vectors = []struct {
-	msg, key, tag []byte
-}{
-	{
-		[]byte("Hello world!"),
-		[]byte("this is 32-byte key for Poly1305"),
-		[]byte{0xa6, 0xf7, 0x45, 0x00, 0x8f, 0x81, 0xc9, 0x16, 0xa2, 0x0d, 0xcc, 0x74, 0xee, 0xf2, 0xb2, 0xf0},
-	},
-	{
-		make([]byte, 32),
-		[]byte("this is 32-byte key for Poly1305"),
-		[]byte{0x49, 0xec, 0x78, 0x09, 0x0e, 0x48, 0x1e, 0xc6, 0xc2, 0x6b, 0x33, 0xb9, 0x1c, 0xcc, 0x03, 0x07},
-	},
-	{
-		make([]byte, 2007),
-		[]byte("this is 32-byte key for Poly1305"),
-		[]byte{0xda, 0x84, 0xbc, 0xab, 0x02, 0x67, 0x6c, 0x38, 0xcd, 0xb0, 0x15, 0x60, 0x42, 0x74, 0xc2, 0xaa},
-	},
-	{
-		make([]byte, 2007),
-		make([]byte, 32),
-		make([]byte, 16),
-	},
-	{
-		// This test triggers an edge-case. See https://go-review.googlesource.com/#/c/30101/.
-		[]byte{0x81, 0xd8, 0xb2, 0xe4, 0x6a, 0x25, 0x21, 0x3b, 0x58, 0xfe, 0xe4, 0x21, 0x3a, 0x2a, 0x28, 0xe9, 0x21, 0xc1, 0x2a, 0x96, 0x32, 0x51, 0x6d, 0x3b, 0x73, 0x27, 0x27, 0x27, 0xbe, 0xcf, 0x21, 0x29},
-		[]byte{0x3b, 0x3a, 0x29, 0xe9, 0x3b, 0x21, 0x3a, 0x5c, 0x5c, 0x3b, 0x3b, 0x05, 0x3a, 0x3a, 0x8c, 0x0d},
-		[]byte{0x6d, 0xc1, 0x8b, 0x8c, 0x34, 0x4c, 0xd7, 0x99, 0x27, 0x11, 0x8b, 0xbe, 0x84, 0xb7, 0xf3, 0x14},
-	},
-	// From: https://tools.ietf.org/html/rfc7539#section-2.5.2
-	{
-		fromHex("43727970746f6772617068696320466f72756d2052657365617263682047726f7570"),
-		fromHex("85d6be7857556d337f4452fe42d506a80103808afb0db2fd4abff6af4149f51b"),
-		fromHex("a8061dc1305136c6c22b8baf0c0127a9"),
-	},
-}
-
-func TestVectors(t *testing.T) {
-	var key [32]byte
-
-	for i, v := range vectors {
-		msg := v.msg
-		copy(key[:], v.key)
-
-		out := Sum(msg, key)
-		if !bytes.Equal(out[:], v.tag) {
-			t.Errorf("Test vector %d : got: %x expected: %x", i, out[:], v.tag)
-		}
-
-		h := New(key)
-		h.Write(msg)
-		tag := h.Sum(nil)
-		if !bytes.Equal(tag[:], v.tag) {
-			t.Errorf("Test vector %d : got: %x expected: %x", i, tag[:], v.tag)
-		}
-
-		var mac [16]byte
-		copy(mac[:], v.tag)
-		if !Verify(&mac, msg, key) {
-			t.Errorf("Test vector %d : Verify failed", i)
-		}
-	}
-}
-
-func TestWriteAfterSum(t *testing.T) {
-	msg := make([]byte, 64)
-	for i := range msg {
-		h := New([32]byte{})
-
-		if _, err := h.Write(msg[:i]); err != nil {
-			t.Fatalf("Iteration %d: poly1305.Hash returned unexpected error: %s", i, err)
-		}
-		h.Sum(nil)
-		if _, err := h.Write(nil); err == nil {
-			t.Fatalf("Iteration %d: poly1305.Hash returned no error for write after sum", i)
-		}
-	}
-}
-
-func TestWrite(t *testing.T) {
-	var key [32]byte
-	for i := range key {
-		key[i] = byte(i)
-	}
-
-	h := New(key)
-
-	var msg1 []byte
-	msg0 := make([]byte, 64)
-	for i := range msg0 {
-		h.Write(msg0[:i])
-		msg1 = append(msg1, msg0[:i]...)
-	}
-
-	tag0 := h.Sum(nil)
-	tag1 := Sum(msg1, key)
-
-	if !bytes.Equal(tag0[:], tag1[:]) {
-		t.Fatalf("Sum differ from poly1305.Sum\n Sum: %s \n poly1305.Sum: %s", hex.EncodeToString(tag0[:]), hex.EncodeToString(tag1[:]))
-	}
-}
-
-// Benchmarks
-
-func BenchmarkSum_64(b *testing.B)    { benchmarkSum(b, 64) }
-func BenchmarkSum_256(b *testing.B)   { benchmarkSum(b, 256) }
-func BenchmarkSum_1K(b *testing.B)    { benchmarkSum(b, 1024) }
-func BenchmarkSum_8K(b *testing.B)    { benchmarkSum(b, 8*1024) }
-func BenchmarkWrite_64(b *testing.B)  { benchmarkWrite(b, 64) }
-func BenchmarkWrite_256(b *testing.B) { benchmarkWrite(b, 256) }
-func BenchmarkWrite_1K(b *testing.B)  { benchmarkWrite(b, 1024) }
-func BenchmarkWrite_8K(b *testing.B)  { benchmarkWrite(b, 8*1024) }
-
-func benchmarkSum(b *testing.B, size int) {
-	var key [32]byte
-
-	msg := make([]byte, size)
-
-	b.SetBytes(int64(size))
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		Sum(msg, key)
-	}
-}
-
-func benchmarkWrite(b *testing.B, size int) {
-	var key [32]byte
-	h := New(key)
-
-	msg := make([]byte, size)
-
-	b.SetBytes(int64(size))
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		h.Write(msg)
-	}
-}
diff --git a/vendor/github.com/agl/ed25519/ed25519_test.go b/vendor/github.com/agl/ed25519/ed25519_test.go
deleted file mode 100644
index 0b4651eb..00000000
--- a/vendor/github.com/agl/ed25519/ed25519_test.go
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ed25519
-
-import (
-	"bufio"
-	"bytes"
-	"compress/gzip"
-	"crypto/rand"
-	"encoding/hex"
-	"io"
-	"os"
-	"strings"
-	"testing"
-
-	"github.com/agl/ed25519/edwards25519"
-)
-
-type zeroReader struct{}
-
-func (zeroReader) Read(buf []byte) (int, error) {
-	for i := range buf {
-		buf[i] = 0
-	}
-	return len(buf), nil
-}
-
-func TestUnmarshalMarshal(t *testing.T) {
-	pub, _, _ := GenerateKey(rand.Reader)
-
-	var A edwards25519.ExtendedGroupElement
-	if !A.FromBytes(pub) {
-		t.Fatalf("ExtendedGroupElement.FromBytes failed")
-	}
-
-	var pub2 [32]byte
-	A.ToBytes(&pub2)
-
-	if *pub != pub2 {
-		t.Errorf("FromBytes(%v)->ToBytes does not round-trip, got %x\n", *pub, pub2)
-	}
-}
-
-func TestSignVerify(t *testing.T) {
-	var zero zeroReader
-	public, private, _ := GenerateKey(zero)
-
-	message := []byte("test message")
-	sig := Sign(private, message)
-	if !Verify(public, message, sig) {
-		t.Errorf("valid signature rejected")
-	}
-
-	wrongMessage := []byte("wrong message")
-	if Verify(public, wrongMessage, sig) {
-		t.Errorf("signature of different message accepted")
-	}
-}
-
-func TestGolden(t *testing.T) {
-	// sign.input.gz is a selection of test cases from
-	// http://ed25519.cr.yp.to/python/sign.input
-	testDataZ, err := os.Open("testdata/sign.input.gz")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer testDataZ.Close()
-	testData, err := gzip.NewReader(testDataZ)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer testData.Close()
-
-	in := bufio.NewReaderSize(testData, 1<<12)
-	lineNo := 0
-	for {
-		lineNo++
-		lineBytes, isPrefix, err := in.ReadLine()
-		if isPrefix {
-			t.Fatal("bufio buffer too small")
-		}
-		if err != nil {
-			if err == io.EOF {
-				break
-			}
-			t.Fatalf("error reading test data: %s", err)
-		}
-
-		line := string(lineBytes)
-		parts := strings.Split(line, ":")
-		if len(parts) != 5 {
-			t.Fatalf("bad number of parts on line %d", lineNo)
-		}
-
-		privBytes, _ := hex.DecodeString(parts[0])
-		pubKeyBytes, _ := hex.DecodeString(parts[1])
-		msg, _ := hex.DecodeString(parts[2])
-		sig, _ := hex.DecodeString(parts[3])
-		// The signatures in the test vectors also include the message
-		// at the end, but we just want R and S.
-		sig = sig[:SignatureSize]
-
-		if l := len(pubKeyBytes); l != PublicKeySize {
-			t.Fatalf("bad public key length on line %d: got %d bytes", lineNo, l)
-		}
-
-		var priv [PrivateKeySize]byte
-		copy(priv[:], privBytes)
-		copy(priv[32:], pubKeyBytes)
-
-		sig2 := Sign(&priv, msg)
-		if !bytes.Equal(sig, sig2[:]) {
-			t.Errorf("different signature result on line %d: %x vs %x", lineNo, sig, sig2)
-		}
-
-		var pubKey [PublicKeySize]byte
-		copy(pubKey[:], pubKeyBytes)
-		if !Verify(&pubKey, msg, sig2) {
-			t.Errorf("signature failed to verify on line %d", lineNo)
-		}
-	}
-}
-
-func BenchmarkKeyGeneration(b *testing.B) {
-	var zero zeroReader
-	for i := 0; i < b.N; i++ {
-		if _, _, err := GenerateKey(zero); err != nil {
-			b.Fatal(err)
-		}
-	}
-}
-
-func BenchmarkSigning(b *testing.B) {
-	var zero zeroReader
-	_, priv, err := GenerateKey(zero)
-	if err != nil {
-		b.Fatal(err)
-	}
-	message := []byte("Hello, world!")
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		Sign(priv, message)
-	}
-}
-
-func BenchmarkVerification(b *testing.B) {
-	var zero zeroReader
-	pub, priv, err := GenerateKey(zero)
-	if err != nil {
-		b.Fatal(err)
-	}
-	message := []byte("Hello, world!")
-	signature := Sign(priv, message)
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		Verify(pub, message, signature)
-	}
-}
diff --git a/vendor/github.com/coreos/go-systemd/.travis.yml b/vendor/github.com/coreos/go-systemd/.travis.yml
deleted file mode 100644
index 98c041c7..00000000
--- a/vendor/github.com/coreos/go-systemd/.travis.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-language: shell # We do everything inside Docker and don't want travis fiddling with steps or environment variables
-
-sudo: required
-
-services:
-  - docker
-
-env:
-  global:
-    - GOPATH=/opt
-    - BUILD_DIR=/opt/src/github.com/coreos/go-systemd
-  matrix:
-    - DOCKER_BASE=ubuntu:18.04
-    - DOCKER_BASE=debian:stretch
-
-before_install:
- - docker pull ${DOCKER_BASE}
- - docker run --privileged -e GOPATH=${GOPATH} --cidfile=/tmp/cidfile ${DOCKER_BASE} /bin/bash -c "apt-get update && apt-get install -y build-essential git golang dbus libsystemd-dev libpam-systemd systemd-container && go get github.com/coreos/pkg/dlopen && go get github.com/godbus/dbus"
- - docker commit `cat /tmp/cidfile` go-systemd/container-tests
- - rm -f /tmp/cidfile
-
-install:
- - docker run -d --cidfile=/tmp/cidfile --privileged -e GOPATH=${GOPATH} -v ${PWD}:${BUILD_DIR} go-systemd/container-tests /bin/systemd --system
-
-script:
- - docker exec `cat /tmp/cidfile` /bin/bash -c "cd ${BUILD_DIR} && ./test"
-
-after_script:
- - docker kill `cat /tmp/cidfile`
diff --git a/vendor/github.com/coreos/go-systemd/CONTRIBUTING.md b/vendor/github.com/coreos/go-systemd/CONTRIBUTING.md
deleted file mode 100644
index 0551ed53..00000000
--- a/vendor/github.com/coreos/go-systemd/CONTRIBUTING.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# How to Contribute
-
-CoreOS projects are [Apache 2.0 licensed](LICENSE) and accept contributions via
-GitHub pull requests.  This document outlines some of the conventions on
-development workflow, commit message formatting, contact points and other
-resources to make it easier to get your contribution accepted.
-
-# Certificate of Origin
-
-By contributing to this project you agree to the Developer Certificate of
-Origin (DCO). This document was created by the Linux Kernel community and is a
-simple statement that you, as a contributor, have the legal right to make the
-contribution. See the [DCO](DCO) file for details.
-
-# Email and Chat
-
-The project currently uses the general CoreOS email list and IRC channel:
-- Email: [coreos-dev](https://groups.google.com/forum/#!forum/coreos-dev)
-- IRC: #[coreos](irc://irc.freenode.org:6667/#coreos) IRC channel on freenode.org
-
-Please avoid emailing maintainers found in the MAINTAINERS file directly. They
-are very busy and read the mailing lists.
-
-## Getting Started
-
-- Fork the repository on GitHub
-- Read the [README](README.md) for build and test instructions
-- Play with the project, submit bugs, submit patches!
-
-## Contribution Flow
-
-This is a rough outline of what a contributor's workflow looks like:
-
-- Create a topic branch from where you want to base your work (usually master).
-- Make commits of logical units.
-- Make sure your commit messages are in the proper format (see below).
-- Push your changes to a topic branch in your fork of the repository.
-- Make sure the tests pass, and add any new tests as appropriate.
-- Submit a pull request to the original repository.
-
-Thanks for your contributions!
-
-### Coding Style
-
-CoreOS projects written in Go follow a set of style guidelines that we've documented 
-[here](https://github.com/coreos/docs/tree/master/golang). Please follow them when 
-working on your contributions.
-
-### Format of the Commit Message
-
-We follow a rough convention for commit messages that is designed to answer two
-questions: what changed and why. The subject line should feature the what and
-the body of the commit should describe the why.
-
-```
-scripts: add the test-cluster command
-
-this uses tmux to setup a test cluster that you can easily kill and
-start for debugging.
-
-Fixes #38
-```
-
-The format can be described more formally as follows:
-
-```
-<subsystem>: <what changed>
-<BLANK LINE>
-<why this change was made>
-<BLANK LINE>
-<footer>
-```
-
-The first line is the subject and should be no longer than 70 characters, the
-second line is always blank, and other lines should be wrapped at 80 characters.
-This allows the message to be easier to read on GitHub as well as in various
-git tools.
diff --git a/vendor/github.com/coreos/go-systemd/DCO b/vendor/github.com/coreos/go-systemd/DCO
deleted file mode 100644
index 716561d5..00000000
--- a/vendor/github.com/coreos/go-systemd/DCO
+++ /dev/null
@@ -1,36 +0,0 @@
-Developer Certificate of Origin
-Version 1.1
-
-Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
-660 York Street, Suite 102,
-San Francisco, CA 94110 USA
-
-Everyone is permitted to copy and distribute verbatim copies of this
-license document, but changing it is not allowed.
-
-
-Developer's Certificate of Origin 1.1
-
-By making a contribution to this project, I certify that:
-
-(a) The contribution was created in whole or in part by me and I
-    have the right to submit it under the open source license
-    indicated in the file; or
-
-(b) The contribution is based upon previous work that, to the best
-    of my knowledge, is covered under an appropriate open source
-    license and I have the right under that license to submit that
-    work with modifications, whether created in whole or in part
-    by me, under the same open source license (unless I am
-    permitted to submit under a different license), as indicated
-    in the file; or
-
-(c) The contribution was provided directly to me by some other
-    person who certified (a), (b) or (c) and I have not modified
-    it.
-
-(d) I understand and agree that this project and the contribution
-    are public and that a record of the contribution (including all
-    personal information I submit with it, including my sign-off) is
-    maintained indefinitely and may be redistributed consistent with
-    this project or the open source license(s) involved.
diff --git a/vendor/github.com/coreos/go-systemd/Jenkinsfile b/vendor/github.com/coreos/go-systemd/Jenkinsfile
deleted file mode 100644
index 7c898974..00000000
--- a/vendor/github.com/coreos/go-systemd/Jenkinsfile
+++ /dev/null
@@ -1,38 +0,0 @@
-matrixJob('Periodic go-systemd builder') {
-    label('master')
-    displayName('Periodic go-systemd builder (master branch)')
-
-    scm {
-        git {
-            remote {
-                url('https://github.com/coreos/go-systemd.git')
-            }
-            branch('master')
-        }
-    }
-
-    concurrentBuild()
-
-    triggers {
-        cron('@daily')
-    }
-
-    axes {
-        label('os_type', 'debian-testing', 'fedora-24', 'fedora-25')
-    }
-
-    wrappers {
-        buildNameSetter {
-            template('go-systemd master (periodic #${BUILD_NUMBER})')
-            runAtStart(true)
-            runAtEnd(true)
-        }
-        timeout {
-            absolute(25)
-        }
-    }
-
-    steps {
-        shell('./scripts/jenkins/periodic-go-systemd-builder.sh')
-    }
-}
\ No newline at end of file
diff --git a/vendor/github.com/coreos/go-systemd/README.md b/vendor/github.com/coreos/go-systemd/README.md
deleted file mode 100644
index cad04a80..00000000
--- a/vendor/github.com/coreos/go-systemd/README.md
+++ /dev/null
@@ -1,69 +0,0 @@
-# go-systemd
-
-[![Build Status](https://travis-ci.org/coreos/go-systemd.png?branch=master)](https://travis-ci.org/coreos/go-systemd)
-[![godoc](https://godoc.org/github.com/coreos/go-systemd?status.svg)](http://godoc.org/github.com/coreos/go-systemd)
-
-Go bindings to systemd. The project has several packages:
-
-- `activation` - for writing and using socket activation from Go
-- `daemon` - for notifying systemd of service status changes
-- `dbus` - for starting/stopping/inspecting running services and units
-- `journal` - for writing to systemd's logging service, journald
-- `sdjournal` - for reading from journald by wrapping its C API
-- `login1` - for integration with the systemd logind API
-- `machine1` - for registering machines/containers with systemd
-- `unit` - for (de)serialization and comparison of unit files
-
-## Socket Activation
-
-An example HTTP server using socket activation can be quickly set up by following this README on a Linux machine running systemd:
-
-https://github.com/coreos/go-systemd/tree/master/examples/activation/httpserver
-
-## systemd Service Notification
-
-The `daemon` package is an implementation of the [sd_notify protocol](https://www.freedesktop.org/software/systemd/man/sd_notify.html#Description). It can be used to inform systemd of service start-up completion, watchdog events, and other status changes.
-
-## D-Bus
-
-The `dbus` package connects to the [systemd D-Bus API](http://www.freedesktop.org/wiki/Software/systemd/dbus/) and lets you start, stop and introspect systemd units. The API docs are here:
-
-http://godoc.org/github.com/coreos/go-systemd/dbus
-
-### Debugging
-
-Create `/etc/dbus-1/system-local.conf` that looks like this:
-
-```
-<!DOCTYPE busconfig PUBLIC
-"-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
-"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-    <policy user="root">
-        <allow eavesdrop="true"/>
-        <allow eavesdrop="true" send_destination="*"/>
-    </policy>
-</busconfig>
-```
-
-## Journal
-
-### Writing to the Journal
-
-Using the pure-Go `journal` package you can submit journal entries directly to systemd's journal, taking advantage of features like indexed key/value pairs for each log entry.
-
-### Reading from the Journal
-
-The `sdjournal` package provides read access to the journal by wrapping around journald's native C API; consequently it requires cgo and the journal headers to be available.
-
-## logind
-
-The `login1` package provides functions to integrate with the [systemd logind API](http://www.freedesktop.org/wiki/Software/systemd/logind/).
-
-## machined
-
-The `machine1` package allows interaction with the [systemd machined D-Bus API](http://www.freedesktop.org/wiki/Software/systemd/machined/).
-
-## Units
-
-The `unit` package provides various functions for working with [systemd unit files](http://www.freedesktop.org/software/systemd/man/systemd.unit.html).
diff --git a/vendor/github.com/coreos/go-systemd/activation/files_test.go b/vendor/github.com/coreos/go-systemd/activation/files_test.go
deleted file mode 100644
index 7cfb6d8a..00000000
--- a/vendor/github.com/coreos/go-systemd/activation/files_test.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package activation
-
-import (
-	"bytes"
-	"io"
-	"os"
-	"os/exec"
-	"testing"
-)
-
-// correctStringWritten fails the text if the correct string wasn't written
-// to the other side of the pipe.
-func correctStringWritten(t *testing.T, r *os.File, expected string) bool {
-	bytes := make([]byte, len(expected))
-	io.ReadAtLeast(r, bytes, len(expected))
-
-	if string(bytes) != expected {
-		t.Fatalf("Unexpected string %s", string(bytes))
-	}
-
-	return true
-}
-
-// TestActivation forks out a copy of activation.go example and reads back two
-// strings from the pipes that are passed in.
-func TestActivation(t *testing.T) {
-	cmd := exec.Command("go", "run", "../examples/activation/activation.go")
-
-	r1, w1, _ := os.Pipe()
-	r2, w2, _ := os.Pipe()
-	cmd.ExtraFiles = []*os.File{
-		w1,
-		w2,
-	}
-
-	cmd.Env = os.Environ()
-	cmd.Env = append(cmd.Env, "LISTEN_FDS=2", "LISTEN_FDNAMES=fd1", "FIX_LISTEN_PID=1")
-
-	err := cmd.Run()
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-
-	correctStringWritten(t, r1, "Hello world: fd1")
-	correctStringWritten(t, r2, "Goodbye world: LISTEN_FD_4")
-}
-
-func TestActivationNoFix(t *testing.T) {
-	cmd := exec.Command("go", "run", "../examples/activation/activation.go")
-	cmd.Env = os.Environ()
-	cmd.Env = append(cmd.Env, "LISTEN_FDS=2")
-
-	out, _ := cmd.CombinedOutput()
-	if !bytes.Contains(out, []byte("No files")) {
-		t.Fatalf("Child didn't error out as expected")
-	}
-}
-
-func TestActivationNoFiles(t *testing.T) {
-	cmd := exec.Command("go", "run", "../examples/activation/activation.go")
-	cmd.Env = os.Environ()
-	cmd.Env = append(cmd.Env, "LISTEN_FDS=0", "FIX_LISTEN_PID=1")
-
-	out, _ := cmd.CombinedOutput()
-	if !bytes.Contains(out, []byte("No files")) {
-		t.Fatalf("Child didn't error out as expected")
-	}
-}
diff --git a/vendor/github.com/coreos/go-systemd/activation/listeners_test.go b/vendor/github.com/coreos/go-systemd/activation/listeners_test.go
deleted file mode 100644
index 333587c9..00000000
--- a/vendor/github.com/coreos/go-systemd/activation/listeners_test.go
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package activation
-
-import (
-	"io"
-	"net"
-	"os"
-	"os/exec"
-	"testing"
-)
-
-// correctStringWritten fails the text if the correct string wasn't written
-// to the other side of the pipe.
-func correctStringWrittenNet(t *testing.T, r net.Conn, expected string) bool {
-	bytes := make([]byte, len(expected))
-	io.ReadAtLeast(r, bytes, len(expected))
-
-	if string(bytes) != expected {
-		t.Fatalf("Unexpected string %s", string(bytes))
-	}
-
-	return true
-}
-
-// TestActivation forks out a copy of activation.go example and reads back two
-// strings from the pipes that are passed in.
-func TestListeners(t *testing.T) {
-	cmd := exec.Command("go", "run", "../examples/activation/listen.go")
-
-	l1, err := net.Listen("tcp", ":9999")
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-	l2, err := net.Listen("tcp", ":1234")
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-
-	t1 := l1.(*net.TCPListener)
-	t2 := l2.(*net.TCPListener)
-
-	f1, _ := t1.File()
-	f2, _ := t2.File()
-
-	cmd.ExtraFiles = []*os.File{
-		f1,
-		f2,
-	}
-
-	r1, err := net.Dial("tcp", "127.0.0.1:9999")
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-	r1.Write([]byte("Hi"))
-
-	r2, err := net.Dial("tcp", "127.0.0.1:1234")
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-	r2.Write([]byte("Hi"))
-
-	cmd.Env = os.Environ()
-	cmd.Env = append(cmd.Env, "LISTEN_FDS=2", "LISTEN_FDNAMES=fd1:fd2", "FIX_LISTEN_PID=1")
-
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		println(string(out))
-		t.Fatalf(err.Error())
-	}
-
-	correctStringWrittenNet(t, r1, "Hello world: fd1")
-	correctStringWrittenNet(t, r2, "Goodbye world: fd2")
-}
diff --git a/vendor/github.com/coreos/go-systemd/activation/packetconns_test.go b/vendor/github.com/coreos/go-systemd/activation/packetconns_test.go
deleted file mode 100644
index 6b102857..00000000
--- a/vendor/github.com/coreos/go-systemd/activation/packetconns_test.go
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package activation
-
-import (
-	"net"
-	"os"
-	"os/exec"
-	"testing"
-)
-
-// TestActivation forks out a copy of activation.go example and reads back two
-// strings from the pipes that are passed in.
-func TestPacketConns(t *testing.T) {
-	cmd := exec.Command("go", "run", "../examples/activation/udpconn.go")
-
-	u1, err := net.ListenUDP("udp", &net.UDPAddr{Port: 9999})
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-	u2, err := net.ListenUDP("udp", &net.UDPAddr{Port: 1234})
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-
-	f1, _ := u1.File()
-	f2, _ := u2.File()
-
-	cmd.ExtraFiles = []*os.File{
-		f1,
-		f2,
-	}
-
-	r1, err := net.Dial("udp", "127.0.0.1:9999")
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-	r1.Write([]byte("Hi"))
-
-	r2, err := net.Dial("udp", "127.0.0.1:1234")
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-	r2.Write([]byte("Hi"))
-
-	cmd.Env = os.Environ()
-	cmd.Env = append(cmd.Env, "LISTEN_FDS=2", "LISTEN_FDNAMES=fd1:fd2", "FIX_LISTEN_PID=1")
-
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		t.Fatalf("Cmd output '%s', err: '%s'\n", out, err)
-	}
-
-	correctStringWrittenNet(t, r1, "Hello world")
-	correctStringWrittenNet(t, r2, "Goodbye world")
-}
diff --git a/vendor/github.com/coreos/go-systemd/code-of-conduct.md b/vendor/github.com/coreos/go-systemd/code-of-conduct.md
deleted file mode 100644
index a234f360..00000000
--- a/vendor/github.com/coreos/go-systemd/code-of-conduct.md
+++ /dev/null
@@ -1,61 +0,0 @@
-## CoreOS Community Code of Conduct
-
-### Contributor Code of Conduct
-
-As contributors and maintainers of this project, and in the interest of
-fostering an open and welcoming community, we pledge to respect all people who
-contribute through reporting issues, posting feature requests, updating
-documentation, submitting pull requests or patches, and other activities.
-
-We are committed to making participation in this project a harassment-free
-experience for everyone, regardless of level of experience, gender, gender
-identity and expression, sexual orientation, disability, personal appearance,
-body size, race, ethnicity, age, religion, or nationality.
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery
-* Personal attacks
-* Trolling or insulting/derogatory comments
-* Public or private harassment
-* Publishing others' private information, such as physical or electronic addresses, without explicit permission
-* Other unethical or unprofessional conduct.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct. By adopting this Code of Conduct,
-project maintainers commit themselves to fairly and consistently applying these
-principles to every aspect of managing this project. Project maintainers who do
-not follow or enforce the Code of Conduct may be permanently removed from the
-project team.
-
-This code of conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting a project maintainer, Brandon Philips
-<brandon.philips@coreos.com>, and/or Rithu John <rithu.john@coreos.com>.
-
-This Code of Conduct is adapted from the Contributor Covenant
-(http://contributor-covenant.org), version 1.2.0, available at
-http://contributor-covenant.org/version/1/2/0/
-
-### CoreOS Events Code of Conduct
-
-CoreOS events are working conferences intended for professional networking and
-collaboration in the CoreOS community. Attendees are expected to behave
-according to professional standards and in accordance with their employer’s
-policies on appropriate workplace behavior.
-
-While at CoreOS events or related social networking opportunities, attendees
-should not engage in discriminatory or offensive speech or actions including
-but not limited to gender, sexuality, race, age, disability, or religion.
-Speakers should be especially aware of these concerns.
-
-CoreOS does not condone any statements by speakers contrary to these standards.
-CoreOS reserves the right to deny entrance and/or eject from an event (without
-refund) any individual found to be engaging in discriminatory or offensive
-speech or actions.
-
-Please bring any concerns to the immediate attention of designated on-site
-staff, Brandon Philips <brandon.philips@coreos.com>, and/or Rithu John <rithu.john@coreos.com>.
diff --git a/vendor/github.com/coreos/go-systemd/daemon/sdnotify_test.go b/vendor/github.com/coreos/go-systemd/daemon/sdnotify_test.go
deleted file mode 100644
index 0a4cdb74..00000000
--- a/vendor/github.com/coreos/go-systemd/daemon/sdnotify_test.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2016 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package daemon
-
-import (
-	"fmt"
-	"io/ioutil"
-	"net"
-	"os"
-	"testing"
-)
-
-// TestSdNotify
-func TestSdNotify(t *testing.T) {
-
-	testDir, e := ioutil.TempDir("/tmp/", "test-")
-	if e != nil {
-		panic(e)
-	}
-	defer os.RemoveAll(testDir)
-
-	notifySocket := testDir + "/notify-socket.sock"
-	laddr := net.UnixAddr{
-		Name: notifySocket,
-		Net:  "unixgram",
-	}
-	_, e = net.ListenUnixgram("unixgram", &laddr)
-	if e != nil {
-		panic(e)
-	}
-
-	tests := []struct {
-		unsetEnv  bool
-		envSocket string
-
-		wsent bool
-		werr  bool
-	}{
-		// (true, nil) - notification supported, data has been sent
-		{false, notifySocket, true, false},
-		// (false, err) - notification supported, but failure happened
-		{true, testDir + "/missing.sock", false, true},
-		// (false, nil) - notification not supported
-		{true, "", false, false},
-	}
-
-	for i, tt := range tests {
-		must(os.Unsetenv("NOTIFY_SOCKET"))
-		if tt.envSocket != "" {
-			must(os.Setenv("NOTIFY_SOCKET", tt.envSocket))
-		}
-		sent, err := SdNotify(tt.unsetEnv, fmt.Sprintf("TestSdNotify test message #%d", i))
-
-		if sent != tt.wsent {
-			t.Errorf("#%d: expected send result %t, got %t", i, tt.wsent, sent)
-		}
-		if tt.werr && err == nil {
-			t.Errorf("#%d: want non-nil err, got nil", i)
-		} else if !tt.werr && err != nil {
-			t.Errorf("#%d: want nil err, got %v", i, err)
-		}
-		if tt.unsetEnv && tt.envSocket != "" && os.Getenv("NOTIFY_SOCKET") != "" {
-			t.Errorf("#%d: environment variable not cleaned up", i)
-		}
-
-	}
-}
diff --git a/vendor/github.com/coreos/go-systemd/daemon/watchdog_test.go b/vendor/github.com/coreos/go-systemd/daemon/watchdog_test.go
deleted file mode 100644
index 5358cf58..00000000
--- a/vendor/github.com/coreos/go-systemd/daemon/watchdog_test.go
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright 2016 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package daemon
-
-import (
-	"os"
-	"strconv"
-	"testing"
-	"time"
-)
-
-func must(err error) {
-	if err != nil {
-		panic(err)
-	}
-}
-
-func TestSdWatchdogEnabled(t *testing.T) {
-	mypid := strconv.Itoa(os.Getpid())
-	tests := []struct {
-		usec     string // empty => unset
-		pid      string // empty => unset
-		unsetEnv bool   // arbitrarily set across testcases
-
-		werr   bool
-		wdelay time.Duration
-	}{
-		// Success cases
-		{"100", mypid, true, false, 100 * time.Microsecond},
-		{"50", mypid, true, false, 50 * time.Microsecond},
-		{"1", mypid, false, false, 1 * time.Microsecond},
-		{"1", "", true, false, 1 * time.Microsecond},
-
-		// No-op cases
-		{"", mypid, true, false, 0}, // WATCHDOG_USEC not set
-		{"1", "0", false, false, 0}, // WATCHDOG_PID doesn't match
-		{"", "", true, false, 0},    // Both not set
-
-		// Failure cases
-		{"-1", mypid, true, true, 0},                // Negative USEC
-		{"string", "1", false, true, 0},             // Non-integer USEC value
-		{"1", "string", true, true, 0},              // Non-integer PID value
-		{"stringa", "stringb", false, true, 0},      // E v e r y t h i n g
-		{"-10239", "-eleventythree", true, true, 0}, // i s   w r o n g
-	}
-
-	for i, tt := range tests {
-		if tt.usec != "" {
-			must(os.Setenv("WATCHDOG_USEC", tt.usec))
-		} else {
-			must(os.Unsetenv("WATCHDOG_USEC"))
-		}
-		if tt.pid != "" {
-			must(os.Setenv("WATCHDOG_PID", tt.pid))
-		} else {
-			must(os.Unsetenv("WATCHDOG_PID"))
-		}
-
-		delay, err := SdWatchdogEnabled(tt.unsetEnv)
-
-		if tt.werr && err == nil {
-			t.Errorf("#%d: want non-nil err, got nil", i)
-		} else if !tt.werr && err != nil {
-			t.Errorf("#%d: want nil err, got %v", i, err)
-		}
-		if tt.wdelay != delay {
-			t.Errorf("#%d: want delay=%d, got %d", i, tt.wdelay, delay)
-		}
-		if tt.unsetEnv && (os.Getenv("WATCHDOG_PID") != "" || os.Getenv("WATCHDOG_USEC") != "") {
-			t.Errorf("#%d: environment variables not cleaned up", i)
-		}
-	}
-}
diff --git a/vendor/github.com/coreos/go-systemd/test b/vendor/github.com/coreos/go-systemd/test
deleted file mode 100755
index 2ffd6117..00000000
--- a/vendor/github.com/coreos/go-systemd/test
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/bash -e
-#
-# Run all tests
-#   ./test
-#   ./test -v
-#
-# Run tests for one package
-#   PKG=./foo ./test
-#   PKG=bar ./test
-#
-
-# Invoke ./cover for HTML output
-COVER=${COVER:-"-cover"}
-
-PROJ="go-systemd"
-ORG_PATH="github.com/coreos"
-REPO_PATH="${ORG_PATH}/${PROJ}"
-
-# As a convenience, set up a self-contained GOPATH if none set
-if [ -z "$GOPATH" ]; then
-	if [ ! -h gopath/src/${REPO_PATH} ]; then
-		mkdir -p gopath/src/${ORG_PATH}
-		ln -s ../../../.. gopath/src/${REPO_PATH} || exit 255
-	fi
-	export GOPATH=${PWD}/gopath
-	go get -u github.com/godbus/dbus
-	go get -u github.com/coreos/pkg/dlopen
-fi
-
-TESTABLE="activation daemon journal login1 unit"
-FORMATTABLE="$TESTABLE sdjournal dbus machine1"
-if [ -e "/run/systemd/system/" ]; then
-	# if we're on a systemd-system, we can test sdjournal
-	TESTABLE="${TESTABLE} sdjournal"
-	if [ "$EUID" == "0" ]; then
-		# testing actual systemd/machined behaviour requires root
-		TESTABLE="${TESTABLE} dbus machine1"
-	fi
-fi
-
-
-# user has not provided PKG override
-if [ -z "$PKG" ]; then
-	TEST=$TESTABLE
-	FMT=$FORMATTABLE
-
-# user has provided PKG override
-else
-	# strip out slashes and dots from PKG=./foo/
-	TEST=${PKG//\//}
-	TEST=${TEST//./}
-
-	# only run gofmt on packages provided by user
-	FMT="$TEST"
-fi
-
-# split TEST into an array and prepend REPO_PATH to each local package
-split=(${TEST// / })
-TEST=${split[@]/#/${REPO_PATH}/}
-
-echo "Running tests..."
-go test -v ${COVER} $@ ${TEST}
-
-echo "Checking gofmt..."
-fmtRes=$(gofmt -l $FMT)
-if [ -n "${fmtRes}" ]; then
-	echo -e "gofmt checking failed:\n${fmtRes}"
-	exit 255
-fi
-
-echo "Checking govet..."
-vetRes=$(go vet $TEST)
-if [ -n "${vetRes}" ]; then
-	echo -e "govet checking failed:\n${vetRes}"
-	exit 255
-fi
-
-echo "Checking for license header..."
-licRes=$(for file in $(find . -type f -iname '*.go' ! -path './gopath/*'); do
-		head -n3 "${file}" | grep -Eq "(Copyright|generated|GENERATED)" || echo -e "  ${file}"
-	done;)
-if [ -n "${licRes}" ]; then
-	echo -e "license header checking failed:\n${licRes}"
-	exit 255
-fi
-
-
-echo "Success"
diff --git a/vendor/github.com/dchest/safefile/safefile_test.go b/vendor/github.com/dchest/safefile/safefile_test.go
deleted file mode 100644
index 0513a9c2..00000000
--- a/vendor/github.com/dchest/safefile/safefile_test.go
+++ /dev/null
@@ -1,155 +0,0 @@
-package safefile
-
-import (
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-)
-
-func ensureFileContains(name, data string) error {
-	b, err := ioutil.ReadFile(name)
-	if err != nil {
-		return err
-	}
-	if string(b) != data {
-		return fmt.Errorf("wrong data in file: expected %s, got %s", data, string(b))
-	}
-	return nil
-}
-
-func tempFileName(count int) string {
-	return filepath.Join(os.TempDir(), fmt.Sprintf("safefile-test-%d-%x", count, time.Now().UnixNano()))
-}
-
-var testData = "Hello, this is a test data"
-
-func testInTempDir() error {
-	name := tempFileName(0)
-	defer os.Remove(name)
-	f, err := Create(name, 0666)
-	if err != nil {
-		return err
-	}
-	if name != f.OrigName() {
-		f.Close()
-		return fmt.Errorf("name %q differs from OrigName: %q", name, f.OrigName())
-	}
-	_, err = io.WriteString(f, testData)
-	if err != nil {
-		f.Close()
-		return err
-	}
-	err = f.Commit()
-	if err != nil {
-		f.Close()
-		return err
-	}
-	err = f.Close()
-	if err != nil {
-		return err
-	}
-	return ensureFileContains(name, testData)
-}
-
-func TestMakeTempName(t *testing.T) {
-	// Make sure temp name is random.
-	m := make(map[string]bool)
-	for i := 0; i < 100; i++ {
-		name, err := makeTempName("/tmp", "sf")
-		if err != nil {
-			t.Fatal(err)
-		}
-		if m[name] {
-			t.Fatal("repeated file name")
-		}
-		m[name] = true
-	}
-}
-
-func TestFile(t *testing.T) {
-	err := testInTempDir()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestWriteFile(t *testing.T) {
-	name := tempFileName(1)
-	err := WriteFile(name, []byte(testData), 0666)
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = ensureFileContains(name, testData)
-	if err != nil {
-		os.Remove(name)
-		t.Fatal(err)
-	}
-	os.Remove(name)
-}
-
-func TestAbandon(t *testing.T) {
-	name := tempFileName(2)
-	f, err := Create(name, 0666)
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = f.Close()
-	if err != nil {
-		t.Fatalf("Abandon failed: %s", err)
-	}
-	// Make sure temporary file doesn't exist.
-	_, err = os.Stat(f.Name())
-	if err != nil && !os.IsNotExist(err) {
-		t.Fatal(err)
-	}
-}
-
-func TestDoubleCommit(t *testing.T) {
-	name := tempFileName(3)
-	f, err := Create(name, 0666)
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = f.Commit()
-	if err != nil {
-		os.Remove(name)
-		t.Fatalf("First commit failed: %s", err)
-	}
-	err = f.Commit()
-	if err != ErrAlreadyCommitted {
-		os.Remove(name)
-		t.Fatalf("Second commit didn't fail: %s", err)
-	}
-	err = f.Close()
-	if err != nil {
-		os.Remove(name)
-		t.Fatalf("Close failed: %s", err)
-	}
-	os.Remove(name)
-}
-
-func TestOverwriting(t *testing.T) {
-	name := tempFileName(4)
-	defer os.Remove(name)
-
-	olddata := "This is old data"
-	err := ioutil.WriteFile(name, []byte(olddata), 0600)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	newdata := "This is new data"
-	err = WriteFile(name, []byte(newdata), 0600)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = ensureFileContains(name, newdata)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/vendor/github.com/facebookgo/atomicfile/atomicfile_test.go b/vendor/github.com/facebookgo/atomicfile/atomicfile_test.go
deleted file mode 100644
index 220b0279..00000000
--- a/vendor/github.com/facebookgo/atomicfile/atomicfile_test.go
+++ /dev/null
@@ -1,86 +0,0 @@
-package atomicfile_test
-
-import (
-	"bytes"
-	"io/ioutil"
-	"os"
-	"testing"
-
-	"github.com/facebookgo/atomicfile"
-)
-
-func test(t *testing.T, dir, prefix string) {
-	t.Parallel()
-
-	tmpfile, err := ioutil.TempFile(dir, prefix)
-	if err != nil {
-		t.Fatal(err)
-	}
-	name := tmpfile.Name()
-
-	if err := os.Remove(name); err != nil {
-		t.Fatal(err)
-	}
-
-	defer os.Remove(name)
-	f, err := atomicfile.New(name, os.FileMode(0666))
-	if err != nil {
-		t.Fatal(err)
-	}
-	f.Write([]byte("foo"))
-	if _, err := os.Stat(name); !os.IsNotExist(err) {
-		t.Fatal("did not expect file to exist")
-	}
-	if err := f.Close(); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := os.Stat(name); err != nil {
-		t.Fatalf("expected file to exist: %s", err)
-	}
-}
-
-func TestCurrentDir(t *testing.T) {
-	cwd, _ := os.Getwd()
-	test(t, cwd, "atomicfile-current-dir-")
-}
-
-func TestRootTmpDir(t *testing.T) {
-	test(t, "/tmp", "atomicfile-root-tmp-dir-")
-}
-
-func TestDefaultTmpDir(t *testing.T) {
-	test(t, "", "atomicfile-default-tmp-dir-")
-}
-
-func TestAbort(t *testing.T) {
-	contents := []byte("the answer is 42")
-	t.Parallel()
-	tmpfile, err := ioutil.TempFile("", "atomicfile-abort-")
-	if err != nil {
-		t.Fatal(err)
-	}
-	name := tmpfile.Name()
-	if _, err := tmpfile.Write(contents); err != nil {
-		t.Fatal(err)
-	}
-	defer os.Remove(name)
-
-	f, err := atomicfile.New(name, os.FileMode(0666))
-	if err != nil {
-		t.Fatal(err)
-	}
-	f.Write([]byte("foo"))
-	if err := f.Abort(); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := os.Stat(name); err != nil {
-		t.Fatalf("expected file to exist: %s", err)
-	}
-	actual, err := ioutil.ReadFile(name)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !bytes.Equal(contents, actual) {
-		t.Fatalf(`did not find expected "%s" instead found "%s"`, contents, actual)
-	}
-}
diff --git a/vendor/github.com/facebookgo/pidfile/pidfile_test.go b/vendor/github.com/facebookgo/pidfile/pidfile_test.go
deleted file mode 100644
index 97630f74..00000000
--- a/vendor/github.com/facebookgo/pidfile/pidfile_test.go
+++ /dev/null
@@ -1,108 +0,0 @@
-package pidfile_test
-
-import (
-	"errors"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/facebookgo/pidfile"
-)
-
-// Make a temporary file, remove it, and return it's path with the hopes that
-// no one else create a file with that name.
-func tempfilename(t *testing.T) string {
-	file, err := ioutil.TempFile("", "pidfile-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = file.Close()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = os.Remove(file.Name())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	return file.Name()
-}
-
-func TestGetSetPath(t *testing.T) {
-	p := tempfilename(t)
-	defer os.Remove(p)
-	pidfile.SetPidfilePath(p)
-
-	if a := pidfile.GetPidfilePath(); a != p {
-		t.Fatalf("was expecting %s but got %s", p, a)
-	}
-}
-
-func TestSimple(t *testing.T) {
-	p := tempfilename(t)
-	defer os.Remove(p)
-	pidfile.SetPidfilePath(p)
-
-	if err := pidfile.Write(); err != nil {
-		t.Fatal(err)
-	}
-
-	pid, err := pidfile.Read()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if os.Getpid() != pid {
-		t.Fatalf("was expecting %d but got %d", os.Getpid(), pid)
-	}
-}
-
-func TestPidfileNotConfigured(t *testing.T) {
-	pidfile.SetPidfilePath("")
-
-	err := pidfile.Write()
-	if err == nil {
-		t.Fatal("was expecting an error")
-	}
-	if !pidfile.IsNotConfigured(err) {
-		t.Fatalf("was expecting IsNotConfigured error but got: %s", err)
-	}
-
-	_, err = pidfile.Read()
-	if err == nil {
-		t.Fatal("was expecting an error")
-	}
-	if !pidfile.IsNotConfigured(err) {
-		t.Fatalf("was expecting IsNotConfigured error but got: %s", err)
-	}
-}
-
-func TestNonIsConfiguredError(t *testing.T) {
-	err := errors.New("foo")
-	if pidfile.IsNotConfigured(err) {
-		t.Fatal("should be false")
-	}
-}
-
-func TestMakesDirectories(t *testing.T) {
-	dir := tempfilename(t)
-	defer os.RemoveAll(dir)
-	p := filepath.Join(dir, "pidfile")
-	pidfile.SetPidfilePath(p)
-
-	if err := pidfile.Write(); err != nil {
-		t.Fatal(err)
-	}
-
-	pid, err := pidfile.Read()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if os.Getpid() != pid {
-		t.Fatalf("was expecting %d but got %d", os.Getpid(), pid)
-	}
-}
diff --git a/vendor/github.com/hashicorp/go-immutable-radix/iradix_test.go b/vendor/github.com/hashicorp/go-immutable-radix/iradix_test.go
deleted file mode 100644
index 326299de..00000000
--- a/vendor/github.com/hashicorp/go-immutable-radix/iradix_test.go
+++ /dev/null
@@ -1,1531 +0,0 @@
-package iradix
-
-import (
-	"fmt"
-	"reflect"
-	"sort"
-	"testing"
-
-	"github.com/hashicorp/go-uuid"
-)
-
-func CopyTree(t *Tree) *Tree {
-	nt := &Tree{
-		root: CopyNode(t.root),
-		size: t.size,
-	}
-	return nt
-}
-
-func CopyNode(n *Node) *Node {
-	nn := &Node{}
-	if n.mutateCh != nil {
-		nn.mutateCh = n.mutateCh
-	}
-	if n.prefix != nil {
-		nn.prefix = make([]byte, len(n.prefix))
-		copy(nn.prefix, n.prefix)
-	}
-	if n.leaf != nil {
-		nn.leaf = CopyLeaf(n.leaf)
-	}
-	if len(n.edges) != 0 {
-		nn.edges = make([]edge, len(n.edges))
-		for idx, edge := range n.edges {
-			nn.edges[idx].label = edge.label
-			nn.edges[idx].node = CopyNode(edge.node)
-		}
-	}
-	return nn
-}
-
-func CopyLeaf(l *leafNode) *leafNode {
-	ll := &leafNode{
-		mutateCh: l.mutateCh,
-		key:      l.key,
-		val:      l.val,
-	}
-	return ll
-}
-
-func TestRadix_HugeTxn(t *testing.T) {
-	r := New()
-
-	// Insert way more nodes than the cache can fit
-	txn1 := r.Txn()
-	var expect []string
-	for i := 0; i < defaultModifiedCache*100; i++ {
-		gen, err := uuid.GenerateUUID()
-		if err != nil {
-			t.Fatalf("err: %v", err)
-		}
-		txn1.Insert([]byte(gen), i)
-		expect = append(expect, gen)
-	}
-	r = txn1.Commit()
-	sort.Strings(expect)
-
-	// Collect the output, should be sorted
-	var out []string
-	fn := func(k []byte, v interface{}) bool {
-		out = append(out, string(k))
-		return false
-	}
-	r.Root().Walk(fn)
-
-	// Verify the match
-	if len(out) != len(expect) {
-		t.Fatalf("length mis-match: %d vs %d", len(out), len(expect))
-	}
-	for i := 0; i < len(out); i++ {
-		if out[i] != expect[i] {
-			t.Fatalf("mis-match: %v %v", out[i], expect[i])
-		}
-	}
-}
-
-func TestRadix(t *testing.T) {
-	var min, max string
-	inp := make(map[string]interface{})
-	for i := 0; i < 1000; i++ {
-		gen, err := uuid.GenerateUUID()
-		if err != nil {
-			t.Fatalf("err: %v", err)
-		}
-		inp[gen] = i
-		if gen < min || i == 0 {
-			min = gen
-		}
-		if gen > max || i == 0 {
-			max = gen
-		}
-	}
-
-	r := New()
-	rCopy := CopyTree(r)
-	for k, v := range inp {
-		newR, _, _ := r.Insert([]byte(k), v)
-		if !reflect.DeepEqual(r, rCopy) {
-			t.Errorf("r: %#v rc: %#v", r, rCopy)
-			t.Errorf("r: %#v rc: %#v", r.root, rCopy.root)
-			t.Fatalf("structure modified %d", newR.Len())
-		}
-		r = newR
-		rCopy = CopyTree(r)
-	}
-
-	if r.Len() != len(inp) {
-		t.Fatalf("bad length: %v %v", r.Len(), len(inp))
-	}
-
-	for k, v := range inp {
-		out, ok := r.Get([]byte(k))
-		if !ok {
-			t.Fatalf("missing key: %v", k)
-		}
-		if out != v {
-			t.Fatalf("value mis-match: %v %v", out, v)
-		}
-	}
-
-	// Check min and max
-	outMin, _, _ := r.Root().Minimum()
-	if string(outMin) != min {
-		t.Fatalf("bad minimum: %v %v", outMin, min)
-	}
-	outMax, _, _ := r.Root().Maximum()
-	if string(outMax) != max {
-		t.Fatalf("bad maximum: %v %v", outMax, max)
-	}
-
-	// Copy the full tree before delete
-	orig := r
-	origCopy := CopyTree(r)
-
-	for k, v := range inp {
-		tree, out, ok := r.Delete([]byte(k))
-		r = tree
-		if !ok {
-			t.Fatalf("missing key: %v", k)
-		}
-		if out != v {
-			t.Fatalf("value mis-match: %v %v", out, v)
-		}
-	}
-	if r.Len() != 0 {
-		t.Fatalf("bad length: %v", r.Len())
-	}
-
-	if !reflect.DeepEqual(orig, origCopy) {
-		t.Fatalf("structure modified")
-	}
-}
-
-func TestRoot(t *testing.T) {
-	r := New()
-	r, _, ok := r.Delete(nil)
-	if ok {
-		t.Fatalf("bad")
-	}
-	r, _, ok = r.Insert(nil, true)
-	if ok {
-		t.Fatalf("bad")
-	}
-	val, ok := r.Get(nil)
-	if !ok || val != true {
-		t.Fatalf("bad: %#v", val)
-	}
-	r, val, ok = r.Delete(nil)
-	if !ok || val != true {
-		t.Fatalf("bad: %v", val)
-	}
-}
-
-func TestInsert_UpdateFeedback(t *testing.T) {
-	r := New()
-	txn1 := r.Txn()
-
-	for i := 0; i < 10; i++ {
-		var old interface{}
-		var didUpdate bool
-		old, didUpdate = txn1.Insert([]byte("helloworld"), i)
-		if i == 0 {
-			if old != nil || didUpdate {
-				t.Fatalf("bad: %d %v %v", i, old, didUpdate)
-			}
-		} else {
-			if old == nil || old.(int) != i-1 || !didUpdate {
-				t.Fatalf("bad: %d %v %v", i, old, didUpdate)
-			}
-		}
-	}
-}
-
-func TestDelete(t *testing.T) {
-	r := New()
-	s := []string{"", "A", "AB"}
-
-	for _, ss := range s {
-		r, _, _ = r.Insert([]byte(ss), true)
-	}
-	var ok bool
-	for _, ss := range s {
-		r, _, ok = r.Delete([]byte(ss))
-		if !ok {
-			t.Fatalf("bad %q", ss)
-		}
-	}
-}
-
-func TestDeletePrefix(t *testing.T) {
-
-	type exp struct {
-		desc        string
-		treeNodes   []string
-		prefix      string
-		expectedOut []string
-	}
-
-	//various test cases where DeletePrefix should succeed
-	cases := []exp{
-		{
-			"prefix not a node in tree",
-			[]string{
-				"",
-				"test/test1",
-				"test/test2",
-				"test/test3",
-				"R",
-				"RA"},
-			"test",
-			[]string{
-				"",
-				"R",
-				"RA",
-			},
-		},
-		{
-			"prefix matches a node in tree",
-			[]string{
-				"",
-				"test",
-				"test/test1",
-				"test/test2",
-				"test/test3",
-				"test/testAAA",
-				"R",
-				"RA",
-			},
-			"test",
-			[]string{
-				"",
-				"R",
-				"RA",
-			},
-		},
-		{
-			"longer prefix, but prefix is not a node in tree",
-			[]string{
-				"",
-				"test/test1",
-				"test/test2",
-				"test/test3",
-				"test/testAAA",
-				"R",
-				"RA",
-			},
-			"test/test",
-			[]string{
-				"",
-				"R",
-				"RA",
-			},
-		},
-		{
-			"prefix only matches one node",
-			[]string{
-				"",
-				"AB",
-				"ABC",
-				"AR",
-				"R",
-				"RA",
-			},
-			"AR",
-			[]string{
-				"",
-				"AB",
-				"ABC",
-				"R",
-				"RA",
-			},
-		},
-	}
-
-	for _, testCase := range cases {
-		t.Run(testCase.desc, func(t *testing.T) {
-			r := New()
-			for _, ss := range testCase.treeNodes {
-				r, _, _ = r.Insert([]byte(ss), true)
-			}
-			if got, want := r.Len(), len(testCase.treeNodes); got != want {
-				t.Fatalf("Unexpected tree length after insert, got %d want %d ", got, want)
-			}
-			r, ok := r.DeletePrefix([]byte(testCase.prefix))
-			if !ok {
-				t.Fatalf("DeletePrefix should have returned true for tree %v, deleting prefix %v", testCase.treeNodes, testCase.prefix)
-			}
-			if got, want := r.Len(), len(testCase.expectedOut); got != want {
-				t.Fatalf("Bad tree length, got %d want %d tree %v, deleting prefix %v ", got, want, testCase.treeNodes, testCase.prefix)
-			}
-
-			verifyTree(t, testCase.expectedOut, r)
-			//Delete a non-existant node
-			r, ok = r.DeletePrefix([]byte("CCCCC"))
-			if ok {
-				t.Fatalf("Expected DeletePrefix to return false ")
-			}
-			verifyTree(t, testCase.expectedOut, r)
-		})
-	}
-}
-
-func TestTrackMutate_DeletePrefix(t *testing.T) {
-
-	r := New()
-
-	keys := []string{
-		"foo",
-		"foo/bar/baz",
-		"foo/baz/bar",
-		"foo/zip/zap",
-		"bazbaz",
-		"zipzap",
-	}
-	for _, k := range keys {
-		r, _, _ = r.Insert([]byte(k), nil)
-	}
-	if r.Len() != len(keys) {
-		t.Fatalf("bad len: %v %v", r.Len(), len(keys))
-	}
-
-	rootWatch, _, _ := r.Root().GetWatch(nil)
-	if rootWatch == nil {
-		t.Fatalf("Should have returned a watch")
-	}
-
-	nodeWatch1, _, _ := r.Root().GetWatch([]byte("foo/bar/baz"))
-	if nodeWatch1 == nil {
-		t.Fatalf("Should have returned a watch")
-	}
-
-	nodeWatch2, _, _ := r.Root().GetWatch([]byte("foo/baz/bar"))
-	if nodeWatch2 == nil {
-		t.Fatalf("Should have returned a watch")
-	}
-
-	nodeWatch3, _, _ := r.Root().GetWatch([]byte("foo/zip/zap"))
-	if nodeWatch3 == nil {
-		t.Fatalf("Should have returned a watch")
-	}
-
-	unknownNodeWatch, _, _ := r.Root().GetWatch([]byte("bazbaz"))
-	if unknownNodeWatch == nil {
-		t.Fatalf("Should have returned a watch")
-	}
-
-	// Verify that deleting prefixes triggers the right set of watches
-	txn := r.Txn()
-	txn.TrackMutate(true)
-	ok := txn.DeletePrefix([]byte("foo"))
-	if !ok {
-		t.Fatalf("Expected delete prefix to return true")
-	}
-	if hasAnyClosedMutateCh(r) {
-		t.Fatalf("Transaction was not committed, no channel should have been closed")
-	}
-
-	txn.Commit()
-
-	// Verify that all the leaf nodes we set up watches for above get triggered from the delete prefix call
-	select {
-	case <-rootWatch:
-	default:
-		t.Fatalf("root watch was not triggered")
-	}
-	select {
-	case <-nodeWatch1:
-	default:
-		t.Fatalf("node watch was not triggered")
-	}
-	select {
-	case <-nodeWatch2:
-	default:
-		t.Fatalf("node watch was not triggered")
-	}
-	select {
-	case <-nodeWatch3:
-	default:
-		t.Fatalf("node watch was not triggered")
-	}
-	select {
-	case <-unknownNodeWatch:
-		t.Fatalf("Unrelated node watch was triggered during a prefix delete")
-	default:
-	}
-
-}
-
-func verifyTree(t *testing.T, expected []string, r *Tree) {
-	root := r.Root()
-	out := []string{}
-	fn := func(k []byte, v interface{}) bool {
-		out = append(out, string(k))
-		return false
-	}
-	root.Walk(fn)
-
-	if !reflect.DeepEqual(expected, out) {
-		t.Fatalf("Unexpected contents of tree after delete prefix: expected %v, but got %v", expected, out)
-	}
-}
-
-func TestLongestPrefix(t *testing.T) {
-	r := New()
-
-	keys := []string{
-		"",
-		"foo",
-		"foobar",
-		"foobarbaz",
-		"foobarbazzip",
-		"foozip",
-	}
-	for _, k := range keys {
-		r, _, _ = r.Insert([]byte(k), nil)
-	}
-	if r.Len() != len(keys) {
-		t.Fatalf("bad len: %v %v", r.Len(), len(keys))
-	}
-
-	type exp struct {
-		inp string
-		out string
-	}
-	cases := []exp{
-		{"a", ""},
-		{"abc", ""},
-		{"fo", ""},
-		{"foo", "foo"},
-		{"foob", "foo"},
-		{"foobar", "foobar"},
-		{"foobarba", "foobar"},
-		{"foobarbaz", "foobarbaz"},
-		{"foobarbazzi", "foobarbaz"},
-		{"foobarbazzip", "foobarbazzip"},
-		{"foozi", "foo"},
-		{"foozip", "foozip"},
-		{"foozipzap", "foozip"},
-	}
-	root := r.Root()
-	for _, test := range cases {
-		m, _, ok := root.LongestPrefix([]byte(test.inp))
-		if !ok {
-			t.Fatalf("no match: %v", test)
-		}
-		if string(m) != test.out {
-			t.Fatalf("mis-match: %v %v", m, test)
-		}
-	}
-}
-
-func TestWalkPrefix(t *testing.T) {
-	r := New()
-
-	keys := []string{
-		"foobar",
-		"foo/bar/baz",
-		"foo/baz/bar",
-		"foo/zip/zap",
-		"zipzap",
-	}
-	for _, k := range keys {
-		r, _, _ = r.Insert([]byte(k), nil)
-	}
-	if r.Len() != len(keys) {
-		t.Fatalf("bad len: %v %v", r.Len(), len(keys))
-	}
-
-	type exp struct {
-		inp string
-		out []string
-	}
-	cases := []exp{
-		exp{
-			"f",
-			[]string{"foobar", "foo/bar/baz", "foo/baz/bar", "foo/zip/zap"},
-		},
-		exp{
-			"foo",
-			[]string{"foobar", "foo/bar/baz", "foo/baz/bar", "foo/zip/zap"},
-		},
-		exp{
-			"foob",
-			[]string{"foobar"},
-		},
-		exp{
-			"foo/",
-			[]string{"foo/bar/baz", "foo/baz/bar", "foo/zip/zap"},
-		},
-		exp{
-			"foo/b",
-			[]string{"foo/bar/baz", "foo/baz/bar"},
-		},
-		exp{
-			"foo/ba",
-			[]string{"foo/bar/baz", "foo/baz/bar"},
-		},
-		exp{
-			"foo/bar",
-			[]string{"foo/bar/baz"},
-		},
-		exp{
-			"foo/bar/baz",
-			[]string{"foo/bar/baz"},
-		},
-		exp{
-			"foo/bar/bazoo",
-			[]string{},
-		},
-		exp{
-			"z",
-			[]string{"zipzap"},
-		},
-	}
-
-	root := r.Root()
-	for _, test := range cases {
-		out := []string{}
-		fn := func(k []byte, v interface{}) bool {
-			out = append(out, string(k))
-			return false
-		}
-		root.WalkPrefix([]byte(test.inp), fn)
-		sort.Strings(out)
-		sort.Strings(test.out)
-		if !reflect.DeepEqual(out, test.out) {
-			t.Fatalf("mis-match: %v %v", out, test.out)
-		}
-	}
-}
-
-func TestWalkPath(t *testing.T) {
-	r := New()
-
-	keys := []string{
-		"foo",
-		"foo/bar",
-		"foo/bar/baz",
-		"foo/baz/bar",
-		"foo/zip/zap",
-		"zipzap",
-	}
-	for _, k := range keys {
-		r, _, _ = r.Insert([]byte(k), nil)
-	}
-	if r.Len() != len(keys) {
-		t.Fatalf("bad len: %v %v", r.Len(), len(keys))
-	}
-
-	type exp struct {
-		inp string
-		out []string
-	}
-	cases := []exp{
-		exp{
-			"f",
-			[]string{},
-		},
-		exp{
-			"foo",
-			[]string{"foo"},
-		},
-		exp{
-			"foo/",
-			[]string{"foo"},
-		},
-		exp{
-			"foo/ba",
-			[]string{"foo"},
-		},
-		exp{
-			"foo/bar",
-			[]string{"foo", "foo/bar"},
-		},
-		exp{
-			"foo/bar/baz",
-			[]string{"foo", "foo/bar", "foo/bar/baz"},
-		},
-		exp{
-			"foo/bar/bazoo",
-			[]string{"foo", "foo/bar", "foo/bar/baz"},
-		},
-		exp{
-			"z",
-			[]string{},
-		},
-	}
-
-	root := r.Root()
-	for _, test := range cases {
-		out := []string{}
-		fn := func(k []byte, v interface{}) bool {
-			out = append(out, string(k))
-			return false
-		}
-		root.WalkPath([]byte(test.inp), fn)
-		sort.Strings(out)
-		sort.Strings(test.out)
-		if !reflect.DeepEqual(out, test.out) {
-			t.Fatalf("mis-match: %v %v", out, test.out)
-		}
-	}
-}
-
-func TestIteratePrefix(t *testing.T) {
-	r := New()
-
-	keys := []string{
-		"foo/bar/baz",
-		"foo/baz/bar",
-		"foo/zip/zap",
-		"foobar",
-		"zipzap",
-	}
-	for _, k := range keys {
-		r, _, _ = r.Insert([]byte(k), nil)
-	}
-	if r.Len() != len(keys) {
-		t.Fatalf("bad len: %v %v", r.Len(), len(keys))
-	}
-
-	type exp struct {
-		inp string
-		out []string
-	}
-	cases := []exp{
-		exp{
-			"",
-			keys,
-		},
-		exp{
-			"f",
-			[]string{
-				"foo/bar/baz",
-				"foo/baz/bar",
-				"foo/zip/zap",
-				"foobar",
-			},
-		},
-		exp{
-			"foo",
-			[]string{
-				"foo/bar/baz",
-				"foo/baz/bar",
-				"foo/zip/zap",
-				"foobar",
-			},
-		},
-		exp{
-			"foob",
-			[]string{"foobar"},
-		},
-		exp{
-			"foo/",
-			[]string{"foo/bar/baz", "foo/baz/bar", "foo/zip/zap"},
-		},
-		exp{
-			"foo/b",
-			[]string{"foo/bar/baz", "foo/baz/bar"},
-		},
-		exp{
-			"foo/ba",
-			[]string{"foo/bar/baz", "foo/baz/bar"},
-		},
-		exp{
-			"foo/bar",
-			[]string{"foo/bar/baz"},
-		},
-		exp{
-			"foo/bar/baz",
-			[]string{"foo/bar/baz"},
-		},
-		exp{
-			"foo/bar/bazoo",
-			[]string{},
-		},
-		exp{
-			"z",
-			[]string{"zipzap"},
-		},
-	}
-
-	root := r.Root()
-	for idx, test := range cases {
-		iter := root.Iterator()
-		if test.inp != "" {
-			iter.SeekPrefix([]byte(test.inp))
-		}
-
-		// Consume all the keys
-		out := []string{}
-		for {
-			key, _, ok := iter.Next()
-			if !ok {
-				break
-			}
-			out = append(out, string(key))
-		}
-		if !reflect.DeepEqual(out, test.out) {
-			t.Fatalf("mis-match: %d %v %v", idx, out, test.out)
-		}
-	}
-}
-
-func TestMergeChildNilEdges(t *testing.T) {
-	r := New()
-	r, _, _ = r.Insert([]byte("foobar"), 42)
-	r, _, _ = r.Insert([]byte("foozip"), 43)
-	r, _, _ = r.Delete([]byte("foobar"))
-
-	root := r.Root()
-	out := []string{}
-	fn := func(k []byte, v interface{}) bool {
-		out = append(out, string(k))
-		return false
-	}
-	root.Walk(fn)
-
-	expect := []string{"foozip"}
-	sort.Strings(out)
-	sort.Strings(expect)
-	if !reflect.DeepEqual(out, expect) {
-		t.Fatalf("mis-match: %v %v", out, expect)
-	}
-}
-
-func TestMergeChildVisibility(t *testing.T) {
-	r := New()
-	r, _, _ = r.Insert([]byte("foobar"), 42)
-	r, _, _ = r.Insert([]byte("foobaz"), 43)
-	r, _, _ = r.Insert([]byte("foozip"), 10)
-
-	txn1 := r.Txn()
-	txn2 := r.Txn()
-
-	// Ensure we get the expected value foobar and foobaz
-	if val, ok := txn1.Get([]byte("foobar")); !ok || val != 42 {
-		t.Fatalf("bad: %v", val)
-	}
-	if val, ok := txn1.Get([]byte("foobaz")); !ok || val != 43 {
-		t.Fatalf("bad: %v", val)
-	}
-	if val, ok := txn2.Get([]byte("foobar")); !ok || val != 42 {
-		t.Fatalf("bad: %v", val)
-	}
-	if val, ok := txn2.Get([]byte("foobaz")); !ok || val != 43 {
-		t.Fatalf("bad: %v", val)
-	}
-
-	// Delete of foozip will cause a merge child between the
-	// "foo" and "ba" nodes.
-	if val, ok := txn2.Delete([]byte("foozip")); !ok || val != 10 {
-		t.Fatalf("bad: %v", val)
-	}
-
-	// Insert of "foobaz" will update the slice of the "fooba" node
-	// in-place to point to the new "foobaz" node. This in-place update
-	// will cause the visibility of the update to leak into txn1 (prior
-	// to the fix).
-	if val, ok := txn2.Insert([]byte("foobaz"), 44); !ok || val != 43 {
-		t.Fatalf("bad: %v", val)
-	}
-
-	// Ensure we get the expected value foobar and foobaz
-	if val, ok := txn1.Get([]byte("foobar")); !ok || val != 42 {
-		t.Fatalf("bad: %v", val)
-	}
-	if val, ok := txn1.Get([]byte("foobaz")); !ok || val != 43 {
-		t.Fatalf("bad: %v", val)
-	}
-	if val, ok := txn2.Get([]byte("foobar")); !ok || val != 42 {
-		t.Fatalf("bad: %v", val)
-	}
-	if val, ok := txn2.Get([]byte("foobaz")); !ok || val != 44 {
-		t.Fatalf("bad: %v", val)
-	}
-
-	// Commit txn2
-	r = txn2.Commit()
-
-	// Ensure we get the expected value foobar and foobaz
-	if val, ok := txn1.Get([]byte("foobar")); !ok || val != 42 {
-		t.Fatalf("bad: %v", val)
-	}
-	if val, ok := txn1.Get([]byte("foobaz")); !ok || val != 43 {
-		t.Fatalf("bad: %v", val)
-	}
-	if val, ok := r.Get([]byte("foobar")); !ok || val != 42 {
-		t.Fatalf("bad: %v", val)
-	}
-	if val, ok := r.Get([]byte("foobaz")); !ok || val != 44 {
-		t.Fatalf("bad: %v", val)
-	}
-}
-
-// isClosed returns true if the given channel is closed.
-func isClosed(ch chan struct{}) bool {
-	select {
-	case <-ch:
-		return true
-	default:
-		return false
-	}
-}
-
-// hasAnyClosedMutateCh scans the given tree and returns true if there are any
-// closed mutate channels on any nodes or leaves.
-func hasAnyClosedMutateCh(r *Tree) bool {
-	for iter := r.root.rawIterator(); iter.Front() != nil; iter.Next() {
-		n := iter.Front()
-		if isClosed(n.mutateCh) {
-			return true
-		}
-		if n.isLeaf() && isClosed(n.leaf.mutateCh) {
-			return true
-		}
-	}
-	return false
-}
-
-func TestTrackMutate_SeekPrefixWatch(t *testing.T) {
-	for i := 0; i < 3; i++ {
-		r := New()
-
-		keys := []string{
-			"foo/bar/baz",
-			"foo/baz/bar",
-			"foo/zip/zap",
-			"foobar",
-			"zipzap",
-		}
-		for _, k := range keys {
-			r, _, _ = r.Insert([]byte(k), nil)
-		}
-		if r.Len() != len(keys) {
-			t.Fatalf("bad len: %v %v", r.Len(), len(keys))
-		}
-
-		iter := r.Root().Iterator()
-		rootWatch := iter.SeekPrefixWatch([]byte("nope"))
-
-		iter = r.Root().Iterator()
-		parentWatch := iter.SeekPrefixWatch([]byte("foo"))
-
-		iter = r.Root().Iterator()
-		leafWatch := iter.SeekPrefixWatch([]byte("foobar"))
-
-		iter = r.Root().Iterator()
-		missingWatch := iter.SeekPrefixWatch([]byte("foobarbaz"))
-
-		iter = r.Root().Iterator()
-		otherWatch := iter.SeekPrefixWatch([]byte("foo/b"))
-
-		// Write to a sub-child should trigger the leaf!
-		txn := r.Txn()
-		txn.TrackMutate(true)
-		txn.Insert([]byte("foobarbaz"), nil)
-		switch i {
-		case 0:
-			r = txn.Commit()
-		case 1:
-			r = txn.CommitOnly()
-			txn.Notify()
-		default:
-			r = txn.CommitOnly()
-			txn.slowNotify()
-		}
-		if hasAnyClosedMutateCh(r) {
-			t.Fatalf("bad")
-		}
-
-		// Verify root and parent triggered, and leaf affected
-		select {
-		case <-rootWatch:
-		default:
-			t.Fatalf("bad")
-		}
-		select {
-		case <-parentWatch:
-		default:
-			t.Fatalf("bad")
-		}
-		select {
-		case <-leafWatch:
-		default:
-			t.Fatalf("bad")
-		}
-		select {
-		case <-missingWatch:
-		default:
-			t.Fatalf("bad")
-		}
-		select {
-		case <-otherWatch:
-			t.Fatalf("bad")
-		default:
-		}
-
-		iter = r.Root().Iterator()
-		rootWatch = iter.SeekPrefixWatch([]byte("nope"))
-
-		iter = r.Root().Iterator()
-		parentWatch = iter.SeekPrefixWatch([]byte("foo"))
-
-		iter = r.Root().Iterator()
-		leafWatch = iter.SeekPrefixWatch([]byte("foobar"))
-
-		iter = r.Root().Iterator()
-		missingWatch = iter.SeekPrefixWatch([]byte("foobarbaz"))
-
-		// Delete to a sub-child should trigger the leaf!
-		txn = r.Txn()
-		txn.TrackMutate(true)
-		txn.Delete([]byte("foobarbaz"))
-		switch i {
-		case 0:
-			r = txn.Commit()
-		case 1:
-			r = txn.CommitOnly()
-			txn.Notify()
-		default:
-			r = txn.CommitOnly()
-			txn.slowNotify()
-		}
-		if hasAnyClosedMutateCh(r) {
-			t.Fatalf("bad")
-		}
-
-		// Verify root and parent triggered, and leaf affected
-		select {
-		case <-rootWatch:
-		default:
-			t.Fatalf("bad")
-		}
-		select {
-		case <-parentWatch:
-		default:
-			t.Fatalf("bad")
-		}
-		select {
-		case <-leafWatch:
-		default:
-			t.Fatalf("bad")
-		}
-		select {
-		case <-missingWatch:
-		default:
-			t.Fatalf("bad")
-		}
-		select {
-		case <-otherWatch:
-			t.Fatalf("bad")
-		default:
-		}
-	}
-}
-
-func TestTrackMutate_GetWatch(t *testing.T) {
-	for i := 0; i < 3; i++ {
-		r := New()
-
-		keys := []string{
-			"foo/bar/baz",
-			"foo/baz/bar",
-			"foo/zip/zap",
-			"foobar",
-			"zipzap",
-		}
-		for _, k := range keys {
-			r, _, _ = r.Insert([]byte(k), nil)
-		}
-		if r.Len() != len(keys) {
-			t.Fatalf("bad len: %v %v", r.Len(), len(keys))
-		}
-
-		rootWatch, _, ok := r.Root().GetWatch(nil)
-		if rootWatch == nil {
-			t.Fatalf("bad")
-		}
-
-		parentWatch, _, ok := r.Root().GetWatch([]byte("foo"))
-		if parentWatch == nil {
-			t.Fatalf("bad")
-		}
-
-		leafWatch, _, ok := r.Root().GetWatch([]byte("foobar"))
-		if !ok {
-			t.Fatalf("should be found")
-		}
-		if leafWatch == nil {
-			t.Fatalf("bad")
-		}
-
-		otherWatch, _, ok := r.Root().GetWatch([]byte("foo/b"))
-		if otherWatch == nil {
-			t.Fatalf("bad")
-		}
-
-		// Write to a sub-child should not trigger the leaf!
-		txn := r.Txn()
-		txn.TrackMutate(true)
-		txn.Insert([]byte("foobarbaz"), nil)
-		switch i {
-		case 0:
-			r = txn.Commit()
-		case 1:
-			r = txn.CommitOnly()
-			txn.Notify()
-		default:
-			r = txn.CommitOnly()
-			txn.slowNotify()
-		}
-		if hasAnyClosedMutateCh(r) {
-			t.Fatalf("bad")
-		}
-
-		// Verify root and parent triggered, not leaf affected
-		select {
-		case <-rootWatch:
-		default:
-			t.Fatalf("bad")
-		}
-		select {
-		case <-parentWatch:
-		default:
-			t.Fatalf("bad")
-		}
-		select {
-		case <-leafWatch:
-			t.Fatalf("bad")
-		default:
-		}
-		select {
-		case <-otherWatch:
-			t.Fatalf("bad")
-		default:
-		}
-
-		// Setup new watchers
-		rootWatch, _, ok = r.Root().GetWatch(nil)
-		if rootWatch == nil {
-			t.Fatalf("bad")
-		}
-
-		parentWatch, _, ok = r.Root().GetWatch([]byte("foo"))
-		if parentWatch == nil {
-			t.Fatalf("bad")
-		}
-
-		// Write to a exactly leaf should trigger the leaf!
-		txn = r.Txn()
-		txn.TrackMutate(true)
-		txn.Insert([]byte("foobar"), nil)
-		switch i {
-		case 0:
-			r = txn.Commit()
-		case 1:
-			r = txn.CommitOnly()
-			txn.Notify()
-		default:
-			r = txn.CommitOnly()
-			txn.slowNotify()
-		}
-		if hasAnyClosedMutateCh(r) {
-			t.Fatalf("bad")
-		}
-
-		select {
-		case <-rootWatch:
-		default:
-			t.Fatalf("bad")
-		}
-		select {
-		case <-parentWatch:
-		default:
-			t.Fatalf("bad")
-		}
-		select {
-		case <-leafWatch:
-		default:
-			t.Fatalf("bad")
-		}
-		select {
-		case <-otherWatch:
-			t.Fatalf("bad")
-		default:
-		}
-
-		// Setup all the watchers again
-		rootWatch, _, ok = r.Root().GetWatch(nil)
-		if rootWatch == nil {
-			t.Fatalf("bad")
-		}
-
-		parentWatch, _, ok = r.Root().GetWatch([]byte("foo"))
-		if parentWatch == nil {
-			t.Fatalf("bad")
-		}
-
-		leafWatch, _, ok = r.Root().GetWatch([]byte("foobar"))
-		if !ok {
-			t.Fatalf("should be found")
-		}
-		if leafWatch == nil {
-			t.Fatalf("bad")
-		}
-
-		// Delete to a sub-child should not trigger the leaf!
-		txn = r.Txn()
-		txn.TrackMutate(true)
-		txn.Delete([]byte("foobarbaz"))
-		switch i {
-		case 0:
-			r = txn.Commit()
-		case 1:
-			r = txn.CommitOnly()
-			txn.Notify()
-		default:
-			r = txn.CommitOnly()
-			txn.slowNotify()
-		}
-		if hasAnyClosedMutateCh(r) {
-			t.Fatalf("bad")
-		}
-
-		// Verify root and parent triggered, not leaf affected
-		select {
-		case <-rootWatch:
-		default:
-			t.Fatalf("bad")
-		}
-		select {
-		case <-parentWatch:
-		default:
-			t.Fatalf("bad")
-		}
-		select {
-		case <-leafWatch:
-			t.Fatalf("bad")
-		default:
-		}
-		select {
-		case <-otherWatch:
-			t.Fatalf("bad")
-		default:
-		}
-
-		// Setup new watchers
-		rootWatch, _, ok = r.Root().GetWatch(nil)
-		if rootWatch == nil {
-			t.Fatalf("bad")
-		}
-
-		parentWatch, _, ok = r.Root().GetWatch([]byte("foo"))
-		if parentWatch == nil {
-			t.Fatalf("bad")
-		}
-
-		// Write to a exactly leaf should trigger the leaf!
-		txn = r.Txn()
-		txn.TrackMutate(true)
-		txn.Delete([]byte("foobar"))
-		switch i {
-		case 0:
-			r = txn.Commit()
-		case 1:
-			r = txn.CommitOnly()
-			txn.Notify()
-		default:
-			r = txn.CommitOnly()
-			txn.slowNotify()
-		}
-		if hasAnyClosedMutateCh(r) {
-			t.Fatalf("bad")
-		}
-
-		select {
-		case <-rootWatch:
-		default:
-			t.Fatalf("bad")
-		}
-		select {
-		case <-parentWatch:
-		default:
-			t.Fatalf("bad")
-		}
-		select {
-		case <-leafWatch:
-		default:
-			t.Fatalf("bad")
-		}
-		select {
-		case <-otherWatch:
-			t.Fatalf("bad")
-		default:
-		}
-	}
-}
-
-func TestTrackMutate_HugeTxn(t *testing.T) {
-	r := New()
-
-	keys := []string{
-		"foo/bar/baz",
-		"foo/baz/bar",
-		"foo/zip/zap",
-		"foobar",
-		"nochange",
-	}
-	for i := 0; i < defaultModifiedCache; i++ {
-		key := fmt.Sprintf("aaa%d", i)
-		r, _, _ = r.Insert([]byte(key), nil)
-	}
-	for _, k := range keys {
-		r, _, _ = r.Insert([]byte(k), nil)
-	}
-	for i := 0; i < defaultModifiedCache; i++ {
-		key := fmt.Sprintf("zzz%d", i)
-		r, _, _ = r.Insert([]byte(key), nil)
-	}
-	if r.Len() != len(keys)+2*defaultModifiedCache {
-		t.Fatalf("bad len: %v %v", r.Len(), len(keys))
-	}
-
-	rootWatch, _, ok := r.Root().GetWatch(nil)
-	if rootWatch == nil {
-		t.Fatalf("bad")
-	}
-
-	parentWatch, _, ok := r.Root().GetWatch([]byte("foo"))
-	if parentWatch == nil {
-		t.Fatalf("bad")
-	}
-
-	leafWatch, _, ok := r.Root().GetWatch([]byte("foobar"))
-	if !ok {
-		t.Fatalf("should be found")
-	}
-	if leafWatch == nil {
-		t.Fatalf("bad")
-	}
-
-	nopeWatch, _, ok := r.Root().GetWatch([]byte("nochange"))
-	if !ok {
-		t.Fatalf("should be found")
-	}
-	if nopeWatch == nil {
-		t.Fatalf("bad")
-	}
-
-	beforeWatch, _, ok := r.Root().GetWatch([]byte("aaa123"))
-	if beforeWatch == nil {
-		t.Fatalf("bad")
-	}
-
-	afterWatch, _, ok := r.Root().GetWatch([]byte("zzz123"))
-	if afterWatch == nil {
-		t.Fatalf("bad")
-	}
-
-	// Start the transaction.
-	txn := r.Txn()
-	txn.TrackMutate(true)
-
-	// Add new nodes on both sides of the tree and delete enough nodes to
-	// overflow the tracking.
-	txn.Insert([]byte("aaa"), nil)
-	for i := 0; i < defaultModifiedCache; i++ {
-		key := fmt.Sprintf("aaa%d", i)
-		txn.Delete([]byte(key))
-	}
-	for i := 0; i < defaultModifiedCache; i++ {
-		key := fmt.Sprintf("zzz%d", i)
-		txn.Delete([]byte(key))
-	}
-	txn.Insert([]byte("zzz"), nil)
-
-	// Hit the leaf, and add a child so we make multiple mutations to the
-	// same node.
-	txn.Insert([]byte("foobar"), nil)
-	txn.Insert([]byte("foobarbaz"), nil)
-
-	// Commit and make sure we overflowed but didn't take on extra stuff.
-	r = txn.CommitOnly()
-	if !txn.trackOverflow || txn.trackChannels != nil {
-		t.Fatalf("bad")
-	}
-
-	// Now do the trigger.
-	txn.Notify()
-
-	// Make sure no closed channels escaped the transaction.
-	if hasAnyClosedMutateCh(r) {
-		t.Fatalf("bad")
-	}
-
-	// Verify the watches fired as expected.
-	select {
-	case <-rootWatch:
-	default:
-		t.Fatalf("bad")
-	}
-	select {
-	case <-parentWatch:
-	default:
-		t.Fatalf("bad")
-	}
-	select {
-	case <-leafWatch:
-	default:
-		t.Fatalf("bad")
-	}
-	select {
-	case <-nopeWatch:
-		t.Fatalf("bad")
-	default:
-	}
-	select {
-	case <-beforeWatch:
-	default:
-		t.Fatalf("bad")
-	}
-	select {
-	case <-afterWatch:
-	default:
-		t.Fatalf("bad")
-	}
-}
-
-func TestTrackMutate_mergeChild(t *testing.T) {
-	// This case does a delete of the "acb" leaf, which causes the "aca"
-	// leaf to get merged with the old "ac" node:
-	//
-	//    [root]                [root]
-	//      |a                    |a
-	//    [node]                [node]
-	//   b/    \c              b/    \c
-	//  (ab)  [node]          (ab)  (aca)
-	//       a/    \b
-	//     (aca)  (acb)
-	//
-	for i := 0; i < 3; i++ {
-		r := New()
-		r, _, _ = r.Insert([]byte("ab"), nil)
-		r, _, _ = r.Insert([]byte("aca"), nil)
-		r, _, _ = r.Insert([]byte("acb"), nil)
-		snapIter := r.root.rawIterator()
-
-		// Run through all notification methods as there were bugs in
-		// both that affected these operations. The slowNotify path
-		// would detect copied but otherwise identical leaves as changed
-		// and wrongly close channels. The normal path would fail to
-		// notify on a child node that had been merged.
-		txn := r.Txn()
-		txn.TrackMutate(true)
-		txn.Delete([]byte("acb"))
-		switch i {
-		case 0:
-			r = txn.Commit()
-		case 1:
-			r = txn.CommitOnly()
-			txn.Notify()
-		default:
-			r = txn.CommitOnly()
-			txn.slowNotify()
-		}
-		if hasAnyClosedMutateCh(r) {
-			t.Fatalf("bad")
-		}
-
-		// Run through the old tree and make sure the exact channels we
-		// expected were closed.
-		for ; snapIter.Front() != nil; snapIter.Next() {
-			n := snapIter.Front()
-			path := snapIter.Path()
-			switch path {
-			case "", "a", "ac": // parent nodes all change
-				if !isClosed(n.mutateCh) || n.leaf != nil {
-					t.Fatalf("bad")
-				}
-			case "ab": // unrelated node / leaf sees no change
-				if isClosed(n.mutateCh) || isClosed(n.leaf.mutateCh) {
-					t.Fatalf("bad")
-				}
-			case "aca": // this node gets merged, but the leaf doesn't change
-				if !isClosed(n.mutateCh) || isClosed(n.leaf.mutateCh) {
-					t.Fatalf("bad")
-				}
-			case "acb": // this node / leaf gets deleted
-				if !isClosed(n.mutateCh) || !isClosed(n.leaf.mutateCh) {
-					t.Fatalf("bad")
-				}
-			default:
-				t.Fatalf("bad: %s", path)
-			}
-		}
-	}
-}
-
-func TestTrackMutate_cachedNodeChange(t *testing.T) {
-	// This case does a delete of the "acb" leaf, which causes the "aca"
-	// leaf to get merged with the old "ac" node:
-	//
-	//    [root]                [root]
-	//      |a                    |a
-	//    [node]                [node]
-	//   b/    \c              b/    \c
-	//  (ab)  [node]          (ab)  (aca*) <- this leaf gets modified
-	//       a/    \b                         post-merge
-	//     (aca)  (acb)
-	//
-	// Then it makes a modification to the "aca" leaf on a node that will
-	// be in the cache, so this makes sure that the leaf watch fires.
-	for i := 0; i < 3; i++ {
-		r := New()
-		r, _, _ = r.Insert([]byte("ab"), nil)
-		r, _, _ = r.Insert([]byte("aca"), nil)
-		r, _, _ = r.Insert([]byte("acb"), nil)
-		snapIter := r.root.rawIterator()
-
-		txn := r.Txn()
-		txn.TrackMutate(true)
-		txn.Delete([]byte("acb"))
-		txn.Insert([]byte("aca"), nil)
-		switch i {
-		case 0:
-			r = txn.Commit()
-		case 1:
-			r = txn.CommitOnly()
-			txn.Notify()
-		default:
-			r = txn.CommitOnly()
-			txn.slowNotify()
-		}
-		if hasAnyClosedMutateCh(r) {
-			t.Fatalf("bad")
-		}
-
-		// Run through the old tree and make sure the exact channels we
-		// expected were closed.
-		for ; snapIter.Front() != nil; snapIter.Next() {
-			n := snapIter.Front()
-			path := snapIter.Path()
-			switch path {
-			case "", "a", "ac": // parent nodes all change
-				if !isClosed(n.mutateCh) || n.leaf != nil {
-					t.Fatalf("bad")
-				}
-			case "ab": // unrelated node / leaf sees no change
-				if isClosed(n.mutateCh) || isClosed(n.leaf.mutateCh) {
-					t.Fatalf("bad")
-				}
-			case "aca": // merge changes the node, then we update the leaf
-				if !isClosed(n.mutateCh) || !isClosed(n.leaf.mutateCh) {
-					t.Fatalf("bad")
-				}
-			case "acb": // this node / leaf gets deleted
-				if !isClosed(n.mutateCh) || !isClosed(n.leaf.mutateCh) {
-					t.Fatalf("bad")
-				}
-			default:
-				t.Fatalf("bad: %s", path)
-			}
-		}
-	}
-}
-
-func TestLenTxn(t *testing.T) {
-	r := New()
-
-	if r.Len() != 0 {
-		t.Fatalf("not starting with empty tree")
-	}
-
-	txn := r.Txn()
-	keys := []string{
-		"foo/bar/baz",
-		"foo/baz/bar",
-		"foo/zip/zap",
-		"foobar",
-		"nochange",
-	}
-	for _, k := range keys {
-		txn.Insert([]byte(k), nil)
-	}
-	r = txn.Commit()
-
-	if r.Len() != len(keys) {
-		t.Fatalf("bad: expected %d, got %d", len(keys), r.Len())
-	}
-
-	txn = r.Txn()
-	for _, k := range keys {
-		txn.Delete([]byte(k))
-	}
-	r = txn.Commit()
-
-	if r.Len() != 0 {
-		t.Fatalf("tree len should be zero, got %d", r.Len())
-	}
-}
diff --git a/vendor/github.com/hashicorp/golang-lru/2q_test.go b/vendor/github.com/hashicorp/golang-lru/2q_test.go
deleted file mode 100644
index 1b0f3518..00000000
--- a/vendor/github.com/hashicorp/golang-lru/2q_test.go
+++ /dev/null
@@ -1,306 +0,0 @@
-package lru
-
-import (
-	"math/rand"
-	"testing"
-)
-
-func Benchmark2Q_Rand(b *testing.B) {
-	l, err := New2Q(8192)
-	if err != nil {
-		b.Fatalf("err: %v", err)
-	}
-
-	trace := make([]int64, b.N*2)
-	for i := 0; i < b.N*2; i++ {
-		trace[i] = rand.Int63() % 32768
-	}
-
-	b.ResetTimer()
-
-	var hit, miss int
-	for i := 0; i < 2*b.N; i++ {
-		if i%2 == 0 {
-			l.Add(trace[i], trace[i])
-		} else {
-			_, ok := l.Get(trace[i])
-			if ok {
-				hit++
-			} else {
-				miss++
-			}
-		}
-	}
-	b.Logf("hit: %d miss: %d ratio: %f", hit, miss, float64(hit)/float64(miss))
-}
-
-func Benchmark2Q_Freq(b *testing.B) {
-	l, err := New2Q(8192)
-	if err != nil {
-		b.Fatalf("err: %v", err)
-	}
-
-	trace := make([]int64, b.N*2)
-	for i := 0; i < b.N*2; i++ {
-		if i%2 == 0 {
-			trace[i] = rand.Int63() % 16384
-		} else {
-			trace[i] = rand.Int63() % 32768
-		}
-	}
-
-	b.ResetTimer()
-
-	for i := 0; i < b.N; i++ {
-		l.Add(trace[i], trace[i])
-	}
-	var hit, miss int
-	for i := 0; i < b.N; i++ {
-		_, ok := l.Get(trace[i])
-		if ok {
-			hit++
-		} else {
-			miss++
-		}
-	}
-	b.Logf("hit: %d miss: %d ratio: %f", hit, miss, float64(hit)/float64(miss))
-}
-
-func Test2Q_RandomOps(t *testing.T) {
-	size := 128
-	l, err := New2Q(128)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	n := 200000
-	for i := 0; i < n; i++ {
-		key := rand.Int63() % 512
-		r := rand.Int63()
-		switch r % 3 {
-		case 0:
-			l.Add(key, key)
-		case 1:
-			l.Get(key)
-		case 2:
-			l.Remove(key)
-		}
-
-		if l.recent.Len()+l.frequent.Len() > size {
-			t.Fatalf("bad: recent: %d freq: %d",
-				l.recent.Len(), l.frequent.Len())
-		}
-	}
-}
-
-func Test2Q_Get_RecentToFrequent(t *testing.T) {
-	l, err := New2Q(128)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Touch all the entries, should be in t1
-	for i := 0; i < 128; i++ {
-		l.Add(i, i)
-	}
-	if n := l.recent.Len(); n != 128 {
-		t.Fatalf("bad: %d", n)
-	}
-	if n := l.frequent.Len(); n != 0 {
-		t.Fatalf("bad: %d", n)
-	}
-
-	// Get should upgrade to t2
-	for i := 0; i < 128; i++ {
-		_, ok := l.Get(i)
-		if !ok {
-			t.Fatalf("missing: %d", i)
-		}
-	}
-	if n := l.recent.Len(); n != 0 {
-		t.Fatalf("bad: %d", n)
-	}
-	if n := l.frequent.Len(); n != 128 {
-		t.Fatalf("bad: %d", n)
-	}
-
-	// Get be from t2
-	for i := 0; i < 128; i++ {
-		_, ok := l.Get(i)
-		if !ok {
-			t.Fatalf("missing: %d", i)
-		}
-	}
-	if n := l.recent.Len(); n != 0 {
-		t.Fatalf("bad: %d", n)
-	}
-	if n := l.frequent.Len(); n != 128 {
-		t.Fatalf("bad: %d", n)
-	}
-}
-
-func Test2Q_Add_RecentToFrequent(t *testing.T) {
-	l, err := New2Q(128)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Add initially to recent
-	l.Add(1, 1)
-	if n := l.recent.Len(); n != 1 {
-		t.Fatalf("bad: %d", n)
-	}
-	if n := l.frequent.Len(); n != 0 {
-		t.Fatalf("bad: %d", n)
-	}
-
-	// Add should upgrade to frequent
-	l.Add(1, 1)
-	if n := l.recent.Len(); n != 0 {
-		t.Fatalf("bad: %d", n)
-	}
-	if n := l.frequent.Len(); n != 1 {
-		t.Fatalf("bad: %d", n)
-	}
-
-	// Add should remain in frequent
-	l.Add(1, 1)
-	if n := l.recent.Len(); n != 0 {
-		t.Fatalf("bad: %d", n)
-	}
-	if n := l.frequent.Len(); n != 1 {
-		t.Fatalf("bad: %d", n)
-	}
-}
-
-func Test2Q_Add_RecentEvict(t *testing.T) {
-	l, err := New2Q(4)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Add 1,2,3,4,5 -> Evict 1
-	l.Add(1, 1)
-	l.Add(2, 2)
-	l.Add(3, 3)
-	l.Add(4, 4)
-	l.Add(5, 5)
-	if n := l.recent.Len(); n != 4 {
-		t.Fatalf("bad: %d", n)
-	}
-	if n := l.recentEvict.Len(); n != 1 {
-		t.Fatalf("bad: %d", n)
-	}
-	if n := l.frequent.Len(); n != 0 {
-		t.Fatalf("bad: %d", n)
-	}
-
-	// Pull in the recently evicted
-	l.Add(1, 1)
-	if n := l.recent.Len(); n != 3 {
-		t.Fatalf("bad: %d", n)
-	}
-	if n := l.recentEvict.Len(); n != 1 {
-		t.Fatalf("bad: %d", n)
-	}
-	if n := l.frequent.Len(); n != 1 {
-		t.Fatalf("bad: %d", n)
-	}
-
-	// Add 6, should cause another recent evict
-	l.Add(6, 6)
-	if n := l.recent.Len(); n != 3 {
-		t.Fatalf("bad: %d", n)
-	}
-	if n := l.recentEvict.Len(); n != 2 {
-		t.Fatalf("bad: %d", n)
-	}
-	if n := l.frequent.Len(); n != 1 {
-		t.Fatalf("bad: %d", n)
-	}
-}
-
-func Test2Q(t *testing.T) {
-	l, err := New2Q(128)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	for i := 0; i < 256; i++ {
-		l.Add(i, i)
-	}
-	if l.Len() != 128 {
-		t.Fatalf("bad len: %v", l.Len())
-	}
-
-	for i, k := range l.Keys() {
-		if v, ok := l.Get(k); !ok || v != k || v != i+128 {
-			t.Fatalf("bad key: %v", k)
-		}
-	}
-	for i := 0; i < 128; i++ {
-		_, ok := l.Get(i)
-		if ok {
-			t.Fatalf("should be evicted")
-		}
-	}
-	for i := 128; i < 256; i++ {
-		_, ok := l.Get(i)
-		if !ok {
-			t.Fatalf("should not be evicted")
-		}
-	}
-	for i := 128; i < 192; i++ {
-		l.Remove(i)
-		_, ok := l.Get(i)
-		if ok {
-			t.Fatalf("should be deleted")
-		}
-	}
-
-	l.Purge()
-	if l.Len() != 0 {
-		t.Fatalf("bad len: %v", l.Len())
-	}
-	if _, ok := l.Get(200); ok {
-		t.Fatalf("should contain nothing")
-	}
-}
-
-// Test that Contains doesn't update recent-ness
-func Test2Q_Contains(t *testing.T) {
-	l, err := New2Q(2)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	l.Add(1, 1)
-	l.Add(2, 2)
-	if !l.Contains(1) {
-		t.Errorf("1 should be contained")
-	}
-
-	l.Add(3, 3)
-	if l.Contains(1) {
-		t.Errorf("Contains should not have updated recent-ness of 1")
-	}
-}
-
-// Test that Peek doesn't update recent-ness
-func Test2Q_Peek(t *testing.T) {
-	l, err := New2Q(2)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	l.Add(1, 1)
-	l.Add(2, 2)
-	if v, ok := l.Peek(1); !ok || v != 1 {
-		t.Errorf("1 should be set to 1: %v, %v", v, ok)
-	}
-
-	l.Add(3, 3)
-	if l.Contains(1) {
-		t.Errorf("should not have updated recent-ness of 1")
-	}
-}
diff --git a/vendor/github.com/hashicorp/golang-lru/arc_test.go b/vendor/github.com/hashicorp/golang-lru/arc_test.go
deleted file mode 100644
index e2d9b68c..00000000
--- a/vendor/github.com/hashicorp/golang-lru/arc_test.go
+++ /dev/null
@@ -1,377 +0,0 @@
-package lru
-
-import (
-	"math/rand"
-	"testing"
-	"time"
-)
-
-func init() {
-	rand.Seed(time.Now().Unix())
-}
-
-func BenchmarkARC_Rand(b *testing.B) {
-	l, err := NewARC(8192)
-	if err != nil {
-		b.Fatalf("err: %v", err)
-	}
-
-	trace := make([]int64, b.N*2)
-	for i := 0; i < b.N*2; i++ {
-		trace[i] = rand.Int63() % 32768
-	}
-
-	b.ResetTimer()
-
-	var hit, miss int
-	for i := 0; i < 2*b.N; i++ {
-		if i%2 == 0 {
-			l.Add(trace[i], trace[i])
-		} else {
-			_, ok := l.Get(trace[i])
-			if ok {
-				hit++
-			} else {
-				miss++
-			}
-		}
-	}
-	b.Logf("hit: %d miss: %d ratio: %f", hit, miss, float64(hit)/float64(miss))
-}
-
-func BenchmarkARC_Freq(b *testing.B) {
-	l, err := NewARC(8192)
-	if err != nil {
-		b.Fatalf("err: %v", err)
-	}
-
-	trace := make([]int64, b.N*2)
-	for i := 0; i < b.N*2; i++ {
-		if i%2 == 0 {
-			trace[i] = rand.Int63() % 16384
-		} else {
-			trace[i] = rand.Int63() % 32768
-		}
-	}
-
-	b.ResetTimer()
-
-	for i := 0; i < b.N; i++ {
-		l.Add(trace[i], trace[i])
-	}
-	var hit, miss int
-	for i := 0; i < b.N; i++ {
-		_, ok := l.Get(trace[i])
-		if ok {
-			hit++
-		} else {
-			miss++
-		}
-	}
-	b.Logf("hit: %d miss: %d ratio: %f", hit, miss, float64(hit)/float64(miss))
-}
-
-func TestARC_RandomOps(t *testing.T) {
-	size := 128
-	l, err := NewARC(128)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	n := 200000
-	for i := 0; i < n; i++ {
-		key := rand.Int63() % 512
-		r := rand.Int63()
-		switch r % 3 {
-		case 0:
-			l.Add(key, key)
-		case 1:
-			l.Get(key)
-		case 2:
-			l.Remove(key)
-		}
-
-		if l.t1.Len()+l.t2.Len() > size {
-			t.Fatalf("bad: t1: %d t2: %d b1: %d b2: %d p: %d",
-				l.t1.Len(), l.t2.Len(), l.b1.Len(), l.b2.Len(), l.p)
-		}
-		if l.b1.Len()+l.b2.Len() > size {
-			t.Fatalf("bad: t1: %d t2: %d b1: %d b2: %d p: %d",
-				l.t1.Len(), l.t2.Len(), l.b1.Len(), l.b2.Len(), l.p)
-		}
-	}
-}
-
-func TestARC_Get_RecentToFrequent(t *testing.T) {
-	l, err := NewARC(128)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Touch all the entries, should be in t1
-	for i := 0; i < 128; i++ {
-		l.Add(i, i)
-	}
-	if n := l.t1.Len(); n != 128 {
-		t.Fatalf("bad: %d", n)
-	}
-	if n := l.t2.Len(); n != 0 {
-		t.Fatalf("bad: %d", n)
-	}
-
-	// Get should upgrade to t2
-	for i := 0; i < 128; i++ {
-		_, ok := l.Get(i)
-		if !ok {
-			t.Fatalf("missing: %d", i)
-		}
-	}
-	if n := l.t1.Len(); n != 0 {
-		t.Fatalf("bad: %d", n)
-	}
-	if n := l.t2.Len(); n != 128 {
-		t.Fatalf("bad: %d", n)
-	}
-
-	// Get be from t2
-	for i := 0; i < 128; i++ {
-		_, ok := l.Get(i)
-		if !ok {
-			t.Fatalf("missing: %d", i)
-		}
-	}
-	if n := l.t1.Len(); n != 0 {
-		t.Fatalf("bad: %d", n)
-	}
-	if n := l.t2.Len(); n != 128 {
-		t.Fatalf("bad: %d", n)
-	}
-}
-
-func TestARC_Add_RecentToFrequent(t *testing.T) {
-	l, err := NewARC(128)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Add initially to t1
-	l.Add(1, 1)
-	if n := l.t1.Len(); n != 1 {
-		t.Fatalf("bad: %d", n)
-	}
-	if n := l.t2.Len(); n != 0 {
-		t.Fatalf("bad: %d", n)
-	}
-
-	// Add should upgrade to t2
-	l.Add(1, 1)
-	if n := l.t1.Len(); n != 0 {
-		t.Fatalf("bad: %d", n)
-	}
-	if n := l.t2.Len(); n != 1 {
-		t.Fatalf("bad: %d", n)
-	}
-
-	// Add should remain in t2
-	l.Add(1, 1)
-	if n := l.t1.Len(); n != 0 {
-		t.Fatalf("bad: %d", n)
-	}
-	if n := l.t2.Len(); n != 1 {
-		t.Fatalf("bad: %d", n)
-	}
-}
-
-func TestARC_Adaptive(t *testing.T) {
-	l, err := NewARC(4)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	// Fill t1
-	for i := 0; i < 4; i++ {
-		l.Add(i, i)
-	}
-	if n := l.t1.Len(); n != 4 {
-		t.Fatalf("bad: %d", n)
-	}
-
-	// Move to t2
-	l.Get(0)
-	l.Get(1)
-	if n := l.t2.Len(); n != 2 {
-		t.Fatalf("bad: %d", n)
-	}
-
-	// Evict from t1
-	l.Add(4, 4)
-	if n := l.b1.Len(); n != 1 {
-		t.Fatalf("bad: %d", n)
-	}
-
-	// Current state
-	// t1 : (MRU) [4, 3] (LRU)
-	// t2 : (MRU) [1, 0] (LRU)
-	// b1 : (MRU) [2] (LRU)
-	// b2 : (MRU) [] (LRU)
-
-	// Add 2, should cause hit on b1
-	l.Add(2, 2)
-	if n := l.b1.Len(); n != 1 {
-		t.Fatalf("bad: %d", n)
-	}
-	if l.p != 1 {
-		t.Fatalf("bad: %d", l.p)
-	}
-	if n := l.t2.Len(); n != 3 {
-		t.Fatalf("bad: %d", n)
-	}
-
-	// Current state
-	// t1 : (MRU) [4] (LRU)
-	// t2 : (MRU) [2, 1, 0] (LRU)
-	// b1 : (MRU) [3] (LRU)
-	// b2 : (MRU) [] (LRU)
-
-	// Add 4, should migrate to t2
-	l.Add(4, 4)
-	if n := l.t1.Len(); n != 0 {
-		t.Fatalf("bad: %d", n)
-	}
-	if n := l.t2.Len(); n != 4 {
-		t.Fatalf("bad: %d", n)
-	}
-
-	// Current state
-	// t1 : (MRU) [] (LRU)
-	// t2 : (MRU) [4, 2, 1, 0] (LRU)
-	// b1 : (MRU) [3] (LRU)
-	// b2 : (MRU) [] (LRU)
-
-	// Add 4, should evict to b2
-	l.Add(5, 5)
-	if n := l.t1.Len(); n != 1 {
-		t.Fatalf("bad: %d", n)
-	}
-	if n := l.t2.Len(); n != 3 {
-		t.Fatalf("bad: %d", n)
-	}
-	if n := l.b2.Len(); n != 1 {
-		t.Fatalf("bad: %d", n)
-	}
-
-	// Current state
-	// t1 : (MRU) [5] (LRU)
-	// t2 : (MRU) [4, 2, 1] (LRU)
-	// b1 : (MRU) [3] (LRU)
-	// b2 : (MRU) [0] (LRU)
-
-	// Add 0, should decrease p
-	l.Add(0, 0)
-	if n := l.t1.Len(); n != 0 {
-		t.Fatalf("bad: %d", n)
-	}
-	if n := l.t2.Len(); n != 4 {
-		t.Fatalf("bad: %d", n)
-	}
-	if n := l.b1.Len(); n != 2 {
-		t.Fatalf("bad: %d", n)
-	}
-	if n := l.b2.Len(); n != 0 {
-		t.Fatalf("bad: %d", n)
-	}
-	if l.p != 0 {
-		t.Fatalf("bad: %d", l.p)
-	}
-
-	// Current state
-	// t1 : (MRU) [] (LRU)
-	// t2 : (MRU) [0, 4, 2, 1] (LRU)
-	// b1 : (MRU) [5, 3] (LRU)
-	// b2 : (MRU) [0] (LRU)
-}
-
-func TestARC(t *testing.T) {
-	l, err := NewARC(128)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	for i := 0; i < 256; i++ {
-		l.Add(i, i)
-	}
-	if l.Len() != 128 {
-		t.Fatalf("bad len: %v", l.Len())
-	}
-
-	for i, k := range l.Keys() {
-		if v, ok := l.Get(k); !ok || v != k || v != i+128 {
-			t.Fatalf("bad key: %v", k)
-		}
-	}
-	for i := 0; i < 128; i++ {
-		_, ok := l.Get(i)
-		if ok {
-			t.Fatalf("should be evicted")
-		}
-	}
-	for i := 128; i < 256; i++ {
-		_, ok := l.Get(i)
-		if !ok {
-			t.Fatalf("should not be evicted")
-		}
-	}
-	for i := 128; i < 192; i++ {
-		l.Remove(i)
-		_, ok := l.Get(i)
-		if ok {
-			t.Fatalf("should be deleted")
-		}
-	}
-
-	l.Purge()
-	if l.Len() != 0 {
-		t.Fatalf("bad len: %v", l.Len())
-	}
-	if _, ok := l.Get(200); ok {
-		t.Fatalf("should contain nothing")
-	}
-}
-
-// Test that Contains doesn't update recent-ness
-func TestARC_Contains(t *testing.T) {
-	l, err := NewARC(2)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	l.Add(1, 1)
-	l.Add(2, 2)
-	if !l.Contains(1) {
-		t.Errorf("1 should be contained")
-	}
-
-	l.Add(3, 3)
-	if l.Contains(1) {
-		t.Errorf("Contains should not have updated recent-ness of 1")
-	}
-}
-
-// Test that Peek doesn't update recent-ness
-func TestARC_Peek(t *testing.T) {
-	l, err := NewARC(2)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	l.Add(1, 1)
-	l.Add(2, 2)
-	if v, ok := l.Peek(1); !ok || v != 1 {
-		t.Errorf("1 should be set to 1: %v, %v", v, ok)
-	}
-
-	l.Add(3, 3)
-	if l.Contains(1) {
-		t.Errorf("should not have updated recent-ness of 1")
-	}
-}
diff --git a/vendor/github.com/hashicorp/golang-lru/lru_test.go b/vendor/github.com/hashicorp/golang-lru/lru_test.go
deleted file mode 100644
index e7e23505..00000000
--- a/vendor/github.com/hashicorp/golang-lru/lru_test.go
+++ /dev/null
@@ -1,221 +0,0 @@
-package lru
-
-import (
-	"math/rand"
-	"testing"
-)
-
-func BenchmarkLRU_Rand(b *testing.B) {
-	l, err := New(8192)
-	if err != nil {
-		b.Fatalf("err: %v", err)
-	}
-
-	trace := make([]int64, b.N*2)
-	for i := 0; i < b.N*2; i++ {
-		trace[i] = rand.Int63() % 32768
-	}
-
-	b.ResetTimer()
-
-	var hit, miss int
-	for i := 0; i < 2*b.N; i++ {
-		if i%2 == 0 {
-			l.Add(trace[i], trace[i])
-		} else {
-			_, ok := l.Get(trace[i])
-			if ok {
-				hit++
-			} else {
-				miss++
-			}
-		}
-	}
-	b.Logf("hit: %d miss: %d ratio: %f", hit, miss, float64(hit)/float64(miss))
-}
-
-func BenchmarkLRU_Freq(b *testing.B) {
-	l, err := New(8192)
-	if err != nil {
-		b.Fatalf("err: %v", err)
-	}
-
-	trace := make([]int64, b.N*2)
-	for i := 0; i < b.N*2; i++ {
-		if i%2 == 0 {
-			trace[i] = rand.Int63() % 16384
-		} else {
-			trace[i] = rand.Int63() % 32768
-		}
-	}
-
-	b.ResetTimer()
-
-	for i := 0; i < b.N; i++ {
-		l.Add(trace[i], trace[i])
-	}
-	var hit, miss int
-	for i := 0; i < b.N; i++ {
-		_, ok := l.Get(trace[i])
-		if ok {
-			hit++
-		} else {
-			miss++
-		}
-	}
-	b.Logf("hit: %d miss: %d ratio: %f", hit, miss, float64(hit)/float64(miss))
-}
-
-func TestLRU(t *testing.T) {
-	evictCounter := 0
-	onEvicted := func(k interface{}, v interface{}) {
-		if k != v {
-			t.Fatalf("Evict values not equal (%v!=%v)", k, v)
-		}
-		evictCounter++
-	}
-	l, err := NewWithEvict(128, onEvicted)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	for i := 0; i < 256; i++ {
-		l.Add(i, i)
-	}
-	if l.Len() != 128 {
-		t.Fatalf("bad len: %v", l.Len())
-	}
-
-	if evictCounter != 128 {
-		t.Fatalf("bad evict count: %v", evictCounter)
-	}
-
-	for i, k := range l.Keys() {
-		if v, ok := l.Get(k); !ok || v != k || v != i+128 {
-			t.Fatalf("bad key: %v", k)
-		}
-	}
-	for i := 0; i < 128; i++ {
-		_, ok := l.Get(i)
-		if ok {
-			t.Fatalf("should be evicted")
-		}
-	}
-	for i := 128; i < 256; i++ {
-		_, ok := l.Get(i)
-		if !ok {
-			t.Fatalf("should not be evicted")
-		}
-	}
-	for i := 128; i < 192; i++ {
-		l.Remove(i)
-		_, ok := l.Get(i)
-		if ok {
-			t.Fatalf("should be deleted")
-		}
-	}
-
-	l.Get(192) // expect 192 to be last key in l.Keys()
-
-	for i, k := range l.Keys() {
-		if (i < 63 && k != i+193) || (i == 63 && k != 192) {
-			t.Fatalf("out of order key: %v", k)
-		}
-	}
-
-	l.Purge()
-	if l.Len() != 0 {
-		t.Fatalf("bad len: %v", l.Len())
-	}
-	if _, ok := l.Get(200); ok {
-		t.Fatalf("should contain nothing")
-	}
-}
-
-// test that Add returns true/false if an eviction occurred
-func TestLRUAdd(t *testing.T) {
-	evictCounter := 0
-	onEvicted := func(k interface{}, v interface{}) {
-		evictCounter++
-	}
-
-	l, err := NewWithEvict(1, onEvicted)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	if l.Add(1, 1) == true || evictCounter != 0 {
-		t.Errorf("should not have an eviction")
-	}
-	if l.Add(2, 2) == false || evictCounter != 1 {
-		t.Errorf("should have an eviction")
-	}
-}
-
-// test that Contains doesn't update recent-ness
-func TestLRUContains(t *testing.T) {
-	l, err := New(2)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	l.Add(1, 1)
-	l.Add(2, 2)
-	if !l.Contains(1) {
-		t.Errorf("1 should be contained")
-	}
-
-	l.Add(3, 3)
-	if l.Contains(1) {
-		t.Errorf("Contains should not have updated recent-ness of 1")
-	}
-}
-
-// test that Contains doesn't update recent-ness
-func TestLRUContainsOrAdd(t *testing.T) {
-	l, err := New(2)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	l.Add(1, 1)
-	l.Add(2, 2)
-	contains, evict := l.ContainsOrAdd(1, 1)
-	if !contains {
-		t.Errorf("1 should be contained")
-	}
-	if evict {
-		t.Errorf("nothing should be evicted here")
-	}
-
-	l.Add(3, 3)
-	contains, evict = l.ContainsOrAdd(1, 1)
-	if contains {
-		t.Errorf("1 should not have been contained")
-	}
-	if !evict {
-		t.Errorf("an eviction should have occurred")
-	}
-	if !l.Contains(1) {
-		t.Errorf("now 1 should be contained")
-	}
-}
-
-// test that Peek doesn't update recent-ness
-func TestLRUPeek(t *testing.T) {
-	l, err := New(2)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	l.Add(1, 1)
-	l.Add(2, 2)
-	if v, ok := l.Peek(1); !ok || v != 1 {
-		t.Errorf("1 should be set to 1: %v, %v", v, ok)
-	}
-
-	l.Add(3, 3)
-	if l.Contains(1) {
-		t.Errorf("should not have updated recent-ness of 1")
-	}
-}
diff --git a/vendor/github.com/hashicorp/golang-lru/simplelru/lru_test.go b/vendor/github.com/hashicorp/golang-lru/simplelru/lru_test.go
deleted file mode 100644
index ca5676e1..00000000
--- a/vendor/github.com/hashicorp/golang-lru/simplelru/lru_test.go
+++ /dev/null
@@ -1,167 +0,0 @@
-package simplelru
-
-import "testing"
-
-func TestLRU(t *testing.T) {
-	evictCounter := 0
-	onEvicted := func(k interface{}, v interface{}) {
-		if k != v {
-			t.Fatalf("Evict values not equal (%v!=%v)", k, v)
-		}
-		evictCounter++
-	}
-	l, err := NewLRU(128, onEvicted)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	for i := 0; i < 256; i++ {
-		l.Add(i, i)
-	}
-	if l.Len() != 128 {
-		t.Fatalf("bad len: %v", l.Len())
-	}
-
-	if evictCounter != 128 {
-		t.Fatalf("bad evict count: %v", evictCounter)
-	}
-
-	for i, k := range l.Keys() {
-		if v, ok := l.Get(k); !ok || v != k || v != i+128 {
-			t.Fatalf("bad key: %v", k)
-		}
-	}
-	for i := 0; i < 128; i++ {
-		_, ok := l.Get(i)
-		if ok {
-			t.Fatalf("should be evicted")
-		}
-	}
-	for i := 128; i < 256; i++ {
-		_, ok := l.Get(i)
-		if !ok {
-			t.Fatalf("should not be evicted")
-		}
-	}
-	for i := 128; i < 192; i++ {
-		ok := l.Remove(i)
-		if !ok {
-			t.Fatalf("should be contained")
-		}
-		ok = l.Remove(i)
-		if ok {
-			t.Fatalf("should not be contained")
-		}
-		_, ok = l.Get(i)
-		if ok {
-			t.Fatalf("should be deleted")
-		}
-	}
-
-	l.Get(192) // expect 192 to be last key in l.Keys()
-
-	for i, k := range l.Keys() {
-		if (i < 63 && k != i+193) || (i == 63 && k != 192) {
-			t.Fatalf("out of order key: %v", k)
-		}
-	}
-
-	l.Purge()
-	if l.Len() != 0 {
-		t.Fatalf("bad len: %v", l.Len())
-	}
-	if _, ok := l.Get(200); ok {
-		t.Fatalf("should contain nothing")
-	}
-}
-
-func TestLRU_GetOldest_RemoveOldest(t *testing.T) {
-	l, err := NewLRU(128, nil)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-	for i := 0; i < 256; i++ {
-		l.Add(i, i)
-	}
-	k, _, ok := l.GetOldest()
-	if !ok {
-		t.Fatalf("missing")
-	}
-	if k.(int) != 128 {
-		t.Fatalf("bad: %v", k)
-	}
-
-	k, _, ok = l.RemoveOldest()
-	if !ok {
-		t.Fatalf("missing")
-	}
-	if k.(int) != 128 {
-		t.Fatalf("bad: %v", k)
-	}
-
-	k, _, ok = l.RemoveOldest()
-	if !ok {
-		t.Fatalf("missing")
-	}
-	if k.(int) != 129 {
-		t.Fatalf("bad: %v", k)
-	}
-}
-
-// Test that Add returns true/false if an eviction occurred
-func TestLRU_Add(t *testing.T) {
-	evictCounter := 0
-	onEvicted := func(k interface{}, v interface{}) {
-		evictCounter++
-	}
-
-	l, err := NewLRU(1, onEvicted)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	if l.Add(1, 1) == true || evictCounter != 0 {
-		t.Errorf("should not have an eviction")
-	}
-	if l.Add(2, 2) == false || evictCounter != 1 {
-		t.Errorf("should have an eviction")
-	}
-}
-
-// Test that Contains doesn't update recent-ness
-func TestLRU_Contains(t *testing.T) {
-	l, err := NewLRU(2, nil)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	l.Add(1, 1)
-	l.Add(2, 2)
-	if !l.Contains(1) {
-		t.Errorf("1 should be contained")
-	}
-
-	l.Add(3, 3)
-	if l.Contains(1) {
-		t.Errorf("Contains should not have updated recent-ness of 1")
-	}
-}
-
-// Test that Peek doesn't update recent-ness
-func TestLRU_Peek(t *testing.T) {
-	l, err := NewLRU(2, nil)
-	if err != nil {
-		t.Fatalf("err: %v", err)
-	}
-
-	l.Add(1, 1)
-	l.Add(2, 2)
-	if v, ok := l.Peek(1); !ok || v != 1 {
-		t.Errorf("1 should be set to 1: %v, %v", v, ok)
-	}
-
-	l.Add(3, 3)
-	if l.Contains(1) {
-		t.Errorf("should not have updated recent-ness of 1")
-	}
-}
diff --git a/vendor/github.com/jedisct1/dlog/dlog_test.go b/vendor/github.com/jedisct1/dlog/dlog_test.go
deleted file mode 100644
index 25a8a57a..00000000
--- a/vendor/github.com/jedisct1/dlog/dlog_test.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package dlog
-
-func Example() {
-	Init("example", SeverityNotice, "")
-	// Call flag.Parse() around that time
-	Info("Application is starting")
-	Debugf("Counter value: %d", 0)
-	Fatal("Kaboom")
-}
diff --git a/vendor/github.com/jedisct1/xsecretbox/xsecretbox_test.go b/vendor/github.com/jedisct1/xsecretbox/xsecretbox_test.go
deleted file mode 100644
index c1b4673b..00000000
--- a/vendor/github.com/jedisct1/xsecretbox/xsecretbox_test.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package xsecretbox
-
-import (
-	"bytes"
-	"testing"
-)
-
-func TestSecretbox(t *testing.T) {
-	key := [32]byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}
-	nonce := [24]byte{23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0}
-	src := []byte{42, 42, 42, 42, 42, 42, 42, 42, 42, 42}
-
-	dst := Seal(nil, nonce[:], src[:], key[:])
-	dec, err := Open(nil, nonce[:], dst[:], key[:])
-	if err != nil || !bytes.Equal(src, dec) {
-		t.Errorf("got %x instead of %x", dec, src)
-	}
-
-	dst[0]++
-	_, err = Open(nil, nonce[:], dst[:], key[:])
-	if err == nil {
-		t.Errorf("tag validation failed")
-	}
-
-	_, _ = SharedKey(key, key)
-}
diff --git a/vendor/github.com/k-sone/critbitgo/critbit_test.go b/vendor/github.com/k-sone/critbitgo/critbit_test.go
deleted file mode 100644
index 1042970d..00000000
--- a/vendor/github.com/k-sone/critbitgo/critbit_test.go
+++ /dev/null
@@ -1,361 +0,0 @@
-package critbitgo_test
-
-import (
-	"bytes"
-	"math/rand"
-	"testing"
-
-	"github.com/k-sone/critbitgo"
-)
-
-func buildTrie(t *testing.T, keys []string) *critbitgo.Trie {
-	trie := critbitgo.NewTrie()
-	for _, key := range keys {
-		if !trie.Insert([]byte(key), key) {
-			t.Errorf("Insert() - failed insert \"%s\"\n%s", key, dumpTrie(trie))
-		}
-	}
-	return trie
-}
-
-func dumpTrie(trie *critbitgo.Trie) string {
-	buf := bytes.NewBufferString("")
-	trie.Dump(buf)
-	return buf.String()
-}
-
-func TestInsert(t *testing.T) {
-	// normal build
-	keys := []string{"", "a", "aa", "b", "bb", "ab", "ba", "aba", "bab"}
-	trie := buildTrie(t, keys)
-	dump := dumpTrie(trie)
-
-	// random build
-	random := rand.New(rand.NewSource(0))
-	for i := 0; i < 10; i++ {
-		// shuffle keys
-		lkeys := make([]string, len(keys))
-		for j, index := range random.Perm(len(keys)) {
-			lkeys[j] = keys[index]
-		}
-
-		ltrie := buildTrie(t, lkeys)
-		ldump := dumpTrie(ltrie)
-		if dump != ldump {
-			t.Errorf("Insert() - different tries\norigin:\n%s\nother:\n%s\n", dump, ldump)
-		}
-	}
-
-	// error check
-	if trie.Insert([]byte("a"), nil) {
-		t.Error("Insert() - check exists")
-	}
-	if !trie.Insert([]byte("c"), nil) {
-		t.Error("Insert() - check not exists")
-	}
-}
-
-func TestSet(t *testing.T) {
-	keys := []string{"", "a", "aa", "b", "bb", "ab", "ba", "aba", "bab"}
-	trie := buildTrie(t, keys)
-
-	trie.Set([]byte("a"), 100)
-	v, _ := trie.Get([]byte("a"))
-	if n, ok := v.(int); !ok || n != 100 {
-		t.Errorf("Set() - failed replace - %v", v)
-	}
-}
-
-func TestContains(t *testing.T) {
-	keys := []string{"", "a", "aa", "b", "bb", "ab", "ba", "aba", "bab"}
-	trie := buildTrie(t, keys)
-
-	for _, key := range keys {
-		if !trie.Contains([]byte(key)) {
-			t.Error("Contains() - not found - %s", key)
-		}
-	}
-
-	if trie.Contains([]byte("aaa")) {
-		t.Error("Contains() - phantom found")
-	}
-}
-
-func TestGet(t *testing.T) {
-	keys := []string{"", "a", "aa", "b", "bb", "ab", "ba", "aba", "bab"}
-	trie := buildTrie(t, keys)
-
-	for _, key := range keys {
-		if value, ok := trie.Get([]byte(key)); value != key || !ok {
-			t.Error("Get() - not found - %s", key)
-		}
-	}
-
-	if value, ok := trie.Get([]byte("aaa")); value != nil || ok {
-		t.Error("Get() - phantom found")
-	}
-}
-
-func TestDelete(t *testing.T) {
-	keys := []string{"", "a", "aa", "b", "bb", "ab", "ba", "aba", "bab"}
-	trie := buildTrie(t, keys)
-
-	for i, key := range keys {
-		if !trie.Contains([]byte(key)) {
-			t.Error("Delete() - not exists - %s", key)
-		}
-		if v, ok := trie.Delete([]byte(key)); !ok || v != key {
-			t.Error("Delete() - failed - %s", key)
-		}
-		if trie.Contains([]byte(key)) {
-			t.Error("Delete() - exists - %s", key)
-		}
-		if i != len(keys) {
-			for _, key2 := range keys[i+1:] {
-				if !trie.Contains([]byte(key2)) {
-					t.Errorf("Delete() - other not exists - %s", key2)
-				}
-			}
-		}
-	}
-}
-
-func TestSize(t *testing.T) {
-	keys := []string{"", "a", "aa", "b", "bb", "ab", "ba", "aba", "bab"}
-	trie := buildTrie(t, keys)
-	klen := len(keys)
-	if s := trie.Size(); s != klen {
-		t.Errorf("Size() - expected [%s], actual [%s]", klen, s)
-	}
-
-	for i, key := range keys {
-		trie.Delete([]byte(key))
-		if s := trie.Size(); s != klen-(i+1) {
-			t.Errorf("Size() - expected [%s], actual [%s]", klen, s)
-		}
-	}
-}
-
-func TestAllprefixed(t *testing.T) {
-	keys := []string{"", "a", "aa", "b", "bb", "ab", "ba", "aba", "bab", "bc"}
-	trie := buildTrie(t, keys)
-
-	elems := make([]string, 0, len(keys))
-	handle := func(key []byte, value interface{}) bool {
-		if k := string(key); k == value {
-			elems = append(elems, k)
-		}
-		return true
-	}
-	if !trie.Allprefixed([]byte{}, handle) {
-		t.Error("Allprefixed() - invalid result")
-	}
-	if len(elems) != 10 {
-		t.Errorf("Allprefixed() - invalid elems length [%v]", elems)
-	}
-	for i, key := range []string{"", "a", "aa", "ab", "aba", "b", "ba", "bab", "bb", "bc"} {
-		if key != elems[i] {
-			t.Errorf("Allprefixed() - not found [%s]", key)
-		}
-	}
-
-	elems = make([]string, 0, len(keys))
-	if !trie.Allprefixed([]byte("a"), handle) {
-		t.Error("Allprefixed() - invalid result")
-	}
-	if len(elems) != 4 {
-		t.Errorf("Allprefixed() - invalid elems length [%v]", elems)
-	}
-	for i, key := range []string{"a", "aa", "ab", "aba"} {
-		if key != elems[i] {
-			t.Errorf("Allprefixed() - not found [%s]", key)
-		}
-	}
-
-	elems = make([]string, 0, len(keys))
-	if !trie.Allprefixed([]byte("bb"), handle) {
-		t.Error("Allprefixed() - invalid result")
-	}
-	if len(elems) != 1 {
-		t.Errorf("Allprefixed() - invalid elems length [%v]", elems)
-	}
-	for i, key := range []string{"bb"} {
-		if key != elems[i] {
-			t.Errorf("Allprefixed() - not found [%s]", key)
-		}
-	}
-
-	elems = make([]string, 0, len(keys))
-	handle = func(key []byte, value interface{}) bool {
-		if k := string(key); k == value {
-			elems = append(elems, k)
-		}
-		if string(key) == "aa" {
-			return false
-		}
-		return true
-	}
-	if trie.Allprefixed([]byte("a"), handle) {
-		t.Error("Allprefixed() - invalid result")
-	}
-	if len(elems) != 2 {
-		t.Errorf("Allprefixed() - invalid elems length [%v]", elems)
-	}
-	for i, key := range []string{"a", "aa"} {
-		if key != elems[i] {
-			t.Errorf("Allprefixed() - not found [%s]", key)
-		}
-	}
-}
-
-func TestLongestPrefix(t *testing.T) {
-	keys := []string{"a", "aa", "b", "bb", "ab", "ba", "aba", "bab"}
-	trie := buildTrie(t, keys)
-
-	expects := map[string]string{
-		"a":   "a",
-		"a^":  "a",
-		"aaa": "aa",
-		"abc": "ab",
-		"bac": "ba",
-		"bbb": "bb",
-		"bc":  "b",
-	}
-	for g, k := range expects {
-		if key, value, ok := trie.LongestPrefix([]byte(g)); !ok || string(key) != k || value != k {
-			t.Errorf("LongestPrefix() - invalid result - %s not %s", key, g)
-		}
-	}
-
-	if _, _, ok := trie.LongestPrefix([]byte{}); ok {
-		t.Error("LongestPrefix() - invalid result - not empty")
-	}
-	if _, _, ok := trie.LongestPrefix([]byte("^")); ok {
-		t.Error("LongestPrefix() - invalid result - not empty")
-	}
-	if _, _, ok := trie.LongestPrefix([]byte("c")); ok {
-		t.Error("LongestPrefix() - invalid result - not empty")
-	}
-}
-
-func TestWalk(t *testing.T) {
-	keys := []string{"", "a", "aa", "b", "bb", "ab", "ba", "aba", "bab"}
-	trie := buildTrie(t, keys)
-
-	elems := make([]string, 0, len(keys))
-	handle := func(key []byte, value interface{}) bool {
-		if k := string(key); k == value {
-			elems = append(elems, k)
-		}
-		return true
-	}
-	if !trie.Walk([]byte{}, handle) {
-		t.Error("Walk() - invalid result")
-	}
-	if len(elems) != 9 {
-		t.Errorf("Walk() - invalid elems length [%v]", elems)
-	}
-	for i, key := range []string{"", "a", "aa", "ab", "aba", "b", "ba", "bab", "bb"} {
-		if key != elems[i] {
-			t.Errorf("Walk() - not found [%s]", key)
-		}
-	}
-
-	elems = make([]string, 0, len(keys))
-	if !trie.Walk([]byte("ab"), handle) {
-		t.Error("Walk() - invalid result")
-	}
-	if len(elems) != 6 {
-		t.Errorf("Walk() - invalid elems length [%v]", elems)
-	}
-	for i, key := range []string{"ab", "aba", "b", "ba", "bab", "bb"} {
-		if key != elems[i] {
-			t.Errorf("Walk() - not found [%s]", key)
-		}
-	}
-
-	elems = make([]string, 0, len(keys))
-	if !trie.Walk(nil, handle) {
-		t.Error("Walk() - invalid result")
-	}
-	if len(elems) != 9 {
-		t.Errorf("Walk() - invalid elems length [%v]", elems)
-	}
-	for i, key := range []string{"", "a", "aa", "ab", "aba", "b", "ba", "bab", "bb"} {
-		if key != elems[i] {
-			t.Errorf("Walk() - not found [%s]", key)
-		}
-	}
-
-	elems = make([]string, 0, len(keys))
-	handle = func(key []byte, value interface{}) bool {
-		if k := string(key); k == value {
-			elems = append(elems, k)
-		}
-		if string(key) == "aa" {
-			return false
-		}
-		return true
-	}
-	if trie.Walk([]byte("a"), handle) {
-		t.Error("Walk() - invalid result")
-	}
-	if len(elems) != 2 {
-		t.Errorf("Walk() - invalid elems length [%v]", elems)
-	}
-	for i, key := range []string{"a", "aa"} {
-		if key != elems[i] {
-			t.Errorf("Walk() - not found [%s]", key)
-		}
-	}
-
-	if trie.Walk([]byte("^"), handle) {
-		t.Error("Walk() - invalid result")
-	}
-	if trie.Walk([]byte("aaa"), handle) {
-		t.Error("Walk() - invalid result")
-	}
-	if trie.Walk([]byte("c"), handle) {
-		t.Error("Walk() - invalid result")
-	}
-}
-
-func TestKeyContainsZeroValue(t *testing.T) {
-	trie := critbitgo.NewTrie()
-	trie.Insert([]byte{1, 0, 1}, nil)
-	trie.Insert([]byte{1}, nil)
-	trie.Insert([]byte{0, 1, 1}, nil)
-	trie.Insert([]byte{}, nil)
-	trie.Insert([]byte{0, 0, 1}, nil)
-	trie.Insert([]byte{1, 1}, nil)
-	trie.Insert([]byte{1, 1, 1}, nil)
-	trie.Insert([]byte{0, 1}, nil)
-	trie.Insert([]byte{0, 1, 0}, nil)
-	trie.Insert([]byte{0, 0}, nil)
-	trie.Insert([]byte{0, 0, 0}, nil)
-	trie.Insert([]byte{0}, nil)
-
-	var index int
-	exp := [][]byte{
-		[]byte{},
-		[]byte{0},
-		[]byte{0, 0},
-		[]byte{0, 0, 0},
-		[]byte{0, 0, 1},
-		[]byte{0, 1},
-		[]byte{0, 1, 0},
-		[]byte{0, 1, 1},
-		[]byte{1},
-		[]byte{1, 0, 1},
-		[]byte{1, 1},
-		[]byte{1, 1, 1},
-	}
-	handle := func(key []byte, _ interface{}) bool {
-		if !bytes.Equal(exp[index], key) {
-			t.Errorf("Key Order - index=%d, expected [%x], actula [%x]", index, exp[index], key)
-		}
-		index += 1
-		return true
-	}
-	trie.Allprefixed([]byte(""), handle)
-}
diff --git a/vendor/github.com/k-sone/critbitgo/map_bench_test.go b/vendor/github.com/k-sone/critbitgo/map_bench_test.go
deleted file mode 100644
index 52bf371c..00000000
--- a/vendor/github.com/k-sone/critbitgo/map_bench_test.go
+++ /dev/null
@@ -1,119 +0,0 @@
-package critbitgo_test
-
-import (
-	"bytes"
-	"math/rand"
-	"sort"
-	"testing"
-)
-
-var keyCount int = 10000
-var keyLen int = 128
-
-var keys []string
-var alphabet string = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
-var alphalen int = len(alphabet)
-
-func init() {
-	keys = make([]string, keyCount)
-	random := rand.New(rand.NewSource(0))
-	for i := 0; i < len(keys); i++ {
-		keys[i] = genRandomKey(random)
-	}
-}
-
-func genRandomKey(rand *rand.Rand) string {
-	buf := bytes.NewBufferString("")
-	for i := 0; i < keyLen; i++ {
-		buf.WriteByte(alphabet[rand.Intn(alphalen)])
-	}
-	return buf.String()
-}
-
-func buildMap(keys []string) map[string]string {
-	m := make(map[string]string)
-	for _, key := range keys {
-		m[key] = key
-	}
-	return m
-}
-
-func BenchmarkMapBuild(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		buildMap(keys)
-	}
-}
-
-func BenchmarkSortedMapBuild(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		buildSortedMap(keys)
-	}
-}
-
-func BenchmarkMapGet(b *testing.B) {
-	m := buildMap(keys)
-	random := rand.New(rand.NewSource(0))
-	b.ResetTimer()
-
-	for i := 0; i < b.N; i++ {
-		k := keys[random.Intn(keyCount)]
-		_ = m[k]
-	}
-}
-
-func BenchmarkSortedMapGet(b *testing.B) {
-	m := buildSortedMap(keys)
-	random := rand.New(rand.NewSource(0))
-	b.ResetTimer()
-
-	for i := 0; i < b.N; i++ {
-		k := keys[random.Intn(keyCount)]
-		_, _ = m.Get(k)
-	}
-}
-
-func BenchmarkMapDelete(b *testing.B) {
-	m := buildMap(keys)
-	random := rand.New(rand.NewSource(0))
-	b.ResetTimer()
-
-	for i := 0; i < b.N; i++ {
-		k := keys[random.Intn(keyCount)]
-		if _, ok := m[k]; ok {
-			delete(m, k)
-		}
-	}
-}
-
-func BenchmarkSortedMapDelete(b *testing.B) {
-	m := buildSortedMap(keys)
-	random := rand.New(rand.NewSource(0))
-	b.ResetTimer()
-
-	for i := 0; i < b.N; i++ {
-		k := keys[random.Intn(keyCount)]
-		m.Delete(k)
-	}
-}
-
-func BenchmarkMapKeys(b *testing.B) {
-	m := buildMap(keys)
-	b.ResetTimer()
-
-	for i := 0; i < b.N; i++ {
-		list := make([]string, 0, len(m))
-		for _, k := range m {
-			list = append(list, k)
-		}
-		sort.Strings(list)
-	}
-}
-
-func BenchmarkSortedMapKeys(b *testing.B) {
-	m := buildSortedMap(keys)
-	b.ResetTimer()
-
-	for i := 0; i < b.N; i++ {
-		m.Keys()
-	}
-}
diff --git a/vendor/github.com/k-sone/critbitgo/map_test.go b/vendor/github.com/k-sone/critbitgo/map_test.go
deleted file mode 100644
index a0d52de6..00000000
--- a/vendor/github.com/k-sone/critbitgo/map_test.go
+++ /dev/null
@@ -1,164 +0,0 @@
-package critbitgo_test
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/k-sone/critbitgo"
-)
-
-func buildSortedMap(keys []string) *critbitgo.SortedMap {
-	m := critbitgo.NewSortedMap()
-	for _, key := range keys {
-		m.Set(key, key)
-	}
-	return m
-}
-
-func TestSortedMapContains(t *testing.T) {
-	keys := []string{"", "a", "aa", "b", "bb", "ab", "ba", "aba", "bab"}
-	m := buildSortedMap(keys)
-
-	for _, key := range keys {
-		if !m.Contains(key) {
-			t.Error("Contains() - not found - [%s]", key)
-		}
-	}
-
-	if m.Contains("aaa") {
-		t.Error("Contains() - phantom found")
-	}
-}
-
-func TestSortedMapGet(t *testing.T) {
-	keys := []string{"", "a", "aa", "b", "bb", "ab", "ba", "aba", "bab"}
-	m := buildSortedMap(keys)
-
-	for _, key := range keys {
-		if value, ok := m.Get(key); !ok || value != key {
-			t.Error("Get() - not found - [%s]", key)
-		}
-	}
-
-	if value, ok := m.Get("aaa"); ok || value != nil {
-		t.Error("Get() - phantom found")
-	}
-}
-
-func TestSortedMapDelete(t *testing.T) {
-	keys := []string{"", "a", "aa", "b", "bb", "ab", "ba", "aba", "bab"}
-	m := buildSortedMap(keys)
-
-	for i, key := range keys {
-		if !m.Contains(key) {
-			t.Error("Delete() - not exists - [%s]", key)
-		}
-		if value, ok := m.Delete(key); !ok || value != key {
-			t.Error("Delete() - failed - [%s]", key)
-		}
-		if m.Contains(key) {
-			t.Error("Delete() - exists - [%s]", key)
-		}
-		if value, ok := m.Delete(key); ok || value != nil {
-			t.Error("Delete() - phantom found - [%s]", key)
-		}
-		if i != len(keys) {
-			for _, key2 := range keys[i+1:] {
-				if !m.Contains(key2) {
-					t.Errorf("Delete() - other not exists - [%s](%s)", key2, key)
-				}
-			}
-		}
-	}
-}
-
-func TestSortedMapSize(t *testing.T) {
-	keys := []string{"", "a", "aa", "b", "bb", "ab", "ba", "aba", "bab"}
-	m := buildSortedMap(keys)
-	klen := len(keys)
-	if s := m.Size(); s != klen {
-		t.Errorf("Size() - expected [%s], actual [%s]", klen, s)
-	}
-
-	for i, key := range keys {
-		m.Delete(key)
-		if s := m.Size(); s != klen-(i+1) {
-			t.Errorf("Size() - expected [%s], actual [%s]", klen, s)
-		}
-	}
-}
-
-func TestSortedMapKeys(t *testing.T) {
-	keys := []string{"", "a", "aa", "b", "bb", "ab", "ba", "aba", "bab"}
-	m := buildSortedMap(keys)
-	skeys := m.Keys()
-	for _, key := range keys {
-		match := false
-		for _, skey := range skeys {
-			if key == skey {
-				match = true
-				break
-			}
-		}
-		if !match {
-			t.Errorf("Keys() - not found [%s]", key)
-		}
-	}
-}
-
-func TestSortedMapEach(t *testing.T) {
-	keys := []string{"", "a", "aa", "b", "bb", "ab", "ba", "aba", "bab"}
-	m := buildSortedMap(keys)
-
-	elems := make(map[string]interface{})
-	handle := func(key string, value interface{}) bool {
-		elems[key] = value
-		return true
-	}
-	if !m.Each("", handle) {
-		t.Error("Each() - invalid result")
-	}
-	for _, key := range keys {
-		if _, ok := elems[key]; !ok {
-			t.Errorf("Each() - not found [%s]", key)
-		} else if value, ok := elems[key].(string); !ok || value != key {
-			t.Errorf("Each() - invalid value [%s](%s)", value, key)
-		}
-	}
-
-	elems = make(map[string]interface{})
-	handle = func(key string, value interface{}) bool {
-		elems[key] = value
-		return true
-	}
-	if !m.Each("b", handle) {
-		t.Error("Each() - invalid result")
-	}
-	for _, key := range keys {
-		if strings.Index(key, "b") == 0 {
-			if _, ok := elems[key]; !ok {
-				t.Errorf("Each() - not found [%s]", key)
-			} else if value, ok := elems[key].(string); !ok || value != key {
-				t.Errorf("Each() - invalid value [%s](%s)", value, key)
-			}
-		} else {
-			if _, ok := elems[key]; ok {
-				t.Errorf("Each() - phantom found [%s]", key)
-			}
-		}
-	}
-
-	elems = make(map[string]interface{})
-	handle = func(key string, value interface{}) bool {
-		elems[key] = value
-		return true
-	}
-	if !m.Each("c", handle) {
-		t.Error("Each() - invalid result")
-	}
-	for _, key := range keys {
-		if _, ok := elems[key]; ok {
-			t.Errorf("Each() - phantom found [%s]", key)
-		}
-	}
-}
diff --git a/vendor/github.com/k-sone/critbitgo/net_bench_test.go b/vendor/github.com/k-sone/critbitgo/net_bench_test.go
deleted file mode 100644
index fc84a2dd..00000000
--- a/vendor/github.com/k-sone/critbitgo/net_bench_test.go
+++ /dev/null
@@ -1,78 +0,0 @@
-package critbitgo_test
-
-import (
-	"math/rand"
-	"net"
-	"testing"
-
-	"github.com/k-sone/critbitgo"
-)
-
-var routeCount int = 10000
-var routes []string
-
-func init() {
-	routes = make([]string, routeCount)
-	random := rand.New(rand.NewSource(0))
-	for i := 0; i < len(routes); i++ {
-		routes[i] = genRoute(random)
-	}
-}
-
-func genRoute(rand *rand.Rand) string {
-	ip := rand.Int31()
-	mask := rand.Intn(33)
-	ipnet := &net.IPNet{
-		IP:   net.IP{byte(ip >> 24), byte(ip >> 16), byte(ip >> 8), byte(ip)},
-		Mask: net.CIDRMask(mask, 32),
-	}
-	return ipnet.String()
-}
-
-func buildNet(keys []string) *critbitgo.Net {
-	tree := critbitgo.NewNet()
-	for i := 0; i < len(keys); i++ {
-		tree.AddCIDR(keys[i], nil)
-	}
-	tree.AddCIDR("0.0.0.0/5", nil)
-	return tree
-}
-
-func BenchmarkNetBuild(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		buildNet(routes)
-	}
-}
-
-func BenchmarkNetGet(b *testing.B) {
-	n := buildNet(routes)
-	random := rand.New(rand.NewSource(0))
-	b.ResetTimer()
-
-	for i := 0; i < b.N; i++ {
-		k := routes[random.Intn(routeCount)]
-		n.GetCIDR(k)
-	}
-}
-
-func BenchmarkNetDelete(b *testing.B) {
-	n := buildNet(routes)
-	random := rand.New(rand.NewSource(0))
-	b.ResetTimer()
-
-	for i := 0; i < b.N; i++ {
-		k := routes[random.Intn(keyCount)]
-		n.DeleteCIDR(k)
-	}
-}
-
-func BenchmarkNetMatch(b *testing.B) {
-	n := buildNet(routes)
-	random := rand.New(rand.NewSource(0))
-	b.ResetTimer()
-
-	for i := 0; i < b.N; i++ {
-		s := genRoute(random)
-		n.MatchCIDR(s)
-	}
-}
diff --git a/vendor/github.com/k-sone/critbitgo/net_test.go b/vendor/github.com/k-sone/critbitgo/net_test.go
deleted file mode 100644
index 0847034d..00000000
--- a/vendor/github.com/k-sone/critbitgo/net_test.go
+++ /dev/null
@@ -1,119 +0,0 @@
-package critbitgo_test
-
-import (
-	"net"
-	"testing"
-
-	"github.com/k-sone/critbitgo"
-)
-
-func TestNet(t *testing.T) {
-	trie := critbitgo.NewNet()
-	cidr := "192.168.1.0/24"
-	host := "192.168.1.1/32"
-	hostIP := net.IPv4(192, 168, 1, 1)
-
-	if _, _, err := trie.GetCIDR(""); err == nil {
-		t.Error("GetCIDR() - not error")
-	}
-	if v, ok, err := trie.GetCIDR(cidr); v != nil || ok || err != nil {
-		t.Errorf("GetCIDR() - phantom: %v, %v, %v", v, ok, err)
-	}
-	if _, _, err := trie.MatchCIDR(""); err == nil {
-		t.Error("MatchCIDR() - not error")
-	}
-	if r, v, err := trie.MatchCIDR(host); r != nil || v != nil || err != nil {
-		t.Errorf("MatchCIDR() - phantom: %v, %v, %v", r, v, err)
-	}
-	if _, _, err := trie.MatchIP(net.IP([]byte{})); err == nil {
-		t.Error("MatchIP() - not error")
-	}
-	if r, v, err := trie.MatchIP(hostIP); r != nil || v != nil || err != nil {
-		t.Errorf("MatchIP() - phantom: %v, %v, %v", r, v, err)
-	}
-	if _, err := trie.ContainedIP(net.IP([]byte{})); err == nil {
-		t.Error("ContainedIP() - not error")
-	}
-	if b, err := trie.ContainedIP(hostIP); b || err != nil {
-		t.Errorf("ContainedIP() - phantom: %v, %v", b, err)
-	}
-	if _, _, err := trie.DeleteCIDR(""); err == nil {
-		t.Error("DeleteCIDR() - not error")
-	}
-	if v, ok, err := trie.DeleteCIDR(cidr); v != nil || ok || err != nil {
-		t.Errorf("DeleteCIDR() - phantom: %v, %v, %v", v, ok, err)
-	}
-
-	if err := trie.AddCIDR(cidr, &cidr); err != nil {
-		t.Errorf("AddCIDR() - %s: error occurred %s", cidr, err)
-	}
-	if v, ok, err := trie.GetCIDR(cidr); v != &cidr || !ok || err != nil {
-		t.Errorf("GetCIDR() - failed: %v, %v, %v", v, ok, err)
-	}
-	if r, v, err := trie.MatchCIDR(host); r == nil || r.String() != cidr || v != &cidr || err != nil {
-		t.Errorf("MatchCIDR() - failed: %v, %v, %v", r, v, err)
-	}
-	if r, v, err := trie.MatchIP(hostIP); r == nil || r.String() != cidr || v != &cidr || err != nil {
-		t.Errorf("MatchIP() - failed: %v, %v, %v", r, v, err)
-	}
-	if b, err := trie.ContainedIP(hostIP); !b || err != nil {
-		t.Errorf("ContainedIP() - failed: %v, %v", b, err)
-	}
-	if v, ok, err := trie.DeleteCIDR(cidr); v != &cidr || !ok || err != nil {
-		t.Errorf("DeleteCIDR() - failed: %v, %v, %v", v, ok, err)
-	}
-}
-
-func checkMatch(t *testing.T, trie *critbitgo.Net, request, expect string) {
-	route, value, err := trie.MatchCIDR(request)
-	if err != nil {
-		t.Errorf("MatchCIDR() - %s: error occurred %s", request, err)
-	}
-	if cidr := route.String(); expect != cidr {
-		t.Errorf("MatchCIDR() - %s: expected [%s], actual [%s]", request, expect, cidr)
-	}
-	if value == nil {
-		t.Errorf("MatchCIDR() - %s: no value", request)
-	}
-}
-
-func TestNetMatch(t *testing.T) {
-	trie := critbitgo.NewNet()
-
-	cidrs := []string{
-		"0.0.0.0/4",
-		"192.168.0.0/16",
-		"192.168.1.0/24",
-		"192.168.1.0/28",
-		"192.168.1.0/32",
-		"192.168.1.1/32",
-		"192.168.1.2/32",
-		"192.168.1.32/27",
-		"192.168.1.32/30",
-		"192.168.2.1/32",
-		"192.168.2.2/32",
-	}
-
-	for _, cidr := range cidrs {
-		if err := trie.AddCIDR(cidr, &cidr); err != nil {
-			t.Errorf("AddCIDR() - %s: error occurred %s", cidr, err)
-		}
-	}
-
-	checkMatch(t, trie, "10.0.0.0/8", "0.0.0.0/4")
-	checkMatch(t, trie, "192.168.1.0/24", "192.168.1.0/24")
-	checkMatch(t, trie, "192.168.1.0/30", "192.168.1.0/28")
-	checkMatch(t, trie, "192.168.1.0/32", "192.168.1.0/32")
-	checkMatch(t, trie, "192.168.1.128/26", "192.168.1.0/24")
-	checkMatch(t, trie, "192.168.2.128/26", "192.168.0.0/16")
-	checkMatch(t, trie, "192.168.1.1/32", "192.168.1.1/32")
-	checkMatch(t, trie, "192.168.1.2/32", "192.168.1.2/32")
-	checkMatch(t, trie, "192.168.1.3/32", "192.168.1.0/28")
-	checkMatch(t, trie, "192.168.1.32/32", "192.168.1.32/30")
-	checkMatch(t, trie, "192.168.1.35/32", "192.168.1.32/30")
-	checkMatch(t, trie, "192.168.1.36/32", "192.168.1.32/27")
-	checkMatch(t, trie, "192.168.1.63/32", "192.168.1.32/27")
-	checkMatch(t, trie, "192.168.1.64/32", "192.168.1.0/24")
-	checkMatch(t, trie, "192.168.2.2/32", "192.168.2.2/32")
-	checkMatch(t, trie, "192.168.2.3/32", "192.168.0.0/16")
-}
diff --git a/vendor/github.com/kardianos/osext/osext_test.go b/vendor/github.com/kardianos/osext/osext_test.go
deleted file mode 100644
index eb18236c..00000000
--- a/vendor/github.com/kardianos/osext/osext_test.go
+++ /dev/null
@@ -1,203 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin linux freebsd netbsd windows openbsd
-
-package osext
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"testing"
-)
-
-const (
-	executableEnvVar = "OSTEST_OUTPUT_EXECUTABLE"
-
-	executableEnvValueMatch  = "match"
-	executableEnvValueDelete = "delete"
-)
-
-func TestPrintExecutable(t *testing.T) {
-	ef, err := Executable()
-	if err != nil {
-		t.Fatalf("Executable failed: %v", err)
-	}
-	t.Log("Executable:", ef)
-}
-func TestPrintExecutableFolder(t *testing.T) {
-	ef, err := ExecutableFolder()
-	if err != nil {
-		t.Fatalf("ExecutableFolder failed: %v", err)
-	}
-	t.Log("Executable Folder:", ef)
-}
-func TestExecutableFolder(t *testing.T) {
-	ef, err := ExecutableFolder()
-	if err != nil {
-		t.Fatalf("ExecutableFolder failed: %v", err)
-	}
-	if ef[len(ef)-1] == filepath.Separator {
-		t.Fatal("ExecutableFolder ends with a trailing slash.")
-	}
-}
-func TestExecutableMatch(t *testing.T) {
-	ep, err := Executable()
-	if err != nil {
-		t.Fatalf("Executable failed: %v", err)
-	}
-
-	// fullpath to be of the form "dir/prog".
-	dir := filepath.Dir(filepath.Dir(ep))
-	fullpath, err := filepath.Rel(dir, ep)
-	if err != nil {
-		t.Fatalf("filepath.Rel: %v", err)
-	}
-	// Make child start with a relative program path.
-	// Alter argv[0] for child to verify getting real path without argv[0].
-	cmd := &exec.Cmd{
-		Dir:  dir,
-		Path: fullpath,
-		Env:  []string{fmt.Sprintf("%s=%s", executableEnvVar, executableEnvValueMatch)},
-	}
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		t.Fatalf("exec(self) failed: %v", err)
-	}
-	outs := string(out)
-	if !filepath.IsAbs(outs) {
-		t.Fatalf("Child returned %q, want an absolute path", out)
-	}
-	if !sameFile(outs, ep) {
-		t.Fatalf("Child returned %q, not the same file as %q", out, ep)
-	}
-}
-
-func TestExecutableDelete(t *testing.T) {
-	if runtime.GOOS != "linux" {
-		t.Skip()
-	}
-	fpath, err := Executable()
-	if err != nil {
-		t.Fatalf("Executable failed: %v", err)
-	}
-
-	r, w := io.Pipe()
-	stderrBuff := &bytes.Buffer{}
-	stdoutBuff := &bytes.Buffer{}
-	cmd := &exec.Cmd{
-		Path:   fpath,
-		Env:    []string{fmt.Sprintf("%s=%s", executableEnvVar, executableEnvValueDelete)},
-		Stdin:  r,
-		Stderr: stderrBuff,
-		Stdout: stdoutBuff,
-	}
-	err = cmd.Start()
-	if err != nil {
-		t.Fatalf("exec(self) start failed: %v", err)
-	}
-
-	tempPath := fpath + "_copy"
-	_ = os.Remove(tempPath)
-
-	err = copyFile(tempPath, fpath)
-	if err != nil {
-		t.Fatalf("copy file failed: %v", err)
-	}
-	err = os.Remove(fpath)
-	if err != nil {
-		t.Fatalf("remove running test file failed: %v", err)
-	}
-	err = os.Rename(tempPath, fpath)
-	if err != nil {
-		t.Fatalf("rename copy to previous name failed: %v", err)
-	}
-
-	w.Write([]byte{0})
-	w.Close()
-
-	err = cmd.Wait()
-	if err != nil {
-		t.Fatalf("exec wait failed: %v", err)
-	}
-
-	childPath := stderrBuff.String()
-	if !filepath.IsAbs(childPath) {
-		t.Fatalf("Child returned %q, want an absolute path", childPath)
-	}
-	if !sameFile(childPath, fpath) {
-		t.Fatalf("Child returned %q, not the same file as %q", childPath, fpath)
-	}
-}
-
-func sameFile(fn1, fn2 string) bool {
-	fi1, err := os.Stat(fn1)
-	if err != nil {
-		return false
-	}
-	fi2, err := os.Stat(fn2)
-	if err != nil {
-		return false
-	}
-	return os.SameFile(fi1, fi2)
-}
-func copyFile(dest, src string) error {
-	df, err := os.Create(dest)
-	if err != nil {
-		return err
-	}
-	defer df.Close()
-
-	sf, err := os.Open(src)
-	if err != nil {
-		return err
-	}
-	defer sf.Close()
-
-	_, err = io.Copy(df, sf)
-	return err
-}
-
-func TestMain(m *testing.M) {
-	env := os.Getenv(executableEnvVar)
-	switch env {
-	case "":
-		os.Exit(m.Run())
-	case executableEnvValueMatch:
-		// First chdir to another path.
-		dir := "/"
-		if runtime.GOOS == "windows" {
-			dir = filepath.VolumeName(".")
-		}
-		os.Chdir(dir)
-		if ep, err := Executable(); err != nil {
-			fmt.Fprint(os.Stderr, "ERROR: ", err)
-		} else {
-			fmt.Fprint(os.Stderr, ep)
-		}
-	case executableEnvValueDelete:
-		bb := make([]byte, 1)
-		var err error
-		n, err := os.Stdin.Read(bb)
-		if err != nil {
-			fmt.Fprint(os.Stderr, "ERROR: ", err)
-			os.Exit(2)
-		}
-		if n != 1 {
-			fmt.Fprint(os.Stderr, "ERROR: n != 1, n == ", n)
-			os.Exit(2)
-		}
-		if ep, err := Executable(); err != nil {
-			fmt.Fprint(os.Stderr, "ERROR: ", err)
-		} else {
-			fmt.Fprint(os.Stderr, ep)
-		}
-	}
-	os.Exit(0)
-}
diff --git a/vendor/github.com/kardianos/service/name_test.go b/vendor/github.com/kardianos/service/name_test.go
deleted file mode 100644
index 3d199150..00000000
--- a/vendor/github.com/kardianos/service/name_test.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015 Daniel Theophanes.
-// Use of this source code is governed by a zlib-style
-// license that can be found in the LICENSE file.
-
-package service
-
-import (
-	"runtime"
-	"strings"
-	"testing"
-)
-
-func TestPlatformName(t *testing.T) {
-	got := Platform()
-	t.Logf("Platform is %v", got)
-	wantPrefix := runtime.GOOS + "-"
-	if !strings.HasPrefix(got, wantPrefix) {
-		t.Errorf("Platform() want: /^%s.*$/, got: %s", wantPrefix, got)
-	}
-}
diff --git a/vendor/github.com/kardianos/service/service_nosu_test.go b/vendor/github.com/kardianos/service/service_nosu_test.go
deleted file mode 100644
index 97ee89d8..00000000
--- a/vendor/github.com/kardianos/service/service_nosu_test.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2016 Lawrence Woodman <lwoodman@vlifesystems.com>
-// Use of this source code is governed by a zlib-style
-// license that can be found in the LICENSE file.
-
-// +build !su
-
-package service_test
-
-import "testing"
-
-func TestInstallRunRestartStopRemove(t *testing.T) {
-	t.Skip("skipping test as not running as root/admin (Build tag: su)")
-}
diff --git a/vendor/github.com/kardianos/service/service_su_test.go b/vendor/github.com/kardianos/service/service_su_test.go
deleted file mode 100644
index 74eca3da..00000000
--- a/vendor/github.com/kardianos/service/service_su_test.go
+++ /dev/null
@@ -1,180 +0,0 @@
-// Copyright 2015 Daniel Theophanes.
-// Use of this source code is governed by a zlib-style
-// license that can be found in the LICENSE file.
-
-// This needs to be run as root/admin hence the reason there is a build tag
-// +build su
-
-package service_test
-
-import (
-	"flag"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"os"
-	"path/filepath"
-	"regexp"
-	"testing"
-	"time"
-
-	"github.com/kardianos/service"
-)
-
-const runAsServiceArg = "RunThisAsService"
-
-func TestMain(m *testing.M) {
-	reportDir := flag.String("su.reportDir", "", "")
-	runAsService := flag.Bool("su.runAsService", false, "")
-	flag.Parse()
-	if !*runAsService {
-		os.Exit(m.Run())
-	}
-	if len(*reportDir) == 0 {
-		log.Fatal("missing su.reportDir argument")
-	}
-	writeReport(*reportDir, "call")
-	runService()
-	writeReport(*reportDir, "finished")
-}
-
-func TestInstallRunRestartStopRemove(t *testing.T) {
-	p := &program{}
-	reportDir := mustTempDir(t)
-	defer os.RemoveAll(reportDir)
-
-	s := mustNewRunAsService(t, p, reportDir)
-	_ = s.Uninstall()
-
-	if err := s.Install(); err != nil {
-		t.Fatal("Install", err)
-	}
-	defer s.Uninstall()
-
-	if err := s.Start(); err != nil {
-		t.Fatal("Start", err)
-	}
-	defer s.Stop()
-	checkReport(t, reportDir, "Start()", 1, 0)
-
-	if err := s.Restart(); err != nil {
-		t.Fatal("restart", err)
-	}
-
-	checkReport(t, reportDir, "Restart()", 2, 1)
-	p.numStopped = 0
-	if err := s.Stop(); err != nil {
-		t.Fatal("stop", err)
-	}
-	checkReport(t, reportDir, "Stop()", 2, 2)
-
-	if err := s.Uninstall(); err != nil {
-		t.Fatal("uninstall", err)
-	}
-}
-
-func runService() {
-	p := &program{}
-	sc := &service.Config{
-		Name: "go_service_test",
-	}
-	s, err := service.New(p, sc)
-	if err != nil {
-		log.Fatal(err)
-	}
-	if err = s.Run(); err != nil {
-		log.Fatal(err)
-	}
-}
-
-func mustTempDir(t *testing.T) string {
-	dir, err := ioutil.TempDir("", "servicetest")
-	if err != nil {
-		t.Fatal(err)
-	}
-	return dir
-}
-
-func writeReport(reportDir string, action string) {
-	b := []byte("go_test_service_report")
-	timeStamp := time.Now().UnixNano()
-	err := ioutil.WriteFile(
-		filepath.Join(reportDir, fmt.Sprintf("%d-%s", timeStamp, action)),
-		b,
-		0644,
-	)
-	if err != nil {
-		log.Fatal(err)
-	}
-}
-
-var matchActionRegexp = regexp.MustCompile("^(\\d+-)([a-z]*)$")
-
-func getReport(
-	t *testing.T,
-	reportDir string,
-) (numCalls int, numFinished int) {
-	numCalls = 0
-	numFinished = 0
-	files, err := ioutil.ReadDir(reportDir)
-	if err != nil {
-		t.Fatalf("ReadDir(%s) err: %s", reportDir, err)
-	}
-
-	for _, file := range files {
-		if matchActionRegexp.MatchString(file.Name()) {
-			action := matchActionRegexp.ReplaceAllString(file.Name(), "$2")
-			switch action {
-			case "call":
-				numCalls++
-			case "finished":
-				numFinished++
-			default:
-				t.Fatalf("getReport() found report with incorrect action: %s", action)
-			}
-		}
-	}
-	return
-}
-
-func checkReport(
-	t *testing.T,
-	reportDir string,
-	msgPrefix string,
-	wantNumCalled int,
-	wantNumFinished int,
-) {
-	var numCalled int
-	var numFinished int
-	for i := 0; i < 25; i++ {
-		numCalled, numFinished = getReport(t, reportDir)
-		<-time.After(200 * time.Millisecond)
-		if numCalled == wantNumCalled && numFinished == wantNumFinished {
-			return
-		}
-	}
-	if numCalled != wantNumCalled {
-		t.Fatalf("%s - numCalled: %d, want %d",
-			msgPrefix, numCalled, wantNumCalled)
-	}
-	if numFinished != wantNumFinished {
-		t.Fatalf("%s - numFinished: %d, want %d",
-			msgPrefix, numFinished, wantNumFinished)
-	}
-}
-
-func mustNewRunAsService(
-	t *testing.T,
-	p *program,
-	reportDir string,
-) service.Service {
-	sc := &service.Config{
-		Name:      "go_service_test",
-		Arguments: []string{"-test.v=true", "-su.runAsService", "-su.reportDir", reportDir},
-	}
-	s, err := service.New(p, sc)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return s
-}
diff --git a/vendor/github.com/kardianos/service/service_test.go b/vendor/github.com/kardianos/service/service_test.go
deleted file mode 100644
index 6d1851b6..00000000
--- a/vendor/github.com/kardianos/service/service_test.go
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2015 Daniel Theophanes.
-// Use of this source code is governed by a zlib-style
-// license that can be found in the LICENSE file.
-
-package service_test
-
-import (
-	"testing"
-	"time"
-
-	"github.com/kardianos/service"
-)
-
-func TestRunInterrupt(t *testing.T) {
-	p := &program{}
-	sc := &service.Config{
-		Name: "go_service_test",
-	}
-	s, err := service.New(p, sc)
-	if err != nil {
-		t.Fatalf("New err: %s", err)
-	}
-
-	go func() {
-		<-time.After(1 * time.Second)
-		interruptProcess(t)
-	}()
-
-	go func() {
-		for i := 0; i < 25 && p.numStopped == 0; i++ {
-			<-time.After(200 * time.Millisecond)
-		}
-		if p.numStopped == 0 {
-			t.Fatal("Run() hasn't been stopped")
-		}
-	}()
-
-	if err = s.Run(); err != nil {
-		t.Fatalf("Run() err: %s", err)
-	}
-}
-
-type program struct {
-	numStopped int
-}
-
-func (p *program) Start(s service.Service) error {
-	go p.run()
-	return nil
-}
-func (p *program) run() {
-	// Do work here
-}
-func (p *program) Stop(s service.Service) error {
-	p.numStopped++
-	return nil
-}
diff --git a/vendor/github.com/kardianos/service/service_windows_test.go b/vendor/github.com/kardianos/service/service_windows_test.go
deleted file mode 100644
index 5a6460e2..00000000
--- a/vendor/github.com/kardianos/service/service_windows_test.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2015 Daniel Theophanes.
-// Use of this source code is governed by a zlib-style
-// license that can be found in the LICENSE file.
-
-package service
-
-import (
-	"testing"
-)
-
-func TestTimeout(t *testing.T) {
-	stopSpan := getStopTimeout()
-	t.Log("Max Stop Duration", stopSpan)
-}
diff --git a/vendor/github.com/kardianos/service/servicetest_unix_test.go b/vendor/github.com/kardianos/service/servicetest_unix_test.go
deleted file mode 100644
index 1c174d7d..00000000
--- a/vendor/github.com/kardianos/service/servicetest_unix_test.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2016 Lawrence Woodman <lwoodman@vlifesystems.com>
-// Use of this source code is governed by a zlib-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux nacl netbsd openbsd solaris
-
-package service_test
-
-import (
-	"os"
-	"testing"
-)
-
-func interruptProcess(t *testing.T) {
-	pid := os.Getpid()
-	p, err := os.FindProcess(pid)
-	if err != nil {
-		t.Fatalf("FindProcess: %s", err)
-	}
-	if err := p.Signal(os.Interrupt); err != nil {
-		t.Fatalf("Signal: %s", err)
-	}
-}
diff --git a/vendor/github.com/kardianos/service/servicetest_windows_test.go b/vendor/github.com/kardianos/service/servicetest_windows_test.go
deleted file mode 100644
index 69ffe279..00000000
--- a/vendor/github.com/kardianos/service/servicetest_windows_test.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2016 Lawrence Woodman <lwoodman@vlifesystems.com>
-// Use of this source code is governed by a zlib-style
-// license that can be found in the LICENSE file.
-
-package service_test
-
-import (
-	"os"
-	"syscall"
-	"testing"
-)
-
-func interruptProcess(t *testing.T) {
-	dll, err := syscall.LoadDLL("kernel32.dll")
-	if err != nil {
-		t.Fatalf("LoadDLL(\"kernel32.dll\") err: %s", err)
-	}
-	p, err := dll.FindProc("GenerateConsoleCtrlEvent")
-	if err != nil {
-		t.Fatalf("FindProc(\"GenerateConsoleCtrlEvent\") err: %s", err)
-	}
-	// Send the CTRL_BREAK_EVENT to a console process group that shares
-	// the console associated with the calling process.
-	// https://msdn.microsoft.com/en-us/library/windows/desktop/ms683155(v=vs.85).aspx
-	pid := os.Getpid()
-	r1, _, err := p.Call(syscall.CTRL_BREAK_EVENT, uintptr(pid))
-	if r1 == 0 {
-		t.Fatalf("Call(CTRL_BREAK_EVENT, %d) err: %s", pid, err)
-	}
-}
diff --git a/vendor/github.com/miekg/dns/client_test.go b/vendor/github.com/miekg/dns/client_test.go
deleted file mode 100644
index 020e141b..00000000
--- a/vendor/github.com/miekg/dns/client_test.go
+++ /dev/null
@@ -1,612 +0,0 @@
-package dns
-
-import (
-	"context"
-	"crypto/tls"
-	"fmt"
-	"net"
-	"strconv"
-	"strings"
-	"sync"
-	"testing"
-	"time"
-)
-
-func TestDialUDP(t *testing.T) {
-	HandleFunc("miek.nl.", HelloServer)
-	defer HandleRemove("miek.nl.")
-
-	s, addrstr, err := RunLocalUDPServer(":0")
-	if err != nil {
-		t.Fatalf("unable to run test server: %v", err)
-	}
-	defer s.Shutdown()
-
-	m := new(Msg)
-	m.SetQuestion("miek.nl.", TypeSOA)
-
-	c := new(Client)
-	conn, err := c.Dial(addrstr)
-	if err != nil {
-		t.Fatalf("failed to dial: %v", err)
-	}
-	if conn == nil {
-		t.Fatalf("conn is nil")
-	}
-}
-
-func TestClientSync(t *testing.T) {
-	HandleFunc("miek.nl.", HelloServer)
-	defer HandleRemove("miek.nl.")
-
-	s, addrstr, err := RunLocalUDPServer(":0")
-	if err != nil {
-		t.Fatalf("unable to run test server: %v", err)
-	}
-	defer s.Shutdown()
-
-	m := new(Msg)
-	m.SetQuestion("miek.nl.", TypeSOA)
-
-	c := new(Client)
-	r, _, err := c.Exchange(m, addrstr)
-	if err != nil {
-		t.Fatalf("failed to exchange: %v", err)
-	}
-	if r == nil {
-		t.Fatal("response is nil")
-	}
-	if r.Rcode != RcodeSuccess {
-		t.Errorf("failed to get an valid answer\n%v", r)
-	}
-	// And now with plain Exchange().
-	r, err = Exchange(m, addrstr)
-	if err != nil {
-		t.Errorf("failed to exchange: %v", err)
-	}
-	if r == nil || r.Rcode != RcodeSuccess {
-		t.Errorf("failed to get an valid answer\n%v", r)
-	}
-}
-
-func TestClientLocalAddress(t *testing.T) {
-	HandleFunc("miek.nl.", HelloServerEchoAddrPort)
-	defer HandleRemove("miek.nl.")
-
-	s, addrstr, err := RunLocalUDPServer(":0")
-	if err != nil {
-		t.Fatalf("unable to run test server: %v", err)
-	}
-	defer s.Shutdown()
-
-	m := new(Msg)
-	m.SetQuestion("miek.nl.", TypeSOA)
-
-	c := new(Client)
-	laddr := net.UDPAddr{IP: net.ParseIP("0.0.0.0"), Port: 12345, Zone: ""}
-	c.Dialer = &net.Dialer{LocalAddr: &laddr}
-	r, _, err := c.Exchange(m, addrstr)
-	if err != nil {
-		t.Fatalf("failed to exchange: %v", err)
-	}
-	if r != nil && r.Rcode != RcodeSuccess {
-		t.Errorf("failed to get an valid answer\n%v", r)
-	}
-	if len(r.Extra) != 1 {
-		t.Errorf("failed to get additional answers\n%v", r)
-	}
-	txt := r.Extra[0].(*TXT)
-	if txt == nil {
-		t.Errorf("invalid TXT response\n%v", txt)
-	}
-	if len(txt.Txt) != 1 || !strings.Contains(txt.Txt[0], ":12345") {
-		t.Errorf("invalid TXT response\n%v", txt.Txt)
-	}
-}
-
-func TestClientTLSSyncV4(t *testing.T) {
-	HandleFunc("miek.nl.", HelloServer)
-	defer HandleRemove("miek.nl.")
-
-	cert, err := tls.X509KeyPair(CertPEMBlock, KeyPEMBlock)
-	if err != nil {
-		t.Fatalf("unable to build certificate: %v", err)
-	}
-
-	config := tls.Config{
-		Certificates: []tls.Certificate{cert},
-	}
-
-	s, addrstr, err := RunLocalTLSServer(":0", &config)
-	if err != nil {
-		t.Fatalf("unable to run test server: %v", err)
-	}
-	defer s.Shutdown()
-
-	m := new(Msg)
-	m.SetQuestion("miek.nl.", TypeSOA)
-
-	c := new(Client)
-
-	// test tcp-tls
-	c.Net = "tcp-tls"
-	c.TLSConfig = &tls.Config{
-		InsecureSkipVerify: true,
-	}
-
-	r, _, err := c.Exchange(m, addrstr)
-	if err != nil {
-		t.Fatalf("failed to exchange: %v", err)
-	}
-	if r == nil {
-		t.Fatal("response is nil")
-	}
-	if r.Rcode != RcodeSuccess {
-		t.Errorf("failed to get an valid answer\n%v", r)
-	}
-
-	// test tcp4-tls
-	c.Net = "tcp4-tls"
-	c.TLSConfig = &tls.Config{
-		InsecureSkipVerify: true,
-	}
-
-	r, _, err = c.Exchange(m, addrstr)
-	if err != nil {
-		t.Fatalf("failed to exchange: %v", err)
-	}
-	if r == nil {
-		t.Fatal("response is nil")
-	}
-	if r.Rcode != RcodeSuccess {
-		t.Errorf("failed to get an valid answer\n%v", r)
-	}
-}
-
-func TestClientSyncBadID(t *testing.T) {
-	HandleFunc("miek.nl.", HelloServerBadID)
-	defer HandleRemove("miek.nl.")
-
-	s, addrstr, err := RunLocalUDPServer(":0")
-	if err != nil {
-		t.Fatalf("unable to run test server: %v", err)
-	}
-	defer s.Shutdown()
-
-	m := new(Msg)
-	m.SetQuestion("miek.nl.", TypeSOA)
-
-	c := new(Client)
-	if _, _, err := c.Exchange(m, addrstr); err != ErrId {
-		t.Errorf("did not find a bad Id")
-	}
-	// And now with plain Exchange().
-	if _, err := Exchange(m, addrstr); err != ErrId {
-		t.Errorf("did not find a bad Id")
-	}
-}
-
-func TestClientEDNS0(t *testing.T) {
-	HandleFunc("miek.nl.", HelloServer)
-	defer HandleRemove("miek.nl.")
-
-	s, addrstr, err := RunLocalUDPServer(":0")
-	if err != nil {
-		t.Fatalf("unable to run test server: %v", err)
-	}
-	defer s.Shutdown()
-
-	m := new(Msg)
-	m.SetQuestion("miek.nl.", TypeDNSKEY)
-
-	m.SetEdns0(2048, true)
-
-	c := new(Client)
-	r, _, err := c.Exchange(m, addrstr)
-	if err != nil {
-		t.Fatalf("failed to exchange: %v", err)
-	}
-
-	if r != nil && r.Rcode != RcodeSuccess {
-		t.Errorf("failed to get a valid answer\n%v", r)
-	}
-}
-
-// Validates the transmission and parsing of local EDNS0 options.
-func TestClientEDNS0Local(t *testing.T) {
-	optStr1 := "1979:0x0707"
-	optStr2 := strconv.Itoa(EDNS0LOCALSTART) + ":0x0601"
-
-	handler := func(w ResponseWriter, req *Msg) {
-		m := new(Msg)
-		m.SetReply(req)
-
-		m.Extra = make([]RR, 1, 2)
-		m.Extra[0] = &TXT{Hdr: RR_Header{Name: m.Question[0].Name, Rrtype: TypeTXT, Class: ClassINET, Ttl: 0}, Txt: []string{"Hello local edns"}}
-
-		// If the local options are what we expect, then reflect them back.
-		ec1 := req.Extra[0].(*OPT).Option[0].(*EDNS0_LOCAL).String()
-		ec2 := req.Extra[0].(*OPT).Option[1].(*EDNS0_LOCAL).String()
-		if ec1 == optStr1 && ec2 == optStr2 {
-			m.Extra = append(m.Extra, req.Extra[0])
-		}
-
-		w.WriteMsg(m)
-	}
-
-	HandleFunc("miek.nl.", handler)
-	defer HandleRemove("miek.nl.")
-
-	s, addrstr, err := RunLocalUDPServer(":0")
-	if err != nil {
-		t.Fatalf("unable to run test server: %s", err)
-	}
-	defer s.Shutdown()
-
-	m := new(Msg)
-	m.SetQuestion("miek.nl.", TypeTXT)
-
-	// Add two local edns options to the query.
-	ec1 := &EDNS0_LOCAL{Code: 1979, Data: []byte{7, 7}}
-	ec2 := &EDNS0_LOCAL{Code: EDNS0LOCALSTART, Data: []byte{6, 1}}
-	o := &OPT{Hdr: RR_Header{Name: ".", Rrtype: TypeOPT}, Option: []EDNS0{ec1, ec2}}
-	m.Extra = append(m.Extra, o)
-
-	c := new(Client)
-	r, _, err := c.Exchange(m, addrstr)
-	if err != nil {
-		t.Fatalf("failed to exchange: %s", err)
-	}
-
-	if r == nil {
-		t.Fatal("response is nil")
-	}
-	if r.Rcode != RcodeSuccess {
-		t.Fatal("failed to get a valid answer")
-	}
-
-	txt := r.Extra[0].(*TXT).Txt[0]
-	if txt != "Hello local edns" {
-		t.Error("Unexpected result for miek.nl", txt, "!= Hello local edns")
-	}
-
-	// Validate the local options in the reply.
-	got := r.Extra[1].(*OPT).Option[0].(*EDNS0_LOCAL).String()
-	if got != optStr1 {
-		t.Errorf("failed to get local edns0 answer; got %s, expected %s", got, optStr1)
-	}
-
-	got = r.Extra[1].(*OPT).Option[1].(*EDNS0_LOCAL).String()
-	if got != optStr2 {
-		t.Errorf("failed to get local edns0 answer; got %s, expected %s", got, optStr2)
-	}
-}
-
-func TestClientConn(t *testing.T) {
-	HandleFunc("miek.nl.", HelloServer)
-	defer HandleRemove("miek.nl.")
-
-	// This uses TCP just to make it slightly different than TestClientSync
-	s, addrstr, err := RunLocalTCPServer(":0")
-	if err != nil {
-		t.Fatalf("unable to run test server: %v", err)
-	}
-	defer s.Shutdown()
-
-	m := new(Msg)
-	m.SetQuestion("miek.nl.", TypeSOA)
-
-	cn, err := Dial("tcp", addrstr)
-	if err != nil {
-		t.Errorf("failed to dial %s: %v", addrstr, err)
-	}
-
-	err = cn.WriteMsg(m)
-	if err != nil {
-		t.Errorf("failed to exchange: %v", err)
-	}
-	r, err := cn.ReadMsg()
-	if err != nil {
-		t.Errorf("failed to get a valid answer: %v", err)
-	}
-	if r == nil || r.Rcode != RcodeSuccess {
-		t.Errorf("failed to get an valid answer\n%v", r)
-	}
-
-	err = cn.WriteMsg(m)
-	if err != nil {
-		t.Errorf("failed to exchange: %v", err)
-	}
-	h := new(Header)
-	buf, err := cn.ReadMsgHeader(h)
-	if buf == nil {
-		t.Errorf("failed to get an valid answer\n%v", r)
-	}
-	if err != nil {
-		t.Errorf("failed to get a valid answer: %v", err)
-	}
-	if int(h.Bits&0xF) != RcodeSuccess {
-		t.Errorf("failed to get an valid answer in ReadMsgHeader\n%v", r)
-	}
-	if h.Ancount != 0 || h.Qdcount != 1 || h.Nscount != 0 || h.Arcount != 1 {
-		t.Errorf("expected to have question and additional in response; got something else: %+v", h)
-	}
-	if err = r.Unpack(buf); err != nil {
-		t.Errorf("unable to unpack message fully: %v", err)
-	}
-}
-
-func TestTruncatedMsg(t *testing.T) {
-	m := new(Msg)
-	m.SetQuestion("miek.nl.", TypeSRV)
-	cnt := 10
-	for i := 0; i < cnt; i++ {
-		r := &SRV{
-			Hdr:    RR_Header{Name: m.Question[0].Name, Rrtype: TypeSRV, Class: ClassINET, Ttl: 0},
-			Port:   uint16(i + 8000),
-			Target: "target.miek.nl.",
-		}
-		m.Answer = append(m.Answer, r)
-
-		re := &A{
-			Hdr: RR_Header{Name: m.Question[0].Name, Rrtype: TypeA, Class: ClassINET, Ttl: 0},
-			A:   net.ParseIP(fmt.Sprintf("127.0.0.%d", i)).To4(),
-		}
-		m.Extra = append(m.Extra, re)
-	}
-	buf, err := m.Pack()
-	if err != nil {
-		t.Errorf("failed to pack: %v", err)
-	}
-
-	r := new(Msg)
-	if err = r.Unpack(buf); err != nil {
-		t.Errorf("unable to unpack message: %v", err)
-	}
-	if len(r.Answer) != cnt {
-		t.Errorf("answer count after regular unpack doesn't match: %d", len(r.Answer))
-	}
-	if len(r.Extra) != cnt {
-		t.Errorf("extra count after regular unpack doesn't match: %d", len(r.Extra))
-	}
-
-	m.Truncated = true
-	buf, err = m.Pack()
-	if err != nil {
-		t.Errorf("failed to pack truncated: %v", err)
-	}
-
-	r = new(Msg)
-	if err = r.Unpack(buf); err != nil && err != ErrTruncated {
-		t.Errorf("unable to unpack truncated message: %v", err)
-	}
-	if !r.Truncated {
-		t.Errorf("truncated message wasn't unpacked as truncated")
-	}
-	if len(r.Answer) != cnt {
-		t.Errorf("answer count after truncated unpack doesn't match: %d", len(r.Answer))
-	}
-	if len(r.Extra) != cnt {
-		t.Errorf("extra count after truncated unpack doesn't match: %d", len(r.Extra))
-	}
-
-	// Now we want to remove almost all of the extra records
-	// We're going to loop over the extra to get the count of the size of all
-	// of them
-	off := 0
-	buf1 := make([]byte, m.Len())
-	for i := 0; i < len(m.Extra); i++ {
-		off, err = PackRR(m.Extra[i], buf1, off, nil, m.Compress)
-		if err != nil {
-			t.Errorf("failed to pack extra: %v", err)
-		}
-	}
-
-	// Remove all of the extra bytes but 10 bytes from the end of buf
-	off -= 10
-	buf1 = buf[:len(buf)-off]
-
-	r = new(Msg)
-	if err = r.Unpack(buf1); err != nil && err != ErrTruncated {
-		t.Errorf("unable to unpack cutoff message: %v", err)
-	}
-	if !r.Truncated {
-		t.Error("truncated cutoff message wasn't unpacked as truncated")
-	}
-	if len(r.Answer) != cnt {
-		t.Errorf("answer count after cutoff unpack doesn't match: %d", len(r.Answer))
-	}
-	if len(r.Extra) != 0 {
-		t.Errorf("extra count after cutoff unpack is not zero: %d", len(r.Extra))
-	}
-
-	// Now we want to remove almost all of the answer records too
-	buf1 = make([]byte, m.Len())
-	as := 0
-	for i := 0; i < len(m.Extra); i++ {
-		off1 := off
-		off, err = PackRR(m.Extra[i], buf1, off, nil, m.Compress)
-		as = off - off1
-		if err != nil {
-			t.Errorf("failed to pack extra: %v", err)
-		}
-	}
-
-	// Keep exactly one answer left
-	// This should still cause Answer to be nil
-	off -= as
-	buf1 = buf[:len(buf)-off]
-
-	r = new(Msg)
-	if err = r.Unpack(buf1); err != nil && err != ErrTruncated {
-		t.Errorf("unable to unpack cutoff message: %v", err)
-	}
-	if !r.Truncated {
-		t.Error("truncated cutoff message wasn't unpacked as truncated")
-	}
-	if len(r.Answer) != 0 {
-		t.Errorf("answer count after second cutoff unpack is not zero: %d", len(r.Answer))
-	}
-
-	// Now leave only 1 byte of the question
-	// Since the header is always 12 bytes, we just need to keep 13
-	buf1 = buf[:13]
-
-	r = new(Msg)
-	err = r.Unpack(buf1)
-	if err == nil || err == ErrTruncated {
-		t.Errorf("error should not be ErrTruncated from question cutoff unpack: %v", err)
-	}
-
-	// Finally, if we only have the header, we don't return an error.
-	buf1 = buf[:12]
-
-	r = new(Msg)
-	if err = r.Unpack(buf1); err != nil {
-		t.Errorf("from header-only unpack should not return an error: %v", err)
-	}
-}
-
-func TestTimeout(t *testing.T) {
-	// Set up a dummy UDP server that won't respond
-	addr, err := net.ResolveUDPAddr("udp", ":0")
-	if err != nil {
-		t.Fatalf("unable to resolve local udp address: %v", err)
-	}
-	conn, err := net.ListenUDP("udp", addr)
-	if err != nil {
-		t.Fatalf("unable to run test server: %v", err)
-	}
-	defer conn.Close()
-	addrstr := conn.LocalAddr().String()
-
-	// Message to send
-	m := new(Msg)
-	m.SetQuestion("miek.nl.", TypeTXT)
-
-	// Use a channel + timeout to ensure we don't get stuck if the
-	// Client Timeout is not working properly
-	done := make(chan struct{}, 2)
-
-	timeout := time.Millisecond
-	allowable := timeout + (10 * time.Millisecond)
-	abortAfter := timeout + (100 * time.Millisecond)
-
-	start := time.Now()
-
-	go func() {
-		c := &Client{Timeout: timeout}
-		_, _, err := c.Exchange(m, addrstr)
-		if err == nil {
-			t.Error("no timeout using Client.Exchange")
-		}
-		done <- struct{}{}
-	}()
-
-	go func() {
-		ctx, cancel := context.WithTimeout(context.Background(), timeout)
-		defer cancel()
-		c := &Client{}
-		_, _, err := c.ExchangeContext(ctx, m, addrstr)
-		if err == nil {
-			t.Error("no timeout using Client.ExchangeContext")
-		}
-		done <- struct{}{}
-	}()
-
-	// Wait for both the Exchange and ExchangeContext tests to be done.
-	for i := 0; i < 2; i++ {
-		select {
-		case <-done:
-		case <-time.After(abortAfter):
-		}
-	}
-
-	length := time.Since(start)
-
-	if length > allowable {
-		t.Errorf("exchange took longer %v than specified Timeout %v", length, allowable)
-	}
-}
-
-// Check that responses from deduplicated requests aren't shared between callers
-func TestConcurrentExchanges(t *testing.T) {
-	cases := make([]*Msg, 2)
-	cases[0] = new(Msg)
-	cases[1] = new(Msg)
-	cases[1].Truncated = true
-	for _, m := range cases {
-		block := make(chan struct{})
-		waiting := make(chan struct{})
-
-		handler := func(w ResponseWriter, req *Msg) {
-			r := m.Copy()
-			r.SetReply(req)
-
-			waiting <- struct{}{}
-			<-block
-			w.WriteMsg(r)
-		}
-
-		HandleFunc("miek.nl.", handler)
-		defer HandleRemove("miek.nl.")
-
-		s, addrstr, err := RunLocalUDPServer(":0")
-		if err != nil {
-			t.Fatalf("unable to run test server: %s", err)
-		}
-		defer s.Shutdown()
-
-		m := new(Msg)
-		m.SetQuestion("miek.nl.", TypeSRV)
-		c := &Client{
-			SingleInflight: true,
-		}
-		r := make([]*Msg, 2)
-
-		var wg sync.WaitGroup
-		wg.Add(len(r))
-		for i := 0; i < len(r); i++ {
-			go func(i int) {
-				defer wg.Done()
-				r[i], _, _ = c.Exchange(m.Copy(), addrstr)
-				if r[i] == nil {
-					t.Errorf("response %d is nil", i)
-				}
-			}(i)
-		}
-		select {
-		case <-waiting:
-		case <-time.After(time.Second):
-			t.FailNow()
-		}
-		close(block)
-		wg.Wait()
-
-		if r[0] == r[1] {
-			t.Errorf("got same response, expected non-shared responses")
-		}
-	}
-}
-
-func TestDoHExchange(t *testing.T) {
-	const addrstr = "https://dns.cloudflare.com/dns-query"
-
-	m := new(Msg)
-	m.SetQuestion("miek.nl.", TypeSOA)
-
-	cl := &Client{Net: "https"}
-
-	r, _, err := cl.Exchange(m, addrstr)
-	if err != nil {
-		t.Fatalf("failed to exchange: %v", err)
-	}
-
-	if r == nil || r.Rcode != RcodeSuccess {
-		t.Errorf("failed to get an valid answer\n%v", r)
-	}
-
-	t.Log(r)
-
-	// TODO: proper tests for this
-}
diff --git a/vendor/github.com/miekg/dns/clientconfig_test.go b/vendor/github.com/miekg/dns/clientconfig_test.go
deleted file mode 100644
index ad5d7d08..00000000
--- a/vendor/github.com/miekg/dns/clientconfig_test.go
+++ /dev/null
@@ -1,181 +0,0 @@
-package dns
-
-import (
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-)
-
-const normal string = `
-# Comment
-domain somedomain.com
-nameserver 10.28.10.2
-nameserver 11.28.10.1
-`
-
-const missingNewline string = `
-domain somedomain.com
-nameserver 10.28.10.2
-nameserver 11.28.10.1` // <- NOTE: NO newline.
-
-func testConfig(t *testing.T, data string) {
-	cc, err := ClientConfigFromReader(strings.NewReader(data))
-	if err != nil {
-		t.Errorf("error parsing resolv.conf: %v", err)
-	}
-	if l := len(cc.Servers); l != 2 {
-		t.Errorf("incorrect number of nameservers detected: %d", l)
-	}
-	if l := len(cc.Search); l != 1 {
-		t.Errorf("domain directive not parsed correctly: %v", cc.Search)
-	} else {
-		if cc.Search[0] != "somedomain.com" {
-			t.Errorf("domain is unexpected: %v", cc.Search[0])
-		}
-	}
-}
-
-func TestNameserver(t *testing.T)          { testConfig(t, normal) }
-func TestMissingFinalNewLine(t *testing.T) { testConfig(t, missingNewline) }
-
-func TestNdots(t *testing.T) {
-	ndotsVariants := map[string]int{
-		"options ndots:0":  0,
-		"options ndots:1":  1,
-		"options ndots:15": 15,
-		"options ndots:16": 15,
-		"options ndots:-1": 0,
-		"":                 1,
-	}
-
-	for data := range ndotsVariants {
-		cc, err := ClientConfigFromReader(strings.NewReader(data))
-		if err != nil {
-			t.Errorf("error parsing resolv.conf: %v", err)
-		}
-		if cc.Ndots != ndotsVariants[data] {
-			t.Errorf("Ndots not properly parsed: (Expected: %d / Was: %d)", ndotsVariants[data], cc.Ndots)
-		}
-	}
-}
-
-func TestClientConfigFromReaderAttempts(t *testing.T) {
-	testCases := []struct {
-		data     string
-		expected int
-	}{
-		{data: "options attempts:0", expected: 1},
-		{data: "options attempts:1", expected: 1},
-		{data: "options attempts:15", expected: 15},
-		{data: "options attempts:16", expected: 16},
-		{data: "options attempts:-1", expected: 1},
-		{data: "options attempt:", expected: 2},
-	}
-
-	for _, test := range testCases {
-		test := test
-		t.Run(strings.Replace(test.data, ":", " ", -1), func(t *testing.T) {
-			t.Parallel()
-
-			cc, err := ClientConfigFromReader(strings.NewReader(test.data))
-			if err != nil {
-				t.Errorf("error parsing resolv.conf: %v", err)
-			}
-			if cc.Attempts != test.expected {
-				t.Errorf("A attempts not properly parsed: (Expected: %d / Was: %d)", test.expected, cc.Attempts)
-			}
-		})
-	}
-}
-
-func TestReadFromFile(t *testing.T) {
-	tempDir, err := ioutil.TempDir("", "")
-	if err != nil {
-		t.Fatalf("tempDir: %v", err)
-	}
-	defer os.RemoveAll(tempDir)
-
-	path := filepath.Join(tempDir, "resolv.conf")
-	if err := ioutil.WriteFile(path, []byte(normal), 0644); err != nil {
-		t.Fatalf("writeFile: %v", err)
-	}
-	cc, err := ClientConfigFromFile(path)
-	if err != nil {
-		t.Errorf("error parsing resolv.conf: %v", err)
-	}
-	if l := len(cc.Servers); l != 2 {
-		t.Errorf("incorrect number of nameservers detected: %d", l)
-	}
-	if l := len(cc.Search); l != 1 {
-		t.Errorf("domain directive not parsed correctly: %v", cc.Search)
-	} else {
-		if cc.Search[0] != "somedomain.com" {
-			t.Errorf("domain is unexpected: %v", cc.Search[0])
-		}
-	}
-}
-
-func TestNameListNdots1(t *testing.T) {
-	cfg := ClientConfig{
-		Ndots: 1,
-	}
-	// fqdn should be only result returned
-	names := cfg.NameList("miek.nl.")
-	if len(names) != 1 {
-		t.Errorf("NameList returned != 1 names: %v", names)
-	} else if names[0] != "miek.nl." {
-		t.Errorf("NameList didn't return sent fqdn domain: %v", names[0])
-	}
-
-	cfg.Search = []string{
-		"test",
-	}
-	// Sent domain has NDots and search
-	names = cfg.NameList("miek.nl")
-	if len(names) != 2 {
-		t.Errorf("NameList returned != 2 names: %v", names)
-	} else if names[0] != "miek.nl." {
-		t.Errorf("NameList didn't return sent domain first: %v", names[0])
-	} else if names[1] != "miek.nl.test." {
-		t.Errorf("NameList didn't return search last: %v", names[1])
-	}
-}
-func TestNameListNdots2(t *testing.T) {
-	cfg := ClientConfig{
-		Ndots: 2,
-	}
-
-	// Sent domain has less than NDots and search
-	cfg.Search = []string{
-		"test",
-	}
-	names := cfg.NameList("miek.nl")
-
-	if len(names) != 2 {
-		t.Errorf("NameList returned != 2 names: %v", names)
-	} else if names[0] != "miek.nl.test." {
-		t.Errorf("NameList didn't return search first: %v", names[0])
-	} else if names[1] != "miek.nl." {
-		t.Errorf("NameList didn't return sent domain last: %v", names[1])
-	}
-}
-
-func TestNameListNdots0(t *testing.T) {
-	cfg := ClientConfig{
-		Ndots: 0,
-	}
-	cfg.Search = []string{
-		"test",
-	}
-	// Sent domain has less than NDots and search
-	names := cfg.NameList("miek")
-	if len(names) != 2 {
-		t.Errorf("NameList returned != 2 names: %v", names)
-	} else if names[0] != "miek." {
-		t.Errorf("NameList didn't return search first: %v", names[0])
-	} else if names[1] != "miek.test." {
-		t.Errorf("NameList didn't return sent domain last: %v", names[1])
-	}
-}
diff --git a/vendor/github.com/miekg/dns/dns_bench_test.go b/vendor/github.com/miekg/dns/dns_bench_test.go
deleted file mode 100644
index 7bf8bd21..00000000
--- a/vendor/github.com/miekg/dns/dns_bench_test.go
+++ /dev/null
@@ -1,230 +0,0 @@
-package dns
-
-import (
-	"net"
-	"testing"
-)
-
-func BenchmarkMsgLength(b *testing.B) {
-	b.StopTimer()
-	makeMsg := func(question string, ans, ns, e []RR) *Msg {
-		msg := new(Msg)
-		msg.SetQuestion(Fqdn(question), TypeANY)
-		msg.Answer = append(msg.Answer, ans...)
-		msg.Ns = append(msg.Ns, ns...)
-		msg.Extra = append(msg.Extra, e...)
-		msg.Compress = true
-		return msg
-	}
-	name1 := "12345678901234567890123456789012345.12345678.123."
-	rrMx := testRR(name1 + " 3600 IN MX 10 " + name1)
-	msg := makeMsg(name1, []RR{rrMx, rrMx}, nil, nil)
-	b.StartTimer()
-	for i := 0; i < b.N; i++ {
-		msg.Len()
-	}
-}
-
-func BenchmarkMsgLengthNoCompression(b *testing.B) {
-	b.StopTimer()
-	makeMsg := func(question string, ans, ns, e []RR) *Msg {
-		msg := new(Msg)
-		msg.SetQuestion(Fqdn(question), TypeANY)
-		msg.Answer = append(msg.Answer, ans...)
-		msg.Ns = append(msg.Ns, ns...)
-		msg.Extra = append(msg.Extra, e...)
-		return msg
-	}
-	name1 := "12345678901234567890123456789012345.12345678.123."
-	rrMx := testRR(name1 + " 3600 IN MX 10 " + name1)
-	msg := makeMsg(name1, []RR{rrMx, rrMx}, nil, nil)
-	b.StartTimer()
-	for i := 0; i < b.N; i++ {
-		msg.Len()
-	}
-}
-
-func BenchmarkMsgLengthPack(b *testing.B) {
-	makeMsg := func(question string, ans, ns, e []RR) *Msg {
-		msg := new(Msg)
-		msg.SetQuestion(Fqdn(question), TypeANY)
-		msg.Answer = append(msg.Answer, ans...)
-		msg.Ns = append(msg.Ns, ns...)
-		msg.Extra = append(msg.Extra, e...)
-		msg.Compress = true
-		return msg
-	}
-	name1 := "12345678901234567890123456789012345.12345678.123."
-	rrMx := testRR(name1 + " 3600 IN MX 10 " + name1)
-	msg := makeMsg(name1, []RR{rrMx, rrMx}, nil, nil)
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		_, _ = msg.Pack()
-	}
-}
-
-func BenchmarkPackDomainName(b *testing.B) {
-	name1 := "12345678901234567890123456789012345.12345678.123."
-	buf := make([]byte, len(name1)+1)
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		_, _ = PackDomainName(name1, buf, 0, nil, false)
-	}
-}
-
-func BenchmarkUnpackDomainName(b *testing.B) {
-	name1 := "12345678901234567890123456789012345.12345678.123."
-	buf := make([]byte, len(name1)+1)
-	_, _ = PackDomainName(name1, buf, 0, nil, false)
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		_, _, _ = UnpackDomainName(buf, 0)
-	}
-}
-
-func BenchmarkUnpackDomainNameUnprintable(b *testing.B) {
-	name1 := "\x02\x02\x02\x025\x02\x02\x02\x02.12345678.123."
-	buf := make([]byte, len(name1)+1)
-	_, _ = PackDomainName(name1, buf, 0, nil, false)
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		_, _, _ = UnpackDomainName(buf, 0)
-	}
-}
-
-func BenchmarkCopy(b *testing.B) {
-	b.ReportAllocs()
-	m := new(Msg)
-	m.SetQuestion("miek.nl.", TypeA)
-	rr := testRR("miek.nl. 2311 IN A 127.0.0.1")
-	m.Answer = []RR{rr}
-	rr = testRR("miek.nl. 2311 IN NS 127.0.0.1")
-	m.Ns = []RR{rr}
-	rr = testRR("miek.nl. 2311 IN A 127.0.0.1")
-	m.Extra = []RR{rr}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		m.Copy()
-	}
-}
-
-func BenchmarkPackA(b *testing.B) {
-	a := &A{Hdr: RR_Header{Name: ".", Rrtype: TypeA, Class: ClassANY}, A: net.IPv4(127, 0, 0, 1)}
-
-	buf := make([]byte, a.len())
-	b.ReportAllocs()
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		_, _ = PackRR(a, buf, 0, nil, false)
-	}
-}
-
-func BenchmarkUnpackA(b *testing.B) {
-	a := &A{Hdr: RR_Header{Name: ".", Rrtype: TypeA, Class: ClassANY}, A: net.IPv4(127, 0, 0, 1)}
-
-	buf := make([]byte, a.len())
-	PackRR(a, buf, 0, nil, false)
-	a = nil
-	b.ReportAllocs()
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		_, _, _ = UnpackRR(buf, 0)
-	}
-}
-
-func BenchmarkPackMX(b *testing.B) {
-	m := &MX{Hdr: RR_Header{Name: ".", Rrtype: TypeA, Class: ClassANY}, Mx: "mx.miek.nl."}
-
-	buf := make([]byte, m.len())
-	b.ReportAllocs()
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		_, _ = PackRR(m, buf, 0, nil, false)
-	}
-}
-
-func BenchmarkUnpackMX(b *testing.B) {
-	m := &MX{Hdr: RR_Header{Name: ".", Rrtype: TypeA, Class: ClassANY}, Mx: "mx.miek.nl."}
-
-	buf := make([]byte, m.len())
-	PackRR(m, buf, 0, nil, false)
-	m = nil
-	b.ReportAllocs()
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		_, _, _ = UnpackRR(buf, 0)
-	}
-}
-
-func BenchmarkPackAAAAA(b *testing.B) {
-	aaaa := testRR(". IN A ::1")
-
-	buf := make([]byte, aaaa.len())
-	b.ReportAllocs()
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		_, _ = PackRR(aaaa, buf, 0, nil, false)
-	}
-}
-
-func BenchmarkUnpackAAAA(b *testing.B) {
-	aaaa := testRR(". IN A ::1")
-
-	buf := make([]byte, aaaa.len())
-	PackRR(aaaa, buf, 0, nil, false)
-	aaaa = nil
-	b.ReportAllocs()
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		_, _, _ = UnpackRR(buf, 0)
-	}
-}
-
-func BenchmarkPackMsg(b *testing.B) {
-	makeMsg := func(question string, ans, ns, e []RR) *Msg {
-		msg := new(Msg)
-		msg.SetQuestion(Fqdn(question), TypeANY)
-		msg.Answer = append(msg.Answer, ans...)
-		msg.Ns = append(msg.Ns, ns...)
-		msg.Extra = append(msg.Extra, e...)
-		msg.Compress = true
-		return msg
-	}
-	name1 := "12345678901234567890123456789012345.12345678.123."
-	rrMx := testRR(name1 + " 3600 IN MX 10 " + name1)
-	msg := makeMsg(name1, []RR{rrMx, rrMx}, nil, nil)
-	buf := make([]byte, 512)
-	b.ReportAllocs()
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		_, _ = msg.PackBuffer(buf)
-	}
-}
-
-func BenchmarkUnpackMsg(b *testing.B) {
-	makeMsg := func(question string, ans, ns, e []RR) *Msg {
-		msg := new(Msg)
-		msg.SetQuestion(Fqdn(question), TypeANY)
-		msg.Answer = append(msg.Answer, ans...)
-		msg.Ns = append(msg.Ns, ns...)
-		msg.Extra = append(msg.Extra, e...)
-		msg.Compress = true
-		return msg
-	}
-	name1 := "12345678901234567890123456789012345.12345678.123."
-	rrMx := testRR(name1 + " 3600 IN MX 10 " + name1)
-	msg := makeMsg(name1, []RR{rrMx, rrMx}, nil, nil)
-	msgBuf, _ := msg.Pack()
-	b.ReportAllocs()
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		_ = msg.Unpack(msgBuf)
-	}
-}
-
-func BenchmarkIdGeneration(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		_ = id()
-	}
-}
diff --git a/vendor/github.com/miekg/dns/dns_test.go b/vendor/github.com/miekg/dns/dns_test.go
deleted file mode 100644
index 3c9d910d..00000000
--- a/vendor/github.com/miekg/dns/dns_test.go
+++ /dev/null
@@ -1,320 +0,0 @@
-package dns
-
-import (
-	"bytes"
-	"encoding/hex"
-	"net"
-	"testing"
-)
-
-func TestPackUnpack(t *testing.T) {
-	out := new(Msg)
-	out.Answer = make([]RR, 1)
-	key := new(DNSKEY)
-	key = &DNSKEY{Flags: 257, Protocol: 3, Algorithm: RSASHA1}
-	key.Hdr = RR_Header{Name: "miek.nl.", Rrtype: TypeDNSKEY, Class: ClassINET, Ttl: 3600}
-	key.PublicKey = "AwEAAaHIwpx3w4VHKi6i1LHnTaWeHCL154Jug0Rtc9ji5qwPXpBo6A5sRv7cSsPQKPIwxLpyCrbJ4mr2L0EPOdvP6z6YfljK2ZmTbogU9aSU2fiq/4wjxbdkLyoDVgtO+JsxNN4bjr4WcWhsmk1Hg93FV9ZpkWb0Tbad8DFqNDzr//kZ"
-
-	out.Answer[0] = key
-	msg, err := out.Pack()
-	if err != nil {
-		t.Error("failed to pack msg with DNSKEY")
-	}
-	in := new(Msg)
-	if in.Unpack(msg) != nil {
-		t.Error("failed to unpack msg with DNSKEY")
-	}
-
-	sig := new(RRSIG)
-	sig = &RRSIG{TypeCovered: TypeDNSKEY, Algorithm: RSASHA1, Labels: 2,
-		OrigTtl: 3600, Expiration: 4000, Inception: 4000, KeyTag: 34641, SignerName: "miek.nl.",
-		Signature: "AwEAAaHIwpx3w4VHKi6i1LHnTaWeHCL154Jug0Rtc9ji5qwPXpBo6A5sRv7cSsPQKPIwxLpyCrbJ4mr2L0EPOdvP6z6YfljK2ZmTbogU9aSU2fiq/4wjxbdkLyoDVgtO+JsxNN4bjr4WcWhsmk1Hg93FV9ZpkWb0Tbad8DFqNDzr//kZ"}
-	sig.Hdr = RR_Header{Name: "miek.nl.", Rrtype: TypeRRSIG, Class: ClassINET, Ttl: 3600}
-
-	out.Answer[0] = sig
-	msg, err = out.Pack()
-	if err != nil {
-		t.Error("failed to pack msg with RRSIG")
-	}
-
-	if in.Unpack(msg) != nil {
-		t.Error("failed to unpack msg with RRSIG")
-	}
-}
-
-func TestPackUnpack2(t *testing.T) {
-	m := new(Msg)
-	m.Extra = make([]RR, 1)
-	m.Answer = make([]RR, 1)
-	dom := "miek.nl."
-	rr := new(A)
-	rr.Hdr = RR_Header{Name: dom, Rrtype: TypeA, Class: ClassINET, Ttl: 0}
-	rr.A = net.IPv4(127, 0, 0, 1)
-
-	x := new(TXT)
-	x.Hdr = RR_Header{Name: dom, Rrtype: TypeTXT, Class: ClassINET, Ttl: 0}
-	x.Txt = []string{"heelalaollo"}
-
-	m.Extra[0] = x
-	m.Answer[0] = rr
-	_, err := m.Pack()
-	if err != nil {
-		t.Error("Packing failed: ", err)
-		return
-	}
-}
-
-func TestPackUnpack3(t *testing.T) {
-	m := new(Msg)
-	m.Extra = make([]RR, 2)
-	m.Answer = make([]RR, 1)
-	dom := "miek.nl."
-	rr := new(A)
-	rr.Hdr = RR_Header{Name: dom, Rrtype: TypeA, Class: ClassINET, Ttl: 0}
-	rr.A = net.IPv4(127, 0, 0, 1)
-
-	x1 := new(TXT)
-	x1.Hdr = RR_Header{Name: dom, Rrtype: TypeTXT, Class: ClassINET, Ttl: 0}
-	x1.Txt = []string{}
-
-	x2 := new(TXT)
-	x2.Hdr = RR_Header{Name: dom, Rrtype: TypeTXT, Class: ClassINET, Ttl: 0}
-	x2.Txt = []string{"heelalaollo"}
-
-	m.Extra[0] = x1
-	m.Extra[1] = x2
-	m.Answer[0] = rr
-	b, err := m.Pack()
-	if err != nil {
-		t.Error("packing failed: ", err)
-		return
-	}
-
-	var unpackMsg Msg
-	err = unpackMsg.Unpack(b)
-	if err != nil {
-		t.Error("unpacking failed")
-		return
-	}
-}
-
-func TestBailiwick(t *testing.T) {
-	yes := map[string]string{
-		"miek1.nl": "miek1.nl",
-		"miek.nl":  "ns.miek.nl",
-		".":        "miek.nl",
-	}
-	for parent, child := range yes {
-		if !IsSubDomain(parent, child) {
-			t.Errorf("%s should be child of %s", child, parent)
-			t.Errorf("comparelabels %d", CompareDomainName(parent, child))
-			t.Errorf("lenlabels %d %d", CountLabel(parent), CountLabel(child))
-		}
-	}
-	no := map[string]string{
-		"www.miek.nl":  "ns.miek.nl",
-		"m\\.iek.nl":   "ns.miek.nl",
-		"w\\.iek.nl":   "w.iek.nl",
-		"p\\\\.iek.nl": "ns.p.iek.nl", // p\\.iek.nl , literal \ in domain name
-		"miek.nl":      ".",
-	}
-	for parent, child := range no {
-		if IsSubDomain(parent, child) {
-			t.Errorf("%s should not be child of %s", child, parent)
-			t.Errorf("comparelabels %d", CompareDomainName(parent, child))
-			t.Errorf("lenlabels %d %d", CountLabel(parent), CountLabel(child))
-		}
-	}
-}
-
-func TestPackNAPTR(t *testing.T) {
-	for _, n := range []string{
-		`apple.com. IN NAPTR   100 50 "se" "SIP+D2U" "" _sip._udp.apple.com.`,
-		`apple.com. IN NAPTR   90 50 "se" "SIP+D2T" "" _sip._tcp.apple.com.`,
-		`apple.com. IN NAPTR   50 50 "se" "SIPS+D2T" "" _sips._tcp.apple.com.`,
-	} {
-		rr := testRR(n)
-		msg := make([]byte, rr.len())
-		if off, err := PackRR(rr, msg, 0, nil, false); err != nil {
-			t.Errorf("packing failed: %v", err)
-			t.Errorf("length %d, need more than %d", rr.len(), off)
-		}
-	}
-}
-
-func TestToRFC3597(t *testing.T) {
-	a := testRR("miek.nl. IN A 10.0.1.1")
-	x := new(RFC3597)
-	x.ToRFC3597(a)
-	if x.String() != `miek.nl.	3600	CLASS1	TYPE1	\# 4 0a000101` {
-		t.Errorf("string mismatch, got: %s", x)
-	}
-
-	b := testRR("miek.nl. IN MX 10 mx.miek.nl.")
-	x.ToRFC3597(b)
-	if x.String() != `miek.nl.	3600	CLASS1	TYPE15	\# 14 000a026d78046d69656b026e6c00` {
-		t.Errorf("string mismatch, got: %s", x)
-	}
-}
-
-func TestNoRdataPack(t *testing.T) {
-	data := make([]byte, 1024)
-	for typ, fn := range TypeToRR {
-		r := fn()
-		*r.Header() = RR_Header{Name: "miek.nl.", Rrtype: typ, Class: ClassINET, Ttl: 16}
-		_, err := PackRR(r, data, 0, nil, false)
-		if err != nil {
-			t.Errorf("failed to pack RR with zero rdata: %s: %v", TypeToString[typ], err)
-		}
-	}
-}
-
-func TestNoRdataUnpack(t *testing.T) {
-	data := make([]byte, 1024)
-	for typ, fn := range TypeToRR {
-		if typ == TypeSOA || typ == TypeTSIG || typ == TypeTKEY {
-			// SOA, TSIG will not be seen (like this) in dyn. updates?
-			// TKEY requires length fields to be present for the Key and OtherData fields
-			continue
-		}
-		r := fn()
-		*r.Header() = RR_Header{Name: "miek.nl.", Rrtype: typ, Class: ClassINET, Ttl: 16}
-		off, err := PackRR(r, data, 0, nil, false)
-		if err != nil {
-			// Should always works, TestNoDataPack should have caught this
-			t.Errorf("failed to pack RR: %v", err)
-			continue
-		}
-		if _, _, err := UnpackRR(data[:off], 0); err != nil {
-			t.Errorf("failed to unpack RR with zero rdata: %s: %v", TypeToString[typ], err)
-		}
-	}
-}
-
-func TestRdataOverflow(t *testing.T) {
-	rr := new(RFC3597)
-	rr.Hdr.Name = "."
-	rr.Hdr.Class = ClassINET
-	rr.Hdr.Rrtype = 65280
-	rr.Rdata = hex.EncodeToString(make([]byte, 0xFFFF))
-	buf := make([]byte, 0xFFFF*2)
-	if _, err := PackRR(rr, buf, 0, nil, false); err != nil {
-		t.Fatalf("maximum size rrdata pack failed: %v", err)
-	}
-	rr.Rdata += "00"
-	if _, err := PackRR(rr, buf, 0, nil, false); err != ErrRdata {
-		t.Fatalf("oversize rrdata pack didn't return ErrRdata - instead: %v", err)
-	}
-}
-
-func TestCopy(t *testing.T) {
-	rr := testRR("miek.nl. 2311 IN A 127.0.0.1") // Weird TTL to avoid catching TTL
-	rr1 := Copy(rr)
-	if rr.String() != rr1.String() {
-		t.Fatalf("Copy() failed %s != %s", rr.String(), rr1.String())
-	}
-}
-
-func TestMsgCopy(t *testing.T) {
-	m := new(Msg)
-	m.SetQuestion("miek.nl.", TypeA)
-	rr := testRR("miek.nl. 2311 IN A 127.0.0.1")
-	m.Answer = []RR{rr}
-	rr = testRR("miek.nl. 2311 IN NS 127.0.0.1")
-	m.Ns = []RR{rr}
-
-	m1 := m.Copy()
-	if m.String() != m1.String() {
-		t.Fatalf("Msg.Copy() failed %s != %s", m.String(), m1.String())
-	}
-
-	m1.Answer[0] = testRR("somethingelse.nl. 2311 IN A 127.0.0.1")
-	if m.String() == m1.String() {
-		t.Fatalf("Msg.Copy() failed; change to copy changed template %s", m.String())
-	}
-
-	rr = testRR("miek.nl. 2311 IN A 127.0.0.2")
-	m1.Answer = append(m1.Answer, rr)
-	if m1.Ns[0].String() == m1.Answer[1].String() {
-		t.Fatalf("Msg.Copy() failed; append changed underlying array %s", m1.Ns[0].String())
-	}
-}
-
-func TestMsgPackBuffer(t *testing.T) {
-	var testMessages = []string{
-		// news.ycombinator.com.in.escapemg.com.	IN	A, response
-		"586285830001000000010000046e6577730b79636f6d62696e61746f7203636f6d02696e086573636170656d6703636f6d0000010001c0210006000100000e10002c036e7332c02103646e730b67726f6f7665736861726bc02d77ed50e600002a3000000e1000093a8000000e10",
-
-		// news.ycombinator.com.in.escapemg.com.	IN	A, question
-		"586201000001000000000000046e6577730b79636f6d62696e61746f7203636f6d02696e086573636170656d6703636f6d0000010001",
-
-		"398781020001000000000000046e6577730b79636f6d62696e61746f7203636f6d0000010001",
-	}
-
-	for i, hexData := range testMessages {
-		// we won't fail the decoding of the hex
-		input, _ := hex.DecodeString(hexData)
-		m := new(Msg)
-		if err := m.Unpack(input); err != nil {
-			t.Errorf("packet %d failed to unpack", i)
-			continue
-		}
-	}
-}
-
-// Make sure we can decode a TKEY packet from the string, modify the RR, and then pack it again.
-func TestTKEY(t *testing.T) {
-	// An example TKEY RR captured.  There is no known accepted standard text format for a TKEY
-	// record so we do this from a hex string instead of from a text readable string.
-	tkeyStr := "0737362d6d732d370932322d3332633233332463303439663961662d633065612d313165372d363839362d6463333937396666656666640000f900ff0000000000d2086773732d747369670059fd01f359fe53730003000000b8a181b53081b2a0030a0100a10b06092a864882f712010202a2819d04819a60819706092a864886f71201020202006f8187308184a003020105a10302010fa2783076a003020112a26f046db29b1b1d2625da3b20b49dafef930dd1e9aad335e1c5f45dcd95e0005d67a1100f3e573d70506659dbed064553f1ab890f68f65ae10def0dad5b423b39f240ebe666f2886c5fe03819692d29182bbed87b83e1f9d16b7334ec16a3c4fc5ad4a990088e0be43f0c6957916f5fe60000"
-	tkeyBytes, err := hex.DecodeString(tkeyStr)
-	if err != nil {
-		t.Fatal("unable to decode TKEY string ", err)
-	}
-	// Decode the RR
-	rr, tkeyLen, unPackErr := UnpackRR(tkeyBytes, 0)
-	if unPackErr != nil {
-		t.Fatal("unable to decode TKEY RR", unPackErr)
-	}
-	// Make sure it's a TKEY record
-	if rr.Header().Rrtype != TypeTKEY {
-		t.Fatal("Unable to decode TKEY")
-	}
-	// Make sure we get back the same length
-	if rr.len() != len(tkeyBytes) {
-		t.Fatalf("Lengths don't match %d != %d", rr.len(), len(tkeyBytes))
-	}
-	// make space for it with some fudge room
-	msg := make([]byte, tkeyLen+1000)
-	offset, packErr := PackRR(rr, msg, 0, nil, false)
-	if packErr != nil {
-		t.Fatal("unable to pack TKEY RR", packErr)
-	}
-	if offset != len(tkeyBytes) {
-		t.Fatalf("mismatched TKEY RR size %d != %d", len(tkeyBytes), offset)
-	}
-	if bytes.Compare(tkeyBytes, msg[0:offset]) != 0 {
-		t.Fatal("mismatched TKEY data after rewriting bytes")
-	}
-	t.Logf("got TKEY of: " + rr.String())
-	// Now add some bytes to this and make sure we can encode OtherData properly
-	tkey := rr.(*TKEY)
-	tkey.OtherData = "abcd"
-	tkey.OtherLen = 2
-	offset, packErr = PackRR(tkey, msg, 0, nil, false)
-	if packErr != nil {
-		t.Fatal("unable to pack TKEY RR after modification", packErr)
-	}
-	if offset != (len(tkeyBytes) + 2) {
-		t.Fatalf("mismatched TKEY RR size %d != %d", offset, len(tkeyBytes)+2)
-	}
-	t.Logf("modified to TKEY of: " + rr.String())
-
-	// Make sure we can parse our string output
-	tkey.Hdr.Class = ClassINET // https://github.com/miekg/dns/issues/577
-	newRR, newError := NewRR(tkey.String())
-	if newError != nil {
-		t.Fatalf("unable to parse TKEY string: %s", newError)
-	}
-	t.Log("got reparsed TKEY of newRR: " + newRR.String())
-}
diff --git a/vendor/github.com/miekg/dns/dnssec_test.go b/vendor/github.com/miekg/dns/dnssec_test.go
deleted file mode 100644
index 2dea4e50..00000000
--- a/vendor/github.com/miekg/dns/dnssec_test.go
+++ /dev/null
@@ -1,860 +0,0 @@
-package dns
-
-import (
-	"crypto"
-	"crypto/ecdsa"
-	"crypto/rsa"
-	"reflect"
-	"strings"
-	"testing"
-	"time"
-
-	"golang.org/x/crypto/ed25519"
-)
-
-func getKey() *DNSKEY {
-	key := new(DNSKEY)
-	key.Hdr.Name = "miek.nl."
-	key.Hdr.Class = ClassINET
-	key.Hdr.Ttl = 14400
-	key.Flags = 256
-	key.Protocol = 3
-	key.Algorithm = RSASHA256
-	key.PublicKey = "AwEAAcNEU67LJI5GEgF9QLNqLO1SMq1EdoQ6E9f85ha0k0ewQGCblyW2836GiVsm6k8Kr5ECIoMJ6fZWf3CQSQ9ycWfTyOHfmI3eQ/1Covhb2y4bAmL/07PhrL7ozWBW3wBfM335Ft9xjtXHPy7ztCbV9qZ4TVDTW/Iyg0PiwgoXVesz"
-	return key
-}
-
-func getSoa() *SOA {
-	soa := new(SOA)
-	soa.Hdr = RR_Header{"miek.nl.", TypeSOA, ClassINET, 14400, 0}
-	soa.Ns = "open.nlnetlabs.nl."
-	soa.Mbox = "miekg.atoom.net."
-	soa.Serial = 1293945905
-	soa.Refresh = 14400
-	soa.Retry = 3600
-	soa.Expire = 604800
-	soa.Minttl = 86400
-	return soa
-}
-
-func TestSecure(t *testing.T) {
-	soa := getSoa()
-
-	sig := new(RRSIG)
-	sig.Hdr = RR_Header{"miek.nl.", TypeRRSIG, ClassINET, 14400, 0}
-	sig.TypeCovered = TypeSOA
-	sig.Algorithm = RSASHA256
-	sig.Labels = 2
-	sig.Expiration = 1296534305 // date -u '+%s' -d"2011-02-01 04:25:05"
-	sig.Inception = 1293942305  // date -u '+%s' -d"2011-01-02 04:25:05"
-	sig.OrigTtl = 14400
-	sig.KeyTag = 12051
-	sig.SignerName = "miek.nl."
-	sig.Signature = "oMCbslaAVIp/8kVtLSms3tDABpcPRUgHLrOR48OOplkYo+8TeEGWwkSwaz/MRo2fB4FxW0qj/hTlIjUGuACSd+b1wKdH5GvzRJc2pFmxtCbm55ygAh4EUL0F6U5cKtGJGSXxxg6UFCQ0doJCmiGFa78LolaUOXImJrk6AFrGa0M="
-
-	key := new(DNSKEY)
-	key.Hdr.Name = "miek.nl."
-	key.Hdr.Class = ClassINET
-	key.Hdr.Ttl = 14400
-	key.Flags = 256
-	key.Protocol = 3
-	key.Algorithm = RSASHA256
-	key.PublicKey = "AwEAAcNEU67LJI5GEgF9QLNqLO1SMq1EdoQ6E9f85ha0k0ewQGCblyW2836GiVsm6k8Kr5ECIoMJ6fZWf3CQSQ9ycWfTyOHfmI3eQ/1Covhb2y4bAmL/07PhrL7ozWBW3wBfM335Ft9xjtXHPy7ztCbV9qZ4TVDTW/Iyg0PiwgoXVesz"
-
-	// It should validate. Period is checked separately, so this will keep on working
-	if sig.Verify(key, []RR{soa}) != nil {
-		t.Error("failure to validate")
-	}
-}
-
-func TestSignature(t *testing.T) {
-	sig := new(RRSIG)
-	sig.Hdr.Name = "miek.nl."
-	sig.Hdr.Class = ClassINET
-	sig.Hdr.Ttl = 3600
-	sig.TypeCovered = TypeDNSKEY
-	sig.Algorithm = RSASHA1
-	sig.Labels = 2
-	sig.OrigTtl = 4000
-	sig.Expiration = 1000 //Thu Jan  1 02:06:40 CET 1970
-	sig.Inception = 800   //Thu Jan  1 01:13:20 CET 1970
-	sig.KeyTag = 34641
-	sig.SignerName = "miek.nl."
-	sig.Signature = "AwEAAaHIwpx3w4VHKi6i1LHnTaWeHCL154Jug0Rtc9ji5qwPXpBo6A5sRv7cSsPQKPIwxLpyCrbJ4mr2L0EPOdvP6z6YfljK2ZmTbogU9aSU2fiq/4wjxbdkLyoDVgtO+JsxNN4bjr4WcWhsmk1Hg93FV9ZpkWb0Tbad8DFqNDzr//kZ"
-
-	// Should not be valid
-	if sig.ValidityPeriod(time.Now()) {
-		t.Error("should not be valid")
-	}
-
-	sig.Inception = 315565800   //Tue Jan  1 10:10:00 CET 1980
-	sig.Expiration = 4102477800 //Fri Jan  1 10:10:00 CET 2100
-	if !sig.ValidityPeriod(time.Now()) {
-		t.Error("should be valid")
-	}
-}
-
-func TestSignVerify(t *testing.T) {
-	// The record we want to sign
-	soa := new(SOA)
-	soa.Hdr = RR_Header{"miek.nl.", TypeSOA, ClassINET, 14400, 0}
-	soa.Ns = "open.nlnetlabs.nl."
-	soa.Mbox = "miekg.atoom.net."
-	soa.Serial = 1293945905
-	soa.Refresh = 14400
-	soa.Retry = 3600
-	soa.Expire = 604800
-	soa.Minttl = 86400
-
-	soa1 := new(SOA)
-	soa1.Hdr = RR_Header{"*.miek.nl.", TypeSOA, ClassINET, 14400, 0}
-	soa1.Ns = "open.nlnetlabs.nl."
-	soa1.Mbox = "miekg.atoom.net."
-	soa1.Serial = 1293945905
-	soa1.Refresh = 14400
-	soa1.Retry = 3600
-	soa1.Expire = 604800
-	soa1.Minttl = 86400
-
-	srv := new(SRV)
-	srv.Hdr = RR_Header{"srv.miek.nl.", TypeSRV, ClassINET, 14400, 0}
-	srv.Port = 1000
-	srv.Weight = 800
-	srv.Target = "web1.miek.nl."
-
-	hinfo := &HINFO{
-		Hdr: RR_Header{
-			Name:   "miek.nl.",
-			Rrtype: TypeHINFO,
-			Class:  ClassINET,
-			Ttl:    3789,
-		},
-		Cpu: "X",
-		Os:  "Y",
-	}
-
-	// With this key
-	key := new(DNSKEY)
-	key.Hdr.Rrtype = TypeDNSKEY
-	key.Hdr.Name = "miek.nl."
-	key.Hdr.Class = ClassINET
-	key.Hdr.Ttl = 14400
-	key.Flags = 256
-	key.Protocol = 3
-	key.Algorithm = RSASHA256
-	privkey, _ := key.Generate(512)
-
-	// Fill in the values of the Sig, before signing
-	sig := new(RRSIG)
-	sig.Hdr = RR_Header{"miek.nl.", TypeRRSIG, ClassINET, 14400, 0}
-	sig.TypeCovered = soa.Hdr.Rrtype
-	sig.Labels = uint8(CountLabel(soa.Hdr.Name)) // works for all 3
-	sig.OrigTtl = soa.Hdr.Ttl
-	sig.Expiration = 1296534305 // date -u '+%s' -d"2011-02-01 04:25:05"
-	sig.Inception = 1293942305  // date -u '+%s' -d"2011-01-02 04:25:05"
-	sig.KeyTag = key.KeyTag()   // Get the keyfrom the Key
-	sig.SignerName = key.Hdr.Name
-	sig.Algorithm = RSASHA256
-
-	for _, r := range []RR{soa, soa1, srv, hinfo} {
-		if err := sig.Sign(privkey.(*rsa.PrivateKey), []RR{r}); err != nil {
-			t.Error("failure to sign the record:", err)
-			continue
-		}
-		if err := sig.Verify(key, []RR{r}); err != nil {
-			t.Errorf("failure to validate: %s", r.Header().Name)
-			continue
-		}
-	}
-}
-
-func Test65534(t *testing.T) {
-	t6 := new(RFC3597)
-	t6.Hdr = RR_Header{"miek.nl.", 65534, ClassINET, 14400, 0}
-	t6.Rdata = "505D870001"
-	key := new(DNSKEY)
-	key.Hdr.Name = "miek.nl."
-	key.Hdr.Rrtype = TypeDNSKEY
-	key.Hdr.Class = ClassINET
-	key.Hdr.Ttl = 14400
-	key.Flags = 256
-	key.Protocol = 3
-	key.Algorithm = RSASHA256
-	privkey, _ := key.Generate(1024)
-
-	sig := new(RRSIG)
-	sig.Hdr = RR_Header{"miek.nl.", TypeRRSIG, ClassINET, 14400, 0}
-	sig.TypeCovered = t6.Hdr.Rrtype
-	sig.Labels = uint8(CountLabel(t6.Hdr.Name))
-	sig.OrigTtl = t6.Hdr.Ttl
-	sig.Expiration = 1296534305 // date -u '+%s' -d"2011-02-01 04:25:05"
-	sig.Inception = 1293942305  // date -u '+%s' -d"2011-01-02 04:25:05"
-	sig.KeyTag = key.KeyTag()
-	sig.SignerName = key.Hdr.Name
-	sig.Algorithm = RSASHA256
-	if err := sig.Sign(privkey.(*rsa.PrivateKey), []RR{t6}); err != nil {
-		t.Error(err)
-		t.Error("failure to sign the TYPE65534 record")
-	}
-	if err := sig.Verify(key, []RR{t6}); err != nil {
-		t.Error(err)
-		t.Errorf("failure to validate %s", t6.Header().Name)
-	}
-}
-
-func TestDnskey(t *testing.T) {
-	pubkey, err := ReadRR(strings.NewReader(`
-miek.nl.	IN	DNSKEY	256 3 10 AwEAAZuMCu2FdugHkTrXYgl5qixvcDw1aDDlvL46/xJKbHBAHY16fNUb2b65cwko2Js/aJxUYJbZk5dwCDZxYfrfbZVtDPQuc3o8QaChVxC7/JYz2AHc9qHvqQ1j4VrH71RWINlQo6VYjzN/BGpMhOZoZOEwzp1HfsOE3lNYcoWU1smL ;{id = 5240 (zsk), size = 1024b}
-`), "Kmiek.nl.+010+05240.key")
-	if err != nil {
-		t.Fatal(err)
-	}
-	privStr := `Private-key-format: v1.3
-Algorithm: 10 (RSASHA512)
-Modulus: m4wK7YV26AeROtdiCXmqLG9wPDVoMOW8vjr/EkpscEAdjXp81RvZvrlzCSjYmz9onFRgltmTl3AINnFh+t9tlW0M9C5zejxBoKFXELv8ljPYAdz2oe+pDWPhWsfvVFYg2VCjpViPM38EakyE5mhk4TDOnUd+w4TeU1hyhZTWyYs=
-PublicExponent: AQAB
-PrivateExponent: UfCoIQ/Z38l8vB6SSqOI/feGjHEl/fxIPX4euKf0D/32k30fHbSaNFrFOuIFmWMB3LimWVEs6u3dpbB9CQeCVg7hwU5puG7OtuiZJgDAhNeOnxvo5btp4XzPZrJSxR4WNQnwIiYWbl0aFlL1VGgHC/3By89ENZyWaZcMLW4KGWE=
-Prime1: yxwC6ogAu8aVcDx2wg1V0b5M5P6jP8qkRFVMxWNTw60Vkn+ECvw6YAZZBHZPaMyRYZLzPgUlyYRd0cjupy4+fQ==
-Prime2: xA1bF8M0RTIQ6+A11AoVG6GIR/aPGg5sogRkIZ7ID/sF6g9HMVU/CM2TqVEBJLRPp73cv6ZeC3bcqOCqZhz+pw==
-Exponent1: xzkblyZ96bGYxTVZm2/vHMOXswod4KWIyMoOepK6B/ZPcZoIT6omLCgtypWtwHLfqyCz3MK51Nc0G2EGzg8rFQ==
-Exponent2: Pu5+mCEb7T5F+kFNZhQadHUklt0JUHbi3hsEvVoHpEGSw3BGDQrtIflDde0/rbWHgDPM4WQY+hscd8UuTXrvLw==
-Coefficient: UuRoNqe7YHnKmQzE6iDWKTMIWTuoqqrFAmXPmKQnC+Y+BQzOVEHUo9bXdDnoI9hzXP1gf8zENMYwYLeWpuYlFQ==
-`
-	privkey, err := pubkey.(*DNSKEY).ReadPrivateKey(strings.NewReader(privStr),
-		"Kmiek.nl.+010+05240.private")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if pubkey.(*DNSKEY).PublicKey != "AwEAAZuMCu2FdugHkTrXYgl5qixvcDw1aDDlvL46/xJKbHBAHY16fNUb2b65cwko2Js/aJxUYJbZk5dwCDZxYfrfbZVtDPQuc3o8QaChVxC7/JYz2AHc9qHvqQ1j4VrH71RWINlQo6VYjzN/BGpMhOZoZOEwzp1HfsOE3lNYcoWU1smL" {
-		t.Error("pubkey is not what we've read")
-	}
-	if pubkey.(*DNSKEY).PrivateKeyString(privkey) != privStr {
-		t.Error("privkey is not what we've read")
-		t.Errorf("%v", pubkey.(*DNSKEY).PrivateKeyString(privkey))
-	}
-}
-
-func TestTag(t *testing.T) {
-	key := new(DNSKEY)
-	key.Hdr.Name = "miek.nl."
-	key.Hdr.Rrtype = TypeDNSKEY
-	key.Hdr.Class = ClassINET
-	key.Hdr.Ttl = 3600
-	key.Flags = 256
-	key.Protocol = 3
-	key.Algorithm = RSASHA256
-	key.PublicKey = "AwEAAcNEU67LJI5GEgF9QLNqLO1SMq1EdoQ6E9f85ha0k0ewQGCblyW2836GiVsm6k8Kr5ECIoMJ6fZWf3CQSQ9ycWfTyOHfmI3eQ/1Covhb2y4bAmL/07PhrL7ozWBW3wBfM335Ft9xjtXHPy7ztCbV9qZ4TVDTW/Iyg0PiwgoXVesz"
-
-	tag := key.KeyTag()
-	if tag != 12051 {
-		t.Errorf("wrong key tag: %d for key %v", tag, key)
-	}
-}
-
-func TestKeyRSA(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping test in short mode.")
-	}
-	key := new(DNSKEY)
-	key.Hdr.Name = "miek.nl."
-	key.Hdr.Rrtype = TypeDNSKEY
-	key.Hdr.Class = ClassINET
-	key.Hdr.Ttl = 3600
-	key.Flags = 256
-	key.Protocol = 3
-	key.Algorithm = RSASHA256
-	priv, _ := key.Generate(2048)
-
-	soa := new(SOA)
-	soa.Hdr = RR_Header{"miek.nl.", TypeSOA, ClassINET, 14400, 0}
-	soa.Ns = "open.nlnetlabs.nl."
-	soa.Mbox = "miekg.atoom.net."
-	soa.Serial = 1293945905
-	soa.Refresh = 14400
-	soa.Retry = 3600
-	soa.Expire = 604800
-	soa.Minttl = 86400
-
-	sig := new(RRSIG)
-	sig.Hdr = RR_Header{"miek.nl.", TypeRRSIG, ClassINET, 14400, 0}
-	sig.TypeCovered = TypeSOA
-	sig.Algorithm = RSASHA256
-	sig.Labels = 2
-	sig.Expiration = 1296534305 // date -u '+%s' -d"2011-02-01 04:25:05"
-	sig.Inception = 1293942305  // date -u '+%s' -d"2011-01-02 04:25:05"
-	sig.OrigTtl = soa.Hdr.Ttl
-	sig.KeyTag = key.KeyTag()
-	sig.SignerName = key.Hdr.Name
-
-	if err := sig.Sign(priv.(*rsa.PrivateKey), []RR{soa}); err != nil {
-		t.Error("failed to sign")
-		return
-	}
-	if err := sig.Verify(key, []RR{soa}); err != nil {
-		t.Error("failed to verify")
-	}
-}
-
-func TestKeyToDS(t *testing.T) {
-	key := new(DNSKEY)
-	key.Hdr.Name = "miek.nl."
-	key.Hdr.Rrtype = TypeDNSKEY
-	key.Hdr.Class = ClassINET
-	key.Hdr.Ttl = 3600
-	key.Flags = 256
-	key.Protocol = 3
-	key.Algorithm = RSASHA256
-	key.PublicKey = "AwEAAcNEU67LJI5GEgF9QLNqLO1SMq1EdoQ6E9f85ha0k0ewQGCblyW2836GiVsm6k8Kr5ECIoMJ6fZWf3CQSQ9ycWfTyOHfmI3eQ/1Covhb2y4bAmL/07PhrL7ozWBW3wBfM335Ft9xjtXHPy7ztCbV9qZ4TVDTW/Iyg0PiwgoXVesz"
-
-	ds := key.ToDS(SHA1)
-	if strings.ToUpper(ds.Digest) != "B5121BDB5B8D86D0CC5FFAFBAAABE26C3E20BAC1" {
-		t.Errorf("wrong DS digest for SHA1\n%v", ds)
-	}
-}
-
-func TestSignRSA(t *testing.T) {
-	pub := "miek.nl. IN DNSKEY 256 3 5 AwEAAb+8lGNCxJgLS8rYVer6EnHVuIkQDghdjdtewDzU3G5R7PbMbKVRvH2Ma7pQyYceoaqWZQirSj72euPWfPxQnMy9ucCylA+FuH9cSjIcPf4PqJfdupHk9X6EBYjxrCLY4p1/yBwgyBIRJtZtAqM3ceAH2WovEJD6rTtOuHo5AluJ"
-
-	priv := `Private-key-format: v1.3
-Algorithm: 5 (RSASHA1)
-Modulus: v7yUY0LEmAtLythV6voScdW4iRAOCF2N217APNTcblHs9sxspVG8fYxrulDJhx6hqpZlCKtKPvZ649Z8/FCczL25wLKUD4W4f1xKMhw9/g+ol926keT1foQFiPGsItjinX/IHCDIEhEm1m0Cozdx4AfZai8QkPqtO064ejkCW4k=
-PublicExponent: AQAB
-PrivateExponent: YPwEmwjk5HuiROKU4xzHQ6l1hG8Iiha4cKRG3P5W2b66/EN/GUh07ZSf0UiYB67o257jUDVEgwCuPJz776zfApcCB4oGV+YDyEu7Hp/rL8KcSN0la0k2r9scKwxTp4BTJT23zyBFXsV/1wRDK1A5NxsHPDMYi2SoK63Enm/1ptk=
-Prime1: /wjOG+fD0ybNoSRn7nQ79udGeR1b0YhUA5mNjDx/x2fxtIXzygYk0Rhx9QFfDy6LOBvz92gbNQlzCLz3DJt5hw==
-Prime2: wHZsJ8OGhkp5p3mrJFZXMDc2mbYusDVTA+t+iRPdS797Tj0pjvU2HN4vTnTj8KBQp6hmnY7dLp9Y1qserySGbw==
-Exponent1: N0A7FsSRIg+IAN8YPQqlawoTtG1t1OkJ+nWrurPootScApX6iMvn8fyvw3p2k51rv84efnzpWAYiC8SUaQDNxQ==
-Exponent2: SvuYRaGyvo0zemE3oS+WRm2scxR8eiA8WJGeOc+obwOKCcBgeZblXzfdHGcEC1KaOcetOwNW/vwMA46lpLzJNw==
-Coefficient: 8+7ZN/JgByqv0NfULiFKTjtyegUcijRuyij7yNxYbCBneDvZGxJwKNi4YYXWx743pcAj4Oi4Oh86gcmxLs+hGw==
-Created: 20110302104537
-Publish: 20110302104537
-Activate: 20110302104537`
-
-	xk := testRR(pub)
-	k := xk.(*DNSKEY)
-	p, err := k.NewPrivateKey(priv)
-	if err != nil {
-		t.Error(err)
-	}
-	switch priv := p.(type) {
-	case *rsa.PrivateKey:
-		if 65537 != priv.PublicKey.E {
-			t.Error("exponenent should be 65537")
-		}
-	default:
-		t.Errorf("we should have read an RSA key: %v", priv)
-	}
-	if k.KeyTag() != 37350 {
-		t.Errorf("keytag should be 37350, got %d %v", k.KeyTag(), k)
-	}
-
-	soa := new(SOA)
-	soa.Hdr = RR_Header{"miek.nl.", TypeSOA, ClassINET, 14400, 0}
-	soa.Ns = "open.nlnetlabs.nl."
-	soa.Mbox = "miekg.atoom.net."
-	soa.Serial = 1293945905
-	soa.Refresh = 14400
-	soa.Retry = 3600
-	soa.Expire = 604800
-	soa.Minttl = 86400
-
-	sig := new(RRSIG)
-	sig.Hdr = RR_Header{"miek.nl.", TypeRRSIG, ClassINET, 14400, 0}
-	sig.Expiration = 1296534305 // date -u '+%s' -d"2011-02-01 04:25:05"
-	sig.Inception = 1293942305  // date -u '+%s' -d"2011-01-02 04:25:05"
-	sig.KeyTag = k.KeyTag()
-	sig.SignerName = k.Hdr.Name
-	sig.Algorithm = k.Algorithm
-
-	sig.Sign(p.(*rsa.PrivateKey), []RR{soa})
-	if sig.Signature != "D5zsobpQcmMmYsUMLxCVEtgAdCvTu8V/IEeP4EyLBjqPJmjt96bwM9kqihsccofA5LIJ7DN91qkCORjWSTwNhzCv7bMyr2o5vBZElrlpnRzlvsFIoAZCD9xg6ZY7ZyzUJmU6IcTwG4v3xEYajcpbJJiyaw/RqR90MuRdKPiBzSo=" {
-		t.Errorf("signature is not correct: %v", sig)
-	}
-}
-
-func TestSignVerifyECDSA(t *testing.T) {
-	pub := `example.net. 3600 IN DNSKEY 257 3 14 (
-	xKYaNhWdGOfJ+nPrL8/arkwf2EY3MDJ+SErKivBVSum1
-	w/egsXvSADtNJhyem5RCOpgQ6K8X1DRSEkrbYQ+OB+v8
-	/uX45NBwY8rp65F6Glur8I/mlVNgF6W/qTI37m40 )`
-	priv := `Private-key-format: v1.2
-Algorithm: 14 (ECDSAP384SHA384)
-PrivateKey: WURgWHCcYIYUPWgeLmiPY2DJJk02vgrmTfitxgqcL4vwW7BOrbawVmVe0d9V94SR`
-
-	eckey := testRR(pub)
-	privkey, err := eckey.(*DNSKEY).NewPrivateKey(priv)
-	if err != nil {
-		t.Fatal(err)
-	}
-	// TODO: Create separate test for this
-	ds := eckey.(*DNSKEY).ToDS(SHA384)
-	if ds.KeyTag != 10771 {
-		t.Fatal("wrong keytag on DS")
-	}
-	if ds.Digest != "72d7b62976ce06438e9c0bf319013cf801f09ecc84b8d7e9495f27e305c6a9b0563a9b5f4d288405c3008a946df983d6" {
-		t.Fatal("wrong DS Digest")
-	}
-	a := testRR("www.example.net. 3600 IN A 192.0.2.1")
-	sig := new(RRSIG)
-	sig.Hdr = RR_Header{"example.net.", TypeRRSIG, ClassINET, 14400, 0}
-	sig.Expiration, _ = StringToTime("20100909102025")
-	sig.Inception, _ = StringToTime("20100812102025")
-	sig.KeyTag = eckey.(*DNSKEY).KeyTag()
-	sig.SignerName = eckey.(*DNSKEY).Hdr.Name
-	sig.Algorithm = eckey.(*DNSKEY).Algorithm
-
-	if sig.Sign(privkey.(*ecdsa.PrivateKey), []RR{a}) != nil {
-		t.Fatal("failure to sign the record")
-	}
-
-	if err := sig.Verify(eckey.(*DNSKEY), []RR{a}); err != nil {
-		t.Fatalf("failure to validate:\n%s\n%s\n%s\n\n%s\n\n%v",
-			eckey.(*DNSKEY).String(),
-			a.String(),
-			sig.String(),
-			eckey.(*DNSKEY).PrivateKeyString(privkey),
-			err,
-		)
-	}
-}
-
-func TestSignVerifyECDSA2(t *testing.T) {
-	srv1 := testRR("srv.miek.nl. IN SRV 1000 800 0 web1.miek.nl.")
-	srv := srv1.(*SRV)
-
-	// With this key
-	key := new(DNSKEY)
-	key.Hdr.Rrtype = TypeDNSKEY
-	key.Hdr.Name = "miek.nl."
-	key.Hdr.Class = ClassINET
-	key.Hdr.Ttl = 14400
-	key.Flags = 256
-	key.Protocol = 3
-	key.Algorithm = ECDSAP256SHA256
-	privkey, err := key.Generate(256)
-	if err != nil {
-		t.Fatal("failure to generate key")
-	}
-
-	// Fill in the values of the Sig, before signing
-	sig := new(RRSIG)
-	sig.Hdr = RR_Header{"miek.nl.", TypeRRSIG, ClassINET, 14400, 0}
-	sig.TypeCovered = srv.Hdr.Rrtype
-	sig.Labels = uint8(CountLabel(srv.Hdr.Name)) // works for all 3
-	sig.OrigTtl = srv.Hdr.Ttl
-	sig.Expiration = 1296534305 // date -u '+%s' -d"2011-02-01 04:25:05"
-	sig.Inception = 1293942305  // date -u '+%s' -d"2011-01-02 04:25:05"
-	sig.KeyTag = key.KeyTag()   // Get the keyfrom the Key
-	sig.SignerName = key.Hdr.Name
-	sig.Algorithm = ECDSAP256SHA256
-
-	if sig.Sign(privkey.(*ecdsa.PrivateKey), []RR{srv}) != nil {
-		t.Fatal("failure to sign the record")
-	}
-
-	err = sig.Verify(key, []RR{srv})
-	if err != nil {
-		t.Errorf("failure to validate:\n%s\n%s\n%s\n\n%s\n\n%v",
-			key.String(),
-			srv.String(),
-			sig.String(),
-			key.PrivateKeyString(privkey),
-			err,
-		)
-	}
-}
-
-func TestSignVerifyEd25519(t *testing.T) {
-	srv1, err := NewRR("srv.miek.nl. IN SRV 1000 800 0 web1.miek.nl.")
-	if err != nil {
-		t.Fatal(err)
-	}
-	srv := srv1.(*SRV)
-
-	// With this key
-	key := new(DNSKEY)
-	key.Hdr.Rrtype = TypeDNSKEY
-	key.Hdr.Name = "miek.nl."
-	key.Hdr.Class = ClassINET
-	key.Hdr.Ttl = 14400
-	key.Flags = 256
-	key.Protocol = 3
-	key.Algorithm = ED25519
-	privkey, err := key.Generate(256)
-	if err != nil {
-		t.Fatal("failure to generate key")
-	}
-
-	// Fill in the values of the Sig, before signing
-	sig := new(RRSIG)
-	sig.Hdr = RR_Header{"miek.nl.", TypeRRSIG, ClassINET, 14400, 0}
-	sig.TypeCovered = srv.Hdr.Rrtype
-	sig.Labels = uint8(CountLabel(srv.Hdr.Name)) // works for all 3
-	sig.OrigTtl = srv.Hdr.Ttl
-	sig.Expiration = 1296534305 // date -u '+%s' -d"2011-02-01 04:25:05"
-	sig.Inception = 1293942305  // date -u '+%s' -d"2011-01-02 04:25:05"
-	sig.KeyTag = key.KeyTag()   // Get the keyfrom the Key
-	sig.SignerName = key.Hdr.Name
-	sig.Algorithm = ED25519
-
-	if sig.Sign(privkey.(ed25519.PrivateKey), []RR{srv}) != nil {
-		t.Fatal("failure to sign the record")
-	}
-
-	err = sig.Verify(key, []RR{srv})
-	if err != nil {
-		t.Logf("failure to validate:\n%s\n%s\n%s\n\n%s\n\n%v",
-			key.String(),
-			srv.String(),
-			sig.String(),
-			key.PrivateKeyString(privkey),
-			err,
-		)
-	}
-}
-
-// Here the test vectors from the relevant RFCs are checked.
-// rfc6605 6.1
-func TestRFC6605P256(t *testing.T) {
-	exDNSKEY := `example.net. 3600 IN DNSKEY 257 3 13 (
-                 GojIhhXUN/u4v54ZQqGSnyhWJwaubCvTmeexv7bR6edb
-                 krSqQpF64cYbcB7wNcP+e+MAnLr+Wi9xMWyQLc8NAA== )`
-	exPriv := `Private-key-format: v1.2
-Algorithm: 13 (ECDSAP256SHA256)
-PrivateKey: GU6SnQ/Ou+xC5RumuIUIuJZteXT2z0O/ok1s38Et6mQ=`
-	rrDNSKEY := testRR(exDNSKEY)
-	priv, err := rrDNSKEY.(*DNSKEY).NewPrivateKey(exPriv)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	exDS := `example.net. 3600 IN DS 55648 13 2 (
-             b4c8c1fe2e7477127b27115656ad6256f424625bf5c1
-             e2770ce6d6e37df61d17 )`
-	rrDS := testRR(exDS)
-	ourDS := rrDNSKEY.(*DNSKEY).ToDS(SHA256)
-	if !reflect.DeepEqual(ourDS, rrDS.(*DS)) {
-		t.Errorf("DS record differs:\n%v\n%v", ourDS, rrDS.(*DS))
-	}
-
-	exA := `www.example.net. 3600 IN A 192.0.2.1`
-	exRRSIG := `www.example.net. 3600 IN RRSIG A 13 3 3600 (
-                20100909100439 20100812100439 55648 example.net.
-                qx6wLYqmh+l9oCKTN6qIc+bw6ya+KJ8oMz0YP107epXA
-                yGmt+3SNruPFKG7tZoLBLlUzGGus7ZwmwWep666VCw== )`
-	rrA := testRR(exA)
-	rrRRSIG := testRR(exRRSIG)
-	if err := rrRRSIG.(*RRSIG).Verify(rrDNSKEY.(*DNSKEY), []RR{rrA}); err != nil {
-		t.Errorf("failure to validate the spec RRSIG: %v", err)
-	}
-
-	ourRRSIG := &RRSIG{
-		Hdr: RR_Header{
-			Ttl: rrA.Header().Ttl,
-		},
-		KeyTag:     rrDNSKEY.(*DNSKEY).KeyTag(),
-		SignerName: rrDNSKEY.(*DNSKEY).Hdr.Name,
-		Algorithm:  rrDNSKEY.(*DNSKEY).Algorithm,
-	}
-	ourRRSIG.Expiration, _ = StringToTime("20100909100439")
-	ourRRSIG.Inception, _ = StringToTime("20100812100439")
-	err = ourRRSIG.Sign(priv.(*ecdsa.PrivateKey), []RR{rrA})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err = ourRRSIG.Verify(rrDNSKEY.(*DNSKEY), []RR{rrA}); err != nil {
-		t.Errorf("failure to validate our RRSIG: %v", err)
-	}
-
-	// Signatures are randomized
-	rrRRSIG.(*RRSIG).Signature = ""
-	ourRRSIG.Signature = ""
-	if !reflect.DeepEqual(ourRRSIG, rrRRSIG.(*RRSIG)) {
-		t.Fatalf("RRSIG record differs:\n%v\n%v", ourRRSIG, rrRRSIG.(*RRSIG))
-	}
-}
-
-// rfc6605 6.2
-func TestRFC6605P384(t *testing.T) {
-	exDNSKEY := `example.net. 3600 IN DNSKEY 257 3 14 (
-                 xKYaNhWdGOfJ+nPrL8/arkwf2EY3MDJ+SErKivBVSum1
-                 w/egsXvSADtNJhyem5RCOpgQ6K8X1DRSEkrbYQ+OB+v8
-                 /uX45NBwY8rp65F6Glur8I/mlVNgF6W/qTI37m40 )`
-	exPriv := `Private-key-format: v1.2
-Algorithm: 14 (ECDSAP384SHA384)
-PrivateKey: WURgWHCcYIYUPWgeLmiPY2DJJk02vgrmTfitxgqcL4vwW7BOrbawVmVe0d9V94SR`
-	rrDNSKEY := testRR(exDNSKEY)
-	priv, err := rrDNSKEY.(*DNSKEY).NewPrivateKey(exPriv)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	exDS := `example.net. 3600 IN DS 10771 14 4 (
-           72d7b62976ce06438e9c0bf319013cf801f09ecc84b8
-           d7e9495f27e305c6a9b0563a9b5f4d288405c3008a94
-           6df983d6 )`
-	rrDS := testRR(exDS)
-	ourDS := rrDNSKEY.(*DNSKEY).ToDS(SHA384)
-	if !reflect.DeepEqual(ourDS, rrDS.(*DS)) {
-		t.Fatalf("DS record differs:\n%v\n%v", ourDS, rrDS.(*DS))
-	}
-
-	exA := `www.example.net. 3600 IN A 192.0.2.1`
-	exRRSIG := `www.example.net. 3600 IN RRSIG A 14 3 3600 (
-           20100909102025 20100812102025 10771 example.net.
-           /L5hDKIvGDyI1fcARX3z65qrmPsVz73QD1Mr5CEqOiLP
-           95hxQouuroGCeZOvzFaxsT8Glr74hbavRKayJNuydCuz
-           WTSSPdz7wnqXL5bdcJzusdnI0RSMROxxwGipWcJm )`
-	rrA := testRR(exA)
-	rrRRSIG := testRR(exRRSIG)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err = rrRRSIG.(*RRSIG).Verify(rrDNSKEY.(*DNSKEY), []RR{rrA}); err != nil {
-		t.Errorf("failure to validate the spec RRSIG: %v", err)
-	}
-
-	ourRRSIG := &RRSIG{
-		Hdr: RR_Header{
-			Ttl: rrA.Header().Ttl,
-		},
-		KeyTag:     rrDNSKEY.(*DNSKEY).KeyTag(),
-		SignerName: rrDNSKEY.(*DNSKEY).Hdr.Name,
-		Algorithm:  rrDNSKEY.(*DNSKEY).Algorithm,
-	}
-	ourRRSIG.Expiration, _ = StringToTime("20100909102025")
-	ourRRSIG.Inception, _ = StringToTime("20100812102025")
-	err = ourRRSIG.Sign(priv.(*ecdsa.PrivateKey), []RR{rrA})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err = ourRRSIG.Verify(rrDNSKEY.(*DNSKEY), []RR{rrA}); err != nil {
-		t.Errorf("failure to validate our RRSIG: %v", err)
-	}
-
-	// Signatures are randomized
-	rrRRSIG.(*RRSIG).Signature = ""
-	ourRRSIG.Signature = ""
-	if !reflect.DeepEqual(ourRRSIG, rrRRSIG.(*RRSIG)) {
-		t.Fatalf("RRSIG record differs:\n%v\n%v", ourRRSIG, rrRRSIG.(*RRSIG))
-	}
-}
-
-// rfc8080 6.1
-func TestRFC8080Ed25519Example1(t *testing.T) {
-	exDNSKEY := `example.com. 3600 IN DNSKEY 257 3 15 (
-             l02Woi0iS8Aa25FQkUd9RMzZHJpBoRQwAQEX1SxZJA4= )`
-	exPriv := `Private-key-format: v1.2
-Algorithm: 15 (ED25519)
-PrivateKey: ODIyNjAzODQ2MjgwODAxMjI2NDUxOTAyMDQxNDIyNjI=`
-	rrDNSKEY, err := NewRR(exDNSKEY)
-	if err != nil {
-		t.Fatal(err)
-	}
-	priv, err := rrDNSKEY.(*DNSKEY).NewPrivateKey(exPriv)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	exDS := `example.com. 3600 IN DS 3613 15 2 (
-             3aa5ab37efce57f737fc1627013fee07bdf241bd10f3b1964ab55c78e79
-             a304b )`
-	rrDS, err := NewRR(exDS)
-	if err != nil {
-		t.Fatal(err)
-	}
-	ourDS := rrDNSKEY.(*DNSKEY).ToDS(SHA256)
-	if !reflect.DeepEqual(ourDS, rrDS.(*DS)) {
-		t.Fatalf("DS record differs:\n%v\n%v", ourDS, rrDS.(*DS))
-	}
-
-	exMX := `example.com. 3600 IN MX 10 mail.example.com.`
-	exRRSIG := `example.com. 3600 IN RRSIG MX 15 2 3600 (
-             1440021600 1438207200 3613 example.com. (
-             oL9krJun7xfBOIWcGHi7mag5/hdZrKWw15jPGrHpjQeRAvTdszaPD+QLs3f
-             x8A4M3e23mRZ9VrbpMngwcrqNAg== ) )`
-	rrMX, err := NewRR(exMX)
-	if err != nil {
-		t.Fatal(err)
-	}
-	rrRRSIG, err := NewRR(exRRSIG)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err = rrRRSIG.(*RRSIG).Verify(rrDNSKEY.(*DNSKEY), []RR{rrMX}); err != nil {
-		t.Errorf("failure to validate the spec RRSIG: %v", err)
-	}
-
-	ourRRSIG := &RRSIG{
-		Hdr: RR_Header{
-			Ttl: rrMX.Header().Ttl,
-		},
-		KeyTag:     rrDNSKEY.(*DNSKEY).KeyTag(),
-		SignerName: rrDNSKEY.(*DNSKEY).Hdr.Name,
-		Algorithm:  rrDNSKEY.(*DNSKEY).Algorithm,
-	}
-	ourRRSIG.Expiration, _ = StringToTime("20150819220000")
-	ourRRSIG.Inception, _ = StringToTime("20150729220000")
-	err = ourRRSIG.Sign(priv.(ed25519.PrivateKey), []RR{rrMX})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err = ourRRSIG.Verify(rrDNSKEY.(*DNSKEY), []RR{rrMX}); err != nil {
-		t.Errorf("failure to validate our RRSIG: %v", err)
-	}
-
-	if !reflect.DeepEqual(ourRRSIG, rrRRSIG.(*RRSIG)) {
-		t.Fatalf("RRSIG record differs:\n%v\n%v", ourRRSIG, rrRRSIG.(*RRSIG))
-	}
-}
-
-// rfc8080 6.1
-func TestRFC8080Ed25519Example2(t *testing.T) {
-	exDNSKEY := `example.com. 3600 IN DNSKEY 257 3 15 (
-             zPnZ/QwEe7S8C5SPz2OfS5RR40ATk2/rYnE9xHIEijs= )`
-	exPriv := `Private-key-format: v1.2
-Algorithm: 15 (ED25519)
-PrivateKey: DSSF3o0s0f+ElWzj9E/Osxw8hLpk55chkmx0LYN5WiY=`
-	rrDNSKEY, err := NewRR(exDNSKEY)
-	if err != nil {
-		t.Fatal(err)
-	}
-	priv, err := rrDNSKEY.(*DNSKEY).NewPrivateKey(exPriv)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	exDS := `example.com. 3600 IN DS 35217 15 2 (
-             401781b934e392de492ec77ae2e15d70f6575a1c0bc59c5275c04ebe80c
-             6614c )`
-	rrDS, err := NewRR(exDS)
-	if err != nil {
-		t.Fatal(err)
-	}
-	ourDS := rrDNSKEY.(*DNSKEY).ToDS(SHA256)
-	if !reflect.DeepEqual(ourDS, rrDS.(*DS)) {
-		t.Fatalf("DS record differs:\n%v\n%v", ourDS, rrDS.(*DS))
-	}
-
-	exMX := `example.com. 3600 IN MX 10 mail.example.com.`
-	exRRSIG := `example.com. 3600 IN RRSIG MX 15 2 3600 (
-             1440021600 1438207200 35217 example.com. (
-             zXQ0bkYgQTEFyfLyi9QoiY6D8ZdYo4wyUhVioYZXFdT410QPRITQSqJSnzQ
-             oSm5poJ7gD7AQR0O7KuI5k2pcBg== ) )`
-	rrMX, err := NewRR(exMX)
-	if err != nil {
-		t.Fatal(err)
-	}
-	rrRRSIG, err := NewRR(exRRSIG)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err = rrRRSIG.(*RRSIG).Verify(rrDNSKEY.(*DNSKEY), []RR{rrMX}); err != nil {
-		t.Errorf("failure to validate the spec RRSIG: %v", err)
-	}
-
-	ourRRSIG := &RRSIG{
-		Hdr: RR_Header{
-			Ttl: rrMX.Header().Ttl,
-		},
-		KeyTag:     rrDNSKEY.(*DNSKEY).KeyTag(),
-		SignerName: rrDNSKEY.(*DNSKEY).Hdr.Name,
-		Algorithm:  rrDNSKEY.(*DNSKEY).Algorithm,
-	}
-	ourRRSIG.Expiration, _ = StringToTime("20150819220000")
-	ourRRSIG.Inception, _ = StringToTime("20150729220000")
-	err = ourRRSIG.Sign(priv.(ed25519.PrivateKey), []RR{rrMX})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err = ourRRSIG.Verify(rrDNSKEY.(*DNSKEY), []RR{rrMX}); err != nil {
-		t.Errorf("failure to validate our RRSIG: %v", err)
-	}
-
-	if !reflect.DeepEqual(ourRRSIG, rrRRSIG.(*RRSIG)) {
-		t.Fatalf("RRSIG record differs:\n%v\n%v", ourRRSIG, rrRRSIG.(*RRSIG))
-	}
-}
-
-func TestInvalidRRSet(t *testing.T) {
-	goodRecords := make([]RR, 2)
-	goodRecords[0] = &TXT{Hdr: RR_Header{Name: "name.cloudflare.com.", Rrtype: TypeTXT, Class: ClassINET, Ttl: 0}, Txt: []string{"Hello world"}}
-	goodRecords[1] = &TXT{Hdr: RR_Header{Name: "name.cloudflare.com.", Rrtype: TypeTXT, Class: ClassINET, Ttl: 0}, Txt: []string{"_o/"}}
-
-	// Generate key
-	keyname := "cloudflare.com."
-	key := &DNSKEY{
-		Hdr:       RR_Header{Name: keyname, Rrtype: TypeDNSKEY, Class: ClassINET, Ttl: 0},
-		Algorithm: ECDSAP256SHA256,
-		Flags:     ZONE,
-		Protocol:  3,
-	}
-	privatekey, err := key.Generate(256)
-	if err != nil {
-		t.Fatal(err.Error())
-	}
-
-	// Need to fill in: Inception, Expiration, KeyTag, SignerName and Algorithm
-	curTime := time.Now()
-	signature := &RRSIG{
-		Inception:  uint32(curTime.Unix()),
-		Expiration: uint32(curTime.Add(time.Hour).Unix()),
-		KeyTag:     key.KeyTag(),
-		SignerName: keyname,
-		Algorithm:  ECDSAP256SHA256,
-	}
-
-	// Inconsistent name between records
-	badRecords := make([]RR, 2)
-	badRecords[0] = &TXT{Hdr: RR_Header{Name: "name.cloudflare.com.", Rrtype: TypeTXT, Class: ClassINET, Ttl: 0}, Txt: []string{"Hello world"}}
-	badRecords[1] = &TXT{Hdr: RR_Header{Name: "nama.cloudflare.com.", Rrtype: TypeTXT, Class: ClassINET, Ttl: 0}, Txt: []string{"_o/"}}
-
-	if IsRRset(badRecords) {
-		t.Fatal("Record set with inconsistent names considered valid")
-	}
-
-	badRecords[0] = &TXT{Hdr: RR_Header{Name: "name.cloudflare.com.", Rrtype: TypeTXT, Class: ClassINET, Ttl: 0}, Txt: []string{"Hello world"}}
-	badRecords[1] = &A{Hdr: RR_Header{Name: "name.cloudflare.com.", Rrtype: TypeA, Class: ClassINET, Ttl: 0}}
-
-	if IsRRset(badRecords) {
-		t.Fatal("Record set with inconsistent record types considered valid")
-	}
-
-	badRecords[0] = &TXT{Hdr: RR_Header{Name: "name.cloudflare.com.", Rrtype: TypeTXT, Class: ClassINET, Ttl: 0}, Txt: []string{"Hello world"}}
-	badRecords[1] = &TXT{Hdr: RR_Header{Name: "name.cloudflare.com.", Rrtype: TypeTXT, Class: ClassCHAOS, Ttl: 0}, Txt: []string{"_o/"}}
-
-	if IsRRset(badRecords) {
-		t.Fatal("Record set with inconsistent record class considered valid")
-	}
-
-	// Sign the good record set and then make sure verification fails on the bad record set
-	if err := signature.Sign(privatekey.(crypto.Signer), goodRecords); err != nil {
-		t.Fatal("Signing good records failed")
-	}
-
-	if err := signature.Verify(key, badRecords); err != ErrRRset {
-		t.Fatal("Verification did not return ErrRRset with inconsistent records")
-	}
-}
-
-// Issue #688 - RSA exponent unpacked in reverse
-func TestRsaExponentUnpack(t *testing.T) {
-	zskRrDnskey, _ := NewRR("isc.org.                7200    IN      DNSKEY  256 3 5 AwEAAcdkaRUlsRD4gcF63PpPJJ1E6kOIb3yn/UHptVsPEQtEbgJ2y20O eix4unpwoQkz+bIAd2rrOU/95wgV530x0/qqKwBLWoGkxdcnNcvVT4hl 3SOTZy1VjwkAfyayHPU8VisXqJGbB3KWevBZlb6AtrXzFu8AHuBeeAAe /fOgreCh")
-	kskRrDnskey, _ := NewRR("isc.org.                7200    IN      DNSKEY  257 3 5 BEAAAAOhHQDBrhQbtphgq2wQUpEQ5t4DtUHxoMVFu2hWLDMvoOMRXjGr hhCeFvAZih7yJHf8ZGfW6hd38hXG/xylYCO6Krpbdojwx8YMXLA5/kA+ u50WIL8ZR1R6KTbsYVMf/Qx5RiNbPClw+vT+U8eXEJmO20jIS1ULgqy3 47cBB1zMnnz/4LJpA0da9CbKj3A254T515sNIMcwsB8/2+2E63/zZrQz Bkj0BrN/9Bexjpiks3jRhZatEsXn3dTy47R09Uix5WcJt+xzqZ7+ysyL KOOedS39Z7SDmsn2eA0FKtQpwA6LXeG2w+jxmw3oA8lVUgEf/rzeC/bB yBNsO70aEFTd")
-	kskRrRrsig, _ := NewRR("isc.org.                7200    IN      RRSIG   DNSKEY 5 2 7200 20180627230244 20180528230244 12892 isc.org. ebKBlhYi1hPGTdPg6zSwvprOIkoFMs+WIhMSjoYW6/K5CS9lDDFdK4cu TgXJRT3etrltTuJiFe2HRpp+7t5cKLy+CeJZVzqrCz200MoHiFuLI9yI DJQGaS5YYCiFbw5+jUGU6aUhZ7Y5/YufeqATkRZzdrKwgK+zri8LPw9T WLoVJPAOW7GR0dgxl9WKmO7Fzi9P8BZR3NuwLV7329X94j+4zyswaw7q e5vif0ybzFveODLsEi/E0a2rTXc4QzzyM0fSVxRkVQyQ7ifIPP4ohnnT d5qpPUbE8xxBzTdWR/TaKADC5aCFkppG9lVAq5CPfClii2949X5RYzy1 rxhuSA==")
-	zskRrRrsig, _ := NewRR("isc.org.                7200    IN      RRSIG   DNSKEY 5 2 7200 20180627230244 20180528230244 19923 isc.org. RgCfzUeq4RJPGoe9RRB6cWf6d/Du+tHK5SxI5QL1waA3O5qVtQKFkY1C dq/yyVjwzfjD9F62TObujOaktv8X80ZMcNPmgHbvK1xOqelMBWv5hxj3 xRe+QQObLZ5NPfHFsphQKXvwgO5Sjk8py2B2iCr3BHCZ8S38oIfuSrQx sn8=")
-
-	zsk, ksk := zskRrDnskey.(*DNSKEY), kskRrDnskey.(*DNSKEY)
-	zskSig, kskSig := zskRrRrsig.(*RRSIG), kskRrRrsig.(*RRSIG)
-
-	if e := zskSig.Verify(zsk, []RR{zsk, ksk}); e != nil {
-		t.Fatalf("cannot verify RRSIG with keytag [%d]. Cause [%s]", zsk.KeyTag(), e.Error())
-	}
-
-	if e := kskSig.Verify(ksk, []RR{zsk, ksk}); e != nil {
-		t.Fatalf("cannot verify RRSIG with keytag [%d]. Cause [%s]", ksk.KeyTag(), e.Error())
-	}
-}
diff --git a/vendor/github.com/miekg/dns/dyn_test.go b/vendor/github.com/miekg/dns/dyn_test.go
deleted file mode 100644
index 09986a5e..00000000
--- a/vendor/github.com/miekg/dns/dyn_test.go
+++ /dev/null
@@ -1,3 +0,0 @@
-package dns
-
-// Find better solution
diff --git a/vendor/github.com/miekg/dns/edns_test.go b/vendor/github.com/miekg/dns/edns_test.go
deleted file mode 100644
index f7cf1575..00000000
--- a/vendor/github.com/miekg/dns/edns_test.go
+++ /dev/null
@@ -1,68 +0,0 @@
-package dns
-
-import "testing"
-
-func TestOPTTtl(t *testing.T) {
-	e := &OPT{}
-	e.Hdr.Name = "."
-	e.Hdr.Rrtype = TypeOPT
-
-	// verify the default setting of DO=0
-	if e.Do() {
-		t.Errorf("DO bit should be zero")
-	}
-
-	// There are 6 possible invocations of SetDo():
-	//
-	// 1. Starting with DO=0, using SetDo()
-	// 2. Starting with DO=0, using SetDo(true)
-	// 3. Starting with DO=0, using SetDo(false)
-	// 4. Starting with DO=1, using SetDo()
-	// 5. Starting with DO=1, using SetDo(true)
-	// 6. Starting with DO=1, using SetDo(false)
-
-	// verify that invoking SetDo() sets DO=1 (TEST #1)
-	e.SetDo()
-	if !e.Do() {
-		t.Errorf("DO bit should be non-zero")
-	}
-	// verify that using SetDo(true) works when DO=1 (TEST #5)
-	e.SetDo(true)
-	if !e.Do() {
-		t.Errorf("DO bit should still be non-zero")
-	}
-	// verify that we can use SetDo(false) to set DO=0 (TEST #6)
-	e.SetDo(false)
-	if e.Do() {
-		t.Errorf("DO bit should be zero")
-	}
-	// verify that if we call SetDo(false) when DO=0 that it is unchanged (TEST #3)
-	e.SetDo(false)
-	if e.Do() {
-		t.Errorf("DO bit should still be zero")
-	}
-	// verify that using SetDo(true) works for DO=0 (TEST #2)
-	e.SetDo(true)
-	if !e.Do() {
-		t.Errorf("DO bit should be non-zero")
-	}
-	// verify that using SetDo() works for DO=1 (TEST #4)
-	e.SetDo()
-	if !e.Do() {
-		t.Errorf("DO bit should be non-zero")
-	}
-
-	if e.Version() != 0 {
-		t.Errorf("version should be non-zero")
-	}
-
-	e.SetVersion(42)
-	if e.Version() != 42 {
-		t.Errorf("set 42, expected %d, got %d", 42, e.Version())
-	}
-
-	e.SetExtendedRcode(42)
-	if e.ExtendedRcode() != 42 {
-		t.Errorf("set 42, expected %d, got %d", 42, e.ExtendedRcode())
-	}
-}
diff --git a/vendor/github.com/miekg/dns/example_test.go b/vendor/github.com/miekg/dns/example_test.go
deleted file mode 100644
index 64c14962..00000000
--- a/vendor/github.com/miekg/dns/example_test.go
+++ /dev/null
@@ -1,146 +0,0 @@
-package dns_test
-
-import (
-	"errors"
-	"fmt"
-	"log"
-	"net"
-
-	"github.com/miekg/dns"
-)
-
-// Retrieve the MX records for miek.nl.
-func ExampleMX() {
-	config, _ := dns.ClientConfigFromFile("/etc/resolv.conf")
-	c := new(dns.Client)
-	m := new(dns.Msg)
-	m.SetQuestion("miek.nl.", dns.TypeMX)
-	m.RecursionDesired = true
-	r, _, err := c.Exchange(m, config.Servers[0]+":"+config.Port)
-	if err != nil {
-		return
-	}
-	if r.Rcode != dns.RcodeSuccess {
-		return
-	}
-	for _, a := range r.Answer {
-		if mx, ok := a.(*dns.MX); ok {
-			fmt.Printf("%s\n", mx.String())
-		}
-	}
-}
-
-// Retrieve the DNSKEY records of a zone and convert them
-// to DS records for SHA1, SHA256 and SHA384.
-func ExampleDS() {
-	config, _ := dns.ClientConfigFromFile("/etc/resolv.conf")
-	c := new(dns.Client)
-	m := new(dns.Msg)
-	zone := "miek.nl"
-	m.SetQuestion(dns.Fqdn(zone), dns.TypeDNSKEY)
-	m.SetEdns0(4096, true)
-	r, _, err := c.Exchange(m, config.Servers[0]+":"+config.Port)
-	if err != nil {
-		return
-	}
-	if r.Rcode != dns.RcodeSuccess {
-		return
-	}
-	for _, k := range r.Answer {
-		if key, ok := k.(*dns.DNSKEY); ok {
-			for _, alg := range []uint8{dns.SHA1, dns.SHA256, dns.SHA384} {
-				fmt.Printf("%s; %d\n", key.ToDS(alg).String(), key.Flags)
-			}
-		}
-	}
-}
-
-const TypeAPAIR = 0x0F99
-
-type APAIR struct {
-	addr [2]net.IP
-}
-
-func NewAPAIR() dns.PrivateRdata { return new(APAIR) }
-
-func (rd *APAIR) String() string { return rd.addr[0].String() + " " + rd.addr[1].String() }
-func (rd *APAIR) Parse(txt []string) error {
-	if len(txt) != 2 {
-		return errors.New("two addresses required for APAIR")
-	}
-	for i, s := range txt {
-		ip := net.ParseIP(s)
-		if ip == nil {
-			return errors.New("invalid IP in APAIR text representation")
-		}
-		rd.addr[i] = ip
-	}
-	return nil
-}
-
-func (rd *APAIR) Pack(buf []byte) (int, error) {
-	b := append([]byte(rd.addr[0]), []byte(rd.addr[1])...)
-	n := copy(buf, b)
-	if n != len(b) {
-		return n, dns.ErrBuf
-	}
-	return n, nil
-}
-
-func (rd *APAIR) Unpack(buf []byte) (int, error) {
-	ln := net.IPv4len * 2
-	if len(buf) != ln {
-		return 0, errors.New("invalid length of APAIR rdata")
-	}
-	cp := make([]byte, ln)
-	copy(cp, buf) // clone bytes to use them in IPs
-
-	rd.addr[0] = net.IP(cp[:3])
-	rd.addr[1] = net.IP(cp[4:])
-
-	return len(buf), nil
-}
-
-func (rd *APAIR) Copy(dest dns.PrivateRdata) error {
-	cp := make([]byte, rd.Len())
-	_, err := rd.Pack(cp)
-	if err != nil {
-		return err
-	}
-
-	d := dest.(*APAIR)
-	d.addr[0] = net.IP(cp[:3])
-	d.addr[1] = net.IP(cp[4:])
-	return nil
-}
-
-func (rd *APAIR) Len() int {
-	return net.IPv4len * 2
-}
-
-func ExamplePrivateHandle() {
-	dns.PrivateHandle("APAIR", TypeAPAIR, NewAPAIR)
-	defer dns.PrivateHandleRemove(TypeAPAIR)
-
-	rr, err := dns.NewRR("miek.nl. APAIR (1.2.3.4    1.2.3.5)")
-	if err != nil {
-		log.Fatal("could not parse APAIR record: ", err)
-	}
-	fmt.Println(rr)
-	// Output: miek.nl.	3600	IN	APAIR	1.2.3.4 1.2.3.5
-
-	m := new(dns.Msg)
-	m.Id = 12345
-	m.SetQuestion("miek.nl.", TypeAPAIR)
-	m.Answer = append(m.Answer, rr)
-
-	fmt.Println(m)
-	// ;; opcode: QUERY, status: NOERROR, id: 12345
-	// ;; flags: rd; QUERY: 1, ANSWER: 1, AUTHORITY: 0, ADDITIONAL: 0
-	//
-	// ;; QUESTION SECTION:
-	// ;miek.nl.	IN	 APAIR
-	//
-	// ;; ANSWER SECTION:
-	// miek.nl.	3600	IN	APAIR	1.2.3.4 1.2.3.5
-}
diff --git a/vendor/github.com/miekg/dns/issue_test.go b/vendor/github.com/miekg/dns/issue_test.go
deleted file mode 100644
index 7299d314..00000000
--- a/vendor/github.com/miekg/dns/issue_test.go
+++ /dev/null
@@ -1,62 +0,0 @@
-package dns
-
-// Tests that solve that an specific issue.
-
-import (
-	"strings"
-	"testing"
-)
-
-func TestTCPRtt(t *testing.T) {
-	m := new(Msg)
-	m.RecursionDesired = true
-	m.SetQuestion("example.org.", TypeA)
-
-	c := &Client{}
-	for _, proto := range []string{"udp", "tcp"} {
-		c.Net = proto
-		_, rtt, err := c.Exchange(m, "8.8.4.4:53")
-		if err != nil {
-			t.Fatal(err)
-		}
-		if rtt == 0 {
-			t.Fatalf("expecting non zero rtt %s, got zero", c.Net)
-		}
-	}
-}
-
-func TestNSEC3MissingSalt(t *testing.T) {
-	rr := testRR("ji6neoaepv8b5o6k4ev33abha8ht9fgc.example. NSEC3 1 1 12 aabbccdd K8UDEMVP1J2F7EG6JEBPS17VP3N8I58H")
-	m := new(Msg)
-	m.Answer = []RR{rr}
-	mb, err := m.Pack()
-	if err != nil {
-		t.Fatalf("expected to pack message. err: %s", err)
-	}
-	if err := m.Unpack(mb); err != nil {
-		t.Fatalf("expected to unpack message. missing salt? err: %s", err)
-	}
-	in := rr.(*NSEC3).Salt
-	out := m.Answer[0].(*NSEC3).Salt
-	if in != out {
-		t.Fatalf("expected salts to match. packed: `%s`. returned: `%s`", in, out)
-	}
-}
-
-func TestNSEC3MixedNextDomain(t *testing.T) {
-	rr := testRR("ji6neoaepv8b5o6k4ev33abha8ht9fgc.example. NSEC3 1 1 12 - k8udemvp1j2f7eg6jebps17vp3n8i58h")
-	m := new(Msg)
-	m.Answer = []RR{rr}
-	mb, err := m.Pack()
-	if err != nil {
-		t.Fatalf("expected to pack message. err: %s", err)
-	}
-	if err := m.Unpack(mb); err != nil {
-		t.Fatalf("expected to unpack message. err: %s", err)
-	}
-	in := strings.ToUpper(rr.(*NSEC3).NextDomain)
-	out := m.Answer[0].(*NSEC3).NextDomain
-	if in != out {
-		t.Fatalf("expected round trip to produce NextDomain `%s`, instead `%s`", in, out)
-	}
-}
diff --git a/vendor/github.com/miekg/dns/labels_test.go b/vendor/github.com/miekg/dns/labels_test.go
deleted file mode 100644
index d9bb556d..00000000
--- a/vendor/github.com/miekg/dns/labels_test.go
+++ /dev/null
@@ -1,201 +0,0 @@
-package dns
-
-import "testing"
-
-func TestCompareDomainName(t *testing.T) {
-	s1 := "www.miek.nl."
-	s2 := "miek.nl."
-	s3 := "www.bla.nl."
-	s4 := "nl.www.bla."
-	s5 := "nl."
-	s6 := "miek.nl."
-
-	if CompareDomainName(s1, s2) != 2 {
-		t.Errorf("%s with %s should be %d", s1, s2, 2)
-	}
-	if CompareDomainName(s1, s3) != 1 {
-		t.Errorf("%s with %s should be %d", s1, s3, 1)
-	}
-	if CompareDomainName(s3, s4) != 0 {
-		t.Errorf("%s with %s should be %d", s3, s4, 0)
-	}
-	// Non qualified tests
-	if CompareDomainName(s1, s5) != 1 {
-		t.Errorf("%s with %s should be %d", s1, s5, 1)
-	}
-	if CompareDomainName(s1, s6) != 2 {
-		t.Errorf("%s with %s should be %d", s1, s5, 2)
-	}
-
-	if CompareDomainName(s1, ".") != 0 {
-		t.Errorf("%s with %s should be %d", s1, s5, 0)
-	}
-	if CompareDomainName(".", ".") != 0 {
-		t.Errorf("%s with %s should be %d", ".", ".", 0)
-	}
-	if CompareDomainName("test.com.", "TEST.COM.") != 2 {
-		t.Errorf("test.com. and TEST.COM. should be an exact match")
-	}
-}
-
-func TestSplit(t *testing.T) {
-	splitter := map[string]int{
-		"www.miek.nl.":   3,
-		"www.miek.nl":    3,
-		"www..miek.nl":   4,
-		`www\.miek.nl.`:  2,
-		`www\\.miek.nl.`: 3,
-		".":              0,
-		"nl.":            1,
-		"nl":             1,
-		"com.":           1,
-		".com.":          2,
-	}
-	for s, i := range splitter {
-		if x := len(Split(s)); x != i {
-			t.Errorf("labels should be %d, got %d: %s %v", i, x, s, Split(s))
-		}
-	}
-}
-
-func TestSplit2(t *testing.T) {
-	splitter := map[string][]int{
-		"www.miek.nl.": {0, 4, 9},
-		"www.miek.nl":  {0, 4, 9},
-		"nl":           {0},
-	}
-	for s, i := range splitter {
-		x := Split(s)
-		switch len(i) {
-		case 1:
-			if x[0] != i[0] {
-				t.Errorf("labels should be %v, got %v: %s", i, x, s)
-			}
-		default:
-			if x[0] != i[0] || x[1] != i[1] || x[2] != i[2] {
-				t.Errorf("labels should be %v, got %v: %s", i, x, s)
-			}
-		}
-	}
-}
-
-func TestPrevLabel(t *testing.T) {
-	type prev struct {
-		string
-		int
-	}
-	prever := map[prev]int{
-		{"www.miek.nl.", 0}: 12,
-		{"www.miek.nl.", 1}: 9,
-		{"www.miek.nl.", 2}: 4,
-
-		{"www.miek.nl", 0}: 11,
-		{"www.miek.nl", 1}: 9,
-		{"www.miek.nl", 2}: 4,
-
-		{"www.miek.nl.", 5}: 0,
-		{"www.miek.nl", 5}:  0,
-
-		{"www.miek.nl.", 3}: 0,
-		{"www.miek.nl", 3}:  0,
-	}
-	for s, i := range prever {
-		x, ok := PrevLabel(s.string, s.int)
-		if i != x {
-			t.Errorf("label should be %d, got %d, %t: preving %d, %s", i, x, ok, s.int, s.string)
-		}
-	}
-}
-
-func TestCountLabel(t *testing.T) {
-	splitter := map[string]int{
-		"www.miek.nl.": 3,
-		"www.miek.nl":  3,
-		"nl":           1,
-		".":            0,
-	}
-	for s, i := range splitter {
-		x := CountLabel(s)
-		if x != i {
-			t.Errorf("CountLabel should have %d, got %d", i, x)
-		}
-	}
-}
-
-func TestSplitDomainName(t *testing.T) {
-	labels := map[string][]string{
-		"miek.nl":       {"miek", "nl"},
-		".":             nil,
-		"www.miek.nl.":  {"www", "miek", "nl"},
-		"www.miek.nl":   {"www", "miek", "nl"},
-		"www..miek.nl":  {"www", "", "miek", "nl"},
-		`www\.miek.nl`:  {`www\.miek`, "nl"},
-		`www\\.miek.nl`: {`www\\`, "miek", "nl"},
-		".www.miek.nl.": {"", "www", "miek", "nl"},
-	}
-domainLoop:
-	for domain, splits := range labels {
-		parts := SplitDomainName(domain)
-		if len(parts) != len(splits) {
-			t.Errorf("SplitDomainName returned %v for %s, expected %v", parts, domain, splits)
-			continue domainLoop
-		}
-		for i := range parts {
-			if parts[i] != splits[i] {
-				t.Errorf("SplitDomainName returned %v for %s, expected %v", parts, domain, splits)
-				continue domainLoop
-			}
-		}
-	}
-}
-
-func TestIsDomainName(t *testing.T) {
-	type ret struct {
-		ok  bool
-		lab int
-	}
-	names := map[string]*ret{
-		"..":               {false, 1},
-		"@.":               {true, 1},
-		"www.example.com":  {true, 3},
-		"www.e%ample.com":  {true, 3},
-		"www.example.com.": {true, 3},
-		"mi\\k.nl.":        {true, 2},
-		"mi\\k.nl":         {true, 2},
-	}
-	for d, ok := range names {
-		l, k := IsDomainName(d)
-		if ok.ok != k || ok.lab != l {
-			t.Errorf(" got %v %d for %s ", k, l, d)
-			t.Errorf("have %v %d for %s ", ok.ok, ok.lab, d)
-		}
-	}
-}
-
-func BenchmarkSplitLabels(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		Split("www.example.com.")
-	}
-}
-
-func BenchmarkLenLabels(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		CountLabel("www.example.com.")
-	}
-}
-
-func BenchmarkCompareDomainName(b *testing.B) {
-	b.ReportAllocs()
-	for i := 0; i < b.N; i++ {
-		CompareDomainName("www.example.com.", "aa.example.com.")
-	}
-}
-
-func BenchmarkIsSubDomain(b *testing.B) {
-	b.ReportAllocs()
-	for i := 0; i < b.N; i++ {
-		IsSubDomain("www.example.com.", "aa.example.com.")
-		IsSubDomain("example.com.", "aa.example.com.")
-		IsSubDomain("miek.nl.", "aa.example.com.")
-	}
-}
diff --git a/vendor/github.com/miekg/dns/leak_test.go b/vendor/github.com/miekg/dns/leak_test.go
deleted file mode 100644
index ff83ac74..00000000
--- a/vendor/github.com/miekg/dns/leak_test.go
+++ /dev/null
@@ -1,72 +0,0 @@
-package dns
-
-import (
-	"fmt"
-	"os"
-	"runtime"
-	"sort"
-	"strings"
-	"testing"
-	"time"
-)
-
-// copied from net/http/main_test.go
-
-func interestingGoroutines() (gs []string) {
-	buf := make([]byte, 2<<20)
-	buf = buf[:runtime.Stack(buf, true)]
-	for _, g := range strings.Split(string(buf), "\n\n") {
-		sl := strings.SplitN(g, "\n", 2)
-		if len(sl) != 2 {
-			continue
-		}
-		stack := strings.TrimSpace(sl[1])
-		if stack == "" ||
-			strings.Contains(stack, "testing.(*M).before.func1") ||
-			strings.Contains(stack, "os/signal.signal_recv") ||
-			strings.Contains(stack, "created by net.startServer") ||
-			strings.Contains(stack, "created by testing.RunTests") ||
-			strings.Contains(stack, "closeWriteAndWait") ||
-			strings.Contains(stack, "testing.Main(") ||
-			strings.Contains(stack, "testing.(*T).Run(") ||
-			strings.Contains(stack, "created by net/http.(*http2Transport).newClientConn") ||
-			// These only show up with GOTRACEBACK=2; Issue 5005 (comment 28)
-			strings.Contains(stack, "runtime.goexit") ||
-			strings.Contains(stack, "created by runtime.gc") ||
-			strings.Contains(stack, "dns.interestingGoroutines") ||
-			strings.Contains(stack, "runtime.MHeap_Scavenger") {
-			continue
-		}
-		gs = append(gs, stack)
-	}
-	sort.Strings(gs)
-	return
-}
-
-func goroutineLeaked() error {
-	if testing.Short() {
-		// Don't worry about goroutine leaks in -short mode or in
-		// benchmark mode. Too distracting when there are false positives.
-		return nil
-	}
-
-	var stackCount map[string]int
-	for i := 0; i < 5; i++ {
-		n := 0
-		stackCount = make(map[string]int)
-		gs := interestingGoroutines()
-		for _, g := range gs {
-			stackCount[g]++
-			n++
-		}
-		if n == 0 {
-			return nil
-		}
-		// Wait for goroutines to schedule and die off:
-		time.Sleep(100 * time.Millisecond)
-	}
-	for stack, count := range stackCount {
-		fmt.Fprintf(os.Stderr, "%d instances of:\n%s\n", count, stack)
-	}
-	return fmt.Errorf("too many goroutines running after dns test(s)")
-}
diff --git a/vendor/github.com/miekg/dns/length_test.go b/vendor/github.com/miekg/dns/length_test.go
deleted file mode 100644
index 66521a5f..00000000
--- a/vendor/github.com/miekg/dns/length_test.go
+++ /dev/null
@@ -1,371 +0,0 @@
-package dns
-
-import (
-	"encoding/hex"
-	"fmt"
-	"net"
-	"reflect"
-	"strings"
-	"testing"
-)
-
-func TestCompressLength(t *testing.T) {
-	m := new(Msg)
-	m.SetQuestion("miek.nl", TypeMX)
-	ul := m.Len()
-	m.Compress = true
-	if ul != m.Len() {
-		t.Fatalf("should be equal")
-	}
-}
-
-// Does the predicted length match final packed length?
-func TestMsgCompressLength(t *testing.T) {
-	makeMsg := func(question string, ans, ns, e []RR) *Msg {
-		msg := new(Msg)
-		msg.SetQuestion(Fqdn(question), TypeANY)
-		msg.Answer = append(msg.Answer, ans...)
-		msg.Ns = append(msg.Ns, ns...)
-		msg.Extra = append(msg.Extra, e...)
-		msg.Compress = true
-		return msg
-	}
-
-	name1 := "12345678901234567890123456789012345.12345678.123."
-	rrA := testRR(name1 + " 3600 IN A 192.0.2.1")
-	rrMx := testRR(name1 + " 3600 IN MX 10 " + name1)
-	tests := []*Msg{
-		makeMsg(name1, []RR{rrA}, nil, nil),
-		makeMsg(name1, []RR{rrMx, rrMx}, nil, nil)}
-
-	for _, msg := range tests {
-		predicted := msg.Len()
-		buf, err := msg.Pack()
-		if err != nil {
-			t.Error(err)
-		}
-		if predicted < len(buf) {
-			t.Errorf("predicted compressed length is wrong: predicted %s (len=%d) %d, actual %d",
-				msg.Question[0].Name, len(msg.Answer), predicted, len(buf))
-		}
-	}
-}
-
-func TestMsgLength(t *testing.T) {
-	makeMsg := func(question string, ans, ns, e []RR) *Msg {
-		msg := new(Msg)
-		msg.Compress = true
-		msg.SetQuestion(Fqdn(question), TypeANY)
-		msg.Answer = append(msg.Answer, ans...)
-		msg.Ns = append(msg.Ns, ns...)
-		msg.Extra = append(msg.Extra, e...)
-		return msg
-	}
-
-	name1 := "12345678901234567890123456789012345.12345678.123."
-	rrA := testRR(name1 + " 3600 IN A 192.0.2.1")
-	rrMx := testRR(name1 + " 3600 IN MX 10 " + name1)
-	tests := []*Msg{
-		makeMsg(name1, []RR{rrA}, nil, nil),
-		makeMsg(name1, []RR{rrMx, rrMx}, nil, nil)}
-
-	for _, msg := range tests {
-		predicted := msg.Len()
-		buf, err := msg.Pack()
-		if err != nil {
-			t.Error(err)
-		}
-		if predicted < len(buf) {
-			t.Errorf("predicted length is wrong: predicted %s (len=%d), actual %d",
-				msg.Question[0].Name, predicted, len(buf))
-		}
-	}
-}
-
-func TestCompressionLenHelper(t *testing.T) {
-	c := make(map[string]int)
-	compressionLenHelper(c, "example.com", 12)
-	if c["example.com"] != 12 {
-		t.Errorf("bad %d", c["example.com"])
-	}
-	if c["com"] != 20 {
-		t.Errorf("bad %d", c["com"])
-	}
-
-	// Test boundaries
-	c = make(map[string]int)
-	// foo label starts at 16379
-	// com label starts at 16384
-	compressionLenHelper(c, "foo.com", 16379)
-	if c["foo.com"] != 16379 {
-		t.Errorf("bad %d", c["foo.com"])
-	}
-	// com label is accessible
-	if c["com"] != 16383 {
-		t.Errorf("bad %d", c["com"])
-	}
-
-	c = make(map[string]int)
-	// foo label starts at 16379
-	// com label starts at 16385 => outside range
-	compressionLenHelper(c, "foo.com", 16380)
-	if c["foo.com"] != 16380 {
-		t.Errorf("bad %d", c["foo.com"])
-	}
-	// com label is NOT accessible
-	if c["com"] != 0 {
-		t.Errorf("bad %d", c["com"])
-	}
-
-	c = make(map[string]int)
-	compressionLenHelper(c, "example.com", 16375)
-	if c["example.com"] != 16375 {
-		t.Errorf("bad %d", c["example.com"])
-	}
-	// com starts AFTER 16384
-	if c["com"] != 16383 {
-		t.Errorf("bad %d", c["com"])
-	}
-
-	c = make(map[string]int)
-	compressionLenHelper(c, "example.com", 16376)
-	if c["example.com"] != 16376 {
-		t.Errorf("bad %d", c["example.com"])
-	}
-	// com starts AFTER 16384
-	if c["com"] != 0 {
-		t.Errorf("bad %d", c["com"])
-	}
-}
-
-func TestCompressionLenSearch(t *testing.T) {
-	c := make(map[string]int)
-	compressed, ok, fullSize := compressionLenSearch(c, "a.b.org.")
-	if compressed != 0 || ok || fullSize != 14 {
-		panic(fmt.Errorf("Failed: compressed:=%d, ok:=%v, fullSize:=%d", compressed, ok, fullSize))
-	}
-	c["org."] = 3
-	compressed, ok, fullSize = compressionLenSearch(c, "a.b.org.")
-	if compressed != 4 || !ok || fullSize != 8 {
-		panic(fmt.Errorf("Failed: compressed:=%d, ok:=%v, fullSize:=%d", compressed, ok, fullSize))
-	}
-	c["b.org."] = 5
-	compressed, ok, fullSize = compressionLenSearch(c, "a.b.org.")
-	if compressed != 6 || !ok || fullSize != 4 {
-		panic(fmt.Errorf("Failed: compressed:=%d, ok:=%v, fullSize:=%d", compressed, ok, fullSize))
-	}
-	// Not found long compression
-	c["x.b.org."] = 5
-	compressed, ok, fullSize = compressionLenSearch(c, "a.b.org.")
-	if compressed != 6 || !ok || fullSize != 4 {
-		panic(fmt.Errorf("Failed: compressed:=%d, ok:=%v, fullSize:=%d", compressed, ok, fullSize))
-	}
-	// Found long compression
-	c["a.b.org."] = 5
-	compressed, ok, fullSize = compressionLenSearch(c, "a.b.org.")
-	if compressed != 8 || !ok || fullSize != 0 {
-		panic(fmt.Errorf("Failed: compressed:=%d, ok:=%v, fullSize:=%d", compressed, ok, fullSize))
-	}
-}
-
-func TestMsgLength2(t *testing.T) {
-	// Serialized replies
-	var testMessages = []string{
-		// google.com. IN A?
-		"064e81800001000b0004000506676f6f676c6503636f6d0000010001c00c00010001000000050004adc22986c00c00010001000000050004adc22987c00c00010001000000050004adc22988c00c00010001000000050004adc22989c00c00010001000000050004adc2298ec00c00010001000000050004adc22980c00c00010001000000050004adc22981c00c00010001000000050004adc22982c00c00010001000000050004adc22983c00c00010001000000050004adc22984c00c00010001000000050004adc22985c00c00020001000000050006036e7331c00cc00c00020001000000050006036e7332c00cc00c00020001000000050006036e7333c00cc00c00020001000000050006036e7334c00cc0d800010001000000050004d8ef200ac0ea00010001000000050004d8ef220ac0fc00010001000000050004d8ef240ac10e00010001000000050004d8ef260a0000290500000000050000",
-		// amazon.com. IN A? (reply has no EDNS0 record)
-		// TODO(miek): this one is off-by-one, need to find out why
-		//"6de1818000010004000a000806616d617a6f6e03636f6d0000010001c00c000100010000000500044815c2d4c00c000100010000000500044815d7e8c00c00010001000000050004b02062a6c00c00010001000000050004cdfbf236c00c000200010000000500140570646e733408756c747261646e73036f726700c00c000200010000000500150570646e733508756c747261646e7304696e666f00c00c000200010000000500160570646e733608756c747261646e7302636f02756b00c00c00020001000000050014036e7331037033310664796e656374036e657400c00c00020001000000050006036e7332c0cfc00c00020001000000050006036e7333c0cfc00c00020001000000050006036e7334c0cfc00c000200010000000500110570646e733108756c747261646e73c0dac00c000200010000000500080570646e7332c127c00c000200010000000500080570646e7333c06ec0cb00010001000000050004d04e461fc0eb00010001000000050004cc0dfa1fc0fd00010001000000050004d04e471fc10f00010001000000050004cc0dfb1fc12100010001000000050004cc4a6c01c121001c000100000005001020010502f3ff00000000000000000001c13e00010001000000050004cc4a6d01c13e001c0001000000050010261000a1101400000000000000000001",
-		// yahoo.com. IN A?
-		"fc2d81800001000300070008057961686f6f03636f6d0000010001c00c00010001000000050004628afd6dc00c00010001000000050004628bb718c00c00010001000000050004cebe242dc00c00020001000000050006036e7336c00cc00c00020001000000050006036e7338c00cc00c00020001000000050006036e7331c00cc00c00020001000000050006036e7332c00cc00c00020001000000050006036e7333c00cc00c00020001000000050006036e7334c00cc00c00020001000000050006036e7335c00cc07b0001000100000005000444b48310c08d00010001000000050004448eff10c09f00010001000000050004cb54dd35c0b100010001000000050004628a0b9dc0c30001000100000005000477a0f77cc05700010001000000050004ca2bdfaac06900010001000000050004caa568160000290500000000050000",
-		// microsoft.com. IN A?
-		"f4368180000100020005000b096d6963726f736f667403636f6d0000010001c00c0001000100000005000440040b25c00c0001000100000005000441373ac9c00c0002000100000005000e036e7331046d736674036e657400c00c00020001000000050006036e7332c04fc00c00020001000000050006036e7333c04fc00c00020001000000050006036e7334c04fc00c00020001000000050006036e7335c04fc04b000100010000000500044137253ec04b001c00010000000500102a010111200500000000000000010001c0650001000100000005000440043badc065001c00010000000500102a010111200600060000000000010001c07700010001000000050004d5c7b435c077001c00010000000500102a010111202000000000000000010001c08900010001000000050004cf2e4bfec089001c00010000000500102404f800200300000000000000010001c09b000100010000000500044137e28cc09b001c00010000000500102a010111200f000100000000000100010000290500000000050000",
-		// google.com. IN MX?
-		"724b8180000100050004000b06676f6f676c6503636f6d00000f0001c00c000f000100000005000c000a056173706d78016cc00cc00c000f0001000000050009001404616c7431c02ac00c000f0001000000050009001e04616c7432c02ac00c000f0001000000050009002804616c7433c02ac00c000f0001000000050009003204616c7434c02ac00c00020001000000050006036e7332c00cc00c00020001000000050006036e7333c00cc00c00020001000000050006036e7334c00cc00c00020001000000050006036e7331c00cc02a00010001000000050004adc2421bc02a001c00010000000500102a00145040080c01000000000000001bc04200010001000000050004adc2461bc05700010001000000050004adc2451bc06c000100010000000500044a7d8f1bc081000100010000000500044a7d191bc0ca00010001000000050004d8ef200ac09400010001000000050004d8ef220ac0a600010001000000050004d8ef240ac0b800010001000000050004d8ef260a0000290500000000050000",
-		// reddit.com. IN A?
-		"12b98180000100080000000c0672656464697403636f6d0000020001c00c0002000100000005000f046175733204616b616d036e657400c00c000200010000000500070475736534c02dc00c000200010000000500070475737733c02dc00c000200010000000500070475737735c02dc00c00020001000000050008056173696131c02dc00c00020001000000050008056173696139c02dc00c00020001000000050008056e73312d31c02dc00c0002000100000005000a076e73312d313935c02dc02800010001000000050004c30a242ec04300010001000000050004451f1d39c05600010001000000050004451f3bc7c0690001000100000005000460073240c07c000100010000000500046007fb81c090000100010000000500047c283484c090001c00010000000500102a0226f0006700000000000000000064c0a400010001000000050004c16c5b01c0a4001c000100000005001026001401000200000000000000000001c0b800010001000000050004c16c5bc3c0b8001c0001000000050010260014010002000000000000000000c30000290500000000050000",
-	}
-
-	for i, hexData := range testMessages {
-		// we won't fail the decoding of the hex
-		input, _ := hex.DecodeString(hexData)
-
-		m := new(Msg)
-		m.Unpack(input)
-		m.Compress = true
-		lenComp := m.Len()
-		b, _ := m.Pack()
-		pacComp := len(b)
-		m.Compress = false
-		lenUnComp := m.Len()
-		b, _ = m.Pack()
-		pacUnComp := len(b)
-		if pacComp+1 != lenComp {
-			t.Errorf("msg.Len(compressed)=%d actual=%d for test %d", lenComp, pacComp, i)
-		}
-		if pacUnComp+1 != lenUnComp {
-			t.Errorf("msg.Len(uncompressed)=%d actual=%d for test %d", lenUnComp, pacUnComp, i)
-		}
-	}
-}
-
-func TestMsgLengthCompressionMalformed(t *testing.T) {
-	// SOA with empty hostmaster, which is illegal
-	soa := &SOA{Hdr: RR_Header{Name: ".", Rrtype: TypeSOA, Class: ClassINET, Ttl: 12345},
-		Ns:      ".",
-		Mbox:    "",
-		Serial:  0,
-		Refresh: 28800,
-		Retry:   7200,
-		Expire:  604800,
-		Minttl:  60}
-	m := new(Msg)
-	m.Compress = true
-	m.Ns = []RR{soa}
-	m.Len() // Should not crash.
-}
-
-func TestMsgCompressLength2(t *testing.T) {
-	msg := new(Msg)
-	msg.Compress = true
-	msg.SetQuestion(Fqdn("bliep."), TypeANY)
-	msg.Answer = append(msg.Answer, &SRV{Hdr: RR_Header{Name: "blaat.", Rrtype: 0x21, Class: 0x1, Ttl: 0x3c}, Port: 0x4c57, Target: "foo.bar."})
-	msg.Extra = append(msg.Extra, &A{Hdr: RR_Header{Name: "foo.bar.", Rrtype: 0x1, Class: 0x1, Ttl: 0x3c}, A: net.IP{0xac, 0x11, 0x0, 0x3}})
-	predicted := msg.Len()
-	buf, err := msg.Pack()
-	if err != nil {
-		t.Error(err)
-	}
-	if predicted != len(buf) {
-		t.Errorf("predicted compressed length is wrong: predicted %s (len=%d) %d, actual %d",
-			msg.Question[0].Name, len(msg.Answer), predicted, len(buf))
-	}
-}
-
-func TestMsgCompressLengthLargeRecords(t *testing.T) {
-	msg := new(Msg)
-	msg.Compress = true
-	msg.SetQuestion("my.service.acme.", TypeSRV)
-	j := 1
-	for i := 0; i < 250; i++ {
-		target := fmt.Sprintf("host-redis-1-%d.test.acme.com.node.dc1.consul.", i)
-		msg.Answer = append(msg.Answer, &SRV{Hdr: RR_Header{Name: "redis.service.consul.", Class: 1, Rrtype: TypeSRV, Ttl: 0x3c}, Port: 0x4c57, Target: target})
-		msg.Extra = append(msg.Extra, &CNAME{Hdr: RR_Header{Name: target, Class: 1, Rrtype: TypeCNAME, Ttl: 0x3c}, Target: fmt.Sprintf("fx.168.%d.%d.", j, i)})
-	}
-	predicted := msg.Len()
-	buf, err := msg.Pack()
-	if err != nil {
-		t.Error(err)
-	}
-	if predicted != len(buf) {
-		t.Fatalf("predicted compressed length is wrong: predicted %s (len=%d) %d, actual %d", msg.Question[0].Name, len(msg.Answer), predicted, len(buf))
-	}
-}
-
-func TestCompareCompressionMapsForANY(t *testing.T) {
-	msg := new(Msg)
-	msg.Compress = true
-	msg.SetQuestion("a.service.acme.", TypeANY)
-	// Be sure to have more than 14bits
-	for i := 0; i < 2000; i++ {
-		target := fmt.Sprintf("host.app-%d.x%d.test.acme.", i%250, i)
-		msg.Answer = append(msg.Answer, &AAAA{Hdr: RR_Header{Name: target, Rrtype: TypeAAAA, Class: ClassINET, Ttl: 0x3c}, AAAA: net.IP{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, byte(i / 255), byte(i % 255)}})
-		msg.Answer = append(msg.Answer, &A{Hdr: RR_Header{Name: target, Rrtype: TypeA, Class: ClassINET, Ttl: 0x3c}, A: net.IP{127, 0, byte(i / 255), byte(i % 255)}})
-		if msg.Len() > 16384 {
-			break
-		}
-	}
-	for labelSize := 0; labelSize < 63; labelSize++ {
-		msg.SetQuestion(fmt.Sprintf("a%s.service.acme.", strings.Repeat("x", labelSize)), TypeANY)
-
-		compressionFake := make(map[string]int)
-		lenFake := compressedLenWithCompressionMap(msg, compressionFake)
-
-		compressionReal := make(map[string]int)
-		buf, err := msg.packBufferWithCompressionMap(nil, compressionReal)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if lenFake != len(buf) {
-			t.Fatalf("padding= %d ; Predicted len := %d != real:= %d", labelSize, lenFake, len(buf))
-		}
-		if !reflect.DeepEqual(compressionFake, compressionReal) {
-			t.Fatalf("padding= %d ; Fake Compression Map != Real Compression Map\n*** Real:= %v\n\n***Fake:= %v", labelSize, compressionReal, compressionFake)
-		}
-	}
-}
-
-func TestCompareCompressionMapsForSRV(t *testing.T) {
-	msg := new(Msg)
-	msg.Compress = true
-	msg.SetQuestion("a.service.acme.", TypeSRV)
-	// Be sure to have more than 14bits
-	for i := 0; i < 2000; i++ {
-		target := fmt.Sprintf("host.app-%d.x%d.test.acme.", i%250, i)
-		msg.Answer = append(msg.Answer, &SRV{Hdr: RR_Header{Name: "redis.service.consul.", Class: ClassINET, Rrtype: TypeSRV, Ttl: 0x3c}, Port: 0x4c57, Target: target})
-		msg.Extra = append(msg.Extra, &A{Hdr: RR_Header{Name: target, Rrtype: TypeA, Class: ClassINET, Ttl: 0x3c}, A: net.IP{127, 0, byte(i / 255), byte(i % 255)}})
-		if msg.Len() > 16384 {
-			break
-		}
-	}
-	for labelSize := 0; labelSize < 63; labelSize++ {
-		msg.SetQuestion(fmt.Sprintf("a%s.service.acme.", strings.Repeat("x", labelSize)), TypeAAAA)
-
-		compressionFake := make(map[string]int)
-		lenFake := compressedLenWithCompressionMap(msg, compressionFake)
-
-		compressionReal := make(map[string]int)
-		buf, err := msg.packBufferWithCompressionMap(nil, compressionReal)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if lenFake != len(buf) {
-			t.Fatalf("padding= %d ; Predicted len := %d != real:= %d", labelSize, lenFake, len(buf))
-		}
-		if !reflect.DeepEqual(compressionFake, compressionReal) {
-			t.Fatalf("padding= %d ; Fake Compression Map != Real Compression Map\n*** Real:= %v\n\n***Fake:= %v", labelSize, compressionReal, compressionFake)
-		}
-	}
-}
-
-func TestMsgCompressLengthLargeRecordsWithPaddingPermutation(t *testing.T) {
-	msg := new(Msg)
-	msg.Compress = true
-	msg.SetQuestion("my.service.acme.", TypeSRV)
-
-	for i := 0; i < 250; i++ {
-		target := fmt.Sprintf("host-redis-x-%d.test.acme.com.node.dc1.consul.", i)
-		msg.Answer = append(msg.Answer, &SRV{Hdr: RR_Header{Name: "redis.service.consul.", Class: 1, Rrtype: TypeSRV, Ttl: 0x3c}, Port: 0x4c57, Target: target})
-		msg.Extra = append(msg.Extra, &CNAME{Hdr: RR_Header{Name: target, Class: ClassINET, Rrtype: TypeCNAME, Ttl: 0x3c}, Target: fmt.Sprintf("fx.168.x.%d.", i)})
-	}
-	for labelSize := 1; labelSize < 63; labelSize++ {
-		msg.SetQuestion(fmt.Sprintf("my.%s.service.acme.", strings.Repeat("x", labelSize)), TypeSRV)
-		predicted := msg.Len()
-		buf, err := msg.Pack()
-		if err != nil {
-			t.Error(err)
-		}
-		if predicted != len(buf) {
-			t.Fatalf("padding= %d ; predicted compressed length is wrong: predicted %s (len=%d) %d, actual %d", labelSize, msg.Question[0].Name, len(msg.Answer), predicted, len(buf))
-		}
-	}
-}
-
-func TestMsgCompressLengthLargeRecordsAllValues(t *testing.T) {
-	msg := new(Msg)
-	msg.Compress = true
-	msg.SetQuestion("redis.service.consul.", TypeSRV)
-	for i := 0; i < 900; i++ {
-		target := fmt.Sprintf("host-redis-%d-%d.test.acme.com.node.dc1.consul.", i/256, i%256)
-		msg.Answer = append(msg.Answer, &SRV{Hdr: RR_Header{Name: "redis.service.consul.", Class: 1, Rrtype: TypeSRV, Ttl: 0x3c}, Port: 0x4c57, Target: target})
-		msg.Extra = append(msg.Extra, &CNAME{Hdr: RR_Header{Name: target, Class: ClassINET, Rrtype: TypeCNAME, Ttl: 0x3c}, Target: fmt.Sprintf("fx.168.%d.%d.", i/256, i%256)})
-		predicted := msg.Len()
-		buf, err := msg.Pack()
-		if err != nil {
-			t.Error(err)
-		}
-		if predicted != len(buf) {
-			t.Fatalf("predicted compressed length is wrong for %d records: predicted %s (len=%d) %d, actual %d", i, msg.Question[0].Name, len(msg.Answer), predicted, len(buf))
-		}
-	}
-}
diff --git a/vendor/github.com/miekg/dns/msg_test.go b/vendor/github.com/miekg/dns/msg_test.go
deleted file mode 100644
index afbe6d83..00000000
--- a/vendor/github.com/miekg/dns/msg_test.go
+++ /dev/null
@@ -1,146 +0,0 @@
-package dns
-
-import (
-	"fmt"
-	"regexp"
-	"strconv"
-	"strings"
-	"testing"
-)
-
-const (
-	maxPrintableLabel = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789x"
-	tooLongLabel      = maxPrintableLabel + "x"
-)
-
-var (
-	longDomain = maxPrintableLabel[:53] + strings.TrimSuffix(
-		strings.Join([]string{".", ".", ".", ".", "."}, maxPrintableLabel[:49]), ".")
-	reChar              = regexp.MustCompile(`.`)
-	i                   = -1
-	maxUnprintableLabel = reChar.ReplaceAllStringFunc(maxPrintableLabel, func(ch string) string {
-		if i++; i >= 32 {
-			i = 0
-		}
-		return fmt.Sprintf("\\%03d", i)
-	})
-)
-
-func TestPackNoSideEffect(t *testing.T) {
-	m := new(Msg)
-	m.SetQuestion(Fqdn("example.com."), TypeNS)
-
-	a := new(Msg)
-	o := &OPT{
-		Hdr: RR_Header{
-			Name:   ".",
-			Rrtype: TypeOPT,
-		},
-	}
-	o.SetUDPSize(DefaultMsgSize)
-
-	a.Extra = append(a.Extra, o)
-	a.SetRcode(m, RcodeBadVers)
-
-	a.Pack()
-	if a.Rcode != RcodeBadVers {
-		t.Errorf("after pack: Rcode is expected to be BADVERS")
-	}
-}
-
-func TestUnpackDomainName(t *testing.T) {
-	var cases = []struct {
-		label          string
-		input          string
-		expectedOutput string
-		expectedError  string
-	}{
-		{"empty domain",
-			"\x00",
-			".",
-			""},
-		{"long label",
-			string(63) + maxPrintableLabel + "\x00",
-			maxPrintableLabel + ".",
-			""},
-		{"unprintable label",
-			string(63) + regexp.MustCompile(`\\[0-9]+`).ReplaceAllStringFunc(maxUnprintableLabel,
-				func(escape string) string {
-					n, _ := strconv.ParseInt(escape[1:], 10, 8)
-					return string(n)
-				}) + "\x00",
-			maxUnprintableLabel + ".",
-			""},
-		{"long domain",
-			string(53) + strings.Replace(longDomain, ".", string(49), -1) + "\x00",
-			longDomain + ".",
-			""},
-		{"compression pointer",
-			// an unrealistic but functional test referencing an offset _inside_ a label
-			"\x03foo" + "\x05\x03com\x00" + "\x07example" + "\xC0\x05",
-			"foo.\\003com\\000.example.com.",
-			""},
-
-		{"too long domain",
-			string(54) + "x" + strings.Replace(longDomain, ".", string(49), -1) + "\x00",
-			"x" + longDomain + ".",
-			ErrLongDomain.Error()},
-		{"too long by pointer",
-			// a matryoshka doll name to get over 255 octets after expansion via internal pointers
-			string([]byte{
-				// 11 length values, first to last
-				40, 37, 34, 31, 28, 25, 22, 19, 16, 13, 0,
-				// 12 filler values
-				120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120,
-				// 10 pointers, last to first
-				192, 10, 192, 9, 192, 8, 192, 7, 192, 6, 192, 5, 192, 4, 192, 3, 192, 2, 192, 1,
-			}),
-			"",
-			ErrLongDomain.Error()},
-		{"long by pointer",
-			// a matryoshka doll name _not_ exceeding 255 octets after expansion
-			string([]byte{
-				// 11 length values, first to last
-				37, 34, 31, 28, 25, 22, 19, 16, 13, 10, 0,
-				// 9 filler values
-				120, 120, 120, 120, 120, 120, 120, 120, 120,
-				// 10 pointers, last to first
-				192, 10, 192, 9, 192, 8, 192, 7, 192, 6, 192, 5, 192, 4, 192, 3, 192, 2, 192, 1,
-			}),
-			"" +
-				(`\"\031\028\025\022\019\016\013\010\000xxxxxxxxx` +
-					`\192\010\192\009\192\008\192\007\192\006\192\005\192\004\192\003\192\002.`) +
-				(`\031\028\025\022\019\016\013\010\000xxxxxxxxx` +
-					`\192\010\192\009\192\008\192\007\192\006\192\005\192\004\192\003.`) +
-				(`\028\025\022\019\016\013\010\000xxxxxxxxx` +
-					`\192\010\192\009\192\008\192\007\192\006\192\005\192\004.`) +
-				(`\025\022\019\016\013\010\000xxxxxxxxx` +
-					`\192\010\192\009\192\008\192\007\192\006\192\005.`) +
-				`\022\019\016\013\010\000xxxxxxxxx\192\010\192\009\192\008\192\007\192\006.` +
-				`\019\016\013\010\000xxxxxxxxx\192\010\192\009\192\008\192\007.` +
-				`\016\013\010\000xxxxxxxxx\192\010\192\009\192\008.` +
-				`\013\010\000xxxxxxxxx\192\010\192\009.` +
-				`\010\000xxxxxxxxx\192\010.` +
-				`\000xxxxxxxxx.`,
-			""},
-		{"truncated name", "\x07example\x03", "", "dns: buffer size too small"},
-		{"non-absolute name", "\x07example\x03com", "", "dns: buffer size too small"},
-		{"compression pointer cycle",
-			"\x03foo" + "\x03bar" + "\x07example" + "\xC0\x04",
-			"",
-			"dns: too many compression pointers"},
-		{"reserved compression pointer 0b10", "\x07example\x80", "", "dns: bad rdata"},
-		{"reserved compression pointer 0b01", "\x07example\x40", "", "dns: bad rdata"},
-	}
-	for _, test := range cases {
-		output, idx, err := UnpackDomainName([]byte(test.input), 0)
-		if test.expectedOutput != "" && output != test.expectedOutput {
-			t.Errorf("%s: expected %s, got %s", test.label, test.expectedOutput, output)
-		}
-		if test.expectedError == "" && err != nil {
-			t.Errorf("%s: expected no error, got %d %v", test.label, idx, err)
-		} else if test.expectedError != "" && (err == nil || err.Error() != test.expectedError) {
-			t.Errorf("%s: expected error %s, got %d %v", test.label, test.expectedError, idx, err)
-		}
-	}
-}
diff --git a/vendor/github.com/miekg/dns/nsecx_test.go b/vendor/github.com/miekg/dns/nsecx_test.go
deleted file mode 100644
index 74ebda3f..00000000
--- a/vendor/github.com/miekg/dns/nsecx_test.go
+++ /dev/null
@@ -1,141 +0,0 @@
-package dns
-
-import "testing"
-
-func TestPackNsec3(t *testing.T) {
-	nsec3 := HashName("dnsex.nl.", SHA1, 0, "DEAD")
-	if nsec3 != "ROCCJAE8BJJU7HN6T7NG3TNM8ACRS87J" {
-		t.Error(nsec3)
-	}
-
-	nsec3 = HashName("a.b.c.example.org.", SHA1, 2, "DEAD")
-	if nsec3 != "6LQ07OAHBTOOEU2R9ANI2AT70K5O0RCG" {
-		t.Error(nsec3)
-	}
-}
-
-func TestNsec3(t *testing.T) {
-	nsec3 := testRR("sk4e8fj94u78smusb40o1n0oltbblu2r.nl. IN NSEC3 1 1 5 F10E9F7EA83FC8F3 SK4F38CQ0ATIEI8MH3RGD0P5I4II6QAN NS SOA TXT RRSIG DNSKEY NSEC3PARAM")
-	if !nsec3.(*NSEC3).Match("nl.") { // name hash = sk4e8fj94u78smusb40o1n0oltbblu2r
-		t.Fatal("sk4e8fj94u78smusb40o1n0oltbblu2r.nl. should match sk4e8fj94u78smusb40o1n0oltbblu2r.nl.")
-	}
-	if !nsec3.(*NSEC3).Match("NL.") { // name hash = sk4e8fj94u78smusb40o1n0oltbblu2r
-		t.Fatal("sk4e8fj94u78smusb40o1n0oltbblu2r.NL. should match sk4e8fj94u78smusb40o1n0oltbblu2r.nl.")
-	}
-	if nsec3.(*NSEC3).Match("com.") { //
-		t.Fatal("com. is not in the zone nl.")
-	}
-	if nsec3.(*NSEC3).Match("test.nl.") { // name hash = gd0ptr5bnfpimpu2d3v6gd4n0bai7s0q
-		t.Fatal("gd0ptr5bnfpimpu2d3v6gd4n0bai7s0q.nl. should not match sk4e8fj94u78smusb40o1n0oltbblu2r.nl.")
-	}
-	nsec3 = testRR("nl. IN NSEC3 1 1 5 F10E9F7EA83FC8F3 SK4F38CQ0ATIEI8MH3RGD0P5I4II6QAN NS SOA TXT RRSIG DNSKEY NSEC3PARAM")
-	if nsec3.(*NSEC3).Match("nl.") {
-		t.Fatal("sk4e8fj94u78smusb40o1n0oltbblu2r.nl. should not match a record without a owner hash")
-	}
-
-	for _, tc := range []struct {
-		rr     *NSEC3
-		name   string
-		covers bool
-	}{
-		// positive tests
-		{ // name hash between owner hash and next hash
-			rr: &NSEC3{
-				Hdr:        RR_Header{Name: "2N1TB3VAIRUOBL6RKDVII42N9TFMIALP.com."},
-				Hash:       1,
-				Flags:      1,
-				Iterations: 5,
-				Salt:       "F10E9F7EA83FC8F3",
-				NextDomain: "PT3RON8N7PM3A0OE989IB84OOSADP7O8",
-			},
-			name:   "bsd.com.",
-			covers: true,
-		},
-		{ // end of zone, name hash is after owner hash
-			rr: &NSEC3{
-				Hdr:        RR_Header{Name: "3v62ulr0nre83v0rja2vjgtlif9v6rab.com."},
-				Hash:       1,
-				Flags:      1,
-				Iterations: 5,
-				Salt:       "F10E9F7EA83FC8F3",
-				NextDomain: "2N1TB3VAIRUOBL6RKDVII42N9TFMIALP",
-			},
-			name:   "csd.com.",
-			covers: true,
-		},
-		{ // end of zone, name hash is before beginning of zone
-			rr: &NSEC3{
-				Hdr:        RR_Header{Name: "PT3RON8N7PM3A0OE989IB84OOSADP7O8.com."},
-				Hash:       1,
-				Flags:      1,
-				Iterations: 5,
-				Salt:       "F10E9F7EA83FC8F3",
-				NextDomain: "3V62ULR0NRE83V0RJA2VJGTLIF9V6RAB",
-			},
-			name:   "asd.com.",
-			covers: true,
-		},
-		// negative tests
-		{ // too short owner name
-			rr: &NSEC3{
-				Hdr:        RR_Header{Name: "nl."},
-				Hash:       1,
-				Flags:      1,
-				Iterations: 5,
-				Salt:       "F10E9F7EA83FC8F3",
-				NextDomain: "39P99DCGG0MDLARTCRMCF6OFLLUL7PR6",
-			},
-			name:   "asd.com.",
-			covers: false,
-		},
-		{ // outside of zone
-			rr: &NSEC3{
-				Hdr:        RR_Header{Name: "39p91242oslggest5e6a7cci4iaeqvnk.nl."},
-				Hash:       1,
-				Flags:      1,
-				Iterations: 5,
-				Salt:       "F10E9F7EA83FC8F3",
-				NextDomain: "39P99DCGG0MDLARTCRMCF6OFLLUL7PR6",
-			},
-			name:   "asd.com.",
-			covers: false,
-		},
-		{ // empty interval
-			rr: &NSEC3{
-				Hdr:        RR_Header{Name: "2n1tb3vairuobl6rkdvii42n9tfmialp.com."},
-				Hash:       1,
-				Flags:      1,
-				Iterations: 5,
-				Salt:       "F10E9F7EA83FC8F3",
-				NextDomain: "2N1TB3VAIRUOBL6RKDVII42N9TFMIALP",
-			},
-			name:   "asd.com.",
-			covers: false,
-		},
-		{ // name hash is before owner hash, not covered
-			rr: &NSEC3{
-				Hdr:        RR_Header{Name: "3V62ULR0NRE83V0RJA2VJGTLIF9V6RAB.com."},
-				Hash:       1,
-				Flags:      1,
-				Iterations: 5,
-				Salt:       "F10E9F7EA83FC8F3",
-				NextDomain: "PT3RON8N7PM3A0OE989IB84OOSADP7O8",
-			},
-			name:   "asd.com.",
-			covers: false,
-		},
-	} {
-		covers := tc.rr.Cover(tc.name)
-		if tc.covers != covers {
-			t.Fatalf("cover failed for %s: expected %t, got %t [record: %s]", tc.name, tc.covers, covers, tc.rr)
-		}
-	}
-}
-
-func TestNsec3EmptySalt(t *testing.T) {
-	rr, _ := NewRR("CK0POJMG874LJREF7EFN8430QVIT8BSM.com. 86400 IN NSEC3 1 1 0 - CK0Q1GIN43N1ARRC9OSM6QPQR81H5M9A  NS SOA RRSIG DNSKEY NSEC3PARAM")
-
-	if !rr.(*NSEC3).Match("com.") {
-		t.Fatalf("expected record to match com. label")
-	}
-}
diff --git a/vendor/github.com/miekg/dns/parse_test.go b/vendor/github.com/miekg/dns/parse_test.go
deleted file mode 100644
index efdaf59a..00000000
--- a/vendor/github.com/miekg/dns/parse_test.go
+++ /dev/null
@@ -1,1465 +0,0 @@
-package dns
-
-import (
-	"bytes"
-	"crypto/rsa"
-	"encoding/hex"
-	"fmt"
-	"math/rand"
-	"net"
-	"reflect"
-	"regexp"
-	"strconv"
-	"strings"
-	"testing"
-	"testing/quick"
-)
-
-func TestDotInName(t *testing.T) {
-	buf := make([]byte, 20)
-	PackDomainName("aa\\.bb.nl.", buf, 0, nil, false)
-	// index 3 must be a real dot
-	if buf[3] != '.' {
-		t.Error("dot should be a real dot")
-	}
-
-	if buf[6] != 2 {
-		t.Error("this must have the value 2")
-	}
-	dom, _, _ := UnpackDomainName(buf, 0)
-	// printing it should yield the backspace again
-	if dom != "aa\\.bb.nl." {
-		t.Error("dot should have been escaped: ", dom)
-	}
-}
-
-func TestDotLastInLabel(t *testing.T) {
-	sample := "aa\\..au."
-	buf := make([]byte, 20)
-	_, err := PackDomainName(sample, buf, 0, nil, false)
-	if err != nil {
-		t.Fatalf("unexpected error packing domain: %v", err)
-	}
-	dom, _, _ := UnpackDomainName(buf, 0)
-	if dom != sample {
-		t.Fatalf("unpacked domain `%s' doesn't match packed domain", dom)
-	}
-}
-
-func TestTooLongDomainName(t *testing.T) {
-	l := "aaabbbcccdddeeefffggghhhiiijjjkkklllmmmnnnooopppqqqrrrsssttt."
-	dom := l + l + l + l + l + l + l
-	_, err := NewRR(dom + " IN A 127.0.0.1")
-	if err == nil {
-		t.Error("should be too long")
-	}
-	_, err = NewRR("..com. IN A 127.0.0.1")
-	if err == nil {
-		t.Error("should fail")
-	}
-}
-
-func TestDomainName(t *testing.T) {
-	tests := []string{"r\\.gieben.miek.nl.", "www\\.www.miek.nl.",
-		"www.*.miek.nl.", "www.*.miek.nl.",
-	}
-	dbuff := make([]byte, 40)
-
-	for _, ts := range tests {
-		if _, err := PackDomainName(ts, dbuff, 0, nil, false); err != nil {
-			t.Error("not a valid domain name")
-			continue
-		}
-		n, _, err := UnpackDomainName(dbuff, 0)
-		if err != nil {
-			t.Error("failed to unpack packed domain name")
-			continue
-		}
-		if ts != n {
-			t.Errorf("must be equal: in: %s, out: %s", ts, n)
-		}
-	}
-}
-
-func TestDomainNameAndTXTEscapes(t *testing.T) {
-	tests := []byte{'.', '(', ')', ';', ' ', '@', '"', '\\', 9, 13, 10, 0, 255}
-	for _, b := range tests {
-		rrbytes := []byte{
-			1, b, 0, // owner
-			byte(TypeTXT >> 8), byte(TypeTXT),
-			byte(ClassINET >> 8), byte(ClassINET),
-			0, 0, 0, 1, // TTL
-			0, 2, 1, b, // Data
-		}
-		rr1, _, err := UnpackRR(rrbytes, 0)
-		if err != nil {
-			panic(err)
-		}
-		s := rr1.String()
-		rr2, err := NewRR(s)
-		if err != nil {
-			t.Errorf("error parsing unpacked RR's string: %v", err)
-		}
-		repacked := make([]byte, len(rrbytes))
-		if _, err := PackRR(rr2, repacked, 0, nil, false); err != nil {
-			t.Errorf("error packing parsed RR: %v", err)
-		}
-		if !bytes.Equal(repacked, rrbytes) {
-			t.Error("packed bytes don't match original bytes")
-		}
-	}
-}
-
-func TestTXTEscapeParsing(t *testing.T) {
-	test := [][]string{
-		{`";"`, `";"`},
-		{`\;`, `";"`},
-		{`"\t"`, `"t"`},
-		{`"\r"`, `"r"`},
-		{`"\ "`, `" "`},
-		{`"\;"`, `";"`},
-		{`"\;\""`, `";\""`},
-		{`"\(a\)"`, `"(a)"`},
-		{`"\(a)"`, `"(a)"`},
-		{`"(a\)"`, `"(a)"`},
-		{`"(a)"`, `"(a)"`},
-		{`"\048"`, `"0"`},
-		{`"\` + "\t" + `"`, `"\009"`},
-		{`"\` + "\n" + `"`, `"\010"`},
-		{`"\` + "\r" + `"`, `"\013"`},
-		{`"\` + "\x11" + `"`, `"\017"`},
-		{`"\'"`, `"'"`},
-	}
-	for _, s := range test {
-		rr, err := NewRR(fmt.Sprintf("example.com. IN TXT %v", s[0]))
-		if err != nil {
-			t.Errorf("could not parse %v TXT: %s", s[0], err)
-			continue
-		}
-
-		txt := sprintTxt(rr.(*TXT).Txt)
-		if txt != s[1] {
-			t.Errorf("mismatch after parsing `%v` TXT record: `%v` != `%v`", s[0], txt, s[1])
-		}
-	}
-}
-
-func GenerateDomain(r *rand.Rand, size int) []byte {
-	dnLen := size % 70 // artificially limit size so there's less to interpret if a failure occurs
-	var dn []byte
-	done := false
-	for i := 0; i < dnLen && !done; {
-		max := dnLen - i
-		if max > 63 {
-			max = 63
-		}
-		lLen := max
-		if lLen != 0 {
-			lLen = int(r.Int31()) % max
-		}
-		done = lLen == 0
-		if done {
-			continue
-		}
-		l := make([]byte, lLen+1)
-		l[0] = byte(lLen)
-		for j := 0; j < lLen; j++ {
-			l[j+1] = byte(rand.Int31())
-		}
-		dn = append(dn, l...)
-		i += 1 + lLen
-	}
-	return append(dn, 0)
-}
-
-func TestDomainQuick(t *testing.T) {
-	r := rand.New(rand.NewSource(0))
-	f := func(l int) bool {
-		db := GenerateDomain(r, l)
-		ds, _, err := UnpackDomainName(db, 0)
-		if err != nil {
-			panic(err)
-		}
-		buf := make([]byte, 255)
-		off, err := PackDomainName(ds, buf, 0, nil, false)
-		if err != nil {
-			t.Errorf("error packing domain: %v", err)
-			t.Errorf(" bytes: %v", db)
-			t.Errorf("string: %v", ds)
-			return false
-		}
-		if !bytes.Equal(db, buf[:off]) {
-			t.Errorf("repacked domain doesn't match original:")
-			t.Errorf("src bytes: %v", db)
-			t.Errorf("   string: %v", ds)
-			t.Errorf("out bytes: %v", buf[:off])
-			return false
-		}
-		return true
-	}
-	if err := quick.Check(f, nil); err != nil {
-		t.Error(err)
-	}
-}
-
-func GenerateTXT(r *rand.Rand, size int) []byte {
-	rdLen := size % 300 // artificially limit size so there's less to interpret if a failure occurs
-	var rd []byte
-	for i := 0; i < rdLen; {
-		max := rdLen - 1
-		if max > 255 {
-			max = 255
-		}
-		sLen := max
-		if max != 0 {
-			sLen = int(r.Int31()) % max
-		}
-		s := make([]byte, sLen+1)
-		s[0] = byte(sLen)
-		for j := 0; j < sLen; j++ {
-			s[j+1] = byte(rand.Int31())
-		}
-		rd = append(rd, s...)
-		i += 1 + sLen
-	}
-	return rd
-}
-
-// Ok, 2 things. 1) this test breaks with the new functionality of splitting up larger txt
-// chunks into 255 byte pieces. 2) I don't like the random nature of this thing, because I can't
-// place the quotes where they need to be.
-// So either add some code the places the quotes in just the right spots, make this non random
-// or do something else.
-// Disabled for now. (miek)
-func testTXTRRQuick(t *testing.T) {
-	s := rand.NewSource(0)
-	r := rand.New(s)
-	typeAndClass := []byte{
-		byte(TypeTXT >> 8), byte(TypeTXT),
-		byte(ClassINET >> 8), byte(ClassINET),
-		0, 0, 0, 1, // TTL
-	}
-	f := func(l int) bool {
-		owner := GenerateDomain(r, l)
-		rdata := GenerateTXT(r, l)
-		rrbytes := make([]byte, 0, len(owner)+2+2+4+2+len(rdata))
-		rrbytes = append(rrbytes, owner...)
-		rrbytes = append(rrbytes, typeAndClass...)
-		rrbytes = append(rrbytes, byte(len(rdata)>>8))
-		rrbytes = append(rrbytes, byte(len(rdata)))
-		rrbytes = append(rrbytes, rdata...)
-		rr, _, err := UnpackRR(rrbytes, 0)
-		if err != nil {
-			panic(err)
-		}
-		buf := make([]byte, len(rrbytes)*3)
-		off, err := PackRR(rr, buf, 0, nil, false)
-		if err != nil {
-			t.Errorf("pack Error: %v\nRR: %v", err, rr)
-			return false
-		}
-		buf = buf[:off]
-		if !bytes.Equal(buf, rrbytes) {
-			t.Errorf("packed bytes don't match original bytes")
-			t.Errorf("src bytes: %v", rrbytes)
-			t.Errorf("   struct: %v", rr)
-			t.Errorf("out bytes: %v", buf)
-			return false
-		}
-		if len(rdata) == 0 {
-			// string'ing won't produce any data to parse
-			return true
-		}
-		rrString := rr.String()
-		rr2, err := NewRR(rrString)
-		if err != nil {
-			t.Errorf("error parsing own output: %v", err)
-			t.Errorf("struct: %v", rr)
-			t.Errorf("string: %v", rrString)
-			return false
-		}
-		if rr2.String() != rrString {
-			t.Errorf("parsed rr.String() doesn't match original string")
-			t.Errorf("original: %v", rrString)
-			t.Errorf("  parsed: %v", rr2.String())
-			return false
-		}
-
-		buf = make([]byte, len(rrbytes)*3)
-		off, err = PackRR(rr2, buf, 0, nil, false)
-		if err != nil {
-			t.Errorf("error packing parsed rr: %v", err)
-			t.Errorf("unpacked Struct: %v", rr)
-			t.Errorf("         string: %v", rrString)
-			t.Errorf("  parsed Struct: %v", rr2)
-			return false
-		}
-		buf = buf[:off]
-		if !bytes.Equal(buf, rrbytes) {
-			t.Errorf("parsed packed bytes don't match original bytes")
-			t.Errorf("   source bytes: %v", rrbytes)
-			t.Errorf("unpacked struct: %v", rr)
-			t.Errorf("         string: %v", rrString)
-			t.Errorf("  parsed struct: %v", rr2)
-			t.Errorf(" repacked bytes: %v", buf)
-			return false
-		}
-		return true
-	}
-	c := &quick.Config{MaxCountScale: 10}
-	if err := quick.Check(f, c); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestParseDirectiveMisc(t *testing.T) {
-	tests := map[string]string{
-		"$ORIGIN miek.nl.\na IN NS b": "a.miek.nl.\t3600\tIN\tNS\tb.miek.nl.",
-		"$TTL 2H\nmiek.nl. IN NS b.":  "miek.nl.\t7200\tIN\tNS\tb.",
-		"miek.nl. 1D IN NS b.":        "miek.nl.\t86400\tIN\tNS\tb.",
-		`name. IN SOA  a6.nstld.com. hostmaster.nic.name. (
-        203362132 ; serial
-        5m        ; refresh (5 minutes)
-        5m        ; retry (5 minutes)
-        2w        ; expire (2 weeks)
-        300       ; minimum (5 minutes)
-)`: "name.\t3600\tIN\tSOA\ta6.nstld.com. hostmaster.nic.name. 203362132 300 300 1209600 300",
-		". 3600000  IN  NS ONE.MY-ROOTS.NET.":        ".\t3600000\tIN\tNS\tONE.MY-ROOTS.NET.",
-		"ONE.MY-ROOTS.NET. 3600000 IN A 192.168.1.1": "ONE.MY-ROOTS.NET.\t3600000\tIN\tA\t192.168.1.1",
-	}
-	for i, o := range tests {
-		rr, err := NewRR(i)
-		if err != nil {
-			t.Error("failed to parse RR: ", err)
-			continue
-		}
-		if rr.String() != o {
-			t.Errorf("`%s' should be equal to\n`%s', but is     `%s'", i, o, rr.String())
-		}
-	}
-}
-
-func TestNSEC(t *testing.T) {
-	nsectests := map[string]string{
-		"nl. IN NSEC3PARAM 1 0 5 30923C44C6CBBB8F":                                                                                                 "nl.\t3600\tIN\tNSEC3PARAM\t1 0 5 30923C44C6CBBB8F",
-		"p2209hipbpnm681knjnu0m1febshlv4e.nl. IN NSEC3 1 1 5 30923C44C6CBBB8F P90DG1KE8QEAN0B01613LHQDG0SOJ0TA NS SOA TXT RRSIG DNSKEY NSEC3PARAM": "p2209hipbpnm681knjnu0m1febshlv4e.nl.\t3600\tIN\tNSEC3\t1 1 5 30923C44C6CBBB8F P90DG1KE8QEAN0B01613LHQDG0SOJ0TA NS SOA TXT RRSIG DNSKEY NSEC3PARAM",
-		"localhost.dnssex.nl. IN NSEC www.dnssex.nl. A RRSIG NSEC":                                                                                 "localhost.dnssex.nl.\t3600\tIN\tNSEC\twww.dnssex.nl. A RRSIG NSEC",
-		"localhost.dnssex.nl. IN NSEC www.dnssex.nl. A RRSIG NSEC TYPE65534":                                                                       "localhost.dnssex.nl.\t3600\tIN\tNSEC\twww.dnssex.nl. A RRSIG NSEC TYPE65534",
-		"localhost.dnssex.nl. IN NSEC www.dnssex.nl. A RRSIG NSec Type65534":                                                                       "localhost.dnssex.nl.\t3600\tIN\tNSEC\twww.dnssex.nl. A RRSIG NSEC TYPE65534",
-		"44ohaq2njb0idnvolt9ggthvsk1e1uv8.skydns.test. NSEC3 1 0 0 - 44OHAQ2NJB0IDNVOLT9GGTHVSK1E1UVA":                                             "44ohaq2njb0idnvolt9ggthvsk1e1uv8.skydns.test.\t3600\tIN\tNSEC3\t1 0 0 - 44OHAQ2NJB0IDNVOLT9GGTHVSK1E1UVA",
-	}
-	for i, o := range nsectests {
-		rr, err := NewRR(i)
-		if err != nil {
-			t.Error("failed to parse RR: ", err)
-			continue
-		}
-		if rr.String() != o {
-			t.Errorf("`%s' should be equal to\n`%s', but is     `%s'", i, o, rr.String())
-		}
-	}
-}
-
-func TestParseLOC(t *testing.T) {
-	lt := map[string]string{
-		"SW1A2AA.find.me.uk.	LOC	51 30 12.748 N 00 07 39.611 W 0.00m 0.00m 0.00m 0.00m": "SW1A2AA.find.me.uk.\t3600\tIN\tLOC\t51 30 12.748 N 00 07 39.611 W 0m 0.00m 0.00m 0.00m",
-		"SW1A2AA.find.me.uk.	LOC	51 0 0.0 N 00 07 39.611 W 0.00m 0.00m 0.00m 0.00m": "SW1A2AA.find.me.uk.\t3600\tIN\tLOC\t51 00 0.000 N 00 07 39.611 W 0m 0.00m 0.00m 0.00m",
-	}
-	for i, o := range lt {
-		rr, err := NewRR(i)
-		if err != nil {
-			t.Error("failed to parse RR: ", err)
-			continue
-		}
-		if rr.String() != o {
-			t.Errorf("`%s' should be equal to\n`%s', but is     `%s'", i, o, rr.String())
-		}
-	}
-}
-
-func TestParseDS(t *testing.T) {
-	dt := map[string]string{
-		"example.net. 3600 IN DS 40692 12 3 22261A8B0E0D799183E35E24E2AD6BB58533CBA7E3B14D659E9CA09B 2071398F": "example.net.\t3600\tIN\tDS\t40692 12 3 22261A8B0E0D799183E35E24E2AD6BB58533CBA7E3B14D659E9CA09B2071398F",
-	}
-	for i, o := range dt {
-		rr, err := NewRR(i)
-		if err != nil {
-			t.Error("failed to parse RR: ", err)
-			continue
-		}
-		if rr.String() != o {
-			t.Errorf("`%s' should be equal to\n`%s', but is     `%s'", i, o, rr.String())
-		}
-	}
-}
-
-func TestQuotes(t *testing.T) {
-	tests := map[string]string{
-		`t.example.com. IN TXT "a bc"`: "t.example.com.\t3600\tIN\tTXT\t\"a bc\"",
-		`t.example.com. IN TXT "a
- bc"`: "t.example.com.\t3600\tIN\tTXT\t\"a\\010 bc\"",
-		`t.example.com. IN TXT ""`:                                                           "t.example.com.\t3600\tIN\tTXT\t\"\"",
-		`t.example.com. IN TXT "a"`:                                                          "t.example.com.\t3600\tIN\tTXT\t\"a\"",
-		`t.example.com. IN TXT "aa"`:                                                         "t.example.com.\t3600\tIN\tTXT\t\"aa\"",
-		`t.example.com. IN TXT "aaa" ;`:                                                      "t.example.com.\t3600\tIN\tTXT\t\"aaa\"",
-		`t.example.com. IN TXT "abc" "DEF"`:                                                  "t.example.com.\t3600\tIN\tTXT\t\"abc\" \"DEF\"",
-		`t.example.com. IN TXT "abc" ( "DEF" )`:                                              "t.example.com.\t3600\tIN\tTXT\t\"abc\" \"DEF\"",
-		`t.example.com. IN TXT aaa ;`:                                                        "t.example.com.\t3600\tIN\tTXT\t\"aaa\"",
-		`t.example.com. IN TXT aaa aaa;`:                                                     "t.example.com.\t3600\tIN\tTXT\t\"aaa\" \"aaa\"",
-		`t.example.com. IN TXT aaa aaa`:                                                      "t.example.com.\t3600\tIN\tTXT\t\"aaa\" \"aaa\"",
-		`t.example.com. IN TXT aaa`:                                                          "t.example.com.\t3600\tIN\tTXT\t\"aaa\"",
-		"cid.urn.arpa. NAPTR 100 50 \"s\" \"z3950+I2L+I2C\"    \"\" _z3950._tcp.gatech.edu.": "cid.urn.arpa.\t3600\tIN\tNAPTR\t100 50 \"s\" \"z3950+I2L+I2C\" \"\" _z3950._tcp.gatech.edu.",
-		"cid.urn.arpa. NAPTR 100 50 \"s\" \"rcds+I2C\"         \"\" _rcds._udp.gatech.edu.":  "cid.urn.arpa.\t3600\tIN\tNAPTR\t100 50 \"s\" \"rcds+I2C\" \"\" _rcds._udp.gatech.edu.",
-		"cid.urn.arpa. NAPTR 100 50 \"s\" \"http+I2L+I2C+I2R\" \"\" _http._tcp.gatech.edu.":  "cid.urn.arpa.\t3600\tIN\tNAPTR\t100 50 \"s\" \"http+I2L+I2C+I2R\" \"\" _http._tcp.gatech.edu.",
-		"cid.urn.arpa. NAPTR 100 10 \"\" \"\" \"/urn:cid:.+@([^\\.]+\\.)(.*)$/\\2/i\" .":     "cid.urn.arpa.\t3600\tIN\tNAPTR\t100 10 \"\" \"\" \"/urn:cid:.+@([^\\.]+\\.)(.*)$/\\2/i\" .",
-	}
-	for i, o := range tests {
-		rr, err := NewRR(i)
-		if err != nil {
-			t.Error("failed to parse RR: ", err)
-			continue
-		}
-		if rr.String() != o {
-			t.Errorf("`%s' should be equal to\n`%s', but is\n`%s'", i, o, rr.String())
-		}
-	}
-}
-
-func TestParseClass(t *testing.T) {
-	tests := map[string]string{
-		"t.example.com. IN A 127.0.0.1": "t.example.com.	3600	IN	A	127.0.0.1",
-		"t.example.com. CS A 127.0.0.1": "t.example.com.	3600	CS	A	127.0.0.1",
-		"t.example.com. CH A 127.0.0.1": "t.example.com.	3600	CH	A	127.0.0.1",
-		// ClassANY can not occur in zone files
-		// "t.example.com. ANY A 127.0.0.1": "t.example.com.	3600	ANY	A	127.0.0.1",
-		"t.example.com. NONE A 127.0.0.1": "t.example.com.	3600	NONE	A	127.0.0.1",
-		"t.example.com. CLASS255 A 127.0.0.1": "t.example.com.	3600	CLASS255	A	127.0.0.1",
-	}
-	for i, o := range tests {
-		rr, err := NewRR(i)
-		if err != nil {
-			t.Error("failed to parse RR: ", err)
-			continue
-		}
-		if rr.String() != o {
-			t.Errorf("`%s' should be equal to\n`%s', but is\n`%s'", i, o, rr.String())
-		}
-	}
-}
-
-func TestBrace(t *testing.T) {
-	tests := map[string]string{
-		"(miek.nl.) 3600 IN A 127.0.1.1":                 "miek.nl.\t3600\tIN\tA\t127.0.1.1",
-		"miek.nl. (3600) IN MX (10) elektron.atoom.net.": "miek.nl.\t3600\tIN\tMX\t10 elektron.atoom.net.",
-		`miek.nl. IN (
-                        3600 A 127.0.0.1)`: "miek.nl.\t3600\tIN\tA\t127.0.0.1",
-		"(miek.nl.) (A) (127.0.2.1)":                          "miek.nl.\t3600\tIN\tA\t127.0.2.1",
-		"miek.nl A 127.0.3.1":                                 "miek.nl.\t3600\tIN\tA\t127.0.3.1",
-		"_ssh._tcp.local. 60 IN (PTR) stora._ssh._tcp.local.": "_ssh._tcp.local.\t60\tIN\tPTR\tstora._ssh._tcp.local.",
-		"miek.nl. NS ns.miek.nl":                              "miek.nl.\t3600\tIN\tNS\tns.miek.nl.",
-		`(miek.nl.) (
-                        (IN)
-                        (AAAA)
-                        (::1) )`: "miek.nl.\t3600\tIN\tAAAA\t::1",
-		`(miek.nl.) (
-                        (IN)
-                        (AAAA)
-                        (::1))`: "miek.nl.\t3600\tIN\tAAAA\t::1",
-		"miek.nl. IN AAAA ::2": "miek.nl.\t3600\tIN\tAAAA\t::2",
-		`((m)(i)ek.(n)l.) (SOA) (soa.) (soa.) (
-                                2009032802 ; serial
-                                21600      ; refresh (6 hours)
-                                7(2)00       ; retry (2 hours)
-                                604()800     ; expire (1 week)
-                                3600       ; minimum (1 hour)
-                        )`: "miek.nl.\t3600\tIN\tSOA\tsoa. soa. 2009032802 21600 7200 604800 3600",
-		"miek\\.nl. IN A 127.0.0.10": "miek\\.nl.\t3600\tIN\tA\t127.0.0.10",
-		"miek.nl. IN A 127.0.0.11":   "miek.nl.\t3600\tIN\tA\t127.0.0.11",
-		"miek.nl. A 127.0.0.12":      "miek.nl.\t3600\tIN\tA\t127.0.0.12",
-		`miek.nl.       86400 IN SOA elektron.atoom.net. miekg.atoom.net. (
-                                2009032802 ; serial
-                                21600      ; refresh (6 hours)
-                                7200       ; retry (2 hours)
-                                604800     ; expire (1 week)
-                                3600       ; minimum (1 hour)
-                        )`: "miek.nl.\t86400\tIN\tSOA\telektron.atoom.net. miekg.atoom.net. 2009032802 21600 7200 604800 3600",
-	}
-	for i, o := range tests {
-		rr, err := NewRR(i)
-		if err != nil {
-			t.Errorf("failed to parse RR: %v\n\t%s", err, i)
-			continue
-		}
-		if rr.String() != o {
-			t.Errorf("`%s' should be equal to\n`%s', but is     `%s'", i, o, rr.String())
-		}
-	}
-}
-
-func TestParseFailure(t *testing.T) {
-	tests := []string{"miek.nl. IN A 327.0.0.1",
-		"miek.nl. IN AAAA ::x",
-		"miek.nl. IN MX a0 miek.nl.",
-		"miek.nl aap IN MX mx.miek.nl.",
-		"miek.nl 200 IN mxx 10 mx.miek.nl.",
-		"miek.nl. inn MX 10 mx.miek.nl.",
-		// "miek.nl. IN CNAME ", // actually valid nowadays, zero size rdata
-		"miek.nl. IN CNAME ..",
-		"miek.nl. PA MX 10 miek.nl.",
-		"miek.nl. ) IN MX 10 miek.nl.",
-	}
-
-	for _, s := range tests {
-		_, err := NewRR(s)
-		if err == nil {
-			t.Errorf("should have triggered an error: \"%s\"", s)
-		}
-	}
-}
-
-func TestOmittedTTL(t *testing.T) {
-	zone := `
-$ORIGIN example.com.
-example.com. 42 IN SOA ns1.example.com. hostmaster.example.com. 1 86400 60 86400 3600 ; TTL=42 SOA
-example.com.        NS 2 ; TTL=42 absolute owner name
-@                   MD 3 ; TTL=42 current-origin owner name
-                    MF 4 ; TTL=42 leading-space implied owner name
-	43 TYPE65280 \# 1 05 ; TTL=43 implied owner name explicit TTL
-	          MB 6       ; TTL=43 leading-tab implied owner name
-$TTL 1337
-example.com. 88 MG 7 ; TTL=88 explicit TTL
-example.com.    MR 8 ; TTL=1337 after first $TTL
-$TTL 314
-             1 TXT 9 ; TTL=1 implied owner name explicit TTL
-example.com.   DNAME 10 ; TTL=314 after second $TTL
-`
-	reCaseFromComment := regexp.MustCompile(`TTL=(\d+)\s+(.*)`)
-	records := ParseZone(strings.NewReader(zone), "", "")
-	var i int
-	for record := range records {
-		i++
-		if record.Error != nil {
-			t.Error(record.Error)
-			continue
-		}
-		expected := reCaseFromComment.FindStringSubmatch(record.Comment)
-		expectedTTL, _ := strconv.ParseUint(expected[1], 10, 32)
-		ttl := record.RR.Header().Ttl
-		if ttl != uint32(expectedTTL) {
-			t.Errorf("%s: expected TTL %d, got %d", expected[2], expectedTTL, ttl)
-		}
-	}
-	if i != 10 {
-		t.Errorf("expected %d records, got %d", 5, i)
-	}
-}
-
-func TestRelativeNameErrors(t *testing.T) {
-	var badZones = []struct {
-		label        string
-		zoneContents string
-		expectedErr  string
-	}{
-		{
-			"relative owner name without origin",
-			"example.com 3600 IN SOA ns.example.com. hostmaster.example.com. 1 86400 60 86400 3600",
-			"bad owner name",
-		},
-		{
-			"relative owner name in RDATA",
-			"example.com. 3600 IN SOA ns hostmaster 1 86400 60 86400 3600",
-			"bad SOA Ns",
-		},
-		{
-			"origin reference without origin",
-			"@ 3600 IN SOA ns.example.com. hostmaster.example.com. 1 86400 60 86400 3600",
-			"bad owner name",
-		},
-		{
-			"relative owner name in $INCLUDE",
-			"$INCLUDE file.db example.com",
-			"bad origin name",
-		},
-		{
-			"relative owner name in $ORIGIN",
-			"$ORIGIN example.com",
-			"bad origin name",
-		},
-	}
-	for _, errorCase := range badZones {
-		entries := ParseZone(strings.NewReader(errorCase.zoneContents), "", "")
-		for entry := range entries {
-			if entry.Error == nil {
-				t.Errorf("%s: expected error, got nil", errorCase.label)
-				continue
-			}
-			err := entry.Error.err
-			if err != errorCase.expectedErr {
-				t.Errorf("%s: expected error `%s`, got `%s`", errorCase.label, errorCase.expectedErr, err)
-			}
-		}
-	}
-}
-
-func TestHIP(t *testing.T) {
-	h := `www.example.com.      IN  HIP ( 2 200100107B1A74DF365639CC39F1D578
-                                AwEAAbdxyhNuSutc5EMzxTs9LBPCIkOFH8cIvM4p
-9+LrV4e19WzK00+CI6zBCQTdtWsuxKbWIy87UOoJTwkUs7lBu+Upr1gsNrut79ryra+bSRGQ
-b1slImA8YVJyuIDsj7kwzG7jnERNqnWxZ48AWkskmdHaVDP4BcelrTI3rMXdXF5D
-                                rvs1.example.com.
-                                rvs2.example.com. )`
-	rr, err := NewRR(h)
-	if err != nil {
-		t.Fatalf("failed to parse RR: %v", err)
-	}
-	msg := new(Msg)
-	msg.Answer = []RR{rr, rr}
-	bytes, err := msg.Pack()
-	if err != nil {
-		t.Fatalf("failed to pack msg: %v", err)
-	}
-	if err := msg.Unpack(bytes); err != nil {
-		t.Fatalf("failed to unpack msg: %v", err)
-	}
-	if len(msg.Answer) != 2 {
-		t.Fatalf("2 answers expected: %v", msg)
-	}
-	for i, rr := range msg.Answer {
-		rr := rr.(*HIP)
-		if l := len(rr.RendezvousServers); l != 2 {
-			t.Fatalf("2 servers expected, only %d in record %d:\n%v", l, i, msg)
-		}
-		for j, s := range []string{"rvs1.example.com.", "rvs2.example.com."} {
-			if rr.RendezvousServers[j] != s {
-				t.Fatalf("expected server %d of record %d to be %s:\n%v", j, i, s, msg)
-			}
-		}
-	}
-}
-
-// Test with no known RR on the line
-func TestLineNumberError2(t *testing.T) {
-	tests := map[string]string{
-		"example.com. 1000 SO master.example.com. admin.example.com. 1 4294967294 4294967293 4294967295 100": "dns: expecting RR type or class, not this...: \"SO\" at line: 1:21",
-		"example.com 1000 IN TALINK a.example.com. b..example.com.":                                          "dns: bad TALINK NextName: \"b..example.com.\" at line: 1:57",
-		"example.com 1000 IN TALINK ( a.example.com. b..example.com. )":                                      "dns: bad TALINK NextName: \"b..example.com.\" at line: 1:60",
-		`example.com 1000 IN TALINK ( a.example.com.
-	bb..example.com. )`: "dns: bad TALINK NextName: \"bb..example.com.\" at line: 2:18",
-		// This is a bug, it should report an error on line 1, but the new is already processed.
-		`example.com 1000 IN TALINK ( a.example.com.  b...example.com.
-	)`: "dns: bad TALINK NextName: \"b...example.com.\" at line: 2:1"}
-
-	for in, errStr := range tests {
-		_, err := NewRR(in)
-		if err == nil {
-			t.Error("err is nil")
-		} else {
-			if err.Error() != errStr {
-				t.Errorf("%s: error should be %s is %v", in, errStr, err)
-			}
-		}
-	}
-}
-
-// Test if the calculations are correct
-func TestRfc1982(t *testing.T) {
-	// If the current time and the timestamp are more than 68 years apart
-	// it means the date has wrapped. 0 is 1970
-
-	// fall in the current 68 year span
-	strtests := []string{"20120525134203", "19700101000000", "20380119031408"}
-	for _, v := range strtests {
-		if x, _ := StringToTime(v); v != TimeToString(x) {
-			t.Errorf("1982 arithmetic string failure %s (%s:%d)", v, TimeToString(x), x)
-		}
-	}
-
-	inttests := map[uint32]string{0: "19700101000000",
-		1 << 31:   "20380119031408",
-		1<<32 - 1: "21060207062815",
-	}
-	for i, v := range inttests {
-		if TimeToString(i) != v {
-			t.Errorf("1982 arithmetic int failure %d:%s (%s)", i, v, TimeToString(i))
-		}
-	}
-
-	// Future tests, these dates get parsed to a date within the current 136 year span
-	future := map[string]string{"22680119031408": "20631123173144",
-		"19010101121212": "20370206184028",
-		"19210101121212": "20570206184028",
-		"19500101121212": "20860206184028",
-		"19700101000000": "19700101000000",
-		"19690101000000": "21050207062816",
-		"29210101121212": "21040522212236",
-	}
-	for from, to := range future {
-		x, _ := StringToTime(from)
-		y := TimeToString(x)
-		if y != to {
-			t.Errorf("1982 arithmetic future failure %s:%s (%s)", from, to, y)
-		}
-	}
-}
-
-func TestEmpty(t *testing.T) {
-	for range ParseZone(strings.NewReader(""), "", "") {
-		t.Errorf("should be empty")
-	}
-}
-
-func TestLowercaseTokens(t *testing.T) {
-	var testrecords = []string{
-		"example.org. 300 IN a 1.2.3.4",
-		"example.org. 300 in A 1.2.3.4",
-		"example.org. 300 in a 1.2.3.4",
-		"example.org. 300 a 1.2.3.4",
-		"example.org. 300 A 1.2.3.4",
-		"example.org. IN a 1.2.3.4",
-		"example.org. in A 1.2.3.4",
-		"example.org. in a 1.2.3.4",
-		"example.org. a 1.2.3.4",
-		"example.org. A 1.2.3.4",
-		"example.org. a 1.2.3.4",
-		"$ORIGIN example.org.\n a 1.2.3.4",
-		"$Origin example.org.\n a 1.2.3.4",
-		"$origin example.org.\n a 1.2.3.4",
-		"example.org. Class1 Type1 1.2.3.4",
-	}
-	for _, testrr := range testrecords {
-		_, err := NewRR(testrr)
-		if err != nil {
-			t.Errorf("failed to parse %#v, got %v", testrr, err)
-		}
-	}
-}
-
-func TestSRVPacking(t *testing.T) {
-	msg := Msg{}
-
-	things := []string{"1.2.3.4:8484",
-		"45.45.45.45:8484",
-		"84.84.84.84:8484",
-	}
-
-	for i, n := range things {
-		h, p, err := net.SplitHostPort(n)
-		if err != nil {
-			continue
-		}
-		port, _ := strconv.ParseUint(p, 10, 16)
-
-		rr := &SRV{
-			Hdr: RR_Header{Name: "somename.",
-				Rrtype: TypeSRV,
-				Class:  ClassINET,
-				Ttl:    5},
-			Priority: uint16(i),
-			Weight:   5,
-			Port:     uint16(port),
-			Target:   h + ".",
-		}
-
-		msg.Answer = append(msg.Answer, rr)
-	}
-
-	_, err := msg.Pack()
-	if err != nil {
-		t.Fatalf("couldn't pack %v: %v", msg, err)
-	}
-}
-
-func TestParseBackslash(t *testing.T) {
-	if _, err := NewRR("nul\\000gap.test.globnix.net. 600 IN	A 192.0.2.10"); err != nil {
-		t.Errorf("could not create RR with \\000 in it")
-	}
-	if _, err := NewRR(`nul\000gap.test.globnix.net. 600 IN TXT "Hello\123"`); err != nil {
-		t.Errorf("could not create RR with \\000 in it")
-	}
-	if _, err := NewRR(`m\ @\ iek.nl. IN 3600 A 127.0.0.1`); err != nil {
-		t.Errorf("could not create RR with \\ and \\@ in it")
-	}
-}
-
-func TestILNP(t *testing.T) {
-	tests := []string{
-		"host1.example.com.\t3600\tIN\tNID\t10 0014:4fff:ff20:ee64",
-		"host1.example.com.\t3600\tIN\tNID\t20 0015:5fff:ff21:ee65",
-		"host2.example.com.\t3600\tIN\tNID\t10 0016:6fff:ff22:ee66",
-		"host1.example.com.\t3600\tIN\tL32\t10 10.1.2.0",
-		"host1.example.com.\t3600\tIN\tL32\t20 10.1.4.0",
-		"host2.example.com.\t3600\tIN\tL32\t10 10.1.8.0",
-		"host1.example.com.\t3600\tIN\tL64\t10 2001:0DB8:1140:1000",
-		"host1.example.com.\t3600\tIN\tL64\t20 2001:0DB8:2140:2000",
-		"host2.example.com.\t3600\tIN\tL64\t10 2001:0DB8:4140:4000",
-		"host1.example.com.\t3600\tIN\tLP\t10 l64-subnet1.example.com.",
-		"host1.example.com.\t3600\tIN\tLP\t10 l64-subnet2.example.com.",
-		"host1.example.com.\t3600\tIN\tLP\t20 l32-subnet1.example.com.",
-	}
-	for _, t1 := range tests {
-		r, err := NewRR(t1)
-		if err != nil {
-			t.Fatalf("an error occurred: %v", err)
-		} else {
-			if t1 != r.String() {
-				t.Fatalf("strings should be equal %s %s", t1, r.String())
-			}
-		}
-	}
-}
-
-func TestGposEidNimloc(t *testing.T) {
-	dt := map[string]string{
-		"444433332222111199990123000000ff. NSAP-PTR foo.bar.com.": "444433332222111199990123000000ff.\t3600\tIN\tNSAP-PTR\tfoo.bar.com.",
-		"lillee. IN  GPOS -32.6882 116.8652 10.0":                 "lillee.\t3600\tIN\tGPOS\t-32.6882 116.8652 10.0",
-		"hinault. IN GPOS -22.6882 116.8652 250.0":                "hinault.\t3600\tIN\tGPOS\t-22.6882 116.8652 250.0",
-		"VENERA.   IN NIMLOC  75234159EAC457800920":               "VENERA.\t3600\tIN\tNIMLOC\t75234159EAC457800920",
-		"VAXA.     IN EID     3141592653589793":                   "VAXA.\t3600\tIN\tEID\t3141592653589793",
-	}
-	for i, o := range dt {
-		rr, err := NewRR(i)
-		if err != nil {
-			t.Error("failed to parse RR: ", err)
-			continue
-		}
-		if rr.String() != o {
-			t.Errorf("`%s' should be equal to\n`%s', but is     `%s'", i, o, rr.String())
-		}
-	}
-}
-
-func TestPX(t *testing.T) {
-	dt := map[string]string{
-		"*.net2.it. IN PX 10 net2.it. PRMD-net2.ADMD-p400.C-it.":      "*.net2.it.\t3600\tIN\tPX\t10 net2.it. PRMD-net2.ADMD-p400.C-it.",
-		"ab.net2.it. IN PX 10 ab.net2.it. O-ab.PRMD-net2.ADMDb.C-it.": "ab.net2.it.\t3600\tIN\tPX\t10 ab.net2.it. O-ab.PRMD-net2.ADMDb.C-it.",
-	}
-	for i, o := range dt {
-		rr, err := NewRR(i)
-		if err != nil {
-			t.Error("failed to parse RR: ", err)
-			continue
-		}
-		if rr.String() != o {
-			t.Errorf("`%s' should be equal to\n`%s', but is     `%s'", i, o, rr.String())
-		}
-	}
-}
-
-func TestComment(t *testing.T) {
-	// Comments we must see
-	comments := map[string]bool{"; this is comment 1": true,
-		"; this is comment 4": true, "; this is comment 6": true,
-		"; this is comment 7": true, "; this is comment 8": true}
-	zone := `
-foo. IN A 10.0.0.1 ; this is comment 1
-foo. IN A (
-	10.0.0.2 ; this is comment2
-)
-; this is comment3
-foo. IN A 10.0.0.3
-foo. IN A ( 10.0.0.4 ); this is comment 4
-
-foo. IN A 10.0.0.5
-; this is comment5
-
-foo. IN A 10.0.0.6
-
-foo. IN DNSKEY 256 3 5 AwEAAb+8l ; this is comment 6
-foo. IN NSEC miek.nl. TXT RRSIG NSEC; this is comment 7
-foo. IN TXT "THIS IS TEXT MAN"; this is comment 8
-`
-	for x := range ParseZone(strings.NewReader(zone), ".", "") {
-		if x.Error == nil {
-			if x.Comment != "" {
-				if _, ok := comments[x.Comment]; !ok {
-					t.Errorf("wrong comment %s", x.Comment)
-				}
-			}
-		}
-	}
-}
-
-func TestEUIxx(t *testing.T) {
-	tests := map[string]string{
-		"host.example. IN EUI48 00-00-5e-90-01-2a":       "host.example.\t3600\tIN\tEUI48\t00-00-5e-90-01-2a",
-		"host.example. IN EUI64 00-00-5e-ef-00-00-00-2a": "host.example.\t3600\tIN\tEUI64\t00-00-5e-ef-00-00-00-2a",
-	}
-	for i, o := range tests {
-		r, err := NewRR(i)
-		if err != nil {
-			t.Errorf("failed to parse %s: %v", i, err)
-		}
-		if r.String() != o {
-			t.Errorf("want %s, got %s", o, r.String())
-		}
-	}
-}
-
-func TestUserRR(t *testing.T) {
-	tests := map[string]string{
-		"host.example. IN UID 1234":              "host.example.\t3600\tIN\tUID\t1234",
-		"host.example. IN GID 1234556":           "host.example.\t3600\tIN\tGID\t1234556",
-		"host.example. IN UINFO \"Miek Gieben\"": "host.example.\t3600\tIN\tUINFO\t\"Miek Gieben\"",
-	}
-	for i, o := range tests {
-		r, err := NewRR(i)
-		if err != nil {
-			t.Errorf("failed to parse %s: %v", i, err)
-		}
-		if r.String() != o {
-			t.Errorf("want %s, got %s", o, r.String())
-		}
-	}
-}
-
-func TestTXT(t *testing.T) {
-	// Test single entry TXT record
-	rr, err := NewRR(`_raop._tcp.local. 60 IN TXT "single value"`)
-	if err != nil {
-		t.Error("failed to parse single value TXT record", err)
-	} else if rr, ok := rr.(*TXT); !ok {
-		t.Error("wrong type, record should be of type TXT")
-	} else {
-		if len(rr.Txt) != 1 {
-			t.Error("bad size of TXT value:", len(rr.Txt))
-		} else if rr.Txt[0] != "single value" {
-			t.Error("bad single value")
-		}
-		if rr.String() != `_raop._tcp.local.	60	IN	TXT	"single value"` {
-			t.Error("bad representation of TXT record:", rr.String())
-		}
-		if rr.len() != 28+1+12 {
-			t.Error("bad size of serialized record:", rr.len())
-		}
-	}
-
-	// Test multi entries TXT record
-	rr, err = NewRR(`_raop._tcp.local. 60 IN TXT "a=1" "b=2" "c=3" "d=4"`)
-	if err != nil {
-		t.Error("failed to parse multi-values TXT record", err)
-	} else if rr, ok := rr.(*TXT); !ok {
-		t.Error("wrong type, record should be of type TXT")
-	} else {
-		if len(rr.Txt) != 4 {
-			t.Error("bad size of TXT multi-value:", len(rr.Txt))
-		} else if rr.Txt[0] != "a=1" || rr.Txt[1] != "b=2" || rr.Txt[2] != "c=3" || rr.Txt[3] != "d=4" {
-			t.Error("bad values in TXT records")
-		}
-		if rr.String() != `_raop._tcp.local.	60	IN	TXT	"a=1" "b=2" "c=3" "d=4"` {
-			t.Error("bad representation of TXT multi value record:", rr.String())
-		}
-		if rr.len() != 28+1+3+1+3+1+3+1+3 {
-			t.Error("bad size of serialized multi value record:", rr.len())
-		}
-	}
-
-	// Test empty-string in TXT record
-	rr, err = NewRR(`_raop._tcp.local. 60 IN TXT ""`)
-	if err != nil {
-		t.Error("failed to parse empty-string TXT record", err)
-	} else if rr, ok := rr.(*TXT); !ok {
-		t.Error("wrong type, record should be of type TXT")
-	} else {
-		if len(rr.Txt) != 1 {
-			t.Error("bad size of TXT empty-string value:", len(rr.Txt))
-		} else if rr.Txt[0] != "" {
-			t.Error("bad value for empty-string TXT record")
-		}
-		if rr.String() != `_raop._tcp.local.	60	IN	TXT	""` {
-			t.Error("bad representation of empty-string TXT record:", rr.String())
-		}
-		if rr.len() != 28+1 {
-			t.Error("bad size of serialized record:", rr.len())
-		}
-	}
-
-	// Test TXT record with chunk larger than 255 bytes, they should be split up, by the parser
-	s := ""
-	for i := 0; i < 255; i++ {
-		s += "a"
-	}
-	s += "b"
-	rr, err = NewRR(`test.local. 60 IN TXT "` + s + `"`)
-	if err != nil {
-		t.Error("failed to parse empty-string TXT record", err)
-	}
-	if rr.(*TXT).Txt[1] != "b" {
-		t.Errorf("Txt should have two chunk, last one my be 'b', but is %s", rr.(*TXT).Txt[1])
-	}
-}
-
-func TestTypeXXXX(t *testing.T) {
-	_, err := NewRR("example.com IN TYPE1234 \\# 4 aabbccdd")
-	if err != nil {
-		t.Errorf("failed to parse TYPE1234 RR: %v", err)
-	}
-	_, err = NewRR("example.com IN TYPE655341 \\# 8 aabbccddaabbccdd")
-	if err == nil {
-		t.Errorf("this should not work, for TYPE655341")
-	}
-	_, err = NewRR("example.com IN TYPE1 \\# 4 0a000001")
-	if err == nil {
-		t.Errorf("this should not work")
-	}
-}
-
-func TestPTR(t *testing.T) {
-	_, err := NewRR("144.2.0.192.in-addr.arpa. 900 IN PTR ilouse03146p0\\(.example.com.")
-	if err != nil {
-		t.Error("failed to parse ", err)
-	}
-}
-
-func TestDigit(t *testing.T) {
-	tests := map[string]byte{
-		"miek\\000.nl. 100 IN TXT \"A\"": 0,
-		"miek\\001.nl. 100 IN TXT \"A\"": 1,
-		"miek\\254.nl. 100 IN TXT \"A\"": 254,
-		"miek\\255.nl. 100 IN TXT \"A\"": 255,
-		"miek\\256.nl. 100 IN TXT \"A\"": 0,
-		"miek\\257.nl. 100 IN TXT \"A\"": 1,
-		"miek\\004.nl. 100 IN TXT \"A\"": 4,
-	}
-	for s, i := range tests {
-		r, err := NewRR(s)
-		buf := make([]byte, 40)
-		if err != nil {
-			t.Fatalf("failed to parse %v", err)
-		}
-		PackRR(r, buf, 0, nil, false)
-		if buf[5] != i {
-			t.Fatalf("5 pos must be %d, is %d", i, buf[5])
-		}
-		r1, _, _ := UnpackRR(buf, 0)
-		if r1.Header().Ttl != 100 {
-			t.Fatalf("TTL should %d, is %d", 100, r1.Header().Ttl)
-		}
-	}
-}
-
-func TestParseRRSIGTimestamp(t *testing.T) {
-	tests := map[string]bool{
-		`miek.nl.  IN RRSIG SOA 8 2 43200 20140210031301 20140111031301 12051 miek.nl. MVZUyrYwq0iZhMFDDnVXD2BvuNiUJjSYlJAgzyAE6CF875BMvvZa+Sb0 RlSCL7WODQSQHhCx/fegHhVVF+Iz8N8kOLrmXD1+jO3Bm6Prl5UhcsPx WTBsg/kmxbp8sR1kvH4oZJtVfakG3iDerrxNaf0sQwhZzyfJQAqpC7pcBoc=`: true,
-		`miek.nl.  IN RRSIG SOA 8 2 43200 315565800 4102477800 12051 miek.nl. MVZUyrYwq0iZhMFDDnVXD2BvuNiUJjSYlJAgzyAE6CF875BMvvZa+Sb0 RlSCL7WODQSQHhCx/fegHhVVF+Iz8N8kOLrmXD1+jO3Bm6Prl5UhcsPx WTBsg/kmxbp8sR1kvH4oZJtVfakG3iDerrxNaf0sQwhZzyfJQAqpC7pcBoc=`:          true,
-	}
-	for r := range tests {
-		_, err := NewRR(r)
-		if err != nil {
-			t.Error(err)
-		}
-	}
-}
-
-func TestTxtEqual(t *testing.T) {
-	rr1 := new(TXT)
-	rr1.Hdr = RR_Header{Name: ".", Rrtype: TypeTXT, Class: ClassINET, Ttl: 0}
-	rr1.Txt = []string{"a\"a", "\"", "b"}
-	rr2, _ := NewRR(rr1.String())
-	if rr1.String() != rr2.String() {
-		// This is not an error, but keep this test.
-		t.Errorf("these two TXT records should match:\n%s\n%s", rr1.String(), rr2.String())
-	}
-}
-
-func TestTxtLong(t *testing.T) {
-	rr1 := new(TXT)
-	rr1.Hdr = RR_Header{Name: ".", Rrtype: TypeTXT, Class: ClassINET, Ttl: 0}
-	// Make a long txt record, this breaks when sending the packet,
-	// but not earlier.
-	rr1.Txt = []string{"start-"}
-	for i := 0; i < 200; i++ {
-		rr1.Txt[0] += "start-"
-	}
-	str := rr1.String()
-	if len(str) < len(rr1.Txt[0]) {
-		t.Error("string conversion should work")
-	}
-}
-
-// Basically, don't crash.
-func TestMalformedPackets(t *testing.T) {
-	var packets = []string{
-		"0021641c0000000100000000000078787878787878787878787303636f6d0000100001",
-	}
-
-	// com = 63 6f 6d
-	for _, packet := range packets {
-		data, _ := hex.DecodeString(packet)
-		var msg Msg
-		msg.Unpack(data)
-	}
-}
-
-type algorithm struct {
-	name uint8
-	bits int
-}
-
-func TestNewPrivateKey(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping test in short mode.")
-	}
-	algorithms := []algorithm{
-		{ECDSAP256SHA256, 256},
-		{ECDSAP384SHA384, 384},
-		{RSASHA1, 1024},
-		{RSASHA256, 2048},
-		{DSA, 1024},
-		{ED25519, 256},
-	}
-
-	for _, algo := range algorithms {
-		key := new(DNSKEY)
-		key.Hdr.Rrtype = TypeDNSKEY
-		key.Hdr.Name = "miek.nl."
-		key.Hdr.Class = ClassINET
-		key.Hdr.Ttl = 14400
-		key.Flags = 256
-		key.Protocol = 3
-		key.Algorithm = algo.name
-		privkey, err := key.Generate(algo.bits)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		newPrivKey, err := key.NewPrivateKey(key.PrivateKeyString(privkey))
-		if err != nil {
-			t.Error(key.String())
-			t.Error(key.PrivateKeyString(privkey))
-			t.Fatal(err)
-		}
-
-		switch newPrivKey := newPrivKey.(type) {
-		case *rsa.PrivateKey:
-			newPrivKey.Precompute()
-		}
-
-		if !reflect.DeepEqual(privkey, newPrivKey) {
-			t.Errorf("[%v] Private keys differ:\n%#v\n%#v", AlgorithmToString[algo.name], privkey, newPrivKey)
-		}
-	}
-}
-
-// special input test
-func TestNewRRSpecial(t *testing.T) {
-	var (
-		rr     RR
-		err    error
-		expect string
-	)
-
-	rr, err = NewRR("; comment")
-	expect = ""
-	if err != nil {
-		t.Errorf("unexpected err: %v", err)
-	}
-	if rr != nil {
-		t.Errorf("unexpected result: [%s] != [%s]", rr, expect)
-	}
-
-	rr, err = NewRR("")
-	expect = ""
-	if err != nil {
-		t.Errorf("unexpected err: %v", err)
-	}
-	if rr != nil {
-		t.Errorf("unexpected result: [%s] != [%s]", rr, expect)
-	}
-
-	rr, err = NewRR("$ORIGIN foo.")
-	expect = ""
-	if err != nil {
-		t.Errorf("unexpected err: %v", err)
-	}
-	if rr != nil {
-		t.Errorf("unexpected result: [%s] != [%s]", rr, expect)
-	}
-
-	rr, err = NewRR(" ")
-	expect = ""
-	if err != nil {
-		t.Errorf("unexpected err: %v", err)
-	}
-	if rr != nil {
-		t.Errorf("unexpected result: [%s] != [%s]", rr, expect)
-	}
-
-	rr, err = NewRR("\n")
-	expect = ""
-	if err != nil {
-		t.Errorf("unexpected err: %v", err)
-	}
-	if rr != nil {
-		t.Errorf("unexpected result: [%s] != [%s]", rr, expect)
-	}
-
-	rr, err = NewRR("foo. A 1.1.1.1\nbar. A 2.2.2.2")
-	expect = "foo.\t3600\tIN\tA\t1.1.1.1"
-	if err != nil {
-		t.Errorf("unexpected err: %v", err)
-	}
-	if rr == nil || rr.String() != expect {
-		t.Errorf("unexpected result: [%s] != [%s]", rr, expect)
-	}
-}
-
-func TestPrintfVerbsRdata(t *testing.T) {
-	x, _ := NewRR("www.miek.nl. IN MX 20 mx.miek.nl.")
-	if Field(x, 1) != "20" {
-		t.Errorf("should be 20")
-	}
-	if Field(x, 2) != "mx.miek.nl." {
-		t.Errorf("should be mx.miek.nl.")
-	}
-
-	x, _ = NewRR("www.miek.nl. IN A 127.0.0.1")
-	if Field(x, 1) != "127.0.0.1" {
-		t.Errorf("should be 127.0.0.1")
-	}
-
-	x, _ = NewRR("www.miek.nl. IN AAAA ::1")
-	if Field(x, 1) != "::1" {
-		t.Errorf("should be ::1")
-	}
-
-	x, _ = NewRR("www.miek.nl. IN NSEC a.miek.nl. A NS SOA MX AAAA")
-	if Field(x, 1) != "a.miek.nl." {
-		t.Errorf("should be a.miek.nl.")
-	}
-	if Field(x, 2) != "A NS SOA MX AAAA" {
-		t.Errorf("should be A NS SOA MX AAAA")
-	}
-
-	x, _ = NewRR("www.miek.nl. IN TXT \"first\" \"second\"")
-	if Field(x, 1) != "first second" {
-		t.Errorf("should be first second")
-	}
-	if Field(x, 0) != "" {
-		t.Errorf("should be empty")
-	}
-}
-
-func TestParseTokenOverflow(t *testing.T) {
-	_, err := NewRR("_443._tcp.example.org. IN TLSA 0 0 0 308205e8308204d0a00302010202100411de8f53b462f6a5a861b712ec6b59300d06092a864886f70d01010b05003070310b300906035504061302555331153013060355040a130c446967694365727420496e6331193017060355040b13107777772e64696769636572742e636f6d312f302d06035504031326446967694365727420534841322048696768204173737572616e636520536572766572204341301e170d3134313130363030303030305a170d3135313131333132303030305a3081a5310b3009060355040613025553311330110603550408130a43616c69666f726e6961311430120603550407130b4c6f7320416e67656c6573313c303a060355040a1333496e7465726e657420436f72706f726174696f6e20666f722041737369676e6564204e616d657320616e64204e756d6265727331133011060355040b130a546563686e6f6c6f6779311830160603550403130f7777772e6578616d706c652e6f726730820122300d06092a864886f70d01010105000382010f003082010a02820101009e663f52a3d18cb67cdfed547408a4e47e4036538988da2798da3b6655f7240d693ed1cb3fe6d6ad3a9e657ff6efa86b83b0cad24e5d31ff2bf70ec3b78b213f1b4bf61bdc669cbbc07d67154128ca92a9b3cbb4213a836fb823ddd4d7cc04918314d25f06086fa9970ba17e357cca9b458c27eb71760ab95e3f9bc898ae89050ae4d09ba2f7e4259d9ff1e072a6971b18355a8b9e53670c3d5dbdbd283f93a764e71b3a4140ca0746090c08510e2e21078d7d07844bf9c03865b531a0bf2ee766bc401f6451c5a1e6f6fb5d5c1d6a97a0abe91ae8b02e89241e07353909ccd5b41c46de207c06801e08f20713603827f2ae3e68cf15ef881d7e0608f70742e30203010001a382024630820242301f0603551d230418301680145168ff90af0207753cccd9656462a212b859723b301d0603551d0e04160414b000a7f422e9b1ce216117c4c46e7164c8e60c553081810603551d11047a3078820f7777772e6578616d706c652e6f7267820b6578616d706c652e636f6d820b6578616d706c652e656475820b6578616d706c652e6e6574820b6578616d706c652e6f7267820f7777772e6578616d706c652e636f6d820f7777772e6578616d706c652e656475820f7777772e6578616d706c652e6e6574300e0603551d0f0101ff0404030205a0301d0603551d250416301406082b0601050507030106082b0601050507030230750603551d1f046e306c3034a032a030862e687474703a2f2f63726c332e64696769636572742e636f6d2f736861322d68612d7365727665722d67332e63726c3034a032a030862e687474703a2f2f63726c342e64696769636572742e636f6d2f736861322d68612d7365727665722d67332e63726c30420603551d20043b3039303706096086480186fd6c0101302a302806082b06010505070201161c68747470733a2f2f7777772e64696769636572742e636f6d2f43505330818306082b0601050507010104773075302406082b060105050730018618687474703a2f2f6f6373702e64696769636572742e636f6d304d06082b060105050730028641687474703a2f2f636163657274732e64696769636572742e636f6d2f446967694365727453484132486967684173737572616e636553657276657243412e637274300c0603551d130101ff04023000300d06092a864886f70d01010b050003820101005eac2124dedb3978a86ff3608406acb542d3cb54cb83facd63aec88144d6a1bf15dbf1f215c4a73e241e582365cba9ea50dd306541653b3513af1a0756c1b2720e8d112b34fb67181efad9c4609bdc670fb025fa6e6d42188161b026cf3089a08369c2f3609fc84bcc3479140c1922ede430ca8dbac2b2a3cdacb305ba15dc7361c4c3a5e6daa99cb446cb221b28078a7a944efba70d96f31ac143d959bccd2fd50e30c325ea2624fb6b6dbe9344dbcf133bfbd5b4e892d635dbf31596451672c6b65ba5ac9b3cddea92b35dab1065cae3c8cb6bb450a62ea2f72ea7c6bdc7b65fa09b012392543734083c7687d243f8d0375304d99ccd2e148966a8637a6797")
-	if err == nil {
-		t.Fatalf("token overflow should return an error")
-	}
-}
-
-func TestParseTLSA(t *testing.T) {
-	lt := []string{
-		"_443._tcp.example.org.\t3600\tIN\tTLSA\t1 1 1 c22be239f483c08957bc106219cc2d3ac1a308dfbbdd0a365f17b9351234cf00",
-		"_443._tcp.example.org.\t3600\tIN\tTLSA\t2 1 2 4e85f45179e9cd6e0e68e2eb5be2e85ec9b92d91c609caf3ef0315213e3f92ece92c38397a607214de95c7fadc0ad0f1c604a469a0387959745032c0d51492f3",
-		"_443._tcp.example.org.\t3600\tIN\tTLSA\t3 0 2 69ec8d2277360b215d0cd956b0e2747108dff34b27d461a41c800629e38ee6c2d1230cc9e8e36711330adc6766e6ff7c5fbb37f106f248337c1a20ad682888d2",
-	}
-	for _, o := range lt {
-		rr, err := NewRR(o)
-		if err != nil {
-			t.Error("failed to parse RR: ", err)
-			continue
-		}
-		if rr.String() != o {
-			t.Errorf("`%s' should be equal to\n`%s', but is     `%s'", o, o, rr.String())
-		}
-	}
-}
-
-func TestParseSMIMEA(t *testing.T) {
-	lt := map[string]string{
-		"2e85e1db3e62be6ea._smimecert.example.com.\t3600\tIN\tSMIMEA\t1 1 2 bd80f334566928fc18f58df7e4928c1886f48f71ca3fd41cd9b1854aca7c2180aaacad2819612ed68e7bd3701cc39be7f2529b017c0bc6a53e8fb3f0c7d48070":   "2e85e1db3e62be6ea._smimecert.example.com.\t3600\tIN\tSMIMEA\t1 1 2 bd80f334566928fc18f58df7e4928c1886f48f71ca3fd41cd9b1854aca7c2180aaacad2819612ed68e7bd3701cc39be7f2529b017c0bc6a53e8fb3f0c7d48070",
-		"2e85e1db3e62be6ea._smimecert.example.com.\t3600\tIN\tSMIMEA\t0 0 1 cdcf0fc66b182928c5217ddd42c826983f5a4b94160ee6c1c9be62d38199f710":                                                                   "2e85e1db3e62be6ea._smimecert.example.com.\t3600\tIN\tSMIMEA\t0 0 1 cdcf0fc66b182928c5217ddd42c826983f5a4b94160ee6c1c9be62d38199f710",
-		"2e85e1db3e62be6ea._smimecert.example.com.\t3600\tIN\tSMIMEA\t3 0 2 499a1eda2af8828b552cdb9d80c3744a25872fddd73f3898d8e4afa3549595d2dd4340126e759566fe8c26b251fa0c887ba4869f011a65f7e79967c2eb729f5b":   "2e85e1db3e62be6ea._smimecert.example.com.\t3600\tIN\tSMIMEA\t3 0 2 499a1eda2af8828b552cdb9d80c3744a25872fddd73f3898d8e4afa3549595d2dd4340126e759566fe8c26b251fa0c887ba4869f011a65f7e79967c2eb729f5b",
-		"2e85e1db3e62be6eb._smimecert.example.com.\t3600\tIN\tSMIMEA\t3 0 2 499a1eda2af8828b552cdb9d80c3744a25872fddd73f3898d8e4afa3549595d2dd4340126e759566fe8 c26b251fa0c887ba4869f01 1a65f7e79967c2eb729f5b": "2e85e1db3e62be6eb._smimecert.example.com.\t3600\tIN\tSMIMEA\t3 0 2 499a1eda2af8828b552cdb9d80c3744a25872fddd73f3898d8e4afa3549595d2dd4340126e759566fe8c26b251fa0c887ba4869f011a65f7e79967c2eb729f5b",
-	}
-	for i, o := range lt {
-		rr, err := NewRR(i)
-		if err != nil {
-			t.Error("failed to parse RR: ", err)
-			continue
-		}
-		if rr.String() != o {
-			t.Errorf("`%s' should be equal to\n`%s', but is     `%s'", o, o, rr.String())
-		}
-	}
-}
-
-func TestParseSSHFP(t *testing.T) {
-	lt := []string{
-		"test.example.org.\t300\tSSHFP\t1 2 (\n" +
-			"\t\t\t\t\tBC6533CDC95A79078A39A56EA7635984ED655318ADA9\n" +
-			"\t\t\t\t\tB6159E30723665DA95BB )",
-		"test.example.org.\t300\tSSHFP\t1 2 ( BC6533CDC  95A79078A39A56EA7635984ED655318AD  A9B6159E3072366 5DA95BB )",
-	}
-	result := "test.example.org.\t300\tIN\tSSHFP\t1 2 BC6533CDC95A79078A39A56EA7635984ED655318ADA9B6159E30723665DA95BB"
-	for _, o := range lt {
-		rr, err := NewRR(o)
-		if err != nil {
-			t.Error("failed to parse RR: ", err)
-			continue
-		}
-		if rr.String() != result {
-			t.Errorf("`%s' should be equal to\n\n`%s', but is     \n`%s'", o, result, rr.String())
-		}
-	}
-}
-
-func TestParseHINFO(t *testing.T) {
-	dt := map[string]string{
-		"example.net. HINFO A B": "example.net.	3600	IN	HINFO	\"A\" \"B\"",
-		"example.net. HINFO \"A\" \"B\"": "example.net.	3600	IN	HINFO	\"A\" \"B\"",
-		"example.net. HINFO A B C D E F": "example.net.	3600	IN	HINFO	\"A\" \"B C D E F\"",
-		"example.net. HINFO AB": "example.net.	3600	IN	HINFO	\"AB\" \"\"",
-		// "example.net. HINFO PC-Intel-700mhz \"Redhat Linux 7.1\"": "example.net.	3600	IN	HINFO	\"PC-Intel-700mhz\" \"Redhat Linux 7.1\"",
-		// This one is recommended in Pro Bind book http://www.zytrax.com/books/dns/ch8/hinfo.html
-		// but effectively, even Bind would replace it to correctly formed text when you AXFR
-		// TODO: remove this set of comments or figure support for quoted/unquoted combinations in endingToTxtSlice function
-	}
-	for i, o := range dt {
-		rr, err := NewRR(i)
-		if err != nil {
-			t.Error("failed to parse RR: ", err)
-			continue
-		}
-		if rr.String() != o {
-			t.Errorf("`%s' should be equal to\n`%s', but is     `%s'", i, o, rr.String())
-		}
-	}
-}
-
-func TestParseCAA(t *testing.T) {
-	lt := map[string]string{
-		"example.net.	CAA	0 issue \"symantec.com\"": "example.net.\t3600\tIN\tCAA\t0 issue \"symantec.com\"",
-		"example.net.	CAA	0 issuewild \"symantec.com; stuff\"": "example.net.\t3600\tIN\tCAA\t0 issuewild \"symantec.com; stuff\"",
-		"example.net.	CAA	128 tbs \"critical\"": "example.net.\t3600\tIN\tCAA\t128 tbs \"critical\"",
-		"example.net.	CAA	2 auth \"0>09\\006\\010+\\006\\001\\004\\001\\214y\\002\\003\\001\\006\\009`\\134H\\001e\\003\\004\\002\\001\\004 y\\209\\012\\221r\\220\\156Q\\218\\150\\150{\\166\\245:\\231\\182%\\157:\\133\\179}\\1923r\\238\\151\\255\\128q\\145\\002\\001\\000\"": "example.net.\t3600\tIN\tCAA\t2 auth \"0>09\\006\\010+\\006\\001\\004\\001\\214y\\002\\003\\001\\006\\009`\\134H\\001e\\003\\004\\002\\001\\004 y\\209\\012\\221r\\220\\156Q\\218\\150\\150{\\166\\245:\\231\\182%\\157:\\133\\179}\\1923r\\238\\151\\255\\128q\\145\\002\\001\\000\"",
-		"example.net.   TYPE257	0 issue \"symantec.com\"": "example.net.\t3600\tIN\tCAA\t0 issue \"symantec.com\"",
-	}
-	for i, o := range lt {
-		rr, err := NewRR(i)
-		if err != nil {
-			t.Error("failed to parse RR: ", err)
-			continue
-		}
-		if rr.String() != o {
-			t.Errorf("`%s' should be equal to\n`%s', but is     `%s'", i, o, rr.String())
-		}
-	}
-}
-
-func TestPackCAA(t *testing.T) {
-	m := new(Msg)
-	record := new(CAA)
-	record.Hdr = RR_Header{Name: "example.com.", Rrtype: TypeCAA, Class: ClassINET, Ttl: 0}
-	record.Tag = "issue"
-	record.Value = "symantec.com"
-	record.Flag = 1
-
-	m.Answer = append(m.Answer, record)
-	bytes, err := m.Pack()
-	if err != nil {
-		t.Fatalf("failed to pack msg: %v", err)
-	}
-	if err := m.Unpack(bytes); err != nil {
-		t.Fatalf("failed to unpack msg: %v", err)
-	}
-	if len(m.Answer) != 1 {
-		t.Fatalf("incorrect number of answers unpacked")
-	}
-	rr := m.Answer[0].(*CAA)
-	if rr.Tag != "issue" {
-		t.Fatalf("invalid tag for unpacked answer")
-	} else if rr.Value != "symantec.com" {
-		t.Fatalf("invalid value for unpacked answer")
-	} else if rr.Flag != 1 {
-		t.Fatalf("invalid flag for unpacked answer")
-	}
-}
-
-func TestParseURI(t *testing.T) {
-	lt := map[string]string{
-		"_http._tcp. IN URI   10 1 \"http://www.example.com/path\"": "_http._tcp.\t3600\tIN\tURI\t10 1 \"http://www.example.com/path\"",
-		"_http._tcp. IN URI   10 1 \"\"":                            "_http._tcp.\t3600\tIN\tURI\t10 1 \"\"",
-	}
-	for i, o := range lt {
-		rr, err := NewRR(i)
-		if err != nil {
-			t.Error("failed to parse RR: ", err)
-			continue
-		}
-		if rr.String() != o {
-			t.Errorf("`%s' should be equal to\n`%s', but is     `%s'", i, o, rr.String())
-		}
-	}
-}
-
-func TestParseAVC(t *testing.T) {
-	avcs := map[string]string{
-		`example.org. IN AVC "app-name:WOLFGANG|app-class:OAM|business=yes"`: `example.org.	3600	IN	AVC	"app-name:WOLFGANG|app-class:OAM|business=yes"`,
-	}
-	for avc, o := range avcs {
-		rr, err := NewRR(avc)
-		if err != nil {
-			t.Error("failed to parse RR: ", err)
-			continue
-		}
-		if rr.String() != o {
-			t.Errorf("`%s' should be equal to\n`%s', but is     `%s'", avc, o, rr.String())
-		}
-	}
-}
-
-func TestParseCSYNC(t *testing.T) {
-	syncs := map[string]string{
-		`example.com. 3600 IN CSYNC 66 3 A NS AAAA`: `example.com.	3600	IN	CSYNC	66 3 A NS AAAA`,
-	}
-	for s, o := range syncs {
-		rr, err := NewRR(s)
-		if err != nil {
-			t.Error("failed to parse RR: ", err)
-			continue
-		}
-		if rr.String() != o {
-			t.Errorf("`%s' should be equal to\n`%s', but is     `%s'", s, o, rr.String())
-		}
-	}
-}
-
-func TestParseBadNAPTR(t *testing.T) {
-	// Should look like: mplus.ims.vodafone.com.	3600	IN	NAPTR	10 100 "S" "SIP+D2U" "" _sip._udp.mplus.ims.vodafone.com.
-	naptr := `mplus.ims.vodafone.com.	3600	IN	NAPTR	10 100 S SIP+D2U  _sip._udp.mplus.ims.vodafone.com.`
-	_, err := NewRR(naptr) // parse fails, we should not have leaked a goroutine.
-	if err == nil {
-		t.Fatalf("parsing NAPTR should have failed: %s", naptr)
-	}
-	if err := goroutineLeaked(); err != nil {
-		t.Errorf("leaked goroutines: %s", err)
-	}
-}
-
-func TestUnbalancedParens(t *testing.T) {
-	sig := `example.com. 3600 IN RRSIG MX 15 2 3600 (
-              1440021600 1438207200 3613 example.com. (
-              oL9krJun7xfBOIWcGHi7mag5/hdZrKWw15jPGrHpjQeRAvTdszaPD+QLs3f
-              x8A4M3e23mRZ9VrbpMngwcrqNAg== )`
-	_, err := NewRR(sig)
-	if err == nil {
-		t.Fatalf("failed to detect extra opening brace")
-	}
-}
-
-func TestBad(t *testing.T) {
-	tests := []string{
-		`" TYPE257 9 1E12\x00\x105"`,
-		`" TYPE256  9 5"`,
-		`" TYPE257 0\"00000000000000400000000000000000000\x00\x10000000000000000000000000000000000 9 l\x16\x01\x005266"`,
-	}
-	for i := range tests {
-		s, err := strconv.Unquote(tests[i])
-		if err != nil {
-			t.Fatalf("failed to unquote: %q: %s", tests[i], err)
-		}
-		if _, err = NewRR(s); err == nil {
-			t.Errorf("correctly parsed %q", s)
-		}
-	}
-}
diff --git a/vendor/github.com/miekg/dns/privaterr_test.go b/vendor/github.com/miekg/dns/privaterr_test.go
deleted file mode 100644
index fa5ff48f..00000000
--- a/vendor/github.com/miekg/dns/privaterr_test.go
+++ /dev/null
@@ -1,166 +0,0 @@
-package dns_test
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/miekg/dns"
-)
-
-const TypeISBN uint16 = 0xFF00
-
-// A crazy new RR type :)
-type ISBN struct {
-	x string // rdata with 10 or 13 numbers, dashes or spaces allowed
-}
-
-func NewISBN() dns.PrivateRdata { return &ISBN{""} }
-
-func (rd *ISBN) Len() int       { return len([]byte(rd.x)) }
-func (rd *ISBN) String() string { return rd.x }
-
-func (rd *ISBN) Parse(txt []string) error {
-	rd.x = strings.TrimSpace(strings.Join(txt, " "))
-	return nil
-}
-
-func (rd *ISBN) Pack(buf []byte) (int, error) {
-	b := []byte(rd.x)
-	n := copy(buf, b)
-	if n != len(b) {
-		return n, dns.ErrBuf
-	}
-	return n, nil
-}
-
-func (rd *ISBN) Unpack(buf []byte) (int, error) {
-	rd.x = string(buf)
-	return len(buf), nil
-}
-
-func (rd *ISBN) Copy(dest dns.PrivateRdata) error {
-	isbn, ok := dest.(*ISBN)
-	if !ok {
-		return dns.ErrRdata
-	}
-	isbn.x = rd.x
-	return nil
-}
-
-var testrecord = strings.Join([]string{"example.org.", "3600", "IN", "ISBN", "12-3 456789-0-123"}, "\t")
-
-func TestPrivateText(t *testing.T) {
-	dns.PrivateHandle("ISBN", TypeISBN, NewISBN)
-	defer dns.PrivateHandleRemove(TypeISBN)
-
-	rr, err := dns.NewRR(testrecord)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if rr.String() != testrecord {
-		t.Errorf("record string representation did not match original %#v != %#v", rr.String(), testrecord)
-	}
-}
-
-func TestPrivateByteSlice(t *testing.T) {
-	dns.PrivateHandle("ISBN", TypeISBN, NewISBN)
-	defer dns.PrivateHandleRemove(TypeISBN)
-
-	rr, err := dns.NewRR(testrecord)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	buf := make([]byte, 100)
-	off, err := dns.PackRR(rr, buf, 0, nil, false)
-	if err != nil {
-		t.Errorf("got error packing ISBN: %v", err)
-	}
-
-	custrr := rr.(*dns.PrivateRR)
-	if ln := custrr.Data.Len() + len(custrr.Header().Name) + 11; ln != off {
-		t.Errorf("offset is not matching to length of Private RR: %d!=%d", off, ln)
-	}
-
-	rr1, off1, err := dns.UnpackRR(buf[:off], 0)
-	if err != nil {
-		t.Errorf("got error unpacking ISBN: %v", err)
-		return
-	}
-
-	if off1 != off {
-		t.Errorf("offset after unpacking differs: %d != %d", off1, off)
-	}
-
-	if rr1.String() != testrecord {
-		t.Errorf("record string representation did not match original %#v != %#v", rr1.String(), testrecord)
-	}
-}
-
-const TypeVERSION uint16 = 0xFF01
-
-type VERSION struct {
-	x string
-}
-
-func NewVersion() dns.PrivateRdata { return &VERSION{""} }
-
-func (rd *VERSION) String() string { return rd.x }
-func (rd *VERSION) Parse(txt []string) error {
-	rd.x = strings.TrimSpace(strings.Join(txt, " "))
-	return nil
-}
-
-func (rd *VERSION) Pack(buf []byte) (int, error) {
-	b := []byte(rd.x)
-	n := copy(buf, b)
-	if n != len(b) {
-		return n, dns.ErrBuf
-	}
-	return n, nil
-}
-
-func (rd *VERSION) Unpack(buf []byte) (int, error) {
-	rd.x = string(buf)
-	return len(buf), nil
-}
-
-func (rd *VERSION) Copy(dest dns.PrivateRdata) error {
-	isbn, ok := dest.(*VERSION)
-	if !ok {
-		return dns.ErrRdata
-	}
-	isbn.x = rd.x
-	return nil
-}
-
-func (rd *VERSION) Len() int {
-	return len([]byte(rd.x))
-}
-
-var smallzone = `$ORIGIN example.org.
-@ 3600 IN SOA	sns.dns.icann.org. noc.dns.icann.org. (
-		2014091518 7200 3600 1209600 3600
-)
-    A   1.2.3.4
-ok ISBN 1231-92110-12
-go VERSION (
-	1.3.1 ; comment
-)
-www ISBN 1231-92110-16
-*  CNAME @
-`
-
-func TestPrivateZoneParser(t *testing.T) {
-	dns.PrivateHandle("ISBN", TypeISBN, NewISBN)
-	dns.PrivateHandle("VERSION", TypeVERSION, NewVersion)
-	defer dns.PrivateHandleRemove(TypeISBN)
-	defer dns.PrivateHandleRemove(TypeVERSION)
-
-	r := strings.NewReader(smallzone)
-	for x := range dns.ParseZone(r, ".", "") {
-		if err := x.Error; err != nil {
-			t.Fatal(err)
-		}
-	}
-}
diff --git a/vendor/github.com/miekg/dns/remote_test.go b/vendor/github.com/miekg/dns/remote_test.go
deleted file mode 100644
index 4cf701fe..00000000
--- a/vendor/github.com/miekg/dns/remote_test.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package dns
-
-import "testing"
-
-const LinodeAddr = "176.58.119.54:53"
-
-func TestClientRemote(t *testing.T) {
-	m := new(Msg)
-	m.SetQuestion("go.dns.miek.nl.", TypeTXT)
-
-	c := new(Client)
-	r, _, err := c.Exchange(m, LinodeAddr)
-	if err != nil {
-		t.Errorf("failed to exchange: %v", err)
-	}
-	if r != nil && r.Rcode != RcodeSuccess {
-		t.Errorf("failed to get an valid answer\n%v", r)
-	}
-}
diff --git a/vendor/github.com/miekg/dns/rr_test.go b/vendor/github.com/miekg/dns/rr_test.go
deleted file mode 100644
index 77a153b1..00000000
--- a/vendor/github.com/miekg/dns/rr_test.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package dns
-
-// testRR returns the RR from string s. The error is thrown away.
-func testRR(s string) RR {
-	r, _ := NewRR(s)
-	return r
-}
diff --git a/vendor/github.com/miekg/dns/sanitize_test.go b/vendor/github.com/miekg/dns/sanitize_test.go
deleted file mode 100644
index b2c0e208..00000000
--- a/vendor/github.com/miekg/dns/sanitize_test.go
+++ /dev/null
@@ -1,75 +0,0 @@
-package dns
-
-import "testing"
-
-func TestDedup(t *testing.T) {
-	testcases := map[[3]RR][]string{
-		[...]RR{
-			testRR("mIek.nl. IN A 127.0.0.1"),
-			testRR("mieK.nl. IN A 127.0.0.1"),
-			testRR("miek.Nl. IN A 127.0.0.1"),
-		}: {"mIek.nl.\t3600\tIN\tA\t127.0.0.1"},
-		[...]RR{
-			testRR("miEk.nl. 2000 IN A 127.0.0.1"),
-			testRR("mieK.Nl. 1000 IN A 127.0.0.1"),
-			testRR("Miek.nL. 500 IN A 127.0.0.1"),
-		}: {"miEk.nl.\t500\tIN\tA\t127.0.0.1"},
-		[...]RR{
-			testRR("miek.nl. IN A 127.0.0.1"),
-			testRR("miek.nl. CH A 127.0.0.1"),
-			testRR("miek.nl. IN A 127.0.0.1"),
-		}: {"miek.nl.\t3600\tIN\tA\t127.0.0.1",
-			"miek.nl.\t3600\tCH\tA\t127.0.0.1",
-		},
-		[...]RR{
-			testRR("miek.nl. CH A 127.0.0.1"),
-			testRR("miek.nl. IN A 127.0.0.1"),
-			testRR("miek.de. IN A 127.0.0.1"),
-		}: {"miek.nl.\t3600\tCH\tA\t127.0.0.1",
-			"miek.nl.\t3600\tIN\tA\t127.0.0.1",
-			"miek.de.\t3600\tIN\tA\t127.0.0.1",
-		},
-		[...]RR{
-			testRR("miek.de. IN A 127.0.0.1"),
-			testRR("miek.nl. 200 IN A 127.0.0.1"),
-			testRR("miek.nl. 300 IN A 127.0.0.1"),
-		}: {"miek.de.\t3600\tIN\tA\t127.0.0.1",
-			"miek.nl.\t200\tIN\tA\t127.0.0.1",
-		},
-	}
-
-	for rr, expected := range testcases {
-		out := Dedup([]RR{rr[0], rr[1], rr[2]}, nil)
-		for i, o := range out {
-			if o.String() != expected[i] {
-				t.Fatalf("expected %v, got %v", expected[i], o.String())
-			}
-		}
-	}
-}
-
-func BenchmarkDedup(b *testing.B) {
-	rrs := []RR{
-		testRR("miEk.nl. 2000 IN A 127.0.0.1"),
-		testRR("mieK.Nl. 1000 IN A 127.0.0.1"),
-		testRR("Miek.nL. 500 IN A 127.0.0.1"),
-	}
-	m := make(map[string]RR)
-	for i := 0; i < b.N; i++ {
-		Dedup(rrs, m)
-	}
-}
-
-func TestNormalizedString(t *testing.T) {
-	tests := map[RR]string{
-		testRR("mIEk.Nl. 3600 IN A 127.0.0.1"):     "miek.nl.\tIN\tA\t127.0.0.1",
-		testRR("m\\ iek.nL. 3600 IN A 127.0.0.1"):  "m\\ iek.nl.\tIN\tA\t127.0.0.1",
-		testRR("m\\\tIeK.nl. 3600 in A 127.0.0.1"): "m\\009iek.nl.\tIN\tA\t127.0.0.1",
-	}
-	for tc, expected := range tests {
-		n := normalizedString(tc)
-		if n != expected {
-			t.Errorf("expected %s, got %s", expected, n)
-		}
-	}
-}
diff --git a/vendor/github.com/miekg/dns/scan_test.go b/vendor/github.com/miekg/dns/scan_test.go
deleted file mode 100644
index e43ad447..00000000
--- a/vendor/github.com/miekg/dns/scan_test.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package dns
-
-import (
-	"io/ioutil"
-	"os"
-	"strings"
-	"testing"
-)
-
-func TestParseZoneInclude(t *testing.T) {
-
-	tmpfile, err := ioutil.TempFile("", "dns")
-	if err != nil {
-		t.Fatalf("could not create tmpfile for test: %s", err)
-	}
-
-	if _, err := tmpfile.WriteString("foo\tIN\tA\t127.0.0.1"); err != nil {
-		t.Fatalf("unable to write content to tmpfile %q: %s", tmpfile.Name(), err)
-	}
-	if err := tmpfile.Close(); err != nil {
-		t.Fatalf("could not close tmpfile %q: %s", tmpfile.Name(), err)
-	}
-
-	zone := "$ORIGIN example.org.\n$INCLUDE " + tmpfile.Name()
-
-	tok := ParseZone(strings.NewReader(zone), "", "")
-	for x := range tok {
-		if x.Error != nil {
-			t.Fatalf("expected no error, but got %s", x.Error)
-		}
-		if x.RR.Header().Name != "foo.example.org." {
-			t.Fatalf("expected %s, but got %s", "foo.example.org.", x.RR.Header().Name)
-		}
-	}
-
-	os.Remove(tmpfile.Name())
-
-	tok = ParseZone(strings.NewReader(zone), "", "")
-	for x := range tok {
-		if x.Error == nil {
-			t.Fatalf("expected first token to contain an error but it didn't")
-		}
-		if !strings.Contains(x.Error.Error(), "failed to open") ||
-			!strings.Contains(x.Error.Error(), tmpfile.Name()) {
-			t.Fatalf(`expected error to contain: "failed to open" and %q but got: %s`, tmpfile.Name(), x.Error)
-		}
-	}
-}
diff --git a/vendor/github.com/miekg/dns/server_test.go b/vendor/github.com/miekg/dns/server_test.go
deleted file mode 100644
index 6fc9e88c..00000000
--- a/vendor/github.com/miekg/dns/server_test.go
+++ /dev/null
@@ -1,792 +0,0 @@
-package dns
-
-import (
-	"crypto/tls"
-	"fmt"
-	"io"
-	"net"
-	"runtime"
-	"sync"
-	"testing"
-	"time"
-)
-
-func HelloServer(w ResponseWriter, req *Msg) {
-	m := new(Msg)
-	m.SetReply(req)
-
-	m.Extra = make([]RR, 1)
-	m.Extra[0] = &TXT{Hdr: RR_Header{Name: m.Question[0].Name, Rrtype: TypeTXT, Class: ClassINET, Ttl: 0}, Txt: []string{"Hello world"}}
-	w.WriteMsg(m)
-}
-
-func HelloServerBadID(w ResponseWriter, req *Msg) {
-	m := new(Msg)
-	m.SetReply(req)
-	m.Id++
-
-	m.Extra = make([]RR, 1)
-	m.Extra[0] = &TXT{Hdr: RR_Header{Name: m.Question[0].Name, Rrtype: TypeTXT, Class: ClassINET, Ttl: 0}, Txt: []string{"Hello world"}}
-	w.WriteMsg(m)
-}
-
-func HelloServerEchoAddrPort(w ResponseWriter, req *Msg) {
-	m := new(Msg)
-	m.SetReply(req)
-
-	remoteAddr := w.RemoteAddr().String()
-	m.Extra = make([]RR, 1)
-	m.Extra[0] = &TXT{Hdr: RR_Header{Name: m.Question[0].Name, Rrtype: TypeTXT, Class: ClassINET, Ttl: 0}, Txt: []string{remoteAddr}}
-	w.WriteMsg(m)
-}
-
-func AnotherHelloServer(w ResponseWriter, req *Msg) {
-	m := new(Msg)
-	m.SetReply(req)
-
-	m.Extra = make([]RR, 1)
-	m.Extra[0] = &TXT{Hdr: RR_Header{Name: m.Question[0].Name, Rrtype: TypeTXT, Class: ClassINET, Ttl: 0}, Txt: []string{"Hello example"}}
-	w.WriteMsg(m)
-}
-
-func RunLocalUDPServer(laddr string) (*Server, string, error) {
-	server, l, _, err := RunLocalUDPServerWithFinChan(laddr)
-
-	return server, l, err
-}
-
-func RunLocalUDPServerWithFinChan(laddr string) (*Server, string, chan error, error) {
-	pc, err := net.ListenPacket("udp", laddr)
-	if err != nil {
-		return nil, "", nil, err
-	}
-	server := &Server{PacketConn: pc, ReadTimeout: time.Hour, WriteTimeout: time.Hour}
-
-	waitLock := sync.Mutex{}
-	waitLock.Lock()
-	server.NotifyStartedFunc = waitLock.Unlock
-
-	// fin must be buffered so the goroutine below won't block
-	// forever if fin is never read from. This always happens
-	// in RunLocalUDPServer and can happen in TestShutdownUDP.
-	fin := make(chan error, 1)
-
-	go func() {
-		fin <- server.ActivateAndServe()
-		pc.Close()
-	}()
-
-	waitLock.Lock()
-	return server, pc.LocalAddr().String(), fin, nil
-}
-
-func RunLocalUDPServerUnsafe(laddr string) (*Server, string, error) {
-	pc, err := net.ListenPacket("udp", laddr)
-	if err != nil {
-		return nil, "", err
-	}
-	server := &Server{PacketConn: pc, Unsafe: true,
-		ReadTimeout: time.Hour, WriteTimeout: time.Hour}
-
-	waitLock := sync.Mutex{}
-	waitLock.Lock()
-	server.NotifyStartedFunc = waitLock.Unlock
-
-	go func() {
-		server.ActivateAndServe()
-		pc.Close()
-	}()
-
-	waitLock.Lock()
-	return server, pc.LocalAddr().String(), nil
-}
-
-func RunLocalTCPServer(laddr string) (*Server, string, error) {
-	server, l, _, err := RunLocalTCPServerWithFinChan(laddr)
-
-	return server, l, err
-}
-
-func RunLocalTCPServerWithFinChan(laddr string) (*Server, string, chan error, error) {
-	l, err := net.Listen("tcp", laddr)
-	if err != nil {
-		return nil, "", nil, err
-	}
-
-	server := &Server{Listener: l, ReadTimeout: time.Hour, WriteTimeout: time.Hour}
-
-	waitLock := sync.Mutex{}
-	waitLock.Lock()
-	server.NotifyStartedFunc = waitLock.Unlock
-
-	// See the comment in RunLocalUDPServerWithFinChan as to
-	// why fin must be buffered.
-	fin := make(chan error, 1)
-
-	go func() {
-		fin <- server.ActivateAndServe()
-		l.Close()
-	}()
-
-	waitLock.Lock()
-	return server, l.Addr().String(), fin, nil
-}
-
-func RunLocalTLSServer(laddr string, config *tls.Config) (*Server, string, error) {
-	l, err := tls.Listen("tcp", laddr, config)
-	if err != nil {
-		return nil, "", err
-	}
-
-	server := &Server{Listener: l, ReadTimeout: time.Hour, WriteTimeout: time.Hour}
-
-	waitLock := sync.Mutex{}
-	waitLock.Lock()
-	server.NotifyStartedFunc = waitLock.Unlock
-
-	go func() {
-		server.ActivateAndServe()
-		l.Close()
-	}()
-
-	waitLock.Lock()
-	return server, l.Addr().String(), nil
-}
-
-func TestServing(t *testing.T) {
-	HandleFunc("miek.nl.", HelloServer)
-	HandleFunc("example.com.", AnotherHelloServer)
-	defer HandleRemove("miek.nl.")
-	defer HandleRemove("example.com.")
-
-	s, addrstr, err := RunLocalUDPServer(":0")
-	if err != nil {
-		t.Fatalf("unable to run test server: %v", err)
-	}
-	defer s.Shutdown()
-
-	c := new(Client)
-	m := new(Msg)
-	m.SetQuestion("miek.nl.", TypeTXT)
-	r, _, err := c.Exchange(m, addrstr)
-	if err != nil || len(r.Extra) == 0 {
-		t.Fatal("failed to exchange miek.nl", err)
-	}
-	txt := r.Extra[0].(*TXT).Txt[0]
-	if txt != "Hello world" {
-		t.Error("unexpected result for miek.nl", txt, "!= Hello world")
-	}
-
-	m.SetQuestion("example.com.", TypeTXT)
-	r, _, err = c.Exchange(m, addrstr)
-	if err != nil {
-		t.Fatal("failed to exchange example.com", err)
-	}
-	txt = r.Extra[0].(*TXT).Txt[0]
-	if txt != "Hello example" {
-		t.Error("unexpected result for example.com", txt, "!= Hello example")
-	}
-
-	// Test Mixes cased as noticed by Ask.
-	m.SetQuestion("eXaMplE.cOm.", TypeTXT)
-	r, _, err = c.Exchange(m, addrstr)
-	if err != nil {
-		t.Error("failed to exchange eXaMplE.cOm", err)
-	}
-	txt = r.Extra[0].(*TXT).Txt[0]
-	if txt != "Hello example" {
-		t.Error("unexpected result for example.com", txt, "!= Hello example")
-	}
-}
-
-func TestServingTLS(t *testing.T) {
-	HandleFunc("miek.nl.", HelloServer)
-	HandleFunc("example.com.", AnotherHelloServer)
-	defer HandleRemove("miek.nl.")
-	defer HandleRemove("example.com.")
-
-	cert, err := tls.X509KeyPair(CertPEMBlock, KeyPEMBlock)
-	if err != nil {
-		t.Fatalf("unable to build certificate: %v", err)
-	}
-
-	config := tls.Config{
-		Certificates: []tls.Certificate{cert},
-	}
-
-	s, addrstr, err := RunLocalTLSServer(":0", &config)
-	if err != nil {
-		t.Fatalf("unable to run test server: %v", err)
-	}
-	defer s.Shutdown()
-
-	c := new(Client)
-	c.Net = "tcp-tls"
-	c.TLSConfig = &tls.Config{
-		InsecureSkipVerify: true,
-	}
-
-	m := new(Msg)
-	m.SetQuestion("miek.nl.", TypeTXT)
-	r, _, err := c.Exchange(m, addrstr)
-	if err != nil || len(r.Extra) == 0 {
-		t.Fatal("failed to exchange miek.nl", err)
-	}
-	txt := r.Extra[0].(*TXT).Txt[0]
-	if txt != "Hello world" {
-		t.Error("unexpected result for miek.nl", txt, "!= Hello world")
-	}
-
-	m.SetQuestion("example.com.", TypeTXT)
-	r, _, err = c.Exchange(m, addrstr)
-	if err != nil {
-		t.Fatal("failed to exchange example.com", err)
-	}
-	txt = r.Extra[0].(*TXT).Txt[0]
-	if txt != "Hello example" {
-		t.Error("unexpected result for example.com", txt, "!= Hello example")
-	}
-
-	// Test Mixes cased as noticed by Ask.
-	m.SetQuestion("eXaMplE.cOm.", TypeTXT)
-	r, _, err = c.Exchange(m, addrstr)
-	if err != nil {
-		t.Error("failed to exchange eXaMplE.cOm", err)
-	}
-	txt = r.Extra[0].(*TXT).Txt[0]
-	if txt != "Hello example" {
-		t.Error("unexpected result for example.com", txt, "!= Hello example")
-	}
-}
-
-func TestServingListenAndServe(t *testing.T) {
-	HandleFunc("example.com.", AnotherHelloServer)
-	defer HandleRemove("example.com.")
-
-	waitLock := sync.Mutex{}
-	server := &Server{Addr: ":0", Net: "udp", ReadTimeout: time.Hour, WriteTimeout: time.Hour, NotifyStartedFunc: waitLock.Unlock}
-	waitLock.Lock()
-
-	go func() {
-		server.ListenAndServe()
-	}()
-	waitLock.Lock()
-
-	c, m := new(Client), new(Msg)
-	m.SetQuestion("example.com.", TypeTXT)
-	addr := server.PacketConn.LocalAddr().String() // Get address via the PacketConn that gets set.
-	r, _, err := c.Exchange(m, addr)
-	if err != nil {
-		t.Fatal("failed to exchange example.com", err)
-	}
-	txt := r.Extra[0].(*TXT).Txt[0]
-	if txt != "Hello example" {
-		t.Error("unexpected result for example.com", txt, "!= Hello example")
-	}
-	server.Shutdown()
-}
-
-func TestServingListenAndServeTLS(t *testing.T) {
-	HandleFunc("example.com.", AnotherHelloServer)
-	defer HandleRemove("example.com.")
-
-	cert, err := tls.X509KeyPair(CertPEMBlock, KeyPEMBlock)
-	if err != nil {
-		t.Fatalf("unable to build certificate: %v", err)
-	}
-
-	config := &tls.Config{
-		Certificates: []tls.Certificate{cert},
-	}
-
-	waitLock := sync.Mutex{}
-	server := &Server{Addr: ":0", Net: "tcp", TLSConfig: config, ReadTimeout: time.Hour, WriteTimeout: time.Hour, NotifyStartedFunc: waitLock.Unlock}
-	waitLock.Lock()
-
-	go func() {
-		server.ListenAndServe()
-	}()
-	waitLock.Lock()
-
-	c, m := new(Client), new(Msg)
-	c.Net = "tcp"
-	m.SetQuestion("example.com.", TypeTXT)
-	addr := server.Listener.Addr().String() // Get address via the Listener that gets set.
-	r, _, err := c.Exchange(m, addr)
-	if err != nil {
-		t.Fatal(err)
-	}
-	txt := r.Extra[0].(*TXT).Txt[0]
-	if txt != "Hello example" {
-		t.Error("unexpected result for example.com", txt, "!= Hello example")
-	}
-	server.Shutdown()
-}
-
-func BenchmarkServe(b *testing.B) {
-	b.StopTimer()
-	HandleFunc("miek.nl.", HelloServer)
-	defer HandleRemove("miek.nl.")
-	a := runtime.GOMAXPROCS(4)
-
-	s, addrstr, err := RunLocalUDPServer(":0")
-	if err != nil {
-		b.Fatalf("unable to run test server: %v", err)
-	}
-	defer s.Shutdown()
-
-	c := new(Client)
-	m := new(Msg)
-	m.SetQuestion("miek.nl", TypeSOA)
-
-	b.StartTimer()
-	for i := 0; i < b.N; i++ {
-		c.Exchange(m, addrstr)
-	}
-	runtime.GOMAXPROCS(a)
-}
-
-func benchmarkServe6(b *testing.B) {
-	b.StopTimer()
-	HandleFunc("miek.nl.", HelloServer)
-	defer HandleRemove("miek.nl.")
-	a := runtime.GOMAXPROCS(4)
-	s, addrstr, err := RunLocalUDPServer("[::1]:0")
-	if err != nil {
-		b.Fatalf("unable to run test server: %v", err)
-	}
-	defer s.Shutdown()
-
-	c := new(Client)
-	m := new(Msg)
-	m.SetQuestion("miek.nl", TypeSOA)
-
-	b.StartTimer()
-	for i := 0; i < b.N; i++ {
-		c.Exchange(m, addrstr)
-	}
-	runtime.GOMAXPROCS(a)
-}
-
-func HelloServerCompress(w ResponseWriter, req *Msg) {
-	m := new(Msg)
-	m.SetReply(req)
-	m.Extra = make([]RR, 1)
-	m.Extra[0] = &TXT{Hdr: RR_Header{Name: m.Question[0].Name, Rrtype: TypeTXT, Class: ClassINET, Ttl: 0}, Txt: []string{"Hello world"}}
-	m.Compress = true
-	w.WriteMsg(m)
-}
-
-func BenchmarkServeCompress(b *testing.B) {
-	b.StopTimer()
-	HandleFunc("miek.nl.", HelloServerCompress)
-	defer HandleRemove("miek.nl.")
-	a := runtime.GOMAXPROCS(4)
-	s, addrstr, err := RunLocalUDPServer(":0")
-	if err != nil {
-		b.Fatalf("unable to run test server: %v", err)
-	}
-	defer s.Shutdown()
-
-	c := new(Client)
-	m := new(Msg)
-	m.SetQuestion("miek.nl", TypeSOA)
-	b.StartTimer()
-	for i := 0; i < b.N; i++ {
-		c.Exchange(m, addrstr)
-	}
-	runtime.GOMAXPROCS(a)
-}
-
-func TestDotAsCatchAllWildcard(t *testing.T) {
-	mux := NewServeMux()
-	mux.Handle(".", HandlerFunc(HelloServer))
-	mux.Handle("example.com.", HandlerFunc(AnotherHelloServer))
-
-	handler := mux.match("www.miek.nl.", TypeTXT)
-	if handler == nil {
-		t.Error("wildcard match failed")
-	}
-
-	handler = mux.match("www.example.com.", TypeTXT)
-	if handler == nil {
-		t.Error("example.com match failed")
-	}
-
-	handler = mux.match("a.www.example.com.", TypeTXT)
-	if handler == nil {
-		t.Error("a.www.example.com match failed")
-	}
-
-	handler = mux.match("boe.", TypeTXT)
-	if handler == nil {
-		t.Error("boe. match failed")
-	}
-}
-
-func TestCaseFolding(t *testing.T) {
-	mux := NewServeMux()
-	mux.Handle("_udp.example.com.", HandlerFunc(HelloServer))
-
-	handler := mux.match("_dns._udp.example.com.", TypeSRV)
-	if handler == nil {
-		t.Error("case sensitive characters folded")
-	}
-
-	handler = mux.match("_DNS._UDP.EXAMPLE.COM.", TypeSRV)
-	if handler == nil {
-		t.Error("case insensitive characters not folded")
-	}
-}
-
-func TestRootServer(t *testing.T) {
-	mux := NewServeMux()
-	mux.Handle(".", HandlerFunc(HelloServer))
-
-	handler := mux.match(".", TypeNS)
-	if handler == nil {
-		t.Error("root match failed")
-	}
-}
-
-type maxRec struct {
-	max int
-	sync.RWMutex
-}
-
-var M = new(maxRec)
-
-func HelloServerLargeResponse(resp ResponseWriter, req *Msg) {
-	m := new(Msg)
-	m.SetReply(req)
-	m.Authoritative = true
-	m1 := 0
-	M.RLock()
-	m1 = M.max
-	M.RUnlock()
-	for i := 0; i < m1; i++ {
-		aRec := &A{
-			Hdr: RR_Header{
-				Name:   req.Question[0].Name,
-				Rrtype: TypeA,
-				Class:  ClassINET,
-				Ttl:    0,
-			},
-			A: net.ParseIP(fmt.Sprintf("127.0.0.%d", i+1)).To4(),
-		}
-		m.Answer = append(m.Answer, aRec)
-	}
-	resp.WriteMsg(m)
-}
-
-func TestServingLargeResponses(t *testing.T) {
-	HandleFunc("example.", HelloServerLargeResponse)
-	defer HandleRemove("example.")
-
-	s, addrstr, err := RunLocalUDPServer(":0")
-	if err != nil {
-		t.Fatalf("unable to run test server: %v", err)
-	}
-	defer s.Shutdown()
-
-	// Create request
-	m := new(Msg)
-	m.SetQuestion("web.service.example.", TypeANY)
-
-	c := new(Client)
-	c.Net = "udp"
-	M.Lock()
-	M.max = 2
-	M.Unlock()
-	_, _, err = c.Exchange(m, addrstr)
-	if err != nil {
-		t.Errorf("failed to exchange: %v", err)
-	}
-	// This must fail
-	M.Lock()
-	M.max = 20
-	M.Unlock()
-	_, _, err = c.Exchange(m, addrstr)
-	if err == nil {
-		t.Error("failed to fail exchange, this should generate packet error")
-	}
-	// But this must work again
-	c.UDPSize = 7000
-	_, _, err = c.Exchange(m, addrstr)
-	if err != nil {
-		t.Errorf("failed to exchange: %v", err)
-	}
-}
-
-func TestServingResponse(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping test in short mode.")
-	}
-	HandleFunc("miek.nl.", HelloServer)
-	s, addrstr, err := RunLocalUDPServer(":0")
-	if err != nil {
-		t.Fatalf("unable to run test server: %v", err)
-	}
-
-	c := new(Client)
-	m := new(Msg)
-	m.SetQuestion("miek.nl.", TypeTXT)
-	m.Response = false
-	_, _, err = c.Exchange(m, addrstr)
-	if err != nil {
-		t.Fatal("failed to exchange", err)
-	}
-	m.Response = true
-	_, _, err = c.Exchange(m, addrstr)
-	if err == nil {
-		t.Fatal("exchanged response message")
-	}
-
-	s.Shutdown()
-	s, addrstr, err = RunLocalUDPServerUnsafe(":0")
-	if err != nil {
-		t.Fatalf("unable to run test server: %v", err)
-	}
-	defer s.Shutdown()
-
-	m.Response = true
-	_, _, err = c.Exchange(m, addrstr)
-	if err != nil {
-		t.Fatal("could exchanged response message in Unsafe mode")
-	}
-}
-
-func TestShutdownTCP(t *testing.T) {
-	s, _, fin, err := RunLocalTCPServerWithFinChan(":0")
-	if err != nil {
-		t.Fatalf("unable to run test server: %v", err)
-	}
-	err = s.Shutdown()
-	if err != nil {
-		t.Fatalf("could not shutdown test TCP server, %v", err)
-	}
-	select {
-	case err := <-fin:
-		if err != nil {
-			t.Errorf("error returned from ActivateAndServe, %v", err)
-		}
-	case <-time.After(2 * time.Second):
-		t.Error("could not shutdown test TCP server. Gave up waiting")
-	}
-}
-
-func TestShutdownTLS(t *testing.T) {
-	cert, err := tls.X509KeyPair(CertPEMBlock, KeyPEMBlock)
-	if err != nil {
-		t.Fatalf("unable to build certificate: %v", err)
-	}
-
-	config := tls.Config{
-		Certificates: []tls.Certificate{cert},
-	}
-
-	s, _, err := RunLocalTLSServer(":0", &config)
-	if err != nil {
-		t.Fatalf("unable to run test server: %v", err)
-	}
-	err = s.Shutdown()
-	if err != nil {
-		t.Errorf("could not shutdown test TLS server, %v", err)
-	}
-}
-
-type trigger struct {
-	done bool
-	sync.RWMutex
-}
-
-func (t *trigger) Set() {
-	t.Lock()
-	defer t.Unlock()
-	t.done = true
-}
-func (t *trigger) Get() bool {
-	t.RLock()
-	defer t.RUnlock()
-	return t.done
-}
-
-func TestHandlerCloseTCP(t *testing.T) {
-
-	ln, err := net.Listen("tcp", ":0")
-	if err != nil {
-		panic(err)
-	}
-	addr := ln.Addr().String()
-
-	server := &Server{Addr: addr, Net: "tcp", Listener: ln}
-
-	hname := "testhandlerclosetcp."
-	triggered := &trigger{}
-	HandleFunc(hname, func(w ResponseWriter, r *Msg) {
-		triggered.Set()
-		w.Close()
-	})
-	defer HandleRemove(hname)
-
-	go func() {
-		defer server.Shutdown()
-		c := &Client{Net: "tcp"}
-		m := new(Msg).SetQuestion(hname, 1)
-		tries := 0
-	exchange:
-		_, _, err := c.Exchange(m, addr)
-		if err != nil && err != io.EOF {
-			t.Errorf("exchange failed: %s\n", err)
-			if tries == 3 {
-				return
-			}
-			time.Sleep(time.Second / 10)
-			tries++
-			goto exchange
-		}
-	}()
-	server.ActivateAndServe()
-	if !triggered.Get() {
-		t.Fatalf("handler never called")
-	}
-}
-
-func TestShutdownUDP(t *testing.T) {
-	s, _, fin, err := RunLocalUDPServerWithFinChan(":0")
-	if err != nil {
-		t.Fatalf("unable to run test server: %v", err)
-	}
-	err = s.Shutdown()
-	if err != nil {
-		t.Errorf("could not shutdown test UDP server, %v", err)
-	}
-	select {
-	case err := <-fin:
-		if err != nil {
-			t.Errorf("error returned from ActivateAndServe, %v", err)
-		}
-	case <-time.After(2 * time.Second):
-		t.Error("could not shutdown test UDP server. Gave up waiting")
-	}
-}
-
-func TestServerStartStopRace(t *testing.T) {
-	for i := 0; i < 10; i++ {
-		var err error
-		s := &Server{}
-		s, _, _, err = RunLocalUDPServerWithFinChan(":0")
-		if err != nil {
-			t.Fatalf("could not start server: %s", err)
-		}
-		go func() {
-			if err := s.Shutdown(); err != nil {
-				t.Fatalf("could not stop server: %s", err)
-			}
-		}()
-	}
-}
-
-type ExampleFrameLengthWriter struct {
-	Writer
-}
-
-func (e *ExampleFrameLengthWriter) Write(m []byte) (int, error) {
-	fmt.Println("writing raw DNS message of length", len(m))
-	return e.Writer.Write(m)
-}
-
-func ExampleDecorateWriter() {
-	// instrument raw DNS message writing
-	wf := DecorateWriter(func(w Writer) Writer {
-		return &ExampleFrameLengthWriter{w}
-	})
-
-	// simple UDP server
-	pc, err := net.ListenPacket("udp", ":0")
-	if err != nil {
-		fmt.Println(err.Error())
-		return
-	}
-	server := &Server{
-		PacketConn:     pc,
-		DecorateWriter: wf,
-		ReadTimeout:    time.Hour, WriteTimeout: time.Hour,
-	}
-
-	waitLock := sync.Mutex{}
-	waitLock.Lock()
-	server.NotifyStartedFunc = waitLock.Unlock
-	defer server.Shutdown()
-
-	go func() {
-		server.ActivateAndServe()
-		pc.Close()
-	}()
-
-	waitLock.Lock()
-
-	HandleFunc("miek.nl.", HelloServer)
-
-	c := new(Client)
-	m := new(Msg)
-	m.SetQuestion("miek.nl.", TypeTXT)
-	_, _, err = c.Exchange(m, pc.LocalAddr().String())
-	if err != nil {
-		fmt.Println("failed to exchange", err.Error())
-		return
-	}
-	// Output: writing raw DNS message of length 56
-}
-
-var (
-	// CertPEMBlock is a X509 data used to test TLS servers (used with tls.X509KeyPair)
-	CertPEMBlock = []byte(`-----BEGIN CERTIFICATE-----
-MIIDAzCCAeugAwIBAgIRAJFYMkcn+b8dpU15wjf++GgwDQYJKoZIhvcNAQELBQAw
-EjEQMA4GA1UEChMHQWNtZSBDbzAeFw0xNjAxMDgxMjAzNTNaFw0xNzAxMDcxMjAz
-NTNaMBIxEDAOBgNVBAoTB0FjbWUgQ28wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDXjqO6skvP03k58CNjQggd9G/mt+Wa+xRU+WXiKCCHttawM8x+slq5
-yfsHCwxlwsGn79HmJqecNqgHb2GWBXAvVVokFDTcC1hUP4+gp2gu9Ny27UHTjlLm
-O0l/xZ5MN8tfKyYlFw18tXu3fkaPyHj8v/D1RDkuo4ARdFvGSe8TqisbhLk2+9ow
-xfIGbEM9Fdiw8qByC2+d+FfvzIKz3GfQVwn0VoRom8L6NBIANq1IGrB5JefZB6nv
-DnfuxkBmY7F1513HKuEJ8KsLWWZWV9OPU4j4I4Rt+WJNlKjbD2srHxyrS2RDsr91
-8nCkNoWVNO3sZq0XkWKecdc921vL4ginAgMBAAGjVDBSMA4GA1UdDwEB/wQEAwIC
-pDATBgNVHSUEDDAKBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MBoGA1UdEQQT
-MBGCCWxvY2FsaG9zdIcEfwAAATANBgkqhkiG9w0BAQsFAAOCAQEAGcU3iyLBIVZj
-aDzSvEDHUd1bnLBl1C58Xu/CyKlPqVU7mLfK0JcgEaYQTSX6fCJVNLbbCrcGLsPJ
-fbjlBbyeLjTV413fxPVuona62pBFjqdtbli2Qe8FRH2KBdm41JUJGdo+SdsFu7nc
-BFOcubdw6LLIXvsTvwndKcHWx1rMX709QU1Vn1GAIsbJV/DWI231Jyyb+lxAUx/C
-8vce5uVxiKcGS+g6OjsN3D3TtiEQGSXLh013W6Wsih8td8yMCMZ3w8LQ38br1GUe
-ahLIgUJ9l6HDguM17R7kGqxNvbElsMUHfTtXXP7UDQUiYXDakg8xDP6n9DCDhJ8Y
-bSt7OLB7NQ==
------END CERTIFICATE-----`)
-
-	// KeyPEMBlock is a X509 data used to test TLS servers (used with tls.X509KeyPair)
-	KeyPEMBlock = []byte(`-----BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEA146jurJLz9N5OfAjY0IIHfRv5rflmvsUVPll4iggh7bWsDPM
-frJaucn7BwsMZcLBp+/R5iannDaoB29hlgVwL1VaJBQ03AtYVD+PoKdoLvTctu1B
-045S5jtJf8WeTDfLXysmJRcNfLV7t35Gj8h4/L/w9UQ5LqOAEXRbxknvE6orG4S5
-NvvaMMXyBmxDPRXYsPKgcgtvnfhX78yCs9xn0FcJ9FaEaJvC+jQSADatSBqweSXn
-2Qep7w537sZAZmOxdeddxyrhCfCrC1lmVlfTj1OI+COEbfliTZSo2w9rKx8cq0tk
-Q7K/dfJwpDaFlTTt7GatF5FinnHXPdtby+IIpwIDAQABAoIBAAJK4RDmPooqTJrC
-JA41MJLo+5uvjwCT9QZmVKAQHzByUFw1YNJkITTiognUI0CdzqNzmH7jIFs39ZeG
-proKusO2G6xQjrNcZ4cV2fgyb5g4QHStl0qhs94A+WojduiGm2IaumAgm6Mc5wDv
-ld6HmknN3Mku/ZCyanVFEIjOVn2WB7ZQLTBs6ZYaebTJG2Xv6p9t2YJW7pPQ9Xce
-s9ohAWohyM4X/OvfnfnLtQp2YLw/BxwehBsCR5SXM3ibTKpFNtxJC8hIfTuWtxZu
-2ywrmXShYBRB1WgtZt5k04bY/HFncvvcHK3YfI1+w4URKtwdaQgPUQRbVwDwuyBn
-flfkCJECgYEA/eWt01iEyE/lXkGn6V9lCocUU7lCU6yk5UT8VXVUc5If4KZKPfCk
-p4zJDOqwn2eM673aWz/mG9mtvAvmnugaGjcaVCyXOp/D/GDmKSoYcvW5B/yjfkLy
-dK6Yaa5LDRVYlYgyzcdCT5/9Qc626NzFwKCZNI4ncIU8g7ViATRxWJ8CgYEA2Ver
-vZ0M606sfgC0H3NtwNBxmuJ+lIF5LNp/wDi07lDfxRR1rnZMX5dnxjcpDr/zvm8J
-WtJJX3xMgqjtHuWKL3yKKony9J5ZPjichSbSbhrzfovgYIRZLxLLDy4MP9L3+CX/
-yBXnqMWuSnFX+M5fVGxdDWiYF3V+wmeOv9JvavkCgYEAiXAPDFzaY+R78O3xiu7M
-r0o3wqqCMPE/wav6O/hrYrQy9VSO08C0IM6g9pEEUwWmzuXSkZqhYWoQFb8Lc/GI
-T7CMXAxXQLDDUpbRgG79FR3Wr3AewHZU8LyiXHKwxcBMV4WGmsXGK3wbh8fyU1NO
-6NsGk+BvkQVOoK1LBAPzZ1kCgYEAsBSmD8U33T9s4dxiEYTrqyV0lH3g/SFz8ZHH
-pAyNEPI2iC1ONhyjPWKlcWHpAokiyOqeUpVBWnmSZtzC1qAydsxYB6ShT+sl9BHb
-RMix/QAauzBJhQhUVJ3OIys0Q1UBDmqCsjCE8SfOT4NKOUnA093C+YT+iyrmmktZ
-zDCJkckCgYEAndqM5KXGk5xYo+MAA1paZcbTUXwaWwjLU+XSRSSoyBEi5xMtfvUb
-7+a1OMhLwWbuz+pl64wFKrbSUyimMOYQpjVE/1vk/kb99pxbgol27hdKyTH1d+ov
-kFsxKCqxAnBVGEWAvVZAiiTOxleQFjz5RnL0BQp9Lg2cQe+dvuUmIAA=
------END RSA PRIVATE KEY-----`)
-)
diff --git a/vendor/github.com/miekg/dns/sig0_test.go b/vendor/github.com/miekg/dns/sig0_test.go
deleted file mode 100644
index 122de6a8..00000000
--- a/vendor/github.com/miekg/dns/sig0_test.go
+++ /dev/null
@@ -1,89 +0,0 @@
-package dns
-
-import (
-	"crypto"
-	"testing"
-	"time"
-)
-
-func TestSIG0(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping test in short mode.")
-	}
-	m := new(Msg)
-	m.SetQuestion("example.org.", TypeSOA)
-	for _, alg := range []uint8{ECDSAP256SHA256, ECDSAP384SHA384, RSASHA1, RSASHA256, RSASHA512} {
-		algstr := AlgorithmToString[alg]
-		keyrr := new(KEY)
-		keyrr.Hdr.Name = algstr + "."
-		keyrr.Hdr.Rrtype = TypeKEY
-		keyrr.Hdr.Class = ClassINET
-		keyrr.Algorithm = alg
-		keysize := 1024
-		switch alg {
-		case ECDSAP256SHA256:
-			keysize = 256
-		case ECDSAP384SHA384:
-			keysize = 384
-		}
-		pk, err := keyrr.Generate(keysize)
-		if err != nil {
-			t.Errorf("failed to generate key for “%s”: %v", algstr, err)
-			continue
-		}
-		now := uint32(time.Now().Unix())
-		sigrr := new(SIG)
-		sigrr.Hdr.Name = "."
-		sigrr.Hdr.Rrtype = TypeSIG
-		sigrr.Hdr.Class = ClassANY
-		sigrr.Algorithm = alg
-		sigrr.Expiration = now + 300
-		sigrr.Inception = now - 300
-		sigrr.KeyTag = keyrr.KeyTag()
-		sigrr.SignerName = keyrr.Hdr.Name
-		mb, err := sigrr.Sign(pk.(crypto.Signer), m)
-		if err != nil {
-			t.Errorf("failed to sign message using “%s”: %v", algstr, err)
-			continue
-		}
-		m := new(Msg)
-		if err := m.Unpack(mb); err != nil {
-			t.Errorf("failed to unpack message signed using “%s”: %v", algstr, err)
-			continue
-		}
-		if len(m.Extra) != 1 {
-			t.Errorf("missing SIG for message signed using “%s”", algstr)
-			continue
-		}
-		var sigrrwire *SIG
-		switch rr := m.Extra[0].(type) {
-		case *SIG:
-			sigrrwire = rr
-		default:
-			t.Errorf("expected SIG RR, instead: %v", rr)
-			continue
-		}
-		for _, rr := range []*SIG{sigrr, sigrrwire} {
-			id := "sigrr"
-			if rr == sigrrwire {
-				id = "sigrrwire"
-			}
-			if err := rr.Verify(keyrr, mb); err != nil {
-				t.Errorf("failed to verify “%s” signed SIG(%s): %v", algstr, id, err)
-				continue
-			}
-		}
-		mb[13]++
-		if err := sigrr.Verify(keyrr, mb); err == nil {
-			t.Errorf("verify succeeded on an altered message using “%s”", algstr)
-			continue
-		}
-		sigrr.Expiration = 2
-		sigrr.Inception = 1
-		mb, _ = sigrr.Sign(pk.(crypto.Signer), m)
-		if err := sigrr.Verify(keyrr, mb); err == nil {
-			t.Errorf("verify succeeded on an expired message using “%s”", algstr)
-			continue
-		}
-	}
-}
diff --git a/vendor/github.com/miekg/dns/tsig_test.go b/vendor/github.com/miekg/dns/tsig_test.go
deleted file mode 100644
index 4bc52733..00000000
--- a/vendor/github.com/miekg/dns/tsig_test.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package dns
-
-import (
-	"encoding/binary"
-	"testing"
-	"time"
-)
-
-func newTsig(algo string) *Msg {
-	m := new(Msg)
-	m.SetQuestion("example.org.", TypeA)
-	m.SetTsig("example.", algo, 300, time.Now().Unix())
-	return m
-}
-
-func TestTsig(t *testing.T) {
-	m := newTsig(HmacMD5)
-	buf, _, err := TsigGenerate(m, "pRZgBrBvI4NAHZYhxmhs/Q==", "", false)
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = TsigVerify(buf, "pRZgBrBvI4NAHZYhxmhs/Q==", "", false)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// TSIG accounts for ID substitution. This means if the message ID is
-	// changed by a forwarder, we should still be able to verify the TSIG.
-	m = newTsig(HmacMD5)
-	buf, _, err = TsigGenerate(m, "pRZgBrBvI4NAHZYhxmhs/Q==", "", false)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	binary.BigEndian.PutUint16(buf[0:2], uint16(42))
-	err = TsigVerify(buf, "pRZgBrBvI4NAHZYhxmhs/Q==", "", false)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestTsigCase(t *testing.T) {
-	m := newTsig("HmAc-mD5.sig-ALg.rEg.int.") // HmacMD5
-	buf, _, err := TsigGenerate(m, "pRZgBrBvI4NAHZYhxmhs/Q==", "", false)
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = TsigVerify(buf, "pRZgBrBvI4NAHZYhxmhs/Q==", "", false)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/vendor/github.com/miekg/dns/types_test.go b/vendor/github.com/miekg/dns/types_test.go
deleted file mode 100644
index 3dbddee1..00000000
--- a/vendor/github.com/miekg/dns/types_test.go
+++ /dev/null
@@ -1,74 +0,0 @@
-package dns
-
-import (
-	"testing"
-)
-
-func TestCmToM(t *testing.T) {
-	s := cmToM(0, 0)
-	if s != "0.00" {
-		t.Error("0, 0")
-	}
-
-	s = cmToM(1, 0)
-	if s != "0.01" {
-		t.Error("1, 0")
-	}
-
-	s = cmToM(3, 1)
-	if s != "0.30" {
-		t.Error("3, 1")
-	}
-
-	s = cmToM(4, 2)
-	if s != "4" {
-		t.Error("4, 2")
-	}
-
-	s = cmToM(5, 3)
-	if s != "50" {
-		t.Error("5, 3")
-	}
-
-	s = cmToM(7, 5)
-	if s != "7000" {
-		t.Error("7, 5")
-	}
-
-	s = cmToM(9, 9)
-	if s != "90000000" {
-		t.Error("9, 9")
-	}
-}
-
-func TestSplitN(t *testing.T) {
-	xs := splitN("abc", 5)
-	if len(xs) != 1 && xs[0] != "abc" {
-		t.Errorf("failure to split abc")
-	}
-
-	s := ""
-	for i := 0; i < 255; i++ {
-		s += "a"
-	}
-
-	xs = splitN(s, 255)
-	if len(xs) != 1 && xs[0] != s {
-		t.Errorf("failure to split 255 char long string")
-	}
-
-	s += "b"
-	xs = splitN(s, 255)
-	if len(xs) != 2 || xs[1] != "b" {
-		t.Errorf("failure to split 256 char long string: %d", len(xs))
-	}
-
-	// Make s longer
-	for i := 0; i < 255; i++ {
-		s += "a"
-	}
-	xs = splitN(s, 255)
-	if len(xs) != 3 || xs[2] != "a" {
-		t.Errorf("failure to split 510 char long string: %d", len(xs))
-	}
-}
diff --git a/vendor/github.com/miekg/dns/udp_test.go b/vendor/github.com/miekg/dns/udp_test.go
deleted file mode 100644
index f27d79df..00000000
--- a/vendor/github.com/miekg/dns/udp_test.go
+++ /dev/null
@@ -1,140 +0,0 @@
-// +build linux,!appengine
-
-package dns
-
-import (
-	"bytes"
-	"net"
-	"runtime"
-	"strings"
-	"testing"
-	"time"
-
-	"golang.org/x/net/ipv4"
-	"golang.org/x/net/ipv6"
-)
-
-func TestSetUDPSocketOptions(t *testing.T) {
-	// returns an error if we cannot resolve that address
-	testFamily := func(n, addr string) error {
-		a, err := net.ResolveUDPAddr(n, addr)
-		if err != nil {
-			return err
-		}
-		c, err := net.ListenUDP(n, a)
-		if err != nil {
-			return err
-		}
-		if err := setUDPSocketOptions(c); err != nil {
-			t.Fatalf("failed to set socket options: %v", err)
-		}
-		ch := make(chan *SessionUDP)
-		go func() {
-			// Set some deadline so this goroutine doesn't hang forever
-			c.SetReadDeadline(time.Now().Add(time.Minute))
-			b := make([]byte, 1)
-			_, sess, err := ReadFromSessionUDP(c, b)
-			if err != nil {
-				t.Fatalf("failed to read from conn: %v", err)
-			}
-			ch <- sess
-		}()
-
-		c2, err := net.Dial("udp", c.LocalAddr().String())
-		if err != nil {
-			t.Fatalf("failed to dial udp: %v", err)
-		}
-		if _, err := c2.Write([]byte{1}); err != nil {
-			t.Fatalf("failed to write to conn: %v", err)
-		}
-		sess := <-ch
-		if len(sess.context) == 0 {
-			t.Fatalf("empty session context: %v", sess)
-		}
-		ip := parseDstFromOOB(sess.context)
-		if ip == nil {
-			t.Fatalf("failed to parse dst: %v", sess)
-		}
-		if !strings.Contains(c.LocalAddr().String(), ip.String()) {
-			t.Fatalf("dst was different than listen addr: %v != %v", ip.String(), c.LocalAddr().String())
-		}
-		return nil
-	}
-
-	// we require that ipv4 be supported
-	if err := testFamily("udp4", "127.0.0.1:0"); err != nil {
-		t.Fatalf("failed to test socket options on IPv4: %v", err)
-	}
-	// IPv6 might not be supported so these will just log
-	if err := testFamily("udp6", "[::1]:0"); err != nil {
-		t.Logf("failed to test socket options on IPv6-only: %v", err)
-	}
-	if err := testFamily("udp", "[::1]:0"); err != nil {
-		t.Logf("failed to test socket options on IPv6/IPv4: %v", err)
-	}
-}
-
-func TestParseDstFromOOB(t *testing.T) {
-	if runtime.GOARCH != "amd64" {
-		// The cmsghdr struct differs in the width (32/64-bit) of
-		// lengths and the struct padding between architectures.
-		// The data below was only written with amd64 in mind, and
-		// thus the test must be skipped on other architectures.
-		t.Skip("skipping test on unsupported architecture")
-	}
-
-	// dst is :ffff:100.100.100.100
-	oob := []byte{36, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 100, 100, 100, 100, 2, 0, 0, 0}
-	dst := parseDstFromOOB(oob)
-	dst4 := dst.To4()
-	if dst4 == nil {
-		t.Errorf("failed to parse IPv4 in IPv6: %v", dst)
-	} else if dst4.String() != "100.100.100.100" {
-		t.Errorf("unexpected IPv4: %v", dst4)
-	}
-
-	// dst is 2001:db8::1
-	oob = []byte{36, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 50, 0, 0, 0, 32, 1, 13, 184, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0}
-	dst = parseDstFromOOB(oob)
-	dst6 := dst.To16()
-	if dst6 == nil {
-		t.Errorf("failed to parse IPv6: %v", dst)
-	} else if dst6.String() != "2001:db8::1" {
-		t.Errorf("unexpected IPv6: %v", dst4)
-	}
-
-	// dst is 100.100.100.100 but was received on 10.10.10.10
-	oob = []byte{28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 2, 0, 0, 0, 10, 10, 10, 10, 100, 100, 100, 100, 0, 0, 0, 0}
-	dst = parseDstFromOOB(oob)
-	dst4 = dst.To4()
-	if dst4 == nil {
-		t.Errorf("failed to parse IPv4: %v", dst)
-	} else if dst4.String() != "100.100.100.100" {
-		t.Errorf("unexpected IPv4: %v", dst4)
-	}
-}
-
-func TestCorrectSource(t *testing.T) {
-	if runtime.GOARCH != "amd64" {
-		// See comment above in TestParseDstFromOOB.
-		t.Skip("skipping test on unsupported architecture")
-	}
-
-	// dst is :ffff:100.100.100.100 which should be counted as IPv4
-	oob := []byte{36, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 100, 100, 100, 100, 2, 0, 0, 0}
-	soob := correctSource(oob)
-	cm4 := new(ipv4.ControlMessage)
-	cm4.Src = net.ParseIP("100.100.100.100")
-	if !bytes.Equal(soob, cm4.Marshal()) {
-		t.Errorf("unexpected oob for ipv4 address: %v", soob)
-	}
-
-	// dst is 2001:db8::1
-	oob = []byte{36, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 50, 0, 0, 0, 32, 1, 13, 184, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0}
-	soob = correctSource(oob)
-	cm6 := new(ipv6.ControlMessage)
-	cm6.Src = net.ParseIP("2001:db8::1")
-	if !bytes.Equal(soob, cm6.Marshal()) {
-		t.Errorf("unexpected oob for IPv6 address: %v", soob)
-	}
-}
diff --git a/vendor/github.com/miekg/dns/update_test.go b/vendor/github.com/miekg/dns/update_test.go
deleted file mode 100644
index 5dba413a..00000000
--- a/vendor/github.com/miekg/dns/update_test.go
+++ /dev/null
@@ -1,139 +0,0 @@
-package dns
-
-import (
-	"bytes"
-	"testing"
-)
-
-func TestDynamicUpdateParsing(t *testing.T) {
-	prefix := "example.com. IN "
-	for _, typ := range TypeToString {
-		if typ == "OPT" || typ == "AXFR" || typ == "IXFR" || typ == "ANY" || typ == "TKEY" ||
-			typ == "TSIG" || typ == "ISDN" || typ == "UNSPEC" || typ == "NULL" || typ == "ATMA" ||
-			typ == "Reserved" || typ == "None" || typ == "NXT" || typ == "MAILB" || typ == "MAILA" {
-			continue
-		}
-		if _, err := NewRR(prefix + typ); err != nil {
-			t.Errorf("failure to parse: %s %s: %v", prefix, typ, err)
-		}
-	}
-}
-
-func TestDynamicUpdateUnpack(t *testing.T) {
-	// From https://github.com/miekg/dns/issues/150#issuecomment-62296803
-	// It should be an update message for the zone "example.",
-	// deleting the A RRset "example." and then adding an A record at "example.".
-	// class ANY, TYPE A
-	buf := []byte{171, 68, 40, 0, 0, 1, 0, 0, 0, 2, 0, 0, 7, 101, 120, 97, 109, 112, 108, 101, 0, 0, 6, 0, 1, 192, 12, 0, 1, 0, 255, 0, 0, 0, 0, 0, 0, 192, 12, 0, 1, 0, 1, 0, 0, 0, 0, 0, 4, 127, 0, 0, 1}
-	msg := new(Msg)
-	err := msg.Unpack(buf)
-	if err != nil {
-		t.Errorf("failed to unpack: %v\n%s", err, msg.String())
-	}
-}
-
-func TestDynamicUpdateZeroRdataUnpack(t *testing.T) {
-	m := new(Msg)
-	rr := &RR_Header{Name: ".", Rrtype: 0, Class: 1, Ttl: ^uint32(0), Rdlength: 0}
-	m.Answer = []RR{rr, rr, rr, rr, rr}
-	m.Ns = m.Answer
-	for n, s := range TypeToString {
-		rr.Rrtype = n
-		bytes, err := m.Pack()
-		if err != nil {
-			t.Errorf("failed to pack %s: %v", s, err)
-			continue
-		}
-		if err := new(Msg).Unpack(bytes); err != nil {
-			t.Errorf("failed to unpack %s: %v", s, err)
-		}
-	}
-}
-
-func TestRemoveRRset(t *testing.T) {
-	// Should add a zero data RR in Class ANY with a TTL of 0
-	// for each set mentioned in the RRs provided to it.
-	rr := testRR(". 100 IN A 127.0.0.1")
-	m := new(Msg)
-	m.Ns = []RR{&RR_Header{Name: ".", Rrtype: TypeA, Class: ClassANY, Ttl: 0, Rdlength: 0}}
-	expectstr := m.String()
-	expect, err := m.Pack()
-	if err != nil {
-		t.Fatalf("error packing expected msg: %v", err)
-	}
-
-	m.Ns = nil
-	m.RemoveRRset([]RR{rr})
-	actual, err := m.Pack()
-	if err != nil {
-		t.Fatalf("error packing actual msg: %v", err)
-	}
-	if !bytes.Equal(actual, expect) {
-		tmp := new(Msg)
-		if err := tmp.Unpack(actual); err != nil {
-			t.Fatalf("error unpacking actual msg: %v\nexpected: %v\ngot: %v\n", err, expect, actual)
-		}
-		t.Errorf("expected msg:\n%s", expectstr)
-		t.Errorf("actual msg:\n%v", tmp)
-	}
-}
-
-func TestPreReqAndRemovals(t *testing.T) {
-	// Build a list of multiple prereqs and then somes removes followed by an insert.
-	// We should be able to add multiple prereqs and updates.
-	m := new(Msg)
-	m.SetUpdate("example.org.")
-	m.Id = 1234
-
-	// Use a full set of RRs each time, so we are sure the rdata is stripped.
-	rrName1 := testRR("name_used. 3600 IN A 127.0.0.1")
-	rrName2 := testRR("name_not_used. 3600 IN A 127.0.0.1")
-	rrRemove1 := testRR("remove1. 3600 IN A 127.0.0.1")
-	rrRemove2 := testRR("remove2. 3600 IN A 127.0.0.1")
-	rrRemove3 := testRR("remove3. 3600 IN A 127.0.0.1")
-	rrInsert := testRR("insert. 3600 IN A 127.0.0.1")
-	rrRrset1 := testRR("rrset_used1. 3600 IN A 127.0.0.1")
-	rrRrset2 := testRR("rrset_used2. 3600 IN A 127.0.0.1")
-	rrRrset3 := testRR("rrset_not_used. 3600 IN A 127.0.0.1")
-
-	// Handle the prereqs.
-	m.NameUsed([]RR{rrName1})
-	m.NameNotUsed([]RR{rrName2})
-	m.RRsetUsed([]RR{rrRrset1})
-	m.Used([]RR{rrRrset2})
-	m.RRsetNotUsed([]RR{rrRrset3})
-
-	// and now the updates.
-	m.RemoveName([]RR{rrRemove1})
-	m.RemoveRRset([]RR{rrRemove2})
-	m.Remove([]RR{rrRemove3})
-	m.Insert([]RR{rrInsert})
-
-	// This test function isn't a Example function because we print these RR with tabs at the
-	// end and the Example function trim these, thus they never match.
-	// TODO(miek): don't print these tabs and make this into an Example function.
-	expect := `;; opcode: UPDATE, status: NOERROR, id: 1234
-;; flags:; QUERY: 1, ANSWER: 5, AUTHORITY: 4, ADDITIONAL: 0
-
-;; QUESTION SECTION:
-;example.org.	IN	 SOA
-
-;; ANSWER SECTION:
-name_used.	0	CLASS255	ANY	
-name_not_used.	0	NONE	ANY	
-rrset_used1.	0	CLASS255	A	
-rrset_used2.	3600	IN	A	127.0.0.1
-rrset_not_used.	0	NONE	A	
-
-;; AUTHORITY SECTION:
-remove1.	0	CLASS255	ANY	
-remove2.	0	CLASS255	A	
-remove3.	0	NONE	A	127.0.0.1
-insert.	3600	IN	A	127.0.0.1
-`
-
-	if m.String() != expect {
-		t.Errorf("expected msg:\n%s", expect)
-		t.Errorf("actual msg:\n%v", m.String())
-	}
-}
diff --git a/vendor/github.com/miekg/dns/version_test.go b/vendor/github.com/miekg/dns/version_test.go
deleted file mode 100644
index 61c40484..00000000
--- a/vendor/github.com/miekg/dns/version_test.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package dns
-
-import "testing"
-
-func TestVersion(t *testing.T) {
-	v := V{1, 0, 0}
-	if x := v.String(); x != "1.0.0" {
-		t.Fatalf("Failed to convert version %v, got: %s", v, x)
-	}
-}
diff --git a/vendor/golang.org/x/crypto/.gitattributes b/vendor/golang.org/x/crypto/.gitattributes
deleted file mode 100644
index d2f212e5..00000000
--- a/vendor/golang.org/x/crypto/.gitattributes
+++ /dev/null
@@ -1,10 +0,0 @@
-# Treat all files in this repo as binary, with no git magic updating
-# line endings. Windows users contributing to Go will need to use a
-# modern version of git and editors capable of LF line endings.
-#
-# We'll prevent accidental CRLF line endings from entering the repo
-# via the git-review gofmt checks.
-#
-# See golang.org/issue/9281
-
-* -text
diff --git a/vendor/golang.org/x/crypto/.gitignore b/vendor/golang.org/x/crypto/.gitignore
deleted file mode 100644
index 8339fd61..00000000
--- a/vendor/golang.org/x/crypto/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Add no patterns to .hgignore except for files generated by the build.
-last-change
diff --git a/vendor/golang.org/x/crypto/CONTRIBUTING.md b/vendor/golang.org/x/crypto/CONTRIBUTING.md
deleted file mode 100644
index d0485e88..00000000
--- a/vendor/golang.org/x/crypto/CONTRIBUTING.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Contributing to Go
-
-Go is an open source project.
-
-It is the work of hundreds of contributors. We appreciate your help!
-
-## Filing issues
-
-When [filing an issue](https://golang.org/issue/new), make sure to answer these five questions:
-
-1.  What version of Go are you using (`go version`)?
-2.  What operating system and processor architecture are you using?
-3.  What did you do?
-4.  What did you expect to see?
-5.  What did you see instead?
-
-General questions should go to the [golang-nuts mailing list](https://groups.google.com/group/golang-nuts) instead of the issue tracker.
-The gophers there will answer or ask you to file an issue if you've tripped over a bug.
-
-## Contributing code
-
-Please read the [Contribution Guidelines](https://golang.org/doc/contribute.html)
-before sending patches.
-
-Unless otherwise noted, the Go source files are distributed under
-the BSD-style license found in the LICENSE file.
diff --git a/vendor/golang.org/x/crypto/README.md b/vendor/golang.org/x/crypto/README.md
deleted file mode 100644
index c9d6fecd..00000000
--- a/vendor/golang.org/x/crypto/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Go Cryptography
-
-This repository holds supplementary Go cryptography libraries.
-
-## Download/Install
-
-The easiest way to install is to run `go get -u golang.org/x/crypto/...`. You
-can also manually git clone the repository to `$GOPATH/src/golang.org/x/crypto`.
-
-## Report Issues / Send Patches
-
-This repository uses Gerrit for code changes. To learn how to submit changes to
-this repository, see https://golang.org/doc/contribute.html.
-
-The main issue tracker for the crypto repository is located at
-https://github.com/golang/go/issues. Prefix your issue with "x/crypto:" in the
-subject line, so it is easy to find.
-
-Note that contributions to the cryptography package receive additional scrutiny
-due to their sensitive nature. Patches may take longer than normal to receive
-feedback.
diff --git a/vendor/golang.org/x/crypto/codereview.cfg b/vendor/golang.org/x/crypto/codereview.cfg
deleted file mode 100644
index 3f8b14b6..00000000
--- a/vendor/golang.org/x/crypto/codereview.cfg
+++ /dev/null
@@ -1 +0,0 @@
-issuerepo: golang/go
diff --git a/vendor/golang.org/x/crypto/curve25519/curve25519_test.go b/vendor/golang.org/x/crypto/curve25519/curve25519_test.go
deleted file mode 100644
index 051a8301..00000000
--- a/vendor/golang.org/x/crypto/curve25519/curve25519_test.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package curve25519
-
-import (
-	"fmt"
-	"testing"
-)
-
-const expectedHex = "89161fde887b2b53de549af483940106ecc114d6982daa98256de23bdf77661a"
-
-func TestBaseScalarMult(t *testing.T) {
-	var a, b [32]byte
-	in := &a
-	out := &b
-	a[0] = 1
-
-	for i := 0; i < 200; i++ {
-		ScalarBaseMult(out, in)
-		in, out = out, in
-	}
-
-	result := fmt.Sprintf("%x", in[:])
-	if result != expectedHex {
-		t.Errorf("incorrect result: got %s, want %s", result, expectedHex)
-	}
-}
-
-func BenchmarkScalarBaseMult(b *testing.B) {
-	var in, out [32]byte
-	in[0] = 1
-
-	b.SetBytes(32)
-	for i := 0; i < b.N; i++ {
-		ScalarBaseMult(&out, &in)
-	}
-}
diff --git a/vendor/golang.org/x/crypto/ed25519/ed25519_test.go b/vendor/golang.org/x/crypto/ed25519/ed25519_test.go
deleted file mode 100644
index 80946036..00000000
--- a/vendor/golang.org/x/crypto/ed25519/ed25519_test.go
+++ /dev/null
@@ -1,220 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ed25519
-
-import (
-	"bufio"
-	"bytes"
-	"compress/gzip"
-	"crypto"
-	"crypto/rand"
-	"encoding/hex"
-	"os"
-	"strings"
-	"testing"
-
-	"golang.org/x/crypto/ed25519/internal/edwards25519"
-)
-
-type zeroReader struct{}
-
-func (zeroReader) Read(buf []byte) (int, error) {
-	for i := range buf {
-		buf[i] = 0
-	}
-	return len(buf), nil
-}
-
-func TestUnmarshalMarshal(t *testing.T) {
-	pub, _, _ := GenerateKey(rand.Reader)
-
-	var A edwards25519.ExtendedGroupElement
-	var pubBytes [32]byte
-	copy(pubBytes[:], pub)
-	if !A.FromBytes(&pubBytes) {
-		t.Fatalf("ExtendedGroupElement.FromBytes failed")
-	}
-
-	var pub2 [32]byte
-	A.ToBytes(&pub2)
-
-	if pubBytes != pub2 {
-		t.Errorf("FromBytes(%v)->ToBytes does not round-trip, got %x\n", pubBytes, pub2)
-	}
-}
-
-func TestSignVerify(t *testing.T) {
-	var zero zeroReader
-	public, private, _ := GenerateKey(zero)
-
-	message := []byte("test message")
-	sig := Sign(private, message)
-	if !Verify(public, message, sig) {
-		t.Errorf("valid signature rejected")
-	}
-
-	wrongMessage := []byte("wrong message")
-	if Verify(public, wrongMessage, sig) {
-		t.Errorf("signature of different message accepted")
-	}
-}
-
-func TestCryptoSigner(t *testing.T) {
-	var zero zeroReader
-	public, private, _ := GenerateKey(zero)
-
-	signer := crypto.Signer(private)
-
-	publicInterface := signer.Public()
-	public2, ok := publicInterface.(PublicKey)
-	if !ok {
-		t.Fatalf("expected PublicKey from Public() but got %T", publicInterface)
-	}
-
-	if !bytes.Equal(public, public2) {
-		t.Errorf("public keys do not match: original:%x vs Public():%x", public, public2)
-	}
-
-	message := []byte("message")
-	var noHash crypto.Hash
-	signature, err := signer.Sign(zero, message, noHash)
-	if err != nil {
-		t.Fatalf("error from Sign(): %s", err)
-	}
-
-	if !Verify(public, message, signature) {
-		t.Errorf("Verify failed on signature from Sign()")
-	}
-}
-
-func TestGolden(t *testing.T) {
-	// sign.input.gz is a selection of test cases from
-	// https://ed25519.cr.yp.to/python/sign.input
-	testDataZ, err := os.Open("testdata/sign.input.gz")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer testDataZ.Close()
-	testData, err := gzip.NewReader(testDataZ)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer testData.Close()
-
-	scanner := bufio.NewScanner(testData)
-	lineNo := 0
-
-	for scanner.Scan() {
-		lineNo++
-
-		line := scanner.Text()
-		parts := strings.Split(line, ":")
-		if len(parts) != 5 {
-			t.Fatalf("bad number of parts on line %d", lineNo)
-		}
-
-		privBytes, _ := hex.DecodeString(parts[0])
-		pubKey, _ := hex.DecodeString(parts[1])
-		msg, _ := hex.DecodeString(parts[2])
-		sig, _ := hex.DecodeString(parts[3])
-		// The signatures in the test vectors also include the message
-		// at the end, but we just want R and S.
-		sig = sig[:SignatureSize]
-
-		if l := len(pubKey); l != PublicKeySize {
-			t.Fatalf("bad public key length on line %d: got %d bytes", lineNo, l)
-		}
-
-		var priv [PrivateKeySize]byte
-		copy(priv[:], privBytes)
-		copy(priv[32:], pubKey)
-
-		sig2 := Sign(priv[:], msg)
-		if !bytes.Equal(sig, sig2[:]) {
-			t.Errorf("different signature result on line %d: %x vs %x", lineNo, sig, sig2)
-		}
-
-		if !Verify(pubKey, msg, sig2) {
-			t.Errorf("signature failed to verify on line %d", lineNo)
-		}
-
-		priv2 := NewKeyFromSeed(priv[:32])
-		if !bytes.Equal(priv[:], priv2) {
-			t.Errorf("recreating key pair gave different private key on line %d: %x vs %x", lineNo, priv[:], priv2)
-		}
-
-		if pubKey2 := priv2.Public().(PublicKey); !bytes.Equal(pubKey, pubKey2) {
-			t.Errorf("recreating key pair gave different public key on line %d: %x vs %x", lineNo, pubKey, pubKey2)
-		}
-
-		if seed := priv2.Seed(); !bytes.Equal(priv[:32], seed) {
-			t.Errorf("recreating key pair gave different seed on line %d: %x vs %x", lineNo, priv[:32], seed)
-		}
-	}
-
-	if err := scanner.Err(); err != nil {
-		t.Fatalf("error reading test data: %s", err)
-	}
-}
-
-func TestMalleability(t *testing.T) {
-	// https://tools.ietf.org/html/rfc8032#section-5.1.7 adds an additional test
-	// that s be in [0, order). This prevents someone from adding a multiple of
-	// order to s and obtaining a second valid signature for the same message.
-	msg := []byte{0x54, 0x65, 0x73, 0x74}
-	sig := []byte{
-		0x7c, 0x38, 0xe0, 0x26, 0xf2, 0x9e, 0x14, 0xaa, 0xbd, 0x05, 0x9a,
-		0x0f, 0x2d, 0xb8, 0xb0, 0xcd, 0x78, 0x30, 0x40, 0x60, 0x9a, 0x8b,
-		0xe6, 0x84, 0xdb, 0x12, 0xf8, 0x2a, 0x27, 0x77, 0x4a, 0xb0, 0x67,
-		0x65, 0x4b, 0xce, 0x38, 0x32, 0xc2, 0xd7, 0x6f, 0x8f, 0x6f, 0x5d,
-		0xaf, 0xc0, 0x8d, 0x93, 0x39, 0xd4, 0xee, 0xf6, 0x76, 0x57, 0x33,
-		0x36, 0xa5, 0xc5, 0x1e, 0xb6, 0xf9, 0x46, 0xb3, 0x1d,
-	}
-	publicKey := []byte{
-		0x7d, 0x4d, 0x0e, 0x7f, 0x61, 0x53, 0xa6, 0x9b, 0x62, 0x42, 0xb5,
-		0x22, 0xab, 0xbe, 0xe6, 0x85, 0xfd, 0xa4, 0x42, 0x0f, 0x88, 0x34,
-		0xb1, 0x08, 0xc3, 0xbd, 0xae, 0x36, 0x9e, 0xf5, 0x49, 0xfa,
-	}
-
-	if Verify(publicKey, msg, sig) {
-		t.Fatal("non-canonical signature accepted")
-	}
-}
-
-func BenchmarkKeyGeneration(b *testing.B) {
-	var zero zeroReader
-	for i := 0; i < b.N; i++ {
-		if _, _, err := GenerateKey(zero); err != nil {
-			b.Fatal(err)
-		}
-	}
-}
-
-func BenchmarkSigning(b *testing.B) {
-	var zero zeroReader
-	_, priv, err := GenerateKey(zero)
-	if err != nil {
-		b.Fatal(err)
-	}
-	message := []byte("Hello, world!")
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		Sign(priv, message)
-	}
-}
-
-func BenchmarkVerification(b *testing.B) {
-	var zero zeroReader
-	pub, priv, err := GenerateKey(zero)
-	if err != nil {
-		b.Fatal(err)
-	}
-	message := []byte("Hello, world!")
-	signature := Sign(priv, message)
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		Verify(pub, message, signature)
-	}
-}
diff --git a/vendor/golang.org/x/crypto/internal/subtle/aliasing_test.go b/vendor/golang.org/x/crypto/internal/subtle/aliasing_test.go
deleted file mode 100644
index a5b62ff7..00000000
--- a/vendor/golang.org/x/crypto/internal/subtle/aliasing_test.go
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package subtle_test
-
-import (
-	"testing"
-
-	"golang.org/x/crypto/internal/subtle"
-)
-
-var a, b [100]byte
-
-var aliasingTests = []struct {
-	x, y                       []byte
-	anyOverlap, inexactOverlap bool
-}{
-	{a[:], b[:], false, false},
-	{a[:], b[:0], false, false},
-	{a[:], b[:50], false, false},
-	{a[40:50], a[50:60], false, false},
-	{a[40:50], a[60:70], false, false},
-	{a[:51], a[50:], true, true},
-	{a[:], a[:], true, false},
-	{a[:50], a[:60], true, false},
-	{a[:], nil, false, false},
-	{nil, nil, false, false},
-	{a[:], a[:0], false, false},
-	{a[:10], a[:10:20], true, false},
-	{a[:10], a[5:10:20], true, true},
-}
-
-func testAliasing(t *testing.T, i int, x, y []byte, anyOverlap, inexactOverlap bool) {
-	any := subtle.AnyOverlap(x, y)
-	if any != anyOverlap {
-		t.Errorf("%d: wrong AnyOverlap result, expected %v, got %v", i, anyOverlap, any)
-	}
-	inexact := subtle.InexactOverlap(x, y)
-	if inexact != inexactOverlap {
-		t.Errorf("%d: wrong InexactOverlap result, expected %v, got %v", i, inexactOverlap, any)
-	}
-}
-
-func TestAliasing(t *testing.T) {
-	for i, tt := range aliasingTests {
-		testAliasing(t, i, tt.x, tt.y, tt.anyOverlap, tt.inexactOverlap)
-		testAliasing(t, i, tt.y, tt.x, tt.anyOverlap, tt.inexactOverlap)
-	}
-}
diff --git a/vendor/golang.org/x/crypto/nacl/box/box_test.go b/vendor/golang.org/x/crypto/nacl/box/box_test.go
deleted file mode 100644
index 481ade28..00000000
--- a/vendor/golang.org/x/crypto/nacl/box/box_test.go
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package box
-
-import (
-	"bytes"
-	"crypto/rand"
-	"encoding/hex"
-	"testing"
-
-	"golang.org/x/crypto/curve25519"
-)
-
-func TestSealOpen(t *testing.T) {
-	publicKey1, privateKey1, _ := GenerateKey(rand.Reader)
-	publicKey2, privateKey2, _ := GenerateKey(rand.Reader)
-
-	if *privateKey1 == *privateKey2 {
-		t.Fatalf("private keys are equal!")
-	}
-	if *publicKey1 == *publicKey2 {
-		t.Fatalf("public keys are equal!")
-	}
-	message := []byte("test message")
-	var nonce [24]byte
-
-	box := Seal(nil, message, &nonce, publicKey1, privateKey2)
-	opened, ok := Open(nil, box, &nonce, publicKey2, privateKey1)
-	if !ok {
-		t.Fatalf("failed to open box")
-	}
-
-	if !bytes.Equal(opened, message) {
-		t.Fatalf("got %x, want %x", opened, message)
-	}
-
-	for i := range box {
-		box[i] ^= 0x40
-		_, ok := Open(nil, box, &nonce, publicKey2, privateKey1)
-		if ok {
-			t.Fatalf("opened box with byte %d corrupted", i)
-		}
-		box[i] ^= 0x40
-	}
-}
-
-func TestBox(t *testing.T) {
-	var privateKey1, privateKey2 [32]byte
-	for i := range privateKey1[:] {
-		privateKey1[i] = 1
-	}
-	for i := range privateKey2[:] {
-		privateKey2[i] = 2
-	}
-
-	var publicKey1 [32]byte
-	curve25519.ScalarBaseMult(&publicKey1, &privateKey1)
-	var message [64]byte
-	for i := range message[:] {
-		message[i] = 3
-	}
-
-	var nonce [24]byte
-	for i := range nonce[:] {
-		nonce[i] = 4
-	}
-
-	box := Seal(nil, message[:], &nonce, &publicKey1, &privateKey2)
-
-	// expected was generated using the C implementation of NaCl.
-	expected, _ := hex.DecodeString("78ea30b19d2341ebbdba54180f821eec265cf86312549bea8a37652a8bb94f07b78a73ed1708085e6ddd0e943bbdeb8755079a37eb31d86163ce241164a47629c0539f330b4914cd135b3855bc2a2dfc")
-
-	if !bytes.Equal(box, expected) {
-		t.Fatalf("box didn't match, got\n%x\n, expected\n%x", box, expected)
-	}
-}
diff --git a/vendor/golang.org/x/crypto/nacl/box/example_test.go b/vendor/golang.org/x/crypto/nacl/box/example_test.go
deleted file mode 100644
index 25e42d2b..00000000
--- a/vendor/golang.org/x/crypto/nacl/box/example_test.go
+++ /dev/null
@@ -1,95 +0,0 @@
-package box_test
-
-import (
-	crypto_rand "crypto/rand" // Custom so it's clear which rand we're using.
-	"fmt"
-	"io"
-
-	"golang.org/x/crypto/nacl/box"
-)
-
-func Example() {
-	senderPublicKey, senderPrivateKey, err := box.GenerateKey(crypto_rand.Reader)
-	if err != nil {
-		panic(err)
-	}
-
-	recipientPublicKey, recipientPrivateKey, err := box.GenerateKey(crypto_rand.Reader)
-	if err != nil {
-		panic(err)
-	}
-
-	// You must use a different nonce for each message you encrypt with the
-	// same key. Since the nonce here is 192 bits long, a random value
-	// provides a sufficiently small probability of repeats.
-	var nonce [24]byte
-	if _, err := io.ReadFull(crypto_rand.Reader, nonce[:]); err != nil {
-		panic(err)
-	}
-
-	msg := []byte("Alas, poor Yorick! I knew him, Horatio")
-	// This encrypts msg and appends the result to the nonce.
-	encrypted := box.Seal(nonce[:], msg, &nonce, recipientPublicKey, senderPrivateKey)
-
-	// The recipient can decrypt the message using their private key and the
-	// sender's public key. When you decrypt, you must use the same nonce you
-	// used to encrypt the message. One way to achieve this is to store the
-	// nonce alongside the encrypted message. Above, we stored the nonce in the
-	// first 24 bytes of the encrypted text.
-	var decryptNonce [24]byte
-	copy(decryptNonce[:], encrypted[:24])
-	decrypted, ok := box.Open(nil, encrypted[24:], &decryptNonce, senderPublicKey, recipientPrivateKey)
-	if !ok {
-		panic("decryption error")
-	}
-	fmt.Println(string(decrypted))
-	// Output: Alas, poor Yorick! I knew him, Horatio
-}
-
-func Example_precompute() {
-	senderPublicKey, senderPrivateKey, err := box.GenerateKey(crypto_rand.Reader)
-	if err != nil {
-		panic(err)
-	}
-
-	recipientPublicKey, recipientPrivateKey, err := box.GenerateKey(crypto_rand.Reader)
-	if err != nil {
-		panic(err)
-	}
-
-	// The shared key can be used to speed up processing when using the same
-	// pair of keys repeatedly.
-	sharedEncryptKey := new([32]byte)
-	box.Precompute(sharedEncryptKey, recipientPublicKey, senderPrivateKey)
-
-	// You must use a different nonce for each message you encrypt with the
-	// same key. Since the nonce here is 192 bits long, a random value
-	// provides a sufficiently small probability of repeats.
-	var nonce [24]byte
-	if _, err := io.ReadFull(crypto_rand.Reader, nonce[:]); err != nil {
-		panic(err)
-	}
-
-	msg := []byte("A fellow of infinite jest, of most excellent fancy")
-	// This encrypts msg and appends the result to the nonce.
-	encrypted := box.SealAfterPrecomputation(nonce[:], msg, &nonce, sharedEncryptKey)
-
-	// The shared key can be used to speed up processing when using the same
-	// pair of keys repeatedly.
-	var sharedDecryptKey [32]byte
-	box.Precompute(&sharedDecryptKey, senderPublicKey, recipientPrivateKey)
-
-	// The recipient can decrypt the message using the shared key. When you
-	// decrypt, you must use the same nonce you used to encrypt the message.
-	// One way to achieve this is to store the nonce alongside the encrypted
-	// message. Above, we stored the nonce in the first 24 bytes of the
-	// encrypted text.
-	var decryptNonce [24]byte
-	copy(decryptNonce[:], encrypted[:24])
-	decrypted, ok := box.OpenAfterPrecomputation(nil, encrypted[24:], &decryptNonce, &sharedDecryptKey)
-	if !ok {
-		panic("decryption error")
-	}
-	fmt.Println(string(decrypted))
-	// Output: A fellow of infinite jest, of most excellent fancy
-}
diff --git a/vendor/golang.org/x/crypto/nacl/secretbox/example_test.go b/vendor/golang.org/x/crypto/nacl/secretbox/example_test.go
deleted file mode 100644
index 789f4ff0..00000000
--- a/vendor/golang.org/x/crypto/nacl/secretbox/example_test.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package secretbox_test
-
-import (
-	"crypto/rand"
-	"encoding/hex"
-	"fmt"
-	"io"
-
-	"golang.org/x/crypto/nacl/secretbox"
-)
-
-func Example() {
-	// Load your secret key from a safe place and reuse it across multiple
-	// Seal calls. (Obviously don't use this example key for anything
-	// real.) If you want to convert a passphrase to a key, use a suitable
-	// package like bcrypt or scrypt.
-	secretKeyBytes, err := hex.DecodeString("6368616e676520746869732070617373776f726420746f206120736563726574")
-	if err != nil {
-		panic(err)
-	}
-
-	var secretKey [32]byte
-	copy(secretKey[:], secretKeyBytes)
-
-	// You must use a different nonce for each message you encrypt with the
-	// same key. Since the nonce here is 192 bits long, a random value
-	// provides a sufficiently small probability of repeats.
-	var nonce [24]byte
-	if _, err := io.ReadFull(rand.Reader, nonce[:]); err != nil {
-		panic(err)
-	}
-
-	// This encrypts "hello world" and appends the result to the nonce.
-	encrypted := secretbox.Seal(nonce[:], []byte("hello world"), &nonce, &secretKey)
-
-	// When you decrypt, you must use the same nonce and key you used to
-	// encrypt the message. One way to achieve this is to store the nonce
-	// alongside the encrypted message. Above, we stored the nonce in the first
-	// 24 bytes of the encrypted text.
-	var decryptNonce [24]byte
-	copy(decryptNonce[:], encrypted[:24])
-	decrypted, ok := secretbox.Open(nil, encrypted[24:], &decryptNonce, &secretKey)
-	if !ok {
-		panic("decryption error")
-	}
-
-	fmt.Println(string(decrypted))
-	// Output: hello world
-}
diff --git a/vendor/golang.org/x/crypto/nacl/secretbox/secretbox_test.go b/vendor/golang.org/x/crypto/nacl/secretbox/secretbox_test.go
deleted file mode 100644
index 3c70b0f4..00000000
--- a/vendor/golang.org/x/crypto/nacl/secretbox/secretbox_test.go
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package secretbox
-
-import (
-	"bytes"
-	"crypto/rand"
-	"encoding/hex"
-	"testing"
-)
-
-func TestSealOpen(t *testing.T) {
-	var key [32]byte
-	var nonce [24]byte
-
-	rand.Reader.Read(key[:])
-	rand.Reader.Read(nonce[:])
-
-	var box, opened []byte
-
-	for msgLen := 0; msgLen < 128; msgLen += 17 {
-		message := make([]byte, msgLen)
-		rand.Reader.Read(message)
-
-		box = Seal(box[:0], message, &nonce, &key)
-		var ok bool
-		opened, ok = Open(opened[:0], box, &nonce, &key)
-		if !ok {
-			t.Errorf("%d: failed to open box", msgLen)
-			continue
-		}
-
-		if !bytes.Equal(opened, message) {
-			t.Errorf("%d: got %x, expected %x", msgLen, opened, message)
-			continue
-		}
-	}
-
-	for i := range box {
-		box[i] ^= 0x20
-		_, ok := Open(opened[:0], box, &nonce, &key)
-		if ok {
-			t.Errorf("box was opened after corrupting byte %d", i)
-		}
-		box[i] ^= 0x20
-	}
-}
-
-func TestSecretBox(t *testing.T) {
-	var key [32]byte
-	var nonce [24]byte
-	var message [64]byte
-
-	for i := range key[:] {
-		key[i] = 1
-	}
-	for i := range nonce[:] {
-		nonce[i] = 2
-	}
-	for i := range message[:] {
-		message[i] = 3
-	}
-
-	box := Seal(nil, message[:], &nonce, &key)
-	// expected was generated using the C implementation of NaCl.
-	expected, _ := hex.DecodeString("8442bc313f4626f1359e3b50122b6ce6fe66ddfe7d39d14e637eb4fd5b45beadab55198df6ab5368439792a23c87db70acb6156dc5ef957ac04f6276cf6093b84be77ff0849cc33e34b7254d5a8f65ad")
-
-	if !bytes.Equal(box, expected) {
-		t.Fatalf("box didn't match, got\n%x\n, expected\n%x", box, expected)
-	}
-}
-
-func TestAppend(t *testing.T) {
-	var key [32]byte
-	var nonce [24]byte
-	var message [8]byte
-
-	out := make([]byte, 4)
-	box := Seal(out, message[:], &nonce, &key)
-	if !bytes.Equal(box[:4], out[:4]) {
-		t.Fatalf("Seal didn't correctly append")
-	}
-
-	out = make([]byte, 4, 100)
-	box = Seal(out, message[:], &nonce, &key)
-	if !bytes.Equal(box[:4], out[:4]) {
-		t.Fatalf("Seal didn't correctly append with sufficient capacity.")
-	}
-}
-
-func benchmarkSealSize(b *testing.B, size int) {
-	message := make([]byte, size)
-	out := make([]byte, size+Overhead)
-	var nonce [24]byte
-	var key [32]byte
-
-	b.SetBytes(int64(size))
-	b.ResetTimer()
-
-	for i := 0; i < b.N; i++ {
-		out = Seal(out[:0], message, &nonce, &key)
-	}
-}
-
-func BenchmarkSeal8Bytes(b *testing.B) {
-	benchmarkSealSize(b, 8)
-}
-
-func BenchmarkSeal100Bytes(b *testing.B) {
-	benchmarkSealSize(b, 100)
-}
-
-func BenchmarkSeal1K(b *testing.B) {
-	benchmarkSealSize(b, 1024)
-}
-
-func BenchmarkSeal8K(b *testing.B) {
-	benchmarkSealSize(b, 8192)
-}
-
-func benchmarkOpenSize(b *testing.B, size int) {
-	msg := make([]byte, size)
-	result := make([]byte, size)
-	var nonce [24]byte
-	var key [32]byte
-	box := Seal(nil, msg, &nonce, &key)
-
-	b.SetBytes(int64(size))
-	b.ResetTimer()
-
-	for i := 0; i < b.N; i++ {
-		if _, ok := Open(result[:0], box, &nonce, &key); !ok {
-			panic("Open failed")
-		}
-	}
-}
-
-func BenchmarkOpen8Bytes(b *testing.B) {
-	benchmarkOpenSize(b, 8)
-}
-
-func BenchmarkOpen100Bytes(b *testing.B) {
-	benchmarkOpenSize(b, 100)
-}
-
-func BenchmarkOpen1K(b *testing.B) {
-	benchmarkOpenSize(b, 1024)
-}
-
-func BenchmarkOpen8K(b *testing.B) {
-	benchmarkOpenSize(b, 8192)
-}
diff --git a/vendor/golang.org/x/crypto/poly1305/poly1305_test.go b/vendor/golang.org/x/crypto/poly1305/poly1305_test.go
deleted file mode 100644
index 256bdbba..00000000
--- a/vendor/golang.org/x/crypto/poly1305/poly1305_test.go
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package poly1305
-
-import (
-	"encoding/hex"
-	"flag"
-	"testing"
-	"unsafe"
-)
-
-var stressFlag = flag.Bool("stress", false, "run slow stress tests")
-
-type test struct {
-	in  string
-	key string
-	tag string
-}
-
-func (t *test) Input() []byte {
-	in, err := hex.DecodeString(t.in)
-	if err != nil {
-		panic(err)
-	}
-	return in
-}
-
-func (t *test) Key() [32]byte {
-	buf, err := hex.DecodeString(t.key)
-	if err != nil {
-		panic(err)
-	}
-	var key [32]byte
-	copy(key[:], buf[:32])
-	return key
-}
-
-func (t *test) Tag() [16]byte {
-	buf, err := hex.DecodeString(t.tag)
-	if err != nil {
-		panic(err)
-	}
-	var tag [16]byte
-	copy(tag[:], buf[:16])
-	return tag
-}
-
-func testSum(t *testing.T, unaligned bool, sumImpl func(tag *[TagSize]byte, msg []byte, key *[32]byte)) {
-	var tag [16]byte
-	for i, v := range testData {
-		in := v.Input()
-		if unaligned {
-			in = unalignBytes(in)
-		}
-		key := v.Key()
-		sumImpl(&tag, in, &key)
-		if tag != v.Tag() {
-			t.Errorf("%d: expected %x, got %x", i, v.Tag(), tag[:])
-		}
-	}
-}
-
-func TestBurnin(t *testing.T) {
-	// This test can be used to sanity-check significant changes. It can
-	// take about many minutes to run, even on fast machines. It's disabled
-	// by default.
-	if !*stressFlag {
-		t.Skip("skipping without -stress")
-	}
-
-	var key [32]byte
-	var input [25]byte
-	var output [16]byte
-
-	for i := range key {
-		key[i] = 1
-	}
-	for i := range input {
-		input[i] = 2
-	}
-
-	for i := uint64(0); i < 1e10; i++ {
-		Sum(&output, input[:], &key)
-		copy(key[0:], output[:])
-		copy(key[16:], output[:])
-		copy(input[:], output[:])
-		copy(input[16:], output[:])
-	}
-
-	const expected = "5e3b866aea0b636d240c83c428f84bfa"
-	if got := hex.EncodeToString(output[:]); got != expected {
-		t.Errorf("expected %s, got %s", expected, got)
-	}
-}
-
-func TestSum(t *testing.T)                 { testSum(t, false, Sum) }
-func TestSumUnaligned(t *testing.T)        { testSum(t, true, Sum) }
-func TestSumGeneric(t *testing.T)          { testSum(t, false, sumGeneric) }
-func TestSumGenericUnaligned(t *testing.T) { testSum(t, true, sumGeneric) }
-
-func benchmark(b *testing.B, size int, unaligned bool) {
-	var out [16]byte
-	var key [32]byte
-	in := make([]byte, size)
-	if unaligned {
-		in = unalignBytes(in)
-	}
-	b.SetBytes(int64(len(in)))
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		Sum(&out, in, &key)
-	}
-}
-
-func Benchmark64(b *testing.B)          { benchmark(b, 64, false) }
-func Benchmark1K(b *testing.B)          { benchmark(b, 1024, false) }
-func Benchmark64Unaligned(b *testing.B) { benchmark(b, 64, true) }
-func Benchmark1KUnaligned(b *testing.B) { benchmark(b, 1024, true) }
-func Benchmark2M(b *testing.B)          { benchmark(b, 2097152, true) }
-
-func unalignBytes(in []byte) []byte {
-	out := make([]byte, len(in)+1)
-	if uintptr(unsafe.Pointer(&out[0]))&(unsafe.Alignof(uint32(0))-1) == 0 {
-		out = out[1:]
-	} else {
-		out = out[:len(in)]
-	}
-	copy(out, in)
-	return out
-}
diff --git a/vendor/golang.org/x/crypto/poly1305/vectors_test.go b/vendor/golang.org/x/crypto/poly1305/vectors_test.go
deleted file mode 100644
index 18d7ff8e..00000000
--- a/vendor/golang.org/x/crypto/poly1305/vectors_test.go
+++ /dev/null
@@ -1,2943 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package poly1305
-
-var testData = [...]test{
-	// edge cases
-	{
-		// see https://go-review.googlesource.com/#/c/30101/
-		key: "3b3a29e93b213a5c5c3b3b053a3a8c0d00000000000000000000000000000000",
-		tag: "6dc18b8c344cd79927118bbe84b7f314",
-		in:  "81d8b2e46a25213b58fee4213a2a28e921c12a9632516d3b73272727becf2129",
-	},
-	{
-		key: "0100000000000000000000000000000000000000000000000000000000000000",
-		tag: "04000000000000000000000000000000", // (2¹³⁰-1) % (2¹³⁰-5)
-		in: "ffffffffffffffffffffffffffffffff" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000",
-	},
-	{
-		key: "0100000000000000000000000000000000000000000000000000000000000000",
-		tag: "faffffffffffffffffffffffffffffff", // (2¹³⁰-6) % (2¹³⁰-5)
-		in: "faffffffffffffffffffffffffffffff" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000",
-	},
-	{
-		key: "0100000000000000000000000000000000000000000000000000000000000000",
-		tag: "00000000000000000000000000000000", // (2¹³⁰-5) % (2¹³⁰-5)
-		in: "fbffffffffffffffffffffffffffffff" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000",
-	},
-	{
-		key: "0100000000000000000000000000000000000000000000000000000000000000",
-		tag: "f9ffffffffffffffffffffffffffffff", // (2*(2¹³⁰-6)) % (2¹³⁰-5)
-		in: "faffffffffffffffffffffffffffffff" +
-			"faffffffffffffffffffffffffffffff" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000",
-	},
-	{
-		key: "0100000000000000000000000000000000000000000000000000000000000000",
-		tag: "00000000000000000000000000000000", // (2*(2¹³⁰-5)) % (2¹³⁰-5)
-		in: "fbffffffffffffffffffffffffffffff" +
-			"fbffffffffffffffffffffffffffffff" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000",
-	},
-	{
-		key: "0100000000000000000000000000000000000000000000000000000000000000",
-		tag: "f8ffffffffffffffffffffffffffffff", // (3*(2¹³⁰-6)) % (2¹³⁰-5)
-		in: "faffffffffffffffffffffffffffffff" +
-			"faffffffffffffffffffffffffffffff" +
-			"faffffffffffffffffffffffffffffff" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000",
-	},
-	{
-		key: "0100000000000000000000000000000000000000000000000000000000000000",
-		tag: "00000000000000000000000000000000", // (3*(2¹³⁰-5)) % (2¹³⁰-5)
-		in: "fbffffffffffffffffffffffffffffff" +
-			"fbffffffffffffffffffffffffffffff" +
-			"fbffffffffffffffffffffffffffffff" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000",
-	},
-	{
-		key: "0100000000000000000000000000000000000000000000000000000000000000",
-		tag: "f7ffffffffffffffffffffffffffffff", // (4*(2¹³⁰-6)) % (2¹³⁰-5)
-		in: "faffffffffffffffffffffffffffffff" +
-			"faffffffffffffffffffffffffffffff" +
-			"faffffffffffffffffffffffffffffff" +
-			"faffffffffffffffffffffffffffffff" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000",
-	},
-	{
-		key: "0100000000000000000000000000000000000000000000000000000000000000",
-		tag: "00000000000000000000000000000000", // (4*(2¹³⁰-5)) % (2¹³⁰-5)
-		in: "fbffffffffffffffffffffffffffffff" +
-			"fbffffffffffffffffffffffffffffff" +
-			"fbffffffffffffffffffffffffffffff" +
-			"fbffffffffffffffffffffffffffffff" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000",
-	},
-	{
-		key: "0100000000000000000000000000000000000000000000000000000000000000",
-		tag: "f3ffffffffffffffffffffffffffffff", // (8*(2¹³⁰-6)) % (2¹³⁰-5)
-		in: "faffffffffffffffffffffffffffffff" +
-			"faffffffffffffffffffffffffffffff" +
-			"faffffffffffffffffffffffffffffff" +
-			"faffffffffffffffffffffffffffffff" +
-			"faffffffffffffffffffffffffffffff" +
-			"faffffffffffffffffffffffffffffff" +
-			"faffffffffffffffffffffffffffffff" +
-			"faffffffffffffffffffffffffffffff" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000",
-	},
-	{
-		key: "0100000000000000000000000000000000000000000000000000000000000000",
-		tag: "00000000000000000000000000000000", // (8*(2¹³⁰-5)) % (2¹³⁰-5)
-		in: "fbffffffffffffffffffffffffffffff" +
-			"fbffffffffffffffffffffffffffffff" +
-			"fbffffffffffffffffffffffffffffff" +
-			"fbffffffffffffffffffffffffffffff" +
-			"fbffffffffffffffffffffffffffffff" +
-			"fbffffffffffffffffffffffffffffff" +
-			"fbffffffffffffffffffffffffffffff" +
-			"fbffffffffffffffffffffffffffffff" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000",
-	},
-	{
-		key: "0100000000000000000000000000000000000000000000000000000000000000",
-		tag: "ebffffffffffffffffffffffffffffff", // (16*(2¹³⁰-6)) % (2¹³⁰-5)
-		in: "faffffffffffffffffffffffffffffff" +
-			"faffffffffffffffffffffffffffffff" +
-			"faffffffffffffffffffffffffffffff" +
-			"faffffffffffffffffffffffffffffff" +
-			"faffffffffffffffffffffffffffffff" +
-			"faffffffffffffffffffffffffffffff" +
-			"faffffffffffffffffffffffffffffff" +
-			"faffffffffffffffffffffffffffffff" +
-			"faffffffffffffffffffffffffffffff" +
-			"faffffffffffffffffffffffffffffff" +
-			"faffffffffffffffffffffffffffffff" +
-			"faffffffffffffffffffffffffffffff" +
-			"faffffffffffffffffffffffffffffff" +
-			"faffffffffffffffffffffffffffffff" +
-			"faffffffffffffffffffffffffffffff" +
-			"faffffffffffffffffffffffffffffff" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000",
-	},
-	{
-		key: "0100000000000000000000000000000000000000000000000000000000000000",
-		tag: "00000000000000000000000000000000", // (16*(2¹³⁰-5)) % (2¹³⁰-5)
-		in: "fbffffffffffffffffffffffffffffff" +
-			"fbffffffffffffffffffffffffffffff" +
-			"fbffffffffffffffffffffffffffffff" +
-			"fbffffffffffffffffffffffffffffff" +
-			"fbffffffffffffffffffffffffffffff" +
-			"fbffffffffffffffffffffffffffffff" +
-			"fbffffffffffffffffffffffffffffff" +
-			"fbffffffffffffffffffffffffffffff" +
-			"fbffffffffffffffffffffffffffffff" +
-			"fbffffffffffffffffffffffffffffff" +
-			"fbffffffffffffffffffffffffffffff" +
-			"fbffffffffffffffffffffffffffffff" +
-			"fbffffffffffffffffffffffffffffff" +
-			"fbffffffffffffffffffffffffffffff" +
-			"fbffffffffffffffffffffffffffffff" +
-			"fbffffffffffffffffffffffffffffff" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000" +
-			"00000000000000000000000000000000",
-	},
-	// original smoke tests
-	{
-		key: "746869732069732033322d62797465206b657920666f7220506f6c7931333035",
-		tag: "a6f745008f81c916a20dcc74eef2b2f0",
-		in:  "48656c6c6f20776f726c6421",
-	},
-	{
-		key: "746869732069732033322d62797465206b657920666f7220506f6c7931333035",
-		tag: "49ec78090e481ec6c26b33b91ccc0307",
-		in:  "0000000000000000000000000000000000000000000000000000000000000000",
-	},
-	{
-		key: "746869732069732033322d62797465206b657920666f7220506f6c7931333035",
-		tag: "da84bcab02676c38cdb015604274c2aa",
-		in: "000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000",
-	},
-	{
-		key: "0000000000000000000000000000000000000000000000000000000000000000",
-		tag: "00000000000000000000000000000000",
-		in: "000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000000000" +
-			"000000000000000000000000000000000000000000000000000000",
-	},
-	// randomly generated
-	{
-		key: "52fdfc072182654f163f5f0f9a621d729566c74d10037c4d7bbb0407d1e2c649",
-		tag: "9566c74d10037c4d7bbb0407d1e2c649",
-		in:  "",
-	},
-	{
-		key: "81855ad8681d0d86d1e91e00167939cb6694d2c422acd208a0072939487f6999",
-		tag: "eaa270caaa12faa39b797374a4b8a420",
-		in:  "eb",
-	},
-	{
-		key: "9d18a44784045d87f3c67cf22746e995af5a25367951baa2ff6cd471c483f15f",
-		tag: "dbea66e1da48a8f822887c6162c2acf1",
-		in:  "b90b",
-	},
-	{
-		key: "adb37c5821b6d95526a41a9504680b4e7c8b763a1b1d49d4955c848621632525",
-		tag: "6ac09aaa88c32ee95a7198376f16abdb",
-		in:  "3fec73",
-	},
-	{
-		key: "8dd7a9e28bf921119c160f0702448615bbda08313f6a8eb668d20bf505987592",
-		tag: "b1443487f97fe340b04a74719ed4de68",
-		in:  "1e668a5b",
-	},
-	{
-		key: "df2c7fc4844592d2572bcd0668d2d6c52f5054e2d0836bf84c7174cb7476364c",
-		tag: "7463be0f9d99a5348039e4afcbf4019c",
-		in:  "c3dbd968b0",
-	},
-	{
-		key: "f7172ed85794bb358b0c3b525da1786f9fff094279db1944ebd7a19d0f7bbacb",
-		tag: "2edaee3bcf303fd05609e131716f8157",
-		in:  "e0255aa5b7d4",
-	},
-	{
-		key: "4bec40f84c892b9bffd43629b0223beea5f4f74391f445d15afd4294040374f6",
-		tag: "965f18767420c1d94a4ef657e8d15e1e",
-		in:  "924b98cbf8713f",
-	},
-	{
-		key: "8d962d7c8d019192c24224e2cafccae3a61fb586b14323a6bc8f9e7df1d92933",
-		tag: "2bf4a33287dd6d87e1ed4282f7342b6a",
-		in:  "3ff993933bea6f5b",
-	},
-	{
-		key: "3af6de0374366c4719e43a1b067d89bc7f01f1f573981659a44ff17a4c7215a3",
-		tag: "c5e987b60373a48893c5af30acf2471f",
-		in:  "b539eb1e5849c6077d",
-	},
-	{
-		key: "bb5722f5717a289a266f97647981998ebea89c0b4b373970115e82ed6f4125c8",
-		tag: "19f0f640b309d168ea1b480e6a4faee5",
-		in:  "fa7311e4d7defa922daa",
-	},
-	{
-		key: "e7786667f7e936cd4f24abf7df866baa56038367ad6145de1ee8f4a8b0993ebd",
-		tag: "de75e5565d97834b9fa84ad568d31359",
-		in:  "f8883a0ad8be9c3978b048",
-	},
-	{
-		key: "83e56a156a8de563afa467d49dec6a40e9a1d007f033c2823061bdd0eaa59f8e",
-		tag: "de184a5a9b826aa203c5c017986d6690",
-		in:  "4da6430105220d0b29688b73",
-	},
-	{
-		key: "4b8ea0f3ca9936e8461f10d77c96ea80a7a665f606f6a63b7f3dfd2567c18979",
-		tag: "7478f18d9684905aa5d1a34ee67e4c84",
-		in:  "e4d60f26686d9bf2fb26c901ff",
-	},
-	{
-		key: "354cde1607ee294b39f32b7c7822ba64f84ab43ca0c6e6b91c1fd3be89904341",
-		tag: "3b2008a9c52b5308f5538b789ab5506f",
-		in:  "79d3af4491a369012db92d184fc3",
-	},
-	{
-		key: "9d1734ff5716428953bb6865fcf92b0c3a17c9028be9914eb7649c6c93478009",
-		tag: "71c8e76a67a505b7370b562ba15ba032",
-		in:  "79d1830356f2a54c3deab2a4b4475d",
-	},
-	{
-		key: "63afbe8fb56987c77f5818526f1814be823350eab13935f31d84484517e924ae",
-		tag: "1dc895f74f866bdb3edf6c4430829c1c",
-		in:  "f78ae151c00755925836b7075885650c",
-	},
-	{
-		key: "30ec29a3703934bf50a28da102975deda77e758579ea3dfe4136abf752b3b827",
-		tag: "afca2b3ba7b0e1a928001966883e9b16",
-		in: "1d03e944b3c9db366b75045f8efd69d22ae5411947cb553d7694267aef4e" +
-			"bcea406b32d6108bd68584f57e37caac6e33feaa3263a399437024ba9c9b" +
-			"14678a274f01a910ae295f6efbfe5f5abf44ccde263b5606633e2bf0006f" +
-			"28295d7d39069f01a239c4365854c3af7f6b41d631f92b9a8d12f4125732" +
-			"5fff332f7576b0620556304a3e3eae14c28d0cea39d2901a52720da85ca1" +
-			"e4b38eaf3f",
-	},
-	{
-		key: "44c6c6ef8362f2f54fc00e09d6fc25640854c15dfcacaa8a2cecce5a3aba53ab",
-		tag: "6f2a09aa76c9b76774e31ec02dcf7991",
-		in: "705b18db94b4d338a5143e63408d8724b0cf3fae17a3f79be1072fb63c35" +
-			"d6042c4160f38ee9e2a9f3fb4ffb0019b454d522b5ffa17604193fb89667" +
-			"10a7960732ca52cf53c3f520c889b79bf504cfb57c7601232d589baccea9" +
-			"d6e263e25c27741d3f6c62cbbb15d9afbcbf7f7da41ab0408e3969c2e2cd" +
-			"cf233438bf1774ace7709a4f091e9a83fdeae0ec55eb233a9b5394cb3c78" +
-			"56b546d313c8a3b4c1c0e05447f4ba370eb36dbcfdec90b302dcdc3b9ef5" +
-			"22e2a6f1ed0afec1f8e20faabedf6b162e717d3a748a58677a0c56348f89" +
-			"21a266b11d0f334c62fe52ba53af19779cb2948b6570ffa0b773963c130a" +
-			"d797ddea",
-	},
-	{
-		key: "fe4e3ad29b5125210f0ef1c314090f07c79a6f571c246f3e9ac0b7413ef110bd",
-		tag: "27381e3fc2a356103fb796f107d826e7",
-		in: "58b00ce73bff706f7ff4b6f44090a32711f3208e4e4b89cb5165ce64002c" +
-			"bd9c2887aa113df2468928d5a23b9ca740f80c9382d9c6034ad2960c7965" +
-			"03e1ce221725f50caf1fbfe831b10b7bf5b15c47a53dbf8e7dcafc9e1386" +
-			"47a4b44ed4bce964ed47f74aa594468ced323cb76f0d3fac476c9fb03fc9" +
-			"228fbae88fd580663a0454b68312207f0a3b584c62316492b49753b5d502" +
-			"7ce15a4f0a58250d8fb50e77f2bf4f0152e5d49435807f9d4b97be6fb779" +
-			"70466a5626fe33408cf9e88e2c797408a32d29416baf206a329cfffd4a75" +
-			"e498320982c85aad70384859c05a4b13a1d5b2f5bfef5a6ed92da482caa9" +
-			"568e5b6fe9d8a9ddd9eb09277b92cef9046efa18500944cbe800a0b1527e" +
-			"a6",
-	},
-	{
-		key: "4729a861d2f6497a3235c37f4192779ec1d96b3b1c5424fce0b727b03072e641",
-		tag: "0173965669fb9de88d38a827a0271271",
-		in: "5a761f03abaa40abc9448fddeb2191d945c04767af847afd0edb5d8857b7" +
-			"99acb18e4affabe3037ffe7fa68aa8af5e39cc416e734d373c5ebebc9cdc" +
-			"c595bcce3c7bd3d8df93fab7e125ddebafe65a31bd5d41e2d2ce9c2b1789" +
-			"2f0fea1931a290220777a93143dfdcbfa68406e877073ff08834e197a403" +
-			"4aa48afa3f85b8a62708caebbac880b5b89b93da53810164402104e648b6" +
-			"226a1b78021851f5d9ac0f313a89ddfc454c5f8f72ac89b38b19f53784c1" +
-			"9e9beac03c875a27db029de37ae37a42318813487685929359ca8c5eb94e" +
-			"152dc1af42ea3d1676c1bdd19ab8e2925c6daee4de5ef9f9dcf08dfcbd02" +
-			"b80809398585928a0f7de50be1a6dc1d5768e8537988fddce562e9b948c9" +
-			"18bba3e933e5c400cde5e60c5ead6fc7ae77ba1d259b188a4b21c86fbc23" +
-			"d728b45347eada650af24c56d0800a8691332088a805bd55c446e25eb075" +
-			"90bafcccbec6177536401d9a2b7f512b54bfc9d00532adf5aaa7c3a96bc5" +
-			"9b489f77d9042c5bce26b163defde5ee6a0fbb3e9346cef81f0ae9515ef3" +
-			"0fa47a364e75aea9e111d596e685a591121966e031650d510354aa845580" +
-			"ff560760fd36514ca197c875f1d02d9216eba7627e2398322eb5cf43d72b" +
-			"d2e5b887d4630fb8d4747ead6eb82acd1c5b078143ee26a586ad23139d50" +
-			"41723470bf24a865837c",
-	},
-	{
-		key: "9123461c41f5ff99aa99ce24eb4d788576e3336e65491622558fdf297b9fa007",
-		tag: "1eb0cdad9237905250d30a24fe172a34",
-		in: "864bafd7cd4ca1b2fb5766ab431a032b72b9a7e937ed648d0801f29055d3" +
-			"090d2463718254f9442483c7b98b938045da519843854b0ed3f7ba951a49" +
-			"3f321f0966603022c1dfc579b99ed9d20d573ad53171c8fef7f1f4e4613b" +
-			"b365b2ebb44f0ffb6907136385cdc838f0bdd4c812f042577410aca008c2" +
-			"afbc4c79c62572e20f8ed94ee62b4de7aa1cc84c887e1f7c31e927dfe52a" +
-			"5f8f46627eb5d3a4fe16fafce23623e196c9dfff7fbaff4ffe94f4589733" +
-			"e563e19d3045aad3e226488ac02cca4291aed169dce5039d6ab00e40f67a" +
-			"ab29332de1448b35507c7c8a09c4db07105dc31003620405da3b2169f5a9" +
-			"10c9d0096e5e3ef1b570680746acd0cc7760331b663138d6d342b051b5df" +
-			"410637cf7aee9b0c8c10a8f9980630f34ce001c0ab7ac65e502d39b216cb" +
-			"c50e73a32eaf936401e2506bd8b82c30d346bc4b2fa319f245a8657ec122" +
-			"eaf4ad5425c249ee160e17b95541c2aee5df820ac85de3f8e784870fd87a" +
-			"36cc0d163833df636613a9cc947437b6592835b9f6f4f8c0e70dbeebae7b" +
-			"14cdb9bc41033aa5baf40d45e24d72eac4a28e3ca030c9937ab8409a7cbf" +
-			"05ae21f97425254543d94d115900b90ae703b97d9856d2441d14ba49a677" +
-			"de8b18cb454b99ddd9daa7ccbb7500dae4e2e5df8cf3859ebddada6745fb" +
-			"a6a04c5c37c7ca35036f11732ce8bc27b48868611fc73c82a491bfabd7a1" +
-			"9df50fdc78a55dbbc2fd37f9296566557fab885b039f30e706f0cd5961e1" +
-			"9b642221db44a69497b8ad99408fe1e037c68bf7c5e5de1d2c68192348ec" +
-			"1189fb2e36973cef09ff14be23922801f6eaee41409158b45f2dec82d17c" +
-			"aaba160cd6",
-	},
-	{
-		key: "40ff73495fe4a05ce1202ca7287ed3235b95e69f571fa5e656aaa51fae1ebdd7",
-		tag: "2e619d8ea81b77484e4fddeb29844e4b",
-		in: "aa6269c2ec7f4057b33593bc84888c970fd528d4a99a1eab9d2420134537" +
-			"cd6d02282e0981e140232a4a87383a21d1845c408ad757043813032a0bd5" +
-			"a30dcca6e3aa2df04715d879279a96879a4f3690ac2025a60c7db15e0501" +
-			"ebc34b734355fe4a059bd3899d920e95f1c46d432f9b08e64d7f9b38965d" +
-			"5a77a7ac183c3833e1a3425ead69d4f975012fd1a49ed832f69e6e9c63b4" +
-			"53ec049c9e7a5cf944232d10353f64434abae060f6506ad3fdb1f4415b0a" +
-			"f9ce8c208bc20ee526741539fa3203c77ecba410fd6718f227e0b430f9bc" +
-			"b049a3d38540dc222969120ce80f2007cd42a708a721aa29987b45d4e428" +
-			"811984ecad349cc35dd93515cefe0b002cee5e71c47935e281ebfc4b8b65" +
-			"2b69ccb092e55a20f1b9f97d046296124621928739a86671cc180152b953" +
-			"e3bf9d19f825c3dd54ae1688e49efb5efe65dcdad34bc860010e7c8c997c" +
-			"d5f9e320ca7d39d4ba801a175b1c76f057832f3f36d7d893e216e4c7bbdb" +
-			"548d0ba48449330027368b34f9c69776b4591532da1c5be68ef4eebe8cb8" +
-			"fa7dc5483fb70c2c896334cb1f9cb5dfe044fa086197ff5dfd02f2ba3884" +
-			"c53dd718c8560da743a8e9d4aeae20ccef002d82ca352592b8d8f2a8df3b" +
-			"0c35f15b9b370dca80d4ca8e9a133eb52094f2dd5c08731f52315d828846" +
-			"e37df68fd10658b480f2ac84233633957e688e924ffe3713b52c76fd8a56" +
-			"da8bb07daa8eb4eb8f7334f99256e2766a4109150eed424f0f743543cdea" +
-			"66e5baaa03edc918e8305bb19fc0c6b4ddb4aa3886cb5090940fc6d4cabe" +
-			"2153809e4ed60a0e2af07f1b2a6bb5a6017a578a27cbdc20a1759f76b088" +
-			"9a83ce25ce3ca91a4eb5c2f8580819da04d02c41770c01746de44f3db6e3" +
-			"402e7873db7635516e87b33e4b412ba3df68544920f5ea27ec097710954f" +
-			"42158bdba66d4814c064b4112538676095467c89ba98e6a543758d7093a4" +
-			"94df",
-	},
-	{
-		key: "5cc36d09c7a6472a41f29c380a987b1ecdcf84765f4e5d3ceefc1c02181f570f",
-		tag: "0d57b8cbea8090df0541354673dcb4e0",
-		in: "44fcd629f08dc1ef53c9ae0d8869fe67fdc7a2c67b425f13c5be8d9f630c" +
-			"1d063c02fd75cf64c1aec9d2e2ef6e6431d5f5ad0489078dc61f46494dcc" +
-			"f403dad7f094170d2c3e29c198b0f341e284c4be8fa60c1a478d6bd55dd2" +
-			"c04dad86d2053d5d25b014e3d8b64322cdcb5004faa46cfa2d6ad2ff933b" +
-			"c3bd9a5a74660af3d048a9a43634c0250427d9a6219197a3f3633f841753" +
-			"ba7c27f3619f387b6b1a6cb9c1dc227674aa020724d137da2cb87b1615d5" +
-			"12974fa4747dd1e17d02c9462a44fec150ca3a8f99cc1e4953365e429956" +
-			"5e108535b1f62e1d4ba18e17a52164418bfd1a933f7fb3a126c860830a87" +
-			"293d9271da736e4398c1e37fb75c4bf02786e1faf4b610cd1377fbb9ae18" +
-			"0655a0abefbad700c09473469f1eca5a66d53fa3dc7cd3e7c3b0411d7e14" +
-			"5f96eb9654ab94913dda503a50f9e773842f4d2a5faa60869bf365830511" +
-			"f2ededd03e0a73000edb60c9a29a5f5e194cf3b5667a694690384599d116" +
-			"f8d2fd93b2aed55b7d44b5b054f3f38e788e4fdf36e591568c41d1052cad" +
-			"0fcb68ca4c4bf5090d57df9db6f0d91dd8b11b804f331adb7efb087a5604" +
-			"e9e22b4d54db40bcbc6e272ff5eaddfc1471459e59f0554c58251342134a" +
-			"8daaef1498069ba581ef1da2510be92843487a4eb8111c79a6f0195fc38a" +
-			"d6aee93c1df2b5897eaa38ad8f47ab2fe0e3aa3e6accbfd4c16d46843318" +
-			"5fc61c861b96ca65e34d31f24d6f56ee85092314a4d7656205c15322f1c9" +
-			"7613c079eae292ba966e10d1e700164e518b243f424c46f9ea63db1c2c34" +
-			"b512c403c128ee19030a6226517b805a072512a5e4cd274b7fd1fa23f830" +
-			"058208ff1a063b41039c74036b5b3da8b1a0b93135a710352da0f6c31203" +
-			"a09d1f2329651bb3ab3984ab591f2247e71cd44835e7a1a1b66d8595f7ae" +
-			"f9bf39d1417d2d31ea3599d405ff4b5999a86f52f3259b452909b57937d8" +
-			"5364d6c23deb4f14e0d9fcee9184df5994fdc11f045c025c8d561adb0e7d" +
-			"fd4748fd4b20f84e53322471a410cdb3fd88e48b2e7eb7ae5dae994cb5ea" +
-			"e3eaf21cf9005db560d6d22e4d9b97d7e9e488751afcd72aa176c0fcde93" +
-			"16f676fd527d9c42105b851639f09ea70533d26fc60cbeb4b76ed554fc99" +
-			"177620b28ca6f56a716f8cb384",
-	},
-	{
-		key: "811c3e356e7c793acf114c624dc86ace38e67bff2a60e5b2a6c20723c1b9f003",
-		tag: "c6e59044cefc43ee681c3eed872d02b3",
-		in: "e115b304c023792448794546a2474f04294d7a616215e5dd6c40a65bb6ed" +
-			"b508c3680b14c176c327fdfb1ee21962c0006b7deb4e5de87db21989d13c" +
-			"3ab0462d5d2a52ef4ca0d366ae06a314f50e3a21d9247f814037798cc5e1" +
-			"0a63de027477decdeb8a8e0c279299272490106ddf8683126f60d35772c6" +
-			"dfc744b0adbfd5dcf118c4f2b06cfaf077881d733a5e643b7c46976647d1" +
-			"c1d3f8f6237c6218fa86fb47080b1f7966137667bd6661660c43b75b6339" +
-			"0b514bbe491aa46b524bde1c5b7456255fb214c3f74907b7ce1cba94210b" +
-			"78b5e68f049fcb002b96a5d38d59df6e977d587abb42d0972d5f3ffc898b" +
-			"3cbec26f104255761aee1b8a232d703585dd276ee1f43c8cd7e92a993eb1" +
-			"5107d02f59ba75f8dd1442ee37786ddb902deb88dd0ebdbf229fb25a9dca" +
-			"86d0ce46a278a45f5517bff2c049cc959a227dcdd3aca677e96ce84390e9" +
-			"b9a28e0988777331847a59f1225b027a66c1421422683dd6081af95e16f2" +
-			"48ab03da494112449ce7bdace6c988292f95699bb5e4d9c8d250aa28a6df" +
-			"44c0c265156deb27e9476a0a4af44f34bdf631b4af1146afe34ea988fc95" +
-			"3e71fc21ce60b3962313000fe46d757109281f6e55bc950200d0834ceb5c" +
-			"41553afd12576f3fbb9a8e05883ccc51c9a1269b6d8e9d27123dce5d0bd6" +
-			"db649c6fea06b4e4e9dea8d2d17709dc50ae8aa38231fd409e9580e255fe" +
-			"2bf59e6e1b6e310610ea4881206262be76120d6c97db969e003947f08bad" +
-			"8fa731f149397c47d2c964e84f090e77e19046277e18cd8917c48a776c9d" +
-			"e627b6656203b522c60e97cc61914621c564243913ae643f1c9c9e0ad00a" +
-			"14f66eaa45844229ecc35abb2637317ae5d5e338c68691bea8fa1fd469b7" +
-			"b54d0fccd730c1284ec7e6fccdec800b8fa67e6e55ac574f1e53a65ab976" +
-			"4c218a404184793cc9892308e296b334c85f7097edc16927c2451c4cd7e5" +
-			"3f239aa4f4c83241bde178f692898b1ece2dbcb19a97e64c4710326528f2" +
-			"4b099d0b674bd614fad307d9b9440adab32117f0f15b1450277b00eb366e" +
-			"0260fca84c1d27e50a1116d2ce16c8f5eb212c77c1a84425744ea3195edb" +
-			"b54c970b77e090b644942d43fe8c4546a158bad7620217a40e34b9bb84d1" +
-			"89eff32b20ef3f015714dbb1f150015d6eeb84cbccbd3fffa63bde89",
-	},
-	{
-		key: "f33691f5db2dea41e1e608af3ff39f3a6988dba204ce1b09214475ae0ea864b8",
-		tag: "6e50e70411201378c8d67857d7b631d2",
-		in: "439bc9ea10db4d2b08c7fcf2e8bd89fa9844f8061d462e28f174489e7514" +
-			"0f84e842040141cc59ce38f9551850cfbdfac2d75337d155090d70d0d930" +
-			"04340bdfe60062f17c53f3c9005b9995a0feb49f6bef8eaff80f4feb7ef3" +
-			"f2181733a4b43b6ac43a5130a73a9b3c2cbc93bd296cd5f48c9df022b6c8" +
-			"2bb752bc21e3d8379be31328aa32edc11efc8a4b4b3f370ee8c870cd281d" +
-			"614e6bc2c0a5ca303bc48696a3bd574ee34738de4c4c29910f8feb7557bf" +
-			"ffcfe7428b4703144bd6d7fe5b3f5de748918553df5453b3c6001696f3de" +
-			"0137e454aadf30cedfb6be36b0b908a38409f1a2dc202fc285610765e4c8" +
-			"6414692bf4bde20ed899e97727b7ea1d95d7c621717c560f1d260ab3624e" +
-			"d6168d77c483dd5ce0d234049017795f2e5a7569d7ad323c50a5b1170337" +
-			"4174a9977026c20cd52c10b72f14e0569a684a3dcf2ccbc148fd3db506e2" +
-			"8d24f6c55544cb3980a36e86747adc89ebad78d1630618d113fa445f8625" +
-			"b583cd7be33913c30c419d047cf3baf40fd05219a1fcec717b87a65fa022" +
-			"1a3aa8143062d77588168019454240ae3d37640996f2967810459bc658df" +
-			"e556de4d07263dc3d9158ec242008226d1c6aea7f0846e12ce2d316e80da" +
-			"522343264ec9451ec23aaaa367d640faad4af3d44d6d86544ade34c93518" +
-			"2843f6b4d1c934996778affa9ee962e7dfef5e70d933d4309f0f343e9606" +
-			"1b91b11ac380a9675e17a96099fe411bedc28a298cd78d5496e28fbbd4f5" +
-			"b0a27735d1144348e22be5b75724d8f125e99c4cb4e9c3a1f0b4e9da5146" +
-			"e6afaa33d02fda74bf58a8badee2b634b989c01755afa6ab20ee494c6ae4" +
-			"c2c6f17af6b53b61d2947d83a18eb3b8a1612aad5d3ea7e8e35f325c9168" +
-			"ac490f22cb713ddb61fbd96011c5849ac8e2fcd42db820349bdf9157dcc0" +
-			"0d9f9ed9c099b10c7194d48b623b0df43759734b2a2e5f8a35e7192bf9a0" +
-			"03dcb9d16a54bd84d922f85b6021b28aacc5264fe9e83deb48f18f864cbd" +
-			"367eb163d39c45b0eb907311a2a4b09fb26109088df782ce031b02f3caff" +
-			"d2dbe25b1cbde9f35ba7c47292a4fd49e7def7a28824f3dfda259a86c3de" +
-			"59257c255c712686ee47d128a55c7b9e8c546035eab7e2da420f32ed5c94" +
-			"bc12a34dc68eb99257a7ea03b69d6c760b0681fa24e4ca97b7c377182ab5" +
-			"fee30a278b08c44c988a8f925af2997883111c750d176b432735868208f4" +
-			"0de7137331b544f2d28040a3581d195e82811c945c3f9fde68fc21b36a44" +
-			"e1cfa2d8eb625f3102461539b3f13c660936a5ddb29a0ae791fbf52c2f69" +
-			"7bd334653f3605b362d91cd78569b41dbd09b2a5892440b5097fa08d0b4b" +
-			"291fc5b934585dd8d5adc80d573fdd194b2eae26dfc49f5e51c1f1607d7e" +
-			"87740702f244bf39ca1d52423e0ae84891dfdf4f43ef984c7a5f293a2007" +
-			"a1e00e39c757f064518953f55621f955986f63",
-	},
-	{
-		key: "d115b6ac998a65b48b3dae5977abaf985258d3d1cfe1616cec3d6a77f7a75785",
-		tag: "b431c9318ec2769fc8ee8f5fc3c079c3",
-		in: "7e7eb43839a6d7616b8a7b1fb7144817904342a9bd34167051162941a6b1" +
-			"b85db5e587f76e4a53211755d5ab29c11822d7711a97b3f1ff5b21f2485d" +
-			"9c86241fb56cdd6796245d3112df11ad9a7344db44d09934c4efb280ed65" +
-			"80cfcafb5c97a32993cbbf4917183e0b7bb38f2ce2479c28e1d39f673962" +
-			"17a7010448dfd39a4e7f406c8bd2d804f993bb410fffa4eb57518a531ecf" +
-			"259a8af068230acb826d9ffc20ee0fc43885221a321e3928971bb28615f0" +
-			"d9f099f5b68a80503a910fdba0bc643c60b64837900be38770b6b30c362c" +
-			"4580722b5dbb1b9c8cd02a18fd7b5661d2c4d28aa941c50af6655c826690" +
-			"37312fbf9f1cf4adb0b9400532755011b40e8252bd0e3c7a22efb0ef9122" +
-			"1e04b4aa8316d4a4ffeaa11909d38cc264650e7ca416835ded0953f39e29" +
-			"b01d3a33bba454760fb0a96d9fe50b3e42c95271e57840380d1fd39a375b" +
-			"3e5513a31a4b80a2dad8731d4fd1ced5ff61e1fbe8ff3ff90a277e6b5631" +
-			"f99f046c4c3c66158554f61af2ede73aede97e94b1d1f129aaadf9b53548" +
-			"553cc2304103e245b77701f134d94d2a3658f2b41108c5a519c2c8f450db" +
-			"027824f1c0ab94010589a4139ff521938b4f0c7bf0986585f535b6e292e5" +
-			"b3ded23bf81cec17c8420fe67a449e508864e4cbb7eaf335975668f013e9" +
-			"da70b33bd52a72094a8f03762ea7440ce9fcd10e251837cfc9ccc1a8cc47" +
-			"0c67379f6a32f16cf70ea8c19d1a67779a9b2d2b379665e0e908a88b26e7" +
-			"8c9f94f17acefa6d5feb70a7095e0297c53e091cf98df132a23a5ce5aa72" +
-			"59f1154b92e079f0b6f95d2a38aa5d62a2fd97c12ee7b085e57cc4652863" +
-			"8defacc1e70c3aceab82a9fa04e6aa70f5fbfd19de075bee4e3aac4a87d0" +
-			"ad0226a463a554816f1ebac08f30f4c3a93fa85d79b92f0da06348b4f008" +
-			"880fac2df0f768d8f9d082f5a747afb0f62eb29c89d926de9fc491921474" +
-			"1d8647c67d57ac55f94751389ee466bbd44dbe186f2f38abbc61a0425613" +
-			"e9b6a64e6bcb45a2e2bb783b9103483643d5610a7e2dcdb10b5d78423285" +
-			"506b42a99b00a4fb7b619b4526bb4ec78299dd01ad894fde2f053e18c55b" +
-			"6047f86333f2690c2cb8e87d9834ab8a5e339aa346e4d9952ed62dc083e3" +
-			"b11a823a67f23fec099a033f127ebe8626a89fa1a5a6b3520aa0d215a8e7" +
-			"dea3af37907686c16521739a95d6c532cc259c497bf397fceaea49cd46b9" +
-			"ad5c1b39a36fdd2f0d2225fef1b6ca2bb73fe604646c10ba4c572ab13a26" +
-			"559ededc98f5a34c874cc25621e65ba4852529b5a4e9c1b2bf8e1a8f8ff0" +
-			"5a31095b84696c6381eb9ad37ac0db184fe5fccf3554e514946a33cabe6f" +
-			"4d617b549d28ad1cc4642dac96e0215ee1596481600d3619e8f45e2c9ae1" +
-			"da834d44aca216bba0efef6254503ca90339f2d7ca508b2722d50c08def8" +
-			"a736590fa44855cd9eb9979c743783aa26e633696739f2ae25ff7b72ceb2" +
-			"4dff4455b85bbd675c8cb71ad18386dc58c371bdf37b4b3875b98a9423ff" +
-			"3becfc0d0ba2aacab3ee7683cb3b345095fefcaca5751ca793da63c89428",
-	},
-	{
-		key: "f3717306b9729be998cdb2c9d856306c5ae3d89da2cdcef12f86f6110c98d873",
-		tag: "907dba0f4849c7cf4570b5128b5f31d5",
-		in: "079572187d4559f24d8e48dc366441acf226a4db79e214ec3ee288acc349" +
-			"887e2e377419bcafa377d0151497b52e4d9cf2a02b0fc91ad9516482bdf6" +
-			"eccd1497954b53241bfb0bc5c04cc45045c6251f23a510060fee32721872" +
-			"bbc95cd8d400dff00bcac2ecce6229c7d73d8f85ed5a87afdccf6dedd299" +
-			"2d5c7b5b8090c47c737ded036ff0e9aedf02a2242fd9820be618b9601e73" +
-			"d3ba5d8f1ae9805cfd2306251704bc74e3546997f109f1dfae20c03ff31f" +
-			"17564769aa49f01233c9c4b79f90fa3d1433d18cdc497914046ad77d2792" +
-			"2588a7d0e61d4258d7d80cdab8503e3111ddca22cf7f39c1f80f1e16a68d" +
-			"9e21db8b53dd316dfa4233cb453a39a90101c60efc08514a3057db007e96" +
-			"507745bd4a0764ed8717a250bffb5fd1ea58474bdfb5b869681939693926" +
-			"40d832a3387ed4ac9cdab0d2af8fcb51b86e4d927097f1e79b5af96574ec" +
-			"d59d0dd150a0208978c41de28ad6cadf72a49279cffd6dc281c640f2e294" +
-			"4cde49a13ed390da1dd92e3011ce0f4a0863375a9db3f67fca1e3b8288a0" +
-			"78611161d7cb668ecdb932e1ff3733982c8c460eeeff2bca46c96e8a02cf" +
-			"b55d770940de556373a4dd676e3a0dd66f1280c8cb77a85136b3f003fab4" +
-			"887dad548de7bfe6488ae55e7a71da4097db03900d4b94e776a939530328" +
-			"83492da900b2a6c3e73d7a6f12ee30c9dd06cc34e5a3893976eb1de5864d" +
-			"32e792ac02e68d052d9d0cfc7cfb40b77728422f6c26cf68987c6b40fcfe" +
-			"9d660abc657360eb129de11bd70af5eb8fe350af2c27a6ece2cdf81b94c8" +
-			"0e68e8c51106497cfa5171236efe2d71d76b5dff3352af9b407dc5aab60f" +
-			"46b5683646f5b28732b7c750d351a08a507243d8e437cc4bef13a3edaa20" +
-			"5fc4e9968b4e563fa0dc965ba20b8e48bc188a321b16d3213bed69647512" +
-			"7a20afc1a3680ef261df6d37b017dee05cfc3a42e4130216e5540cf715c4" +
-			"e638d7d615c50bef576eeb19b3b15b2c2b454dfcef2b18161a143ddf52fc" +
-			"8e88fa71cbe34c92cd4b5a0adc81e5c33e11d2721bc1b95a9e693ac3cabc" +
-			"490889a8a42bf7e22375b679e8598c8faef22a006ed2da8ab1c08aaed2f5" +
-			"6d6f26649036335c0881bfec1e3a5346335c3b3707ee92173f1a7a3305c2" +
-			"933f78e995da8f1df64daf12b81ce23c8813c27fd4551103dc33561c2e80" +
-			"45b6b6770fa03498fd359a104884699d628020173edbcc4398b977e456e4" +
-			"885964840466176a490e7c513ba5d66090277c1ab1632a995a54f555a452" +
-			"1170a000507865b6650730aa6d6050a55959102836fff3d37e4773340e59" +
-			"2e56951ff9652519de4421d9c5b63edbeb30a3852a1ea110a9a29721aee3" +
-			"23d5a306de1624cecc87badc47aa87f489635d2fb60bff62ba67f5257999" +
-			"6af0a1f1a6fbcd8704e119196fcc289a6db6a4170a2cae31a1d30744b702" +
-			"2536d1526d41659c2dcc8b39c26aecfc0f8a707136d81b2827a158fd7386" +
-			"a537514471c213a8c859016748e0264cf3fbde10f40c620840ec4df99432" +
-			"e2b9e1e368e33f126ec40c572e841c2618d49d4eb098b9533b1f4ae00b46" +
-			"8d15de8c8ab6d0b650e599576f2bd90a124c9c6a0f911fd1bd8253bac272" +
-			"942cbdf8864f3747ff7f09d8a5a9d8599be7ee1744e5f1faf3e526cd2a06" +
-			"b157527272af9d38565957c9ce663c295766c0e0e464971c6282b70d4c0c" +
-			"1fb3b69856b34c089ad2b2c745f5a033cee1429c5b855581ee285278893c" +
-			"43a5968d9c28384b7abe8d072ba69089c938685cb1eab461f05314ad6d06" +
-			"eaa58512f8738bde35b7b15ef359dd2e8753cb1ed6",
-	},
-	{
-		key: "9772c1a4b74cbf53586e5df04369b35f1fdca390565872251bc6844bc81bda88",
-		tag: "68eb7fc459ecc3be819485001ab438dc",
-		in: "e115cc2f33e367cb85c01a914b3a512404ad6a98b5b0c3a211d4bffd5802" +
-			"ee43b3fb07451c74524ec8b4eddbb41ca33dd6e49791875d716a44bec97b" +
-			"7c2d4546616939ffa3b1ab9b8ba1d1a637e7c985cc922606caa0453085e3" +
-			"5f2fe0bd2de129d1d1856ade975a3281a62965927d8bb695e54514e69558" +
-			"89361a2a00a1b24e62bda78d0b71a0d40147016fcdaf1a702331dda8e678" +
-			"d8f476dcc91698da1688c610ec0cb1d9b8fbcd45dfde6d1503ba60a01337" +
-			"ae5b2f5c854a82c3087779babd2e522dd92f4718cd9f8c649ac226745ca2" +
-			"fa1696442764758f67cd926369578ae87612790dc56ed9cda935281a490e" +
-			"5c984950ec7a4e930520d273a69da4ed3a330e532508e26f942961fed0e3" +
-			"efeed52a7b96250d723155aa39a8ae85131c255c32bf406b647de1a37fba" +
-			"dc61e302bb5b70adec4505ee66b3a1d1b7bfe9c58b11e53ad556d56e5807" +
-			"017bb30b71be94e8f86aaf1496e8b8d6db75ec0afbe1cd336c23963c745d" +
-			"7b4ba1787ceb30728f1762b46f6eaad5064c8029d29b86266b87f93142a2" +
-			"74f519f3281d8c1cb43c23eb184ae41f3f625cf624b05a48d73cd7783fdf" +
-			"14954a03ec1a930e9a954424eff030e3f15357de4c19983f484619a0e9e2" +
-			"b67221cf965e9aa8d8926595c793adfe0181050df8b845ce648a66df532f" +
-			"78b10c83ecc86374a4f8abf8edcc303654bafd3dcc7de9c77a0a9d1d98fb" +
-			"121534b47d16f75b55fdc2a5e2e6799f8a2f8000d4292282e56863ae422a" +
-			"5779900ad6881b78946e750d7777f33f2f013a75c19615632c0e40b98338" +
-			"1e9b8d35a26abe30242c45662eebb157e6d7a8a5519de60268ac289b8295" +
-			"5d4feb47b9eef6da65031c6f52c2c4f5baa36fce3618b6a331f1e8bdd621" +
-			"48954fcf0846afeeb0a6cadb495c909a7fe671b021d5b0b4669961052187" +
-			"d01b67d44218471bfb04c1a3d82bf7b776208013fc8adabaefb11719f7a7" +
-			"e6cb0b92d4cc39b403ceb56bd806cbdcc9ee75362ab4aaeb760e170fdc6a" +
-			"23c038d45f465d8ec8519af8b0aad2eb5fae2972c603ed35ff8e46644803" +
-			"fc042ff8044540280766e35d8aaddcaa81e7c0c7eba28674f710492924c6" +
-			"1743da4d241e12b0c519910d4e31de332c2672ea77c9a3d5c60cd78a35d7" +
-			"924fda105b6f0a7cc11523157982418405be0bacf554b6398aeb9a1a3b12" +
-			"fe411c09e9bfb66416a47dd51cbd29abf8fbbd264dd57ba21a388c7e19e8" +
-			"12e66768b2584ad8471bef36245881fc04a22d9900a246668592ca35cfc3" +
-			"a8faf77da494df65f7d5c3daa129b7c98cef57e0826dee394eb927b3d6b3" +
-			"a3c42fa2576dcc6efd1259b6819da9544c82728276b324a36121a519aee5" +
-			"ae850738a44349cdec1220a6a933808aee44ba48ce46ec8fb7d897bd9e6b" +
-			"c4c325a27d1b457eb6be5c1806cd301c5d874d2e863fb0a01cbd3e1f5b0f" +
-			"8e0c771fca0c0b14042a7b0f3ae6264294a82212119b73821dcfbbfd85bb" +
-			"625b6f75e4dc0ee0292ab4f17daf1d507e6c97364260480d406bd43b7d8e" +
-			"8c2f26672a916321b482d5fa7166e282bfeed9b3598c8f8c19d2f8c8b98d" +
-			"f24c2500c8ad41cd6ed3f2835737916d846f1a6406cda1125ed7740fe301" +
-			"d1144559b7c95fa407599ae40a795226513153f86c9b8abe7d8aa6963c99" +
-			"5646ec586cbf20a03a698cc0681b7bd333402d00fa8e15cb32300b5a24ea" +
-			"316c5e1df67de78891846cb9183a4b112c3bcc17bcaa5fecd6c1dbbf6ef8" +
-			"272d9269e7f0ba9f17050a6aa5f11cb28874360396ab647941f2c9a85cb0" +
-			"6a969919b16997b0827af8f909c614545f1ad638ebb23109f6bab6b49b22" +
-			"b2285cabbb998b3e1bf42771b4d4e52330b224e5a1d63169ec85fe1c7dd2" +
-			"46dbafa6138448420f463d547a41c2b26026d4621b854bc7786ab3a0a93a" +
-			"e5390dd840f2454028b7c3bb87680f04f084089bbc8786ee42cf06904d01" +
-			"7e405144d2fae141599e2babe71abfbe7644fb25ec8a8a44a8928ff77a59" +
-			"a3e235de6bd7c7b803cf3cf60435e473e3315f02d7292b1c3f5a19c93646" +
-			"3cc4ccd6b24961083756f86ffa107322c5c7dd8d2e4ca0466f6725e8a35b" +
-			"574f0439f34ca52a393b2f017d2503ba2018fb4a0991fddc1949832d370a" +
-			"27c42e",
-	},
-	{
-		key: "d18a328b63a1d0f34e987682fe6ca3d48b4834b4312a17e99b3d88827b8d2238",
-		tag: "938b43b80cb3935e39b21dd8ba133cf8",
-		in: "bc2b0baf92580ee6c5efe640f2a029a791a3c77bec459be74cbc30931508" +
-			"d9f312c3a0944212831cbe4fc92e8f107f2f750c91bcc09f7624fa9a09b4" +
-			"9b7712cf5d619ea9da100fc23068ae2f4e353047e3956b215884bdb12235" +
-			"3f06b8ee98f36c3212493d61ae9ce151cd0453f3075b18a12d7d73da3de7" +
-			"dc2d98376cfb420069ca8148c511ca6bbae57572394a3c615a6fefb30c5f" +
-			"d727f964b4065ac9ee252bdd2bcae3e70162fe0e8069974e073f0a093d45" +
-			"be52d7de16a8f5f65c548aa6525822ffb00dc642530fedf355f7188ef017" +
-			"56384760c80afb61ad903d10119a7d615ec4fbdc79c490160bdeaf200915" +
-			"e405f2a921a2380c0ab9d2ac1e4fdc8ec4b907368c004458598efac13dc7" +
-			"2751e7faded538e3dc8b16590cac9b7ec294da0ad53e22cb9c05d8ef494f" +
-			"a04f6ab7c843c867fbe3cf1b4eb146d65339b0b03392259f12627a8e98e8" +
-			"0f4896c30b8ecd210acb2365539a872541921dcd8e1e54caf4936dfc7e1f" +
-			"68f3bbce61d325b447a8cce7f0fcad28494f2e47dae46b136594b5dfca7a" +
-			"bdafd6856f91496c05b21079aa55aa8c41628220a2cf0cdd755893375b7b" +
-			"b13d914c9a1d1db4a18f8fa36c55e52d0342352052032fb62d32fcd51cb1" +
-			"ac46f44b06e682db5d96d583cda03b966c650c03ae53542e8da1066b6884" +
-			"4a7e2280c664415e413f270b1fdcfbb40b9daa6131d071ee7eb1553dc5b1" +
-			"a50677971223dc316d2d326d57cbd529c88698facdca425e2d5c6b10d7ae" +
-			"cae28b8890aa44ede9b9193dbe8d1d8aa1fa580ca384b57eadcbefc96dd8" +
-			"bfccbe3b855a96f1fd4913035f817b75954ef1827c7718aab24d353e41cb" +
-			"a73748e14e0c2750d5b6a9752125708cc7ee7a498c7fbadf4186e7f8fa93" +
-			"bfdf281a49400f877621651b8ba87edda5231e80b758564e75139b61b1a9" +
-			"9fb9ec694f928ab1f47c6c4287bd4182d1b2be053380616e98da06f3ef57" +
-			"b570ade17c51da1d602b6ebc5a638ebde30d99bf4f91d0e01557c7dcd8f7" +
-			"9e5120143c935fc699eb5616ccd3cac56b5f8a53ed9e6c47ba896bfefe71" +
-			"2004ad908c12cf6d954b83bec8fb0e641cc261ff8f542b86e62d90e227f2" +
-			"a5bd59c9d390c0dd857f6da2b7624787a0bb31908bae84896890b283da61" +
-			"d8ec4f56eea38b22b438d6374b42243f9c1d94288874e53ab90c554cc1f1" +
-			"d736acde67aff55007fd4b3becc4d0f3ddd96f10dc75255cb0327aa47076" +
-			"2b3a3a656e33c87b02a682658b6cd2a75d9c0462803c9bbffa51441501a0" +
-			"3a2fbb2344aa13d27ffb9e98704ea6720b6a9992e53449688cd74d0648fa" +
-			"e8e776b0ea6bf048b2ec05341e5948cab0af015328b284ae7bd89a5f763c" +
-			"eaf5ca3e647a9f5bff7197e4d357e4359fa5fe30709545453149be510e3b" +
-			"ff86beeba5110c79c0215fbe9ac9339a8ac7d41f7488588ab14ac657aaf7" +
-			"d5c03a353932bbb2b261f0e83f3526c5e8e0c2348a10ab4eed6ecdcf9014" +
-			"7550abcb0a722f257e01d38bad47cdd5a64eef43ef4e741bf50da275720a" +
-			"0aee47adfc5cd2534b911dc269197c3c396820b303f6941e3fd85b5ed21d" +
-			"6d8136745c3eeb9f36b1f226434e334dc94be8a5606079cb7643136aacd2" +
-			"da9c38b2eb7e2b898bd8632003767bf0c87d00a3c2fcee48bbbcdd949af3" +
-			"3455128216709df25879b0ce894ac4f121dfca6b8c7865002b828696641d" +
-			"14ffc59924fbda50866fded0afaea545c8008c564a3a0b023f519a9980ea" +
-			"d541d91d1c07a739fd02286ea5660e473f80494236a68e84ea31aad71348" +
-			"e45055ded69c39941e31d51df257a4d0b0d8f025dbedee093f2b91795bc1" +
-			"533dc472020769a157a187abd6d8d52e1693e2ef56b2212759d0c0120e54" +
-			"c425d0084fdb3925e296dd6cdd8e677043a90674904057d88ebdea5998aa" +
-			"03562a790adecc4399352df43e5179cf8c584d95ef8e4b37295946b1d37f" +
-			"faf4b3b7b98869184e42ea8b304fe1059f180ff83d14a0861ca7c0682c34" +
-			"b48a70df8653bd8d9a26f9489e1271fa44e41b392e648d0e619ecdad2c53" +
-			"952094802eeb70ade4ffe096e3049867de93a824217e31364b18204e9681" +
-			"dd8e84ae2678aad155b238f59dd9bf9ce07e97183a690b2a46a8f3624843" +
-			"5b2f713e7d8dcda4dea1e3c4cf9692dda082322c51f7bb1f63d92aa987ec" +
-			"cf1355a043e21a7b8d60a2b97f18487f6fff4c77df92dbfdc9837540c518" +
-			"9fd9585731bc6e726a34ca21154b0499522c9d1016953dd0fa2eb6a92b6d" +
-			"14d6e3da5c12fabe92bd639e253983fc91041091791643",
-	},
-	{
-		key: "46e8eb27acfdc8f4be622d8741c7bc414464c149e21da97ab4afbf3e07b98b0e",
-		tag: "56b5f49be824c7a19b19faabf0787a87",
-		in: "ced52b76c057872a60107194b432cf04b7be05e65209045d2952ea0284d8" +
-			"3e2ed5a15cfdc58071204573c18ab03765b4d5e63a601419e039c42075b2" +
-			"7ebb2827de9c6233d6632e6d3db9140bdb4a9291d53f33734c2dc8e24df9" +
-			"0764dc10e0d321d20fdf659bfa2a81bc9e04fd0f83448143276647c08bfa" +
-			"dcfe3bc23898eda655c9353693ed7b022f43eefa23c21db7660c5029ca64" +
-			"a6085d93029ea6c43197356f56b7624d4819f5008d053357d981ffbe7f40" +
-			"96d6c55d8417002d36189b04bbb2c637339d90f4910a400833a8d422d88d" +
-			"c816c1636e8d9f7f926c244a28d9e0a956cec11e81d0fd81d4b2b5d4904a" +
-			"d1a5f55b5ec078dcb5c2bc1112bbfd5efc8c2577fe6d9872a985ee129e5b" +
-			"953e9cebf28cf23c6f9c6a5e09cb09ab586c6a50e4389cd3110777591d7f" +
-			"0608a3fd95b99f6ba03984fb0e13c6bbbde3668c59f2f2b69d7caadffa94" +
-			"6f67e725d56280e59e66dca025a18d4616e81abd9801835bd94485bb2025" +
-			"dee81fba440005b181ee81dc1d7796cbec92e4ec1c9016c8e8073cf281ce" +
-			"f749993f09a618a4671d58b476feffa454600f82955c591882715148a826" +
-			"586f68bb50059914dce1c1c85e5e3951647c9964ec9316005209a58baeb5" +
-			"2c6d01e6b4c275c0050a7e2bdc52133e433b050a700b556d4314e5c041d1" +
-			"93ee47f47adc971aed1b63259dd5cd4f95854a71a947eae3d3d12d0d7b52" +
-			"c6cd2fef2d2e892607a9681d73ac3236fad21ee30a4f857010bc95c00d5f" +
-			"6f0c6b3fe50cd6452be6eec4f5f01542dc2cb5e2db1f52224f11348fe2a0" +
-			"5d1e5885f1317f2d06ce2813dc4c723008e836a2ee95d0aac66855fe4c3b" +
-			"1b2e02ba0700be759b1ef1c2a3123ee4ccf9200d8d4de5e0d503f04c2053" +
-			"66393d1e91b648392ca28389d976aa618b4796acbfe8aa356ecdce1f7786" +
-			"bf09af226bb9402317b6fa319bbb9248d8ce00b1f49f066c69d4df93266b" +
-			"938342cd7fd4b07c320c2409ef72d8a57c21d0c6d6d493f7ca94d01b9852" +
-			"e4fca6a9291e9060154bc38af6c86932645f53914709fc90e11db56ec471" +
-			"6d600ee6452041248ea8244f79534f793bfc1f2020855d817cb4ca3c48ea" +
-			"7f6441ce9af9bda61936c226d810086c04a35e8654fdc30d4b35701adccc" +
-			"016d5895b2121ba4066e44d694f6371d97911786edb73dc3020ba186a01f" +
-			"ee3dd6036c0e205a8d05979bad228fd12c0fd2fded6c7f1e4c11354d266e" +
-			"d9c2f706269c43cd90504997d93a17b39b10dab0ff083ab3bd06540ce612" +
-			"d08f46ce75a16ef330525737410a0d98fb3d484968f9c12edcaf50103fdc" +
-			"c14128ea4ad6c30b56247eab28197fe617e5f88afa5cbe003c63d423647a" +
-			"d3042626fafd2084a0582ff1b1efdb5baa162662048019546234e2f6b6a1" +
-			"d8bb971114aae41df7795b4f3598f2af9e8921a9aadc7fab6c780aaa32a3" +
-			"84865a4ccb02351dbc55ec92a3152d1e66ec9d478be5dca17b4a131b4a0d" +
-			"3d4420fc6123fef80fd56ca266407d58a7880d6b7e5ce2b6bdc9a3721071" +
-			"7feec573d83c83a2e3f7d4023f2f68e785cde728fdbf5054060e4c89faa6" +
-			"1c9dd10524a08811d15c627b3b4ada549a3fa1d8dd77c005daaf2addeb10" +
-			"0abf694da8dd692f113965cd6366a5a7b0c17e1f2a320243e2c90b01418e" +
-			"22426d0401a2c8fd02cb3129a14fdfa6cbcaa1f1c2f17706e9ac374a3458" +
-			"777761e986ee4c358d26f8e420d33230d198fd86704e77298dd4c40c5205" +
-			"7566ac0cd92993b21937c3a3b4a8b89110a97cf38c781ad758bdc28f3565" +
-			"60cf3acbedfa8e05b396d226ef619746e8e4fa84c8e00a7f0e6d652808c8" +
-			"9c9b123d9bd802624cfa949eb68af85ca459b9aa85b81dbc0b630856cb9d" +
-			"7e18cdc96b3c069a006dd5b716e218a5ed1f580be3e3ccf0083017607902" +
-			"a7967a02d0a439e7c54b3b7ca4cc9d94a7754efba0bb5e192e8d1a6e7c79" +
-			"4aa59e410869b21009d9443204213f7bceb880ccf1f61edb6a67c395a361" +
-			"ff14144262b4d90c0e715dbefce92339ff704cc4065d56118624a7e429e4" +
-			"cadf0b9d2e7ffc4eb31c6078474a5265beba0774209c79bf81a930b302bd" +
-			"0f142534a6ae402da6d355a010d8c82dc379ea16d49b9d859a7de4db6e62" +
-			"40f6976ae0f47bc583b327df7ec88f5bd68f713b5d53796e72e28c29e843" +
-			"6c64cd411d335623ff4f5d167f3c7b8cba411e82f03714662425c8e1bc1e" +
-			"fbf435d28df541a914a55317de0ded8c744a1c3a6e047590244b207bcdcb" +
-			"f4bd1f9f81210deddd629192c58e6fd73e83812f084ef52f21c67bea98ee" +
-			"17554437d9642e2e",
-	},
-	{
-		key: "b41210e5ef845bd5a8128455c4e67b533e3e2b19dffc1fb754caa528c234d6a0",
-		tag: "72c9534aec8c1d883eef899f04e1c65e",
-		in: "7eeca180bb20d99635e36b9208221b2b8ef073fbf5a57f5190e19cb86c49" +
-			"89b0e8150d22ec3aaf56f6ed9cb6720284d13a4b0a34cd3d7f7fc7089326" +
-			"6d1893fa4185269fb806677ff490aec8f889896fca50d6c80d295875b1d5" +
-			"4a779b6d49305360b31011b48537157d0f323ff4e865d46fba6bd23a06c1" +
-			"46878cf9404360d325432312ff08ce495edca63a3c93c44d79c050e3f1de" +
-			"4b6ca5fedbbd43dbdef9ceb26d440a59c7e0be3a8e461c4f15b6b1e1dc36" +
-			"a71fc723ad593fb903e83d0804ce497fc49bfc6b6a602b9dc6e9891010b1" +
-			"4ca066cb1c68044c1ad837c638076dd3708078509cba49fdc54922cdf5d7" +
-			"715fb43e9b5a5942cb8950eade143577bc9dcedde58d51deddc70075e452" +
-			"bbceab1e95b5d003eb96bea69687faa6d50d9c605769cb4287b5d9924dd6" +
-			"8881c699abaa6f93e41dac7639cdbbbd0259099a3ed096f482a1fa322b15" +
-			"ffc379812c74e09e95f1bd3706347eac421fe56895e738a47fcd3e118773" +
-			"c3a7e7e264cc7ff5a53a80e436df058265dab9756fdf6913786a47e98bbc" +
-			"411052d58ffec9ee948e28cbaadaae471c5d828eaf3b3c87d3bfd495477b" +
-			"403da54f1418a15ace0d4d0df68f6a8f2b0457b127d5eae1f45ae055afa1" +
-			"8f058d5dd7eea559de3ae9378ca53f7d6dc9a9465ea1f945295f16ee0404" +
-			"7fc9dd3deda8ee32631d7af70c20edc1e12c5f8abd2e78f43dbd4cd6407f" +
-			"038efab144a24ea8a090a7ba3e6499345a60106220c2959a388e1a73d070" +
-			"1d854bfaaa86165a5aee934b615ac7f45da7c43a1e8f74613917ed10dcd2" +
-			"27e4b070414412e77851db5bc053e5f502bb4e2b2645bca074c18643e814" +
-			"4caeccb58be49ea9a552913c0616382c899635eea79a166988c206b9aaa0" +
-			"977c7ced89c4c7aaeaa8fb89b38030c44530a97187fda592b088198b63a5" +
-			"2dfad59a0a4c1aadf812bdf1881924e8b51b8fd4dbca8e73b2986b3ab484" +
-			"171e9d0cbb08be40ae60de8818bd7f400191b42c7b3200c27643f06720a7" +
-			"e0a17441f34131629388ac43955b78c31ea6602a70dd665f872e7669e865" +
-			"f6f40e634e8772d747608cd3a570e1726eb1ddca64f08582b022bb026eda" +
-			"6a913dc83f174ce3c18b9fc0503d3ac74e2fe45691d6dfb4af8c86d752a1" +
-			"6d6664fab4de08afe8858392fcc35cb9ea82fc42c42d48c0c0556267ea0d" +
-			"cc19b10f05e0318c4488ffe704b5036908f5cb938eebd3163503acaa874f" +
-			"592d945448fbeb93a877a26a72306a36e181745ba300afdc30cb7986919f" +
-			"3dbdc5c47ef1fa052a9e4aeeda3955f61ce2f30a0593a81dbaffebac5a49" +
-			"e5a8d1308352701d1ca9e620a67a89abdf5f0f8b1a0acfde5819981d4b77" +
-			"58799c0fe41030b86754837712af821c315301aa8dd50d1387b9fb92ee63" +
-			"10777e08229edd54e5e86b086ac281bd321082ef46ce298a6211aaa3aa4f" +
-			"6e55b5a4641220ec94cca73087760da1b1ac3e0da3f438214e691aa184b0" +
-			"535950b715a64d11485940dcaa3f72e0aa521002b1443f5e7880e2a85b83" +
-			"40d32db0fc4c4702e10f0fa24a35da9307850e945f608ad34d6cfdf6f2b9" +
-			"ff4f6b8e9eb5a883546578e2ff3cc5787322e4384640f42dc5bd05f432d9" +
-			"610dcf7c06cdf34762dd2a5e805e24aee8cebb3b4db9e4d1471da995bba9" +
-			"a72cf59ea8a040671b1d8ce24a3dce4fc86d2df85c8ab5e1eb2b0567c186" +
-			"4fb464f48c3ca72c7df2749542ed4d4be51b63769012ce3d06356856b2a4" +
-			"24995a2429a156ad93bc79c705e7b163149ce53a42c34a19680dfe4fd0f7" +
-			"fce38c30dffe9da9bc941d131f435c1398f8284a230e9d6e3992710074c3" +
-			"881d03aa309a9edd0fde7a39c33f6455dfcc5ae3fa20ea0e0d6549a43536" +
-			"b4cd8a2991a135b7d7a4265fb840318813091274414108f13fe191db7774" +
-			"6a5f4270f6d51a29ff523954f84cb76131d4abee79161dcbd97dc1ef24cf" +
-			"db1fade057dddee00a1e0de0db1afaeed1b535f7bb402afa3b297551fd14" +
-			"8c8f3e05f1351d3a8ee2948daaf14e7fc448c4670c906ae076eac5a7c656" +
-			"fd5f9cd937b91e26c9e5adb43c138f8d65e447b0022a524e059f879c6e27" +
-			"4ff7e671f75717233aae70853d5bd7bbb41b43c47bb08d6dc2f54f9ec606" +
-			"9487d1267add72403d01552a3d138abab9ca8a0d2dc32439759aa5695f70" +
-			"1a17d28dfb85850fdb55fddadcdde4d220e4b05821e5736d346e7dc9c945" +
-			"72743366488b1de8975184771361894b6520e3407c5c2e38473430969e35" +
-			"b106024da8618665d58c9d084824a28991a33658d6ec702139e01b65b7d0" +
-			"cc537a644caeee880657803d95f5f67816948d5ab362922f8ffbd531473e" +
-			"b0ff8fde2afc37a4abfa28dbed0be1b3d4ed48a1d02358e8403905d33b12" +
-			"3066e7a9fe2491ee9eb24fc9de7dbd322c8ddbc5ebcd0d92cd102ebac96b" +
-			"90e2fd784fd6d4b699304df23b17d963080a013794322690456be525c071" +
-			"b78fcd2d1148026e44ff14c4d0f942cd44d2b3263f4a93b79ec7a618b4b0" +
-			"d77ae7a1f6e6c7c7e2f498b825bf1954df348bae45ae1d7c87b6787f1212" +
-			"60c9a724429a4a2491ef989f65acfdc72fa717486dcf1984905218e11cc3" +
-			"970a09d71061e6df751f100abfbf",
-	},
-	{
-		key: "d9b0dc303188756312c12d08488c29f43a72e78714560fe476703c1d9d3e20c1",
-		tag: "6b9782f2a09b59653aa448348a49291b",
-		in: "dbde1820035997dc8a8ff3015b4e0674e7ce7bf0c2d994b7977f2d91b49b" +
-			"f200995040daeb1218a0f4307b6b8211913992b070d321bdb947b4ba5017" +
-			"a0885e7e5502710a75cbbcb56d49e1bdc2bc2afa5a0e83851162dec41340" +
-			"bafc41c5e11fcbf4ea2ac45bc57def4742281bbf734777f83c9ae1ea3d5e" +
-			"d42380230570f59c40d5dd9a2d89b75fa3c92664f12a274d965ed8de79a8" +
-			"b37f3763939ad21d1703ad794f617c8b32b20cc4dd7c1b7f969a65e1bafa" +
-			"f6c43f30c9eba256f10201910e2cc31a9b13a46ad29257024ef8f2ee29b2" +
-			"ee63cc5b6230ab9f87cd5cb534f4b0bb08a790466e0d57b849fffa1ed21b" +
-			"fb0b27804e3ff9df7bebf14e100cf91691a493e53870abfad6321f6711c5" +
-			"0fbcf1f0b2c1e5231d6c0a08e710525176355f6f82bedc1f787f0d3cb41f" +
-			"a11e91ebf9f4cbae46035a371232d63ef0d8bda0355af8cd0a2f7d1327d8" +
-			"0ab769ea0f1da0f76ec99cc737b5ce84675fa8a9ac0c98342bb82b5848bf" +
-			"656d35327ea01a1b09d84ab974c307511af68a30cd6978b529a8f58c68a5" +
-			"9d476062ace8897ec0d1a90d5d167e29ebaa6f46d93d697760c8771417ce" +
-			"94c0f3698985a98702833d1b68641b811840ca3d935386dbd4600fbc81c8" +
-			"728c4fd0e4588be739a048f03bd4ac651ceecd7e2fb120fe7190011f957f" +
-			"cbbfdc025f1ca0b356208db8cad87fcd53c5d3a30a7c2a48140ccd4cdb49" +
-			"f3961cef742caedd1e848bf3cacafb0da030416bf3177877aa0bc5f9d1cc" +
-			"41fafcb829d5e3ace9394028683d712552579e024084a6b855830ad9f567" +
-			"ff58f05d3ec263eddd6f56adec378f167e8dabbeaf7d0a9e65c71660314d" +
-			"6c8d54beeca2711113fbc32a2ff8c0daa8373278d10085d2a0660ad53f4e" +
-			"1ade74a483be180180acf9e9ad3ea5bdd9162ccd69599163a451c6837d5e" +
-			"a5e115bd9a560f395128ea002ee739009a44fa46078b18959933fb6e866f" +
-			"eb4612a56ce93b1affcb95fccaa18d71a148582ba1412a5daa07404fcb39" +
-			"c3cb4a2519cc506c1172c6c326016ae2e5410f6a438569f35a50d45cbf3c" +
-			"c46188651aa22c257858f60649cee8c05c75953ce49358dfe5980445fce9" +
-			"614ccd16d333ad236e29d204691ca0bf46f29da954bcaae52e41016556d2" +
-			"f4cae1d37565bcbe84de1b49f344d0200478a38187da29c155cc98184d9d" +
-			"33dca088d70054e0fce321f7a90c48a14963d0ace2b4e7a24b21c14a5e67" +
-			"1994fe1f7d22d1135d4df9268dd18d323fde3603288735626a5449582d35" +
-			"30e2c2225414e05a8c7b987c873a82e272a5d83e59b90f3d7264631d6ad0" +
-			"4a0cf3b5e96596a66ed5bfbc24ab6e4870aeec0acbad2cc5affaee06de32" +
-			"dca06f175bf763cf8e7fdf95941a177e934f0078be7dbaa4c9b6f5c16b4a" +
-			"5607bab5d56144a6ba3c7d9a084b8d1f4b24b6f9754ed207b230d3a2cc26" +
-			"259ccc725e1f8a44c4df8143e13edb5ebf073e2c9d2da5f1562df4feece2" +
-			"f6480987f093f642eb7afa3aa92dce2a8b60bb925cd2d11cf6c2ae7d2153" +
-			"1a9c8f068d71d0e682023932fe64e956a49347aed22b21084c4a84480491" +
-			"244ac6b337b6d12d5551ad5684766c68bacca62bdcafab6603c81bdbd8e6" +
-			"80d9d8b3825eaea4df023142e840f98ee251466a0422d810a54726a9f03a" +
-			"7e0afeb0043e60e2ba4908f951d2e87fcbc372096f2a9f4f2a95ad5faede" +
-			"3796b11ecf4401c3ee3d268bd8c46476c61e0ffc5c43c0f3c58c79e20f75" +
-			"520c102aa3c260972a870fc50f8841fa0553a9e30bf37ad282fb51b34adc" +
-			"7a933ca1691a8a706605ce0b906fdccbe954f8e5f2f63c42599a483c4be7" +
-			"3a041ef90ad930fe60e7e6d44bab29eebde5abb111e433447825c8a46ef7" +
-			"070d1f65862b30418efd93bfea9c2b601a994354a2ff1fc11c383e7bc555" +
-			"9e7546b8bf8d44358b1ce8cb63978dd194260e00a88a8fd17df06373aa80" +
-			"04a89172a6051bd5b8cea41bdaf3f23fc0612197f5573f3f72bce39c9f89" +
-			"faf3fb48d8ca918586d4feaea7e0f2a0d7a6afca096a081af462ea5318cc" +
-			"898a9cc09e8258a837559570cbd5eb901e8c0e04ee88ba31c81a76b000b8" +
-			"0e544feba576b3eb5272b53e46e96a0b35b9c759caadcec61444f8ec47c3" +
-			"45a1d2304e2708eeddfbfa75a98eab3493889047d690e84431d445407fdd" +
-			"99560c0bdd287e0944116f8ac62ab992ed3f1e2b415aea784b03c6904795" +
-			"f4326ff60bc839615f2894570dc9c27cf928ef192047528a1a19ec990978" +
-			"3b0d1a13dd4baf4a19e49bf798975abe2ad167dd574b32b3d0c22aa4d9b5" +
-			"2761e8f56cf2100fe5a39fceae3d865f3724d4f299d07ff899fed6baf7fc" +
-			"eb7189357bf56cf94a6493e61301b43e3ed158cb9c7a0e615fd9888c2db0" +
-			"7f7689762f62ef6b3ad4125e06b07a422f5040c3aa8b8f205d68356c9225" +
-			"56fc4c976165fed9599daeb297498ecf744bf6c7dc5e30604c461ad99402" +
-			"2eea0fb6fe33f82a97b5c272fd24162a94b761ec7e52173e7bb42e88b343" +
-			"64f5fa2c141ed04a86b8d00fd9c25bf77a8dc3e63f5543331405be6bf421" +
-			"6a891089b316aa4f887cb4aff0dfb4e80c2ccd65ddd9daa74b17b4411c0f" +
-			"c849dc748d9b138279dcd9ebfc6e6759a53f5c28a41bb82107d71cc161fa" +
-			"81291a8290",
-	},
-	{
-		key: "fb70ae7ec12264ff9f51124da188e5b11dbf53cae2671363f6054b575b1ddcc1",
-		tag: "d9ab81fab28b3be96fa3331714e78c9a",
-		in: "c62edf20b1d53962b42386eb570b10378f9764421ecbd7c4802853332747" +
-			"19ff4c89c06005050fa9ba6579a844060eb7ece6c43bab520e683e0f36ba" +
-			"49cba259edc6ae35d41e0d7812a7d5edbe4d90cd5e0504d16f4c3f70d01f" +
-			"5a0313de55934b661ce1ec317968c2c4de60f45c66cded8c10565a1ca6d2" +
-			"3a84bf182df2fcb05956ed4d46b49fc0fe3bd23961d9466fde070341ce41" +
-			"bc6e148449360a31634fe10e91082d82def90d9da2c250ea72c58add2058" +
-			"d046b4392b78bc3af5b3936ed568733e8ad5672dabbfa3130a6a535ec73b" +
-			"da8e7223535f49f96cd35d56ed4792c5cb7076720d5461d96a2692b2ada5" +
-			"2be08fb7bad15d15a0108143790024f0f15f5adc275e783aa56b70844061" +
-			"e30952a040e4cb9650f2a010417812790105d8f58bd25d99b0db3cb16229" +
-			"3f6322e86cd5b0bb1505a7b998fb0f81d1e1915faca3c2c8ddea39115507" +
-			"80339430a7955521839deff5b301f3fad54edd5ebd2ac4ec9b1795cb4dc0" +
-			"e2eb62ebca8e886c3f1e507d10a0228c3027b472a7104b815f5ec8dae55e" +
-			"0783ff7ae9a3e6b99e381ad788206b135520cb870ba0cdbe876feea843b8" +
-			"5a82adc95a6d71c555f798da92b82daf0abfcdbc82ec30b1f12d78490b06" +
-			"7315735017a94ac150b44dfaace151896f873923310ffcd41e91bac04de6" +
-			"d70ea71565948c907ab21c4a23703fbbd2a8de6d3095f3d8f901538968e3" +
-			"60e7bfddb9d22036b1c23f4f5f1b2ee22623426a2d5de68c1e1a38e38e08" +
-			"e2b5670aac1edff69e9c73c2ca56cb69c709009ef1d541aff1fdb2b40c92" +
-			"9b87f162f394b76cdbba1f5605993e4dd9c312321d59b0aa5c6e33be1b10" +
-			"bfd00b92d4c02db064d0e4a98f2913c89051b0f0ead163deb5087b6466d9" +
-			"84f57553b0fa53850eaa142e072fd91802eb9f0d2eb7318dd620555e6ce1" +
-			"86706b866d41cf6ba81f100342faa14d801dc6f3d522db38fab17a879fcb" +
-			"b6acfe922163505bd23a6842f6ef6397ae5fb6e6016421998bd43b0142b0" +
-			"3ca3b16d6ccb7a47891c75c687d791a930b26aaa2e3412e7aa16e2cf1501" +
-			"7bf6df6d2e1c289af0d7ce03954a60c1dfcee5e4b3da51eb43ddd14faf59" +
-			"082005d0c8b104561f66c002ff426be60be769282fc5685cfd1968df1941" +
-			"73667e48e9ad681d35757f1199f1d93377bbad093c8cc3efa2bcb6ecb703" +
-			"694422772d15aaa58cab9e9ab277ed510f684114cc4a44ccadb3eb1c9a76" +
-			"d8619a9b7743106df6fb6f927ac49b22ae5bb9a9a4d231e340a2cd0e3282" +
-			"53f6d75df694826f60e4b3e758398793eaf73ef5d4b56cd1471e16400f40" +
-			"4a947e9737f4f874fe09a29ad799f4525156e3abbf0585c3c3c0a3744c86" +
-			"5d56db3d2ecba6bcbb1adcc8bf5f3b2a2d46d3eba18cda55201598a8112f" +
-			"d8f14e205f0e615f081b8ff6c5aa6669da776bfc7c34d5af4d0b26d0d819" +
-			"f6aacc53cf3c6653138b9a962acee9d6ea01d280c35bb1f05d1509238ccf" +
-			"004c5013167f804d1780d9f4ef9d45742fccac346b0472bde24ff5db9ae0" +
-			"16455a3c02256358fcd8e6a9aae94f8a37a1a3da58a889bbe3d295e16544" +
-			"2e580f59bdd31c92ffcab40c49c1cdbb4db1dd4882b66edc10fcb1704203" +
-			"c518c1d8d4c268588ce13fc38e0210aeb47d11d2603d4b3de5c6ff5e969b" +
-			"9d5904abb282b699bd04a6e9f1cb323679e30400d725aab128a032745dc0" +
-			"be05a46b02b34b93bff02523cd8498c021fc35a488f164a70ef1ceb873d9" +
-			"14a681d3a3a34cc76bfd5a547e2630d7741a284511bae5897d9f7a197fc2" +
-			"456af5c6cd7e1a93d3388c7a990b5feacd7749cf39fdecdc20adfdd540c6" +
-			"9d330195db7cc0d4555ea5f5356a3647e2265399f153c34ed1e217c5dafd" +
-			"c2c5dd3d566c332c7ddacb0d76ecd3a0ad505a4165443aa81b0f43cabfb4" +
-			"62942fe74a77c22b8f68a8b1a6d712d1e9b86e6a750005a3796ba1545396" +
-			"13170906d228dabf572ab969c762f8b296054f23d5d4a37bff64bf9cc46f" +
-			"43b491b41101256018376d487fe8097f1653a7a9e99e1ef2492600598fb0" +
-			"bbb7df8270be8b9106126d6f491f8b342a96ab95df6133e883d3db4c6a99" +
-			"402aeb58d371263a32dcf76d33c8904395b9cf0016fdfc15608eb43e20b0" +
-			"99cbe7455f7a76f69bba058ef96f83ae752587485657f89c7f26fde7fbeb" +
-			"a82ede581ee92821dc13b8202930aa58bd4f1c86f68926baca0d06fee642" +
-			"ea8c652d226af91a9638a0244f1a03c7ce56969b87cd5c1f86110d192e0b" +
-			"98dd979d74acca6c1956b1127d9a1f456053d17974081ed8ced0faa4293a" +
-			"319e5b25ba285c1151214f52c283e39c35af51c4572c8e395b7856697bfe" +
-			"dfc4145ab4ed0bdbe43ba509c06a196ae6bf30d7582550cb546c63b51833" +
-			"cb0dfff7196d83f6a1c6d6d712cce2ec1989fd9ff5a0a22ac5022b49d566" +
-			"58f196703e4809e7624fe7cfa6c13b378f5aac7e66e657ed7eaa942d1a00" +
-			"544a947199f24d736b8976ec2cfb563433c49ba131bd08b63636854219d4" +
-			"c45100c98e3092773ef492dd9210bfd8f54cfe2cddafcf5c05468d90e620" +
-			"0c2ef99d17fa6992cc45eff3072b7cfd51cabb07ea3019582c245b3ff758" +
-			"0302e88edc2c13fc43646ba34de37338568baa66ecff3accfebad88d143a" +
-			"fd1c3b09ae39c501e3f116af33b0b720d6c2baf5acd7f31220788b2f9017" +
-			"3ed7a51f400054e174d3b692273fcab263eb87bc38b1f486e707d399fe8d" +
-			"5a3f0a7ed4f5e443d477d1ab30bc0b312b7d85754cb886e9",
-	},
-	{
-		key: "f7e7affceb80a0127d9ce2f27693f447be80efc695d2e3ee9ca37c3f1b4120f4",
-		tag: "41c32ced08a16bb35ac8c23868f58ac9",
-		in: "5a3607fb98eaea52e4d642e98aa35719bfce5b7d7902950995f4a87c3dc6" +
-			"ad6238aadc71b7884318c2b93cd24139eed13d68773f901307a90189e272" +
-			"6471e4bf9e786b2e4cf144764f33c3ac3e66521f845f6f0688f09eaa227f" +
-			"e71033b0f74295f6ddb91fe741323f2b54f420cb9b774d4291b06219f1fb" +
-			"4410b55900425c5e6fcabec76a5c2424d637a1641db6f0f6cad564a36a91" +
-			"0f49894bfd598e91f38ceea65e8253c1284f210cf7b50a96e664e562f3cc" +
-			"01c4fc490fa6d4679fd63fbb3ed8995a8a05166b573e92d22ef4370c6aac" +
-			"74ae94c94177e5f71143c6f340efceefda679ae76f6ed7f26eaa4848a8de" +
-			"8c40894316efbb06400f9695b18ba279e8947c032a84a40ca647d9ace457" +
-			"6dd0082494d6bd7be4e7928e749c78110af8774a5d43e9c9479964e2fddc" +
-			"ee51146460eac734311225d08c60706e40f298a7cb97f369ef599be097ac" +
-			"3bf1c275497bbd68968a235fdf8a61bc7cfeef0fe451bb04e662ca39f34e" +
-			"a8e3acdd0befe9762f9eeb275c0cdd43c80fc91131d1e0e790020975ab65" +
-			"afbea81f303ebd86760821efb4cad7cc01fd6d6fd194ac5ffe7703d890d0" +
-			"169e21b444cdbaf691fc741a5d99bd47357c37785755fa72582ca4754a03" +
-			"b4def86ded39aa6d9eb3f38801077e6d17e3cee3fb57ae83f30c79c3cf29" +
-			"0e2739c6b7323612cec3a561ebeadb4faa642f150323aaa9d270658c907c" +
-			"4c1610a5e1834730c08be3379cf1abc50c30e2bf01ce903927c27d85e135" +
-			"3db9e216dda8860c45925e2bb791abe5c8281ee6d16607bdca87f60662dc" +
-			"bd6e20224e7f009a86db66fadd8e37e0a59559328385090c6953cd20bb61" +
-			"f28a734fb056714f5159977f18e5c5f11de75f7a00ba807e47a29e4da32d" +
-			"5c67ec76ce4d7b669b5e6ee17e1df7c673dd8a7c87fce665cda8adb9547d" +
-			"1dccbdbe7be44846b4b121b0bfa65e4ed530789510d79bc4477e50178060" +
-			"f2668ac8956f39ef422ecb0e4cf90b8ce508552eedeeefa6c7d1bccc077e" +
-			"8088bd7e0e6aaf0bda9f11c412c270ee2ad6912f9808f9344a4bb137bdac" +
-			"b5b9372b00b0de026a8f5d1fb13972e1290b5005689f7636c43aee2fd443" +
-			"93d390371ae573f0e064b2d7df552b9adf04bf173d71c621795b9fb503dc" +
-			"5e918536c6ad25ce4a76f70e6b752b6d44be321187269a19bcf33ec899ca" +
-			"40e88b4eb23217095a85057bf95d8a54812cae4a7d32e0c2966a21376110" +
-			"74c6c8c3dd45a553c43c675d23308709f91be0b235d0222aa5e1e1ce08f9" +
-			"c6b45ceb5b47bcd7d7b2d4380bcdbd6eced452d93e6d8cbe18123277889c" +
-			"7f86b15fb991364a501fbf5d8244f2e3332ea0ab49e833c6f765017a4006" +
-			"cc7cd1a0365945a8d8873cb21832b210c83e451c01ac949de2fb0f7a420e" +
-			"405bf64eb251c6f022181595d68174b91e503187d3b3f49b60c23e44ea40" +
-			"ca20311305b413047bb22e89672758b74d6bd1a06decf09e9556421087a4" +
-			"0c1d2c44c5fb13d4d9625581ac4ccef1a1b5eeb5689aac5c0291aebda276" +
-			"50daf9d4396a64d02c6d58bcbd609d9a0017880ae0cbaf02ad0f1fc8d1b3" +
-			"ec987ffe13102d77352690c9b761bf13ea0b3a8ebad4a0823817fcaab4d0" +
-			"9b0bf03486620761dc77a6ba007ba07153b17425c4026597473e78863cbf" +
-			"430c0e5e9b04a83ad11506b61b8d9be3aeb06b5114e0d53d4724863eba12" +
-			"4f3b974bdb0d02743520409910621cd730c97ca984fe2921c38055f83ee8" +
-			"c4611db92e52d8ea51d89203e89df7586c574df15f3a96ed5a10bf04cb27" +
-			"f9656b5b11cf35fd21360b029ab26e9a741c6b3e6357aa1a41de2cac6e85" +
-			"f9a49e3441e60a60e74f434e1b8cd4454b11962e5507ebf904e9d6c52a7d" +
-			"9722300517c434758fbd6191f4550108b143eb16c0b60094fdc29327492c" +
-			"18a3f36737e506fda2ae48cd48691533f525acfffb619d356bf8347a8bbb" +
-			"4babdc2ac866e497f192e65a694d620687cfb4f631fbd6ae5d20ac2e3a12" +
-			"4d85f9391a240b616d829ac2adceedf8f3451ee77e4835639b13c622ef8c" +
-			"48a181fc7598eacb419fa438d4046aa971942c86b36eb8e16eab67105783" +
-			"d27fc56f5b66f35451b2a407d4648a87ae70807e45bccf14983b3abcb198" +
-			"d661d562dfcb00ffc569ca967171746e4e36f839946bc7d2ea9a0eda85b5" +
-			"a5594f6a9c1b179f7230eaa7797a6aaf8628d67fd538050cf47aa654778c" +
-			"11dbdc149458c1ec2233c7ca5cb172356424eb79479b6a3eed1deb9f3278" +
-			"5282a1034ba165032b0d30733912e7cd775cdb7e0f2616b05d521dc407a2" +
-			"ae7dfcf46fbae30547b56f14dbb0ead11b3666666c45d345cd5dbfa200ae" +
-			"24d5d0b747cdc29dfe7d9029a3e8c94d205c0b78b56d5e18613b3169bd44" +
-			"1b3c31513528fe102f9bac588c400f29c515d59bbcb0725a62c2e5bfb32b" +
-			"5cf291d737e67f923080f52d8a79f2324e45a3bd051bd51bac2816c501af" +
-			"873b27f253ef9b92ba4d7a422e2fb26a35c1e99eca605acc10d2a60369d0" +
-			"1f52bca5850299a522b3aa126f470675fa2ec84793a31e9ac0d11beab08e" +
-			"2c66d989a1e1b89db8d11439ad0d0e79617eafe0160e88384f936c15eb15" +
-			"ece4ff00e1ba80b0f9fb7a7d6138bdf0bf48d5d2ad494deae0ccf448c4bd" +
-			"60f0788d3f2b76de8ad1456f7572bd0ffd27bc2836d704d95e9c0df34571" +
-			"9dab267dd805577fafda03b834dd225ad9714d2bd182b4103faa5975180f" +
-			"90d5d6cac1825a19b9d4c87cc825512ae9dbeb33d2759c990905050f960c" +
-			"db3eb364c15b593524c882902b2a1d7fe40ea3f54fb0202fd8821463c7e3" +
-			"4b02a1209ba0048a9805f0468a13e03d18009318ecd92042959be263a51a" +
-			"407f1e660632c4247419659a4e073a8e9cd4a226763a7daea464d5427270" +
-			"7efd053cb4efc0504602c4f63e7d247b55db2ce1c07138f585d16cec97a3" +
-			"0731d5aec2166cb4de41695feb76280cbae1af8a2e67c2d5a3ac5487ffe8" +
-			"640f308ace6137e83576b79d586b663122221c20aba7a6bf60f73958f436" +
-			"59f087f850ba6e2d7fd862249c5fa6b20e3e43d4f2aa10d4c9cebfcbdf02" +
-			"6b8d103e4f89b93dd8af172f421001c8b162bd6d0b847a58ac108b6d6cc4" +
-			"9c7a9ba069deee",
-	},
-	{
-		key: "e3d21f9674f72ae65661aebe726a8a6496dd3cc4b3319f797e75ccbc98125caa",
-		tag: "3c95668130de728d24f7bca0c91588bc",
-		in: "baaea2b4b4cbe9dbc4fa193c376271f40a9e216836dc35ac8012476e9abd" +
-			"43dac6b9ce67dc6815904e6c84a5730cea0f9b4c6900a04ae2f7344fd846" +
-			"58a99513ffb268c6899dfe98d605c11e7dc77de77b0d30986f3051754503" +
-			"7c26be7b719aa9ca1140cfdf4c586b7fe726a8bc403249396a11cfee0a6a" +
-			"f6c5e72259785cfd13c2897384fe527100170001ea19106aed38f7d5d9a7" +
-			"ad43f0b41451e19989192a46b4f9734a774b6304cb74feb7d83822044a24" +
-			"2e51d55c0b8318e0439493bd1a57cc13f6079166cabc46877d003dcd39b2" +
-			"c0b90f6b32fc77acf04a6c125e11b35d91e2b18401cd53df4aff804e3c67" +
-			"a8bb3894b27c6e9b0070b53a85aafab0c0a253f9cfd4d3cd3be52428385b" +
-			"24a3f9f71660ca2c38474d14a0309e2f400e2c21af6e379099283ff241d7" +
-			"51da5a96a8dcbfdc43b913b29cc8cf8020eebb4a67f5bed31f2e383f8656" +
-			"8c815ff172382b425e95902e80f5fc219eccb51b656d37b56660f749e5b1" +
-			"4976a23648680a472d02ba71476e0afb29a0e084984f4eac3befbf8dd802" +
-			"2b7dca4dadd18bbe58e49c49ce48a06a71557a9a620c51e2623f818e4d62" +
-			"c2564c7ba04595cc109685869b183faeff2ac7a65049fc57cb10fb01951e" +
-			"a525332782d691f9759ec2ecd68bebb9c7aece5d522a08ce7830be520db4" +
-			"c9d60a2e490eaa0c91e37b256a97f84b39fe3c77953748c3b86fd84e9547" +
-			"a298c049cb28b8c85d59548b8dce635d59487c9de615802d16a8adc4c0e7" +
-			"80f35b9f10588a431b39b499dca929ab9d225f26e5721820627fe62427fe" +
-			"06d5773a50878b6effe840dc55bd3ea0c35168f6b6a972d57e8f88c5993d" +
-			"1ae33e0b7e9459c123753b518c184de7aaf429df078c9a18a29af77c727b" +
-			"796f5c1a501fa8105ee873c4e78c907142eb19690638a182fddb413adb06" +
-			"d66db19c7f6f46dac582bd72a6347b4427a576eb769d233febaf7be8f768" +
-			"337273c12253924f15653f9f3602b783703a81454a1dd7a8772a9ab1eeb8" +
-			"51be33e0c6c0708f3cc2012cabe8e2f0c38e35372abe27bc148fc4e1054d" +
-			"9d151f80aec0232a3a92dd77928a3678ebd7d09ba7b4e1d83227257292c0" +
-			"b8bc4a76de36bff6c9deb383029afaf4f37d5b935dc080a18665545e4acc" +
-			"195da0b9545d8902408886204b64f8548b32d012e0cdc520c17d9fb3be97" +
-			"800c2e2b945cb09a75a0a49e5d4d81c4194d91e839333b2b9b9e34d588e4" +
-			"e20cc1e911ca0a1429fa70ff063f0090fd842f89dfc5cc44affcce4e1e1b" +
-			"8b11c612f66b074c03ac2a055fd8f51ac9ed4f2e624589ff5730721d077a" +
-			"fb4c19e43abf8cf3ffa698362be8be51e92c2c91a4a56be64d9ac6d3fbaf" +
-			"5536a24c7fd0adaf74ca84c508e5e8c8bf7d4254e0c44158bd26acdf3f64" +
-			"e78438b3aaff89ac9986cef1e3a88d5bf2016340367a1cacd01ec167ec6d" +
-			"185d93a2a220d718b43ce1d429d2cb598605660b030e51e8d75fdbdd5b8f" +
-			"8677675e196a40a88285b18b24c5d2d594bab3d457e6f9e503e38cd470a6" +
-			"9ff8037c9a0a0f110a434335d954fa856a3721e0edcfb14287c3dd9639ba" +
-			"4db32b7da0670dd0a872e468e3819741d0d4ecf0a4f7a011bbae1493c01e" +
-			"642757491189f8664be3ec6437c4f3c76abfb0276e44a4d28871d3487c2c" +
-			"ce2f230452cb06184bb8620919659a7ba0a3d5c12ec25678b03403715ee4" +
-			"acb6a53d281036d8f3a085143cf5ecc3a0c6c92129caa7ac1f645c7bb95e" +
-			"4f63da38dc319e2ccff4a9006f9b9b1a38c4c39f6dc686bb82d43fb9fce4" +
-			"0c767d3ff22f52c5f9900130c65bb6a9cc7408a777d49b70946665f4a733" +
-			"5099376b276a43dc9a6382bb2d40425f6481b1846148434c672b84dd7a20" +
-			"33deb5140d43ba39e04ffe83659b6deb48629e1abf51e68748deffb756a3" +
-			"ed9e0807506b248a024cd509f539f4161366547c62c72933584e851599b6" +
-			"82ec16f1d79e9c6a01cff6f51ba7f46b67cdca09f3ab8496322b990a6116" +
-			"8d7574854a1cb1cb8f30a303dbd13a095df56dbb940dd16ce79879cd2d73" +
-			"80a419842fa1b34da668286de4c1ff5917b7aaa64713c349dc8f855d04ae" +
-			"de9a3a4d0739dfc36510b1e7bb1695418164285c44631b4b1a7c5798ecb2" +
-			"d976c1a3679a827bf0e8c662567e402bcc1354222036ad5959a6f0b8508c" +
-			"6a8c7d4a63e7dde154d778fc80a011592771d55801c7e1297b00b77f80d6" +
-			"314ebd1f5b3057398d1943599897cfabb65e7568d8fbdfcbecfd4b8a83ca" +
-			"0a7bed08ab9a656424831e0d7718c15727af7c83b2ef5eb5684aa044eca2" +
-			"ba896811246766248b20a325094a4b4159f9cde1ee349be6dc3c9a190453" +
-			"0349212a9537f65ae333c288753cd2bef6c5beb2f4164168d965a2c0fb9c" +
-			"c8c73d9e776e23d53ddcfb83bb7dfe2a1b8c781280f449d6f310faf8b53e" +
-			"89e6a611d6d3f42f2aaed5259730d149b3e7dabdc9f865bc1555374738c8" +
-			"456abe112e9628fb31efc2ecdc972da05987aafce728ccaed246cfcdf518" +
-			"3fe5dae528bbfb99d33194167e0f84d462d3d0da83e92227cf57922c7956" +
-			"4fe44648d87c69ad708e797972c44c4a5183fd5d1150a1182e3d39c3cd16" +
-			"3920f1d7ed83992bc4116d9351ae1c6c4827d1374242e374310409f32d5f" +
-			"0f38c78b6489c568b791c70394d29ea2516dcb10e51bdad862ce3339d5e6" +
-			"14fe14f150961809c36e0a2c8eb872e9f7a1c0956fbc9194cb63ff9993e5" +
-			"d0dcf62c0f49e81dbe99f3656c4dea57b766ae9a11254f9970618f1b33c8" +
-			"f339f440de240170f7a21f03ff2da42102b323ce2b9b7d0de5aae324d1ba" +
-			"c87b1e4c5279a566bf659778f8b03882aded57377a0f1b063af2897060e4" +
-			"23be7cefd4aa9a28479c16773944d254fc21d3e1acdf508b7972372b5991" +
-			"3b8b088e93471a7d54c6ae4c52ba465ef07f19f269677fc2f64d3fb3d7f1" +
-			"9069d6c7001d4b002ed6683c59bd5651a450503b68a4a00820b8c17e3263" +
-			"18f32c21dfbcb2a02a104edaeff67ec09533aaf3d1a7fb41aa5d506ccdbb" +
-			"e6e35fa0a263c0aad3acc91182addf8c5bdfbd0626702694b8d652a63c65" +
-			"8d6b2b7c75d015630de508195e1fca9573b61bc549ca017c4bd888194d44" +
-			"3e031f36170215a301f922736a819f3ffda69117170d1933300366c5f2ae" +
-			"1052446ef7c3b82c5868be158a881597132f51c91c80c24ebf621393dc45" +
-			"05fe057364a76ae67494a8a5f67acb551cfe89f447df272ed9c1509fc330" +
-			"2c3e16541452d4d68438f26858724012ad3b72c094b9f166c6bedb8336a3" +
-			"41e032988f39cf53535789b320b5424d07b6bf5f8792e3aceb0e868765b8" +
-			"611d7905089949e0c273e2410c72a146cd63981f420405bd883e5390e985" +
-			"8214a8db714e8400a21d0636d7e5d9671a3582ab9ff032170b8dd6b9d5a2" +
-			"144d065228fa54aea9a22654df67f3f62c5fc59d68914d8b219829b536cd" +
-			"2ae937ecccdb6031d94cb3",
-	},
-	{
-		key: "84373472e362a356bd5c9b50f55c588d067b939009944f02564f136c62dac36b",
-		tag: "12dd5297cfcec53deae1dd5f9325d894",
-		in: "860d9b2954c3daf18fd67eb8bd9e6e3de2e4988ad9b04b1987219204dee2" +
-			"388db1c59a935de27bce29e7cd3ebdf038785efb35eabd4c3785a62b1d9c" +
-			"3ffa25e2273cfe5eb10b4ec6152cd8f21dea415421b452efc7cc4ea6bf1a" +
-			"b85fa6614e7f6d650125424865386ff8ab53247a63ff023b2d0753a9e5bd" +
-			"458d6ab0156fd3cf2d5002f902f927a847e8c4a8426b0a5191f5e237d590" +
-			"2659ce9be9024750d1d618a6b8dd57efb6c2bbac2930858f1132639391aa" +
-			"9e8a620a2a7d64bb7e943c77753401b5b619d95ef857df25a52b4eb97372" +
-			"a05416706b2644e2687bf1d42c0cf06e5eef8a1fc7e178440bfebb85c44a" +
-			"4837f69e43a1789728a999c5e04291576e757510f22bca11583a4e93688b" +
-			"442f2b2dab8d5ea9441ff09b8287862ca538ad979297cc75510a3d9ef36a" +
-			"662b4b7c373f184202befa5bf3f315642e6210763d033b7e2c59731cb356" +
-			"045e9470bf2f83cd62f11b3e904b0c0b1be99bcb805150ba7ef12b8df3ca" +
-			"bfc5055640687d710ab88e0fa8034b26112ebfd044a4b290b1c6f6d18c31" +
-			"ba9880b1cf2d81b5d02f00d6d351da5dbf47b6a5cb7b53eaf6de52c8a68d" +
-			"053602ccffa37ccb44a7683ab4f8a58c4bbc9e140e4e6f3cc10a5c07ebd6" +
-			"070818db983f9f415168606011efab6b8d7b4e61e8eadd8bfd8d028b89bf" +
-			"b0a16996252d7b4ee4f9ab50fc9d6e482ecf99beeabc38d70efbb9a0d4b7" +
-			"9a1c5d2835adf8e25111352eabd24d562644efc97637f695e4792f2049c6" +
-			"00f4d889ceb951cfe289adf159865d013046985d7fe2598014bf2dbbc528" +
-			"b4166fc2180e724ded8e7ea1c8d66338ec50d955d5594a0a7b4655338b70" +
-			"e8978485a722df814fdc6fd2436dbc060121fcb575672b2a5e454c1209bc" +
-			"2bb21a99d39dcb3c697306dbc2104d60fd8051c43ea2fce268987d0ec249" +
-			"a5c02f91d3b0dfee181b3cf8ef1ba9665daf7ea1f1d3b216e378943b78b6" +
-			"bb41e5dba095748bc776f8df6383033a1f5504955da3f42153b1c7ea83e2" +
-			"f90b990ea0c5bd3906b5c4060b19f447ec7762916b8766e5a23bc4d39cdf" +
-			"8e27752df8129b60ccee1731e47383b589d4fcad865eed4041a186df206e" +
-			"9fb69ab6ea092e36f186a6fea8d77bd7f3ab0fa0e29404d617317c75c832" +
-			"854427848237cfc18486c95f7213b9d53f324da036e8d298133b5003984a" +
-			"b9d71836f9f1b059db90005a9067c261bd85aaeed4d623df2220eb52b73d" +
-			"d683abcdee5cebd411996f853752f638bd28df6d78bec2ed3e00d7beea06" +
-			"2b81c19682ffb2f6abe3a3623a2e0570650c1384f1818d76fbefe3a7ef3f" +
-			"46138160ef897f9934e00e066e215230e719c23905dc60d7fa4d666fa52f" +
-			"e7737db15126d3262c3a4c385cdb23ff3b56c131e43b241f4a6062a1a248" +
-			"de9f13eb82c11f7b6a22c28904a1eb6513cdb11179067b13c7b5f83a58c1" +
-			"4f2753f19fdb356f124f52923249d6e4a2c8dadc8bb0fc91e360155a14c5" +
-			"c194334b9f0a566d51fad98592b59c1cc4b40eeddb34e64f337f83874884" +
-			"0583f853398c343dabc29b9444be1e316309fb8d81304d654b3d4bc4cff3" +
-			"55fc31278fe22e649324ef10acd247c0b72397edf96a1c16bbbef0640296" +
-			"4d219575fd23c36efc1fb8f8a34b510ba9bdfb3b478e236777ef7c6c47f5" +
-			"5a2bd0383d8eed3759456ffcffb15e61985b08c022658a5ffc875821bdf8" +
-			"83f69f096dcc72a96888c3af76db57a54be701759670bf05cc9015f5bf1a" +
-			"745cf755a25b1403a870875701427f820c4b29eccc260f30113629ba03e2" +
-			"785014bdcbf34d0c67aa6aca20d2dece811788686d5a45820d2980bf7d69" +
-			"d5c820a09bad7bd95166f63dcfbe8652565c285e60e2704955d69b3037d8" +
-			"7f5e6567d95b8891276d5cf7c59047d10a02ae4a28794405e2524ec2d595" +
-			"1b36ad1b9d5265fa098a033b88aa66cd9eaf01eea49c7dc4cc51c486f624" +
-			"507a2be23f152f43709b2cfecee44945ca506950e90e70164b77e12e1c13" +
-			"0b4d1021c2afa20038f190096276cd22e89b6e7dd10fd58fa033c9d42536" +
-			"98de3f4908203be8dbf259112f840c76726d982b4a837cae7139e27182b6" +
-			"1b4dfbcc50e42d5ab8532edfbd30f668879824e9ebc34b63ff1526cda81a" +
-			"e38352a774d79f73219500e57f0159a32326195d8895d965071834876a45" +
-			"c1a3c0bc4b1638535f7d40011cd5b23343fc27fa318c1aa3f9d8c43351c6" +
-			"6148dc2175e0e620813266da3000954dfa22048f305244629d512e852376" +
-			"6248a897a3ec3e2983aaa8a0f025f18feea57a5153a59b02604ebfcc7a9f" +
-			"b03e62443df88ead9dee955e23bcf6528c278a353f254c9484a67a7b263d" +
-			"a301923a4efb6866aeaaafd428e6da48781365bc49e90cd16b2388220d08" +
-			"bb9f79d14012b5a8299a651917b6a829488753b6ca449a14e8dd8c5fd5ef" +
-			"657d627b8e7773475b802655dc033694f24376e3b01e519d1aa8365d0e55" +
-			"92d0a4adbf555639b6d75d7ee59a7d12c6c11317b7927f11bbe75ed90508" +
-			"b0698420e231206704d22dd1f1740edbdcaf19a47d66ace4eecbcefb77b0" +
-			"85cfcfaced4d2d6048ce76434eb79990f0898adb4af2c377b581ebab3f3a" +
-			"150f40dcae002d4caa60050591c0de4ba83bfd59a08670beaa4641aa9829" +
-			"bdbb720d6eb8b2f3e864a98676a67271a82cffdca2b3590a0b5f97efa5d4" +
-			"ba062b4798707159782bedc75e5363d5f5d55ec2bef70db22955adf401fa" +
-			"c3b7af937816eb25d54d9f2a92e5a2a04bd8b8d7568204fd289f5ed2e033" +
-			"a76209d288e11e8a4dbb06b9029e90cb186446746853f02d738e06bba538" +
-			"894e03e2658ab3d7f9ac861d2cffdf12396004d1cd15f18812d3803ab9e0" +
-			"6f41c9b374d6a0678bb82ce06d9e3b9dbc8d2e90b8f64d0d040f3fa8a3fa" +
-			"8be71d2b3183cceae1bcbfa2353689d842f7d7052e5699dcc70ab2b58761" +
-			"7041e5aa1e2f41911d525505f061d3ca45152f5a7a1fab50c674e4597a52" +
-			"b46aafb4ba57413879cad1308321843abb7c39696fc2f2e225878bb1191e" +
-			"e151cc76f1a1b8d491c1672fecbf710db82dcd32554361967fc839c8e5d4" +
-			"e488856e1b9382eb3fc3bdc3b6886a3cd79761b02bafa080a745ef6afa26" +
-			"822f1d10d5e8eefb842837d82c9986e78fc3390caa142b7643de8f613e5a" +
-			"890a57f5883409549537f8139534f4ca1b60f33e42be25433f1d82add530" +
-			"6a4cfce258c0d4f1f3c9148ffb5c4b626d51f78ac20bff0393b7fdb4b9cd" +
-			"70fee7f69892c8a9ee089c6c5c7bee0a1b825e5b9517f2c82d6c149735fe" +
-			"45a8839812c2deb2a355b6230697053092eca450b7b0d3242b2689efe364" +
-			"09e820d91fa4932034d96495d9dd3baa4b385da815a7cb69438ff648b326" +
-			"e7efe8d688e88570ba59df7c439faf72c95317a10c984c5ec0043407e9fc" +
-			"9b46487810eac19d2bb40e0a654935f76e7d8861480c5f48419eb33084d4" +
-			"0e1070e5ad542c94f58b49e67dd05b6637a2c67d41451b7e00ba30eff221" +
-			"755d6d427ec634a2b95980d274a89579feccf1c7df3787a9435e588f2496" +
-			"06a93b7ac41c8aaa84b91c95cad9463d4881de7353d95b13bbde4c9da90b" +
-			"f1fe96257309a416407c64368b5564f022c4a493f2a39df1696f45801e42" +
-			"a5",
-	},
-	{
-		key: "2d0035a30d19b9cbc7a27561f3ab474c01115c4499b4adec660ea06ebaa1a14c",
-		tag: "a2c77b55cb0c076d8ea83cfe0e64f293",
-		in: "4e667580ba4f38f64e5cb5566bffb486dcae10cd17acb3754251e837767f" +
-			"16429bba2b832f29ba538f97f3556548d163be25e69f88fff0743150623b" +
-			"e0a1d82af9384ca335927a0e9cacc3dadbdf1e24fa5c81f2602d109e1400" +
-			"33929e409b9a0fa4f2653944edcb8b3ef963ba7f8806196c73bff0ded670" +
-			"c6def5d240c5f3daa121f8d5bec9b2a0b0f1d62d54b013dc742d6bd46325" +
-			"460f692b76d4991f0796820ddebf150c7d33829795784dd2759b334d2706" +
-			"70a7264941be5d99d460d078a9eedc3660cb3176ad302f9365f0bd698e46" +
-			"9f3e63511abc81109995dba17be1abe8bcd28407c7fc8d02c14794bb033e" +
-			"178a94f6dc73719d5bc235f980a16eccb4121ca83b13c4e165931ae4f192" +
-			"4292f8cfdf1c3ed40feb71e13d919b48fa296dddb4d23114a3d86ec10f16" +
-			"f314de4cef813ed24b49f4c7bc44cb8424df1f70e8d77366161c7cdd709e" +
-			"97610aca3a24fb2202ffe15eaaa25d711cb5179212a2c6497a13e5d7c365" +
-			"7bc502b3d2ebde2e57b714dd9bc21e73795f3d35d620613918c4c9aa0e89" +
-			"031481c97a5a4c15ec6abe42d40498c33d71c823bf1d5bb5fee457e2fff0" +
-			"bf777c80c6e3336ab3ce793440e74b336a8f7034f6ea2e4ff5ea4ea7c350" +
-			"65cf2ccd2da1d6df29bde10f4cc0202b5e4cf7ed097da49b970a6db41e5e" +
-			"98f3845b42f46663b1d1ff01da71389a8737ba8f51eac1ef357ba5ac9a80" +
-			"dd2c7f9476111dcd651fc33f4c86dc8658656f3f02a8878bc38ff0d0a1af" +
-			"2e31fb92eaef08c50195490818661feaf90e8b6f5daa1ebedb2cdbc8d5dc" +
-			"16db3505f9611ac46bc37931e02c1fd6aad6e4b7e187d5e6f990fddc9563" +
-			"2b33f55bf68b0db3890b11113ecc839a4fa4de25160e574289aabe4d8fb7" +
-			"9cecf9d2fa75ac8d0195beefbdfe0815f8d7d9751c1280a29b547149ec7c" +
-			"2295f5afa53cfb516158086bf203357eec2a5db71143f996c81555a47f92" +
-			"209719a71570a5553f1ff9b4b41827dd74657b463f36623565f0c9f4d2ee" +
-			"8735d6af56ceb3b3d0ec516b22f0ddafbc24647481f61ab169e2616c91c0" +
-			"e1f6a35436598ed801670e1dba76226cbd0544959ebe70f836c8a7df575c" +
-			"b907d780ed5aa0d6e4e8e0d2f457efe89a777374aa49d4961db96dbb787f" +
-			"021d99231001360d532a70ee1fb94bd6f26524dd4b7556c6d40e08723d7f" +
-			"9905aca66c4743f2bf8b34493bdabcfca617809a867bfe0a4f94c756a6a3" +
-			"dcd04ffc0a3ac671a0afefe0d5d447efcec48c6368998760db6a572676d4" +
-			"29b6d3d6e0c815650447748c4b27541c5447acfb8f7261b6378f3fc0fdd7" +
-			"375eb9d458648c7fe9cd96344f11aca912cc5098e9ee39e0b6794cc1dc2d" +
-			"f1b10f927102705efa20e667b63a91f935c17764650b287f5289d5790766" +
-			"555f31985c5aad94c652ba41fa9c0195d15405f1fcce9e23054a42c8a252" +
-			"da83bf6268782ba44edec5d8f94a20b1830cd1c5894cc6b9b52ad0b12a5e" +
-			"cf3195a32a0b02483ae3b954ac6f3af1e0f334221279d03a72138f3a2cb2" +
-			"1e706427c4d604674dab88d429f28a67be7a996126e077a1dcf8989d90d0" +
-			"8b08f4abb9a546b3c64ecaa287bf3468c59add86365b885f52afe13ed8d2" +
-			"69ea61832a7ecbb96ff3336f58a1eeaa6dde3611f3ff7c2cc8c9b745b0e8" +
-			"b5919914245a49ac192cd77d10deb9a249623f696065a532c20eef9e9b0f" +
-			"e706579566a9eeb14d4e8251a7750e29eaa60f034c1a7a1d51aa03a45fff" +
-			"89acf41080deec5506128b06f003fa46bc4021a82fad6a8052a49744ed69" +
-			"45bd9331b5ae80d873cd042bff079b2b9d8af8065a22c449c32a56dbbe7a" +
-			"80d0f3e30b9167532506915883dce0aa9cb749e4368c595c5bd33b57e36d" +
-			"98cc9bf91cbfa47331d69b5cbe9c92bc66c0fc9ca8717bfc108e1f710333" +
-			"14dba02a28b9aa05890cb01ae9175806c3c4215bd446f6cc96ec5d08982b" +
-			"4f83cd1646160e1d306b3cdec02d251f0901b03e8c3c35464eaa5082586b" +
-			"b55482db97599d513ed8d7a82e32fae302684b7ede058474c1fac7893444" +
-			"16fec93fb982accd162dd956ba2f31a894e9366eca00e6e997fbbf9a2980" +
-			"8b83a139f6432147a717381bb8baa2205715f735c1e0db273cdda6897c9f" +
-			"39bf0d7eb7caf93f657ef4d3fecea28baf69cf36d3cf347081df3114455e" +
-			"b4fe3e49ad3c3f14435e0b39b6c0d16db0fbcfd7ba8da8760d5952c03667" +
-			"251e7a4c3008cfb0904225e55c23b884bb09d26631650460c4240bd5a165" +
-			"b531ee76ba5749b3bc60adad35de519321c1672b47bc35fb59f7792a3495" +
-			"11b2bb3504ba4a28717823a27a1f99ce6970290b26efcf1e7a0399b10eb1" +
-			"0c1299c09b80f4520d00e7908d004d5b6a72a411759cfa9523f6b2912234" +
-			"481b1d8fe4c2365961c0528bd593d42bebb398b5836ae6ca013fe440adbb" +
-			"0090e8ea274f4d8bcae483e3663051a328f7c12870b40e4973a9797a2336" +
-			"3d3c53e1b0d1a9159bfb26158f44734b3c34b571be641bba2db937d4ae1e" +
-			"edc807b95b1c2a7d44804885536316ad38aedf0d83b1519661f2bb5283cb" +
-			"9c50dd61c3753433e988189f26962d1f4befd444257d0b6d5b819d5fd572" +
-			"22c9fdff032e07a4d8686d451e71de4748965309c0a2d7c422ab7cf3d96a" +
-			"8c0a1b0afb229debd1c9421cb828b9f2be96bb9d6b5be7ef8134bd9ccf81" +
-			"51620937d720d83dbdddbfaba8ecd2eab6f1974090efde0ca963e9fdd691" +
-			"ed0cc5e074c5780779222552fa46ddcd951763a32aa3a044ff4a73cbab41" +
-			"dabb3c2c03fcda68303477f0dc26f35bdb5c9bde721fba1a2db732a89629" +
-			"a8de3cfebc3918df1a9d5053d09da5b7316e3285bf62156ca28cb64d343e" +
-			"72445fd66757bf4ab374fe7932a65f3d7fb6e42cb12e5b67ddf8530383a4" +
-			"6c1ee7ec8883e454a467df1aa7e468a6e7035515f473901efca5d46ff358" +
-			"70e0cc2575bbd7f8866c8e73cb157903a1694ff3051424f28de826984dcd" +
-			"065dc3658df144ae3a6d37b88c367e3cf7c58169dfdedda4a2821ce22188" +
-			"40472ff72f0dd1a6b0100555ff188b80f835259a634405e3dad61fc299f9" +
-			"307e27503b2cb7714bf3b636cc64b61d2e374119c8ef8adb21f1516c7fe2" +
-			"38c807818065bf312003c12e02525d69d9629a99e4ac66ad2e792f302cd2" +
-			"a6f5f702dd28040738a084a7052f2c3ed0924c33b7a5d357b7c9a29cebd8" +
-			"621a4bfb7bb34676ff210d59f7f9d4eafb7c5c490c9ea48402af5bb072c4" +
-			"731bdebcbed4e8e08a67931b6d7342d4ef7bc4a75ca1dfbd32ed6027d8fc" +
-			"b71e3f55565c02e06daa8c579b69774889181291c470576a99e11f2c5acf" +
-			"77e091ef65ed243d4287176f7f6ac7aba6908c9ff1fa43b894a499b642ad" +
-			"c01b2fa1c4b58801411941bb448f1f7a04794d2cfe5db1be61f7b86d6eca" +
-			"c547ee51d4c9050f9e9f318dae958c150acc21c878f0c7df6065294eb1d9" +
-			"a278c920838a0db752b080a32e67ac312fa76b589a385f31847196076ed8" +
-			"1021fcc375bfcc8e1361878e2693860eb21ff0595e4eaaf7897f2b79367f" +
-			"7c4f711279bf0c93a97dcb1cd8d87e444ad5f4cb5c1de44e37868c6743f1" +
-			"cd72cec376726f26c8bd4836f9a9f9c68042f95ca6f9d7cde493e531c553" +
-			"8bf7ace6dd768db69ac7b41ce93e8ca27ff20a83ff2148ec5b89e05d8b8f" +
-			"5d78d0fe16b96f6eb8d3b20126a186085c6825df81aa16b3dbf57eabc360" +
-			"71299ccdda60e250c652408d9cd1da94d73c728440ae08fddb901aec0fac" +
-			"1050a778b10f94f84883bee158bc53b1c001807c43a3151fbf581b18dda2" +
-			"527430872834e5c380575c54b7aa50f817cf3249fb943d46933cad32092e" +
-			"bfc575bd31cc744b7405580a5f2eabe27a02eec31e0d7306750adbbb9f08" +
-			"c78cb2d4c738b2274c7310cbf8dd0e59138b6a91b8253ae9512fe3d7367e" +
-			"a965ac44d54a7ed664e5e5c3c6c2d942eac388cd32beffb38f",
-	},
-	{
-		key: "2f29d71d73f7af98f96b34e939e1a21e2789ec6271b878bbebd14d7942d30080",
-		tag: "ec02f4953a9a63ab6f2bfc3501e4fab8",
-		in: "0e0950987f3508239063e26a13727fefcdfd2cea6a903615c64bf12d9ed3" +
-			"887f9b2cf7ccaa196ccc7756b09471475b9daefd4261e69abd23b9faf9c5" +
-			"1fd5d5788bb39d3c068fa6807d30f6201d3f6dfd31715d08b1733440cde1" +
-			"049608d23c4e45c5ed61f863350232f85827e7c292dc5f1eced1cbc912e3" +
-			"f5c420bd945911d3881ede5153d3b2cc85371fff98d2caf97cad6ef59001" +
-			"4017f9690cab08989851c2647e77e81401714a93ed9f938b79f8f54e3133" +
-			"fc2cdef259df2ba0d48f37bf9e43792e3a777214cf4aab6dde6deeb543a8" +
-			"813b71b5974136c1220d6218a252881f0f5677ff5b6aba127f19a5f3c5aa" +
-			"c988543d7839a90a3f947c4e4d5c6ae1ab48dbd40456d1aa65339a4c15eb" +
-			"520e8ff9f965ac4c37735937cf09942e7958f8a6cddee41707423f715903" +
-			"ffe0d15af8c3140d3a736d23be7485fceb9f07c6509f2c506eda4ec9d30c" +
-			"cc133708f48d8828e332808c84a745d337296d871b9794de1c5d06534aaf" +
-			"65587526a84e2521f8b332645e0e72564bb308ecf99b7bc69608474389d1" +
-			"686ffab8c49b7f04dadc28d2ecdd0f508dad2135843304e378b3bc7a4f25" +
-			"7fa4316be956e0a021edb8045f39fa9f002087f067199bd6001acaadd261" +
-			"4bf6aefd3f098f92a959685f24bb2206c347359d9c6adc6847117bb434ac" +
-			"6c40ec618f6ae8b75a5e2e4d44c332b7b06c8b4d521493b9b0bde8894209" +
-			"717a24b320214297b62dec741cea018ea681c9b56702068528b3726953e8" +
-			"c5e4ccd5029e4183e772d9834a56a88d45bf87603dfda40e03f7e894766a" +
-			"7623ab4dcc0dfc3086d17566945069173935916f772e2a5f8e1547348f28" +
-			"782400fc069ac0e2b94242e9e0f1ba2d0e76898f9b986540e61ea64d7f69" +
-			"1006b86ce61565da75eb16a8b4c5865ca4eebdde2190e354734bda94fe7e" +
-			"12ff47dcb5d5e6ad93cfadcc491cb350b09ffe391a157e14b65e3a211b5d" +
-			"4e447c3ff95571dbab33a83126d68dfddf9383b4359d4103ca64af1e6963" +
-			"d09e17eb944aa71e76711dca33168586bfc44ebe9fdc55497d83f238c66d" +
-			"bcb16063bc85635f0f1a6280563bca49ef971db96a41b6ac5e0642643262" +
-			"61eb4662f3d6ad4cac826db895de22c9b8aa35e6464a7f44e1ae7238e355" +
-			"068d68754ffcca76c50b7ce7ef9bfebac9eeab32c87d059cc7ef2adb5d57" +
-			"c7419adb394eef48441952253e8391e555730e29789d6293c3696f441449" +
-			"0aebe2bbe541e191a6652ffbec1192f0f9395b7ea370aefc1f1cc8438035" +
-			"d7681f12f1e11d6e334da188b10c302fc0f4bcf1de448090510a8f1d5683" +
-			"0c943a3c388b33a038c26741a4cf3487313f755fe7a28e25e44b5383c5f4" +
-			"cd6ef34d7dd73462226281899dc3f2e69809a0150f694673f31addc89888" +
-			"072a7d4ecd63d6b90540f9522ec05829a7f17d48728345ad808fb0203883" +
-			"3cbd018d612992a88df944b8e34a70920b3f26cda2e8bb16c3aa38b12b33" +
-			"b395c9ba5e809f60ff05f087112151af1b5987403cff8bb2dce79093f431" +
-			"2c744f911a6f3091e4f9ef9375c4dce4c241d2f6024a1797321851ca316c" +
-			"4e460fc060e7839deaff8ab5e8bf682c0f21ab6952eb793cffe690db911f" +
-			"50b11f56ea352942c43bfff51d4360882754faeb7cf28b6b32bf7fc9ca71" +
-			"fbfe1d72be05b8bac9ba513d731e2c9d13d6f2f10eb926edaaf0e3996656" +
-			"da8718a8e103c59326529e91ebac6ed52657c9690ccbf81028cd9fb189ec" +
-			"4de94fc0771e53302c8d9082835a68780cccd772660a110a1b40c57bef3a" +
-			"c1d69428aea549ed17663a96895a66a3bb5ff6ff61dc64908df49b760caf" +
-			"a5aff05e2766a418dbaa1e7d189a9edd55a04fee8c9d6e506d299abc36a9" +
-			"d67be035fea5d220f41d081af67615fe627c4dd04bd8659c7fa4f57f35d0" +
-			"db40d9684aa178d7483ed5d86f04eaea412e0ea05a4698377dbff4fc3a39" +
-			"1f6ce0cb833d3118d6c69319b511cce65fdc74928e270da0c537f8201eff" +
-			"77416155d4a39c7ad38c22cdbf7d2b7ff7d85383c178a835ec604c3f9ee3" +
-			"7399f7dd826e34f1a35ab75da44ba56f86097ddc0f3658ef5bd65a24f4de" +
-			"4255d0b03411a9d7f0ddc29e33cb865da23393471aa94e6c9e72e789206d" +
-			"3ba118aecd39727068f528f01b25fae2280d70033e4ee46b41b864bb922e" +
-			"001d8bf46d6fbaa5a594e926f45eb3a4d2f074506d7834b606f43c89699a" +
-			"6db00b374658d9333700894d440a712a1f25f5538f9e7c8ee57ae7e612df" +
-			"13292c8ba9dbede4fb77cc6c8944aaef59ea6ad3b36db398f4bb0f82d40b" +
-			"44879835f224d6e05992b1b8a68dd58c3dbda2fd73786492ee48c7a25f87" +
-			"264b766930fe9427487504fad17f8d230934f044e49ba219f26ead728856" +
-			"cb30eecc33a3946d3b1b781061f2458c7c46f6d96f3e06f369f97be91835" +
-			"f23b38347d1e381ad5be4419275772c2abd549522a0203c1ee9c96faefe1" +
-			"df413c4b7b2624417890e0716854b7092b3b3b368cb674035d3e6bab2357" +
-			"e7c262b606f7141b6dad2f6145ebc1deb7597814719784f3c17848a90ffb" +
-			"cb0289e2f3cc7da12442b837c4e47f468bca3eb4e944a31c48562c2f144e" +
-			"9e920ab5e4cf90a14ccadbae29af13db38cda911e3c8f6f525e6722809b5" +
-			"31a4de1926ab12f643d25af87eb8610df59eded6ec278242247dc69a4213" +
-			"13f7c2b26ae7a917c1bdaf66c56876e9104d40b59e6ca1431ddb77fc89f3" +
-			"14b46a154cf127688564a4f9e120d7b5816cd24a6e095dc8ab8b43bc3639" +
-			"329719f0e0f723e2f5136d82638e2249e648ebca67cf0306741e9e8d45cb" +
-			"903bca85485c4007397c88a1ce07266f4f611b96b7e0ace3074247a7dfb1" +
-			"cdbbdd66e25e172fd2bda74abde7f3b4cb5cc7ee7859f053b2f04f9de03b" +
-			"a8e96264117f502087c3ddbee8d850bf3618b4de90f7b3e562dfa57e4426" +
-			"5357236e35e71d1669226d63bca50b1b944ac07a1f794e73e80985689b25" +
-			"f18fc709367d63b8639d71865cee667536040be827145c08cf3e57a66678" +
-			"4c81115706a146eccadc7aa1a9f074b47e95bcba7db8108a13279077bef2" +
-			"64699fb87e5abf5b05ff3879d7c7c5169c7cae817c13f0859d4e9c05db0f" +
-			"74c045ecc30a51e515feea627da387ff780719395b5b9ad93179b16fad10" +
-			"5856049169dcebd43a7f39c549762405f807378e854b1654a1179d895ef0" +
-			"85aafc72c7fe1e0e1cd3abf8e20935e331145bbcece4f17ad24ebb6c64ea" +
-			"73bd98a7494c134859206c9422f7c4a057db0ae0770c4bcb08c1a6b9ca4b" +
-			"7dd8c1cdb3e4977c7ce6c1e79b9d6ad98e27d2759b53cee73ec037a8b686" +
-			"f1ff78eb8421f41c74ce9c62a90d38b75159ec925f232e0db71362f31e29" +
-			"4336f5580a34b26c5a01ee3454cba227c7f400f6889a319d7121dcea27b9" +
-			"584f33ac796d48a9a24cc5b6799ee12f10725fbc10d7cf83e4b87d9c444b" +
-			"f43e2f5ee49d8f3b531ebb58fed4234cb8bcab1b8b18bf50956506baae8b" +
-			"c1b7492250f3adf64294310387f1d4bcac12652895d4f2dce26f380733ce" +
-			"0b5820e9fcd8512a1585a49940a32fc8875ac3c9542a4270602e5e97e720" +
-			"90ed71b51badb775340429fdbe45b887fb9ee61cf9e091c06092cf0a2129" +
-			"b26572574c46910cb458bca7c63eddd29d89753d57e568323e380065794d" +
-			"3fa1ffb874543f5b0ddc702b087e91e22604d9600d37fa0dd90d7acb2458" +
-			"4cd408a4e66bb781dde5f39efda6a8fc26be0d08ffdf851e422ab1500c28" +
-			"bf6b4c85bdfa94e8aef5cda22870c39ad49c3c6acdbb3b0d58cd05424c65" +
-			"20740b5c2bce4336545eda12716317df58e6fb764fcb3004f5248c5ccd84" +
-			"f63abdc0dd2a64e447c0de4da4a1082a729d8ebe14810d396933085cde18" +
-			"318278481fdb9a748b637cacb491f5234bfe16b53a35da6677336baeedb7" +
-			"4a28c19a412e7812dace251446d40ec07afd63854c3dffbd5c0f6a9a3cac" +
-			"ee3bab07fba94800fd1fa0fe44f5f2ecb2b4a188cd02b8a2df0728347c50" +
-			"7d0cc58fcd5d54dffdbda11dd1bcc59758396ed8db77498fbe13238d3d8a" +
-			"0040194dfe66811542ddaa658094a9580d4e4b4e29",
-	},
-	{
-		key: "1285f117bd90b70ef078ae62f37d2218419e894b7d334759ddb2d88833b287b5",
-		tag: "429b2b39195a10357043c9601590a277",
-		in: "00ef065a1adb4ce7108b497813ccc748933fa8442689a7cb8dc7c1ffdbf6" +
-			"c09adfe05ca2cc5ec3acb7493f3497ee8f9cd9bb8a4b332c18e33f78114a" +
-			"c8f9a72ddb9f13494e934ad711818909831013ba195b53f5e9e5b4689399" +
-			"6d0b669f3860958a32b85a21009d47fddbc8697b7c9b92dc75d5060eb4fb" +
-			"40aed7a1dbe69dbbeb6296f5467ea2426cd17d323671fa408855bc53e5c2" +
-			"d111203ae38cecac7719c0bd7f21f6bd6a1588187b3b513983627b80ac0b" +
-			"300b7fa038af1cc8512403ac2cea6e406595202ec3e74014d94cf8780ed0" +
-			"33c570e887ca7fb35ee4768202aa52427d02c24e63f7f2cede95ca9909e9" +
-			"dfa86246a27db757750667c198c9aff4ce348f7ac51864b36ef5695df713" +
-			"d17b8f561a972d0136bd9ee9aa16079c2ab5d29ac9ab472255ade05dc49c" +
-			"b966e0c1c04258ef9ec59ded01f402d9fdcd9a2020a2038a8c78892ca218" +
-			"30136069485527069132959dab2b81c73ca590fde2a7ecff761d95a54d63" +
-			"a2664aa5a6deec163e46b5225bc98976a4f363063b0f42e29f792d138af8" +
-			"eae68d3854b5c1985d5cd1c9f49f529b0b4d2c936887b5b92cdebacef992" +
-			"c35e0b7bbd52114aff8c6b261852e28e451b02099814f809b0289cba0586" +
-			"04a363e3f969aad3d982f645ec4c549f943fb360fb8fa0d5a597bf89842f" +
-			"8ced6014a5b2590ef71524a7ad50fe0ef0e2f81b6e26b99f9ebbc8036549" +
-			"f7eacbf6ab884710c6406ff59788e03ede35c30d4781ad5af171e0623e8f" +
-			"cf5344d71165f0475e256e9159040f702b359a2963116ed135dd6c1d111d" +
-			"2a1e33e15c178ca4f02c5fb15593c50cf9a8a492f01e04778dbb81d26c99" +
-			"0c58cf50a9bcf4fe38fbfc0fc0685d8bd422a773c7bce649f7a86c59118e" +
-			"f5f857b2c72508cd1ef05e1a0c0b7ab4687fdd57437092eb49bf41a9ae8b" +
-			"bd98272ea2f8ee2515ff267fa6ae892c266a7effe61ed54984924aefc461" +
-			"6cf483dec024ad666bc797beaa429a742d1b8806f67d451b6d3a85b4d474" +
-			"003cfe9e9dd906df47da5559c41f15afabecc3e6af279cca0f2a200eb2e8" +
-			"31437e034d457fc880f60f5ae635690bce82bf6d1ad6b4f5344ec042bf25" +
-			"7d010273c861e3ac516e9ee2bab3a255f570baa32298467bf704bf6d9076" +
-			"a4c0b08a528a05cd1fcbdf51f3885fbaba7891a144fc058919903b269b4a" +
-			"29f43926eda32c38853b814a7d528156c223748d674d8f7f5448350f011b" +
-			"bfab1511001b8014e20fee37ccd4a0456f638c197c86dc116b34f955c0b7" +
-			"dee10bac5ea0c2fec8a780ac05098b51b902ca6afff4db3c6fb4f761df79" +
-			"b2039dc5f16d9402442a6fcf6c4297769e6c36824d908beba8e584ea0b3a" +
-			"91b9017baeefac651d0307bd89f517789236c0693c65a5a20f244d39684c" +
-			"eb810cd2ffd3c78fe9285d2eb9f55d133b86113efb8dffcbc6d258e84c38" +
-			"2dd8f4d7d63b65672516d9bfcc3310a79ce244b60d380128d529487f99b7" +
-			"d532d5f5c28fad8b9a071fd2fab8fd98f6d7ed9dadbd2fc4396476eba6e2" +
-			"1a1b1cc594a31fbd3418d98e4aa736cab285a2786fbbd4650e49f9b080ed" +
-			"3fda34941c28d25545395e1408fc3e60730d0696061f821a4d24123cadf2" +
-			"3af3d37ba7ce1ba3cde1368d468f136df82c02f9be9210022192aa02117a" +
-			"ef5ff70bcfeffd47bc37b920826a4d3db001f956939abc0df520f3ec1613" +
-			"ba1c4b3385cad97e42bfd15a3150711fe86ba4562f17780cee1cdf198615" +
-			"ca06270db84986f33e1d53d552b0da82397c496a23c7a78ca7641a908e71" +
-			"89249cc657c0431f1e09ae0213f28a27e6267e9d17b5bba0ea4f3c21f266" +
-			"fe538e215ec62f85517ae6bd87799ac5ce68453f09cbbc50d6e2a168f0cf" +
-			"7166ad50cb65b6c76406c326573c00e04a3186251c6181933828c58f4198" +
-			"f8208c4484805639b0d428fd05b57e4356239638f458a84000c7a7a8de62" +
-			"ec25b54d1e39d2579ec9c512fec475f243576f35efc02a1cd6b0478e2dc8" +
-			"be5f17aa4e3849cd42e76fbffe6e7d6f912d6edf80f718f94a7e48e1fc10" +
-			"6cac29627d9d4b82f05a30cd7c739f7f3ef7ea368d22612f189da450e274" +
-			"de7b61c6361521e684d639be5af4cb11fefa5fce6f8a5065c90873e504c1" +
-			"2c940571ea7bd7e9221129b83039d2edb069e8b5bb68567d8fcae34c6ee0" +
-			"cb94474d8b056cc3c7403873f2fe6db3b567a44e702e4f4813b2a264231b" +
-			"0a998207b41916715ef94e5eec281589d0a711f8e74be32bc60f43d693de" +
-			"77f21d5f7eef892abe87725f3d2b01d9ddb6dee15f40735a8fb67766dbcd" +
-			"020a93b8eef4361dc3a891d521551f65dbe6e3f68c60819b0a540b0991c6" +
-			"4449d207cf5b1c198c17ad6caf3adc628d09fa0baae7a696d84e1879577c" +
-			"ffe9b3f62669d4ea5ebab6364f08c66d170ee4a94d61fb77d60b33dd6b60" +
-			"650f034c5c9879243d5c16f853dd7a89885a9047a341b076912d47872b3b" +
-			"3de49edf7451b435698ac4e182d16c339be83e18531a34aebad36c5c7c93" +
-			"aaf121cf99ff92d3844d40740fe001eeca9ee71300d826bc3cfc87a29d39" +
-			"ea108a3cf259657ec4b967fbb534e7513ef3a96bffb35abc5ce0e890696e" +
-			"54fab515af3d2c0be6e003747504e486c0ec6e30fa4ca79d6596ae0425f3" +
-			"396e40fd37432e52c74f812250dad603b3502f97ada48a26e39fd4d44584" +
-			"6591bfa5ffb3770d95d3dbd49e9c3a38c6305796b8f7d79bd0845170925d" +
-			"575774445299bdf9d3f8ad3dc2dc5cfd3ef0293b84d6e11370851af05ebf" +
-			"b3510a22edd930797dcb76b759a9b5a77ed8dd5130e79ff5ac44b01901bb" +
-			"79603cecf674202bc5d84076ff41b3c806454ce80cb9e5fa9db77294d20e" +
-			"6d3008ae3017aba712862ecd4b32daafef1b8cc8b19ee8f8bc3835e2372b" +
-			"5cec66222ad5ea9df753c033508ec43c8b5995e88c36c13ea3465c8bc462" +
-			"ae0a659d9767db34499e9d01fb1588410257d6f588b3fdb766a66bce28b5" +
-			"e0880f8cf988a2e5eb5bf80cd7d83192b7392fbb2e3a07d51aea2b6bfac0" +
-			"d74d304f56d5af3598a0712cb09c04c5dc14194eca8e1b9b29f88344c0ea" +
-			"55638c0f8ebb70b6242b797fe2525fa1bde76293dbc0a66ab4715e6f9b11" +
-			"f7ecd8f35a20ee4ff3552caf01bb307e257ec0576023d624d6094d43d25a" +
-			"aadfce939a6808f8baacb2109c3de50a1cfada9e384cdba3e97d2c9025a3" +
-			"2377bb195fce68c5569d2d1267e1bc68fcd925ddb4acf567fb29ea80517a" +
-			"7e4056fb014cdee597333ac2408157ff60cfa1afdc363a11fd4883308cab" +
-			"d9a8fe56c2b41c95eaef854f20bf5941ed23156d86de3bd413465a3bc74d" +
-			"5acffcd15722879849c261c1bbe987f89a1f00b3069453841b7da667d566" +
-			"e41fd894d94de44c23fed08d9bdffb723aa8449bf236261240d865efd7b1" +
-			"74a4460e5004ff77f4196d1d421227dff7c78f1726df7b5eebddb4bb5f57" +
-			"5ade25296dda2e71ab87ea2b44ef2ce8742a7ad5c1e7a40e097eb336561e" +
-			"865515f7ee0efbe01d5a928f208f7c9f2f58974d1c11af0e737c673dc446" +
-			"1795da9757010cefc6e7f2784658717938735ed8cbcbd7981a1bb8f31cab" +
-			"b901c87a3218dd1195c59f64d0bc3ce8b72580fe38e6dbf1181e0090e5c6" +
-			"d162df9f31cc52fa6a8ac61897e9b4b3cb0ca2bfb38a38d9b78e46d775d5" +
-			"7645d2d6da16bda8edd8675e2ba121f7f85400cf7cacb9ffcdfae583fb93" +
-			"753d07985a00afc3a4e26c9939a5116d9b61196502f5d774ab4c7fb6cfa6" +
-			"01bcfddcfabfcd28055e858d7d3c19feb6bd7c02565add3a3af61bfba8b6" +
-			"f4b52c072a8613e878368318383143059a98a85ba521f781a8983c2486ba" +
-			"b83f5b91fce02acee0be8d0dda7489975f0506c8f363b5adc48ba971adeb" +
-			"4e1c830b5f264ed42da36d2b5ce2fdab1e63333b1061ec5a44ec1b6e99da" +
-			"0f25e7f7250e788fe3f1b8e64467d3d709aeb7360720f854afe38e190cc0" +
-			"925c6cbd77fbfccc07d8beeb0ce68e47442fadaf13b53c30a03ce317cf79" +
-			"dc9155ddf96814583695f15c970fd0b6cea0b04b1825eb26e65ea9351bf2" +
-			"f7a841ddaa8c9f8e885b7c30b9985bac23d3ce777b",
-	},
-	{
-		key: "491ebd0dddefc9f0117176772f9bab61b92a1f1de13796176091c56d1e53dfbe",
-		tag: "fbd3f884a3dc2a8be06ce03883282e1e",
-		in: "953b9a40789b206fb507ec2c5e9c88ca1baf25ad24c11a62f664db1da8bf" +
-			"dbe9b54f8e93b0bfb4adb12f8873096b8960fd91eb92a8ddb53232ac9141" +
-			"57caced33424cff943a8db129049af7e7b733afbec6637d8ee4f39d063e2" +
-			"be241cca6a339e48d72372efabceac57220692c40856532d95529adfae87" +
-			"a71c72f30244126d01a875375ad8836ef8db929bc81027935042a05c346f" +
-			"bc94dcc057db015e55c56064d2b11154596b813ee64b73bcac05d2688bf6" +
-			"f1fbb0cf3f8307b3df44c3e2dd1d226a4d0e9dc5f7482bada9611970f887" +
-			"f656dcb19ce1f8c5c86f4cbd1e4f49b18f170ecfd184028e769e79d7424f" +
-			"d01cb315897c21111f53f4d41c3b71402eea695272cb5b4e5f33abb9df50" +
-			"cbdaa55ed629d3ed7d93b43e550295502db1f2ed884afc320518e88be4c6" +
-			"b62a13f8d3636ba091d07dbc6c20c7e7fda016c05b2fadcfc9ea32f4ee2c" +
-			"4893de78ad8a1771aacf6efdbd8fb1f6ee9b0572ced3edc6313185b5d398" +
-			"88ce77950aa4c5201a256e3ae3e74f05b70faada14124b35b105a70e7769" +
-			"7184576b69708eaabd36e0ba885fc6bafd5738a67307a1181792333cddfd" +
-			"a4ef19c88497c82fccff05a8f9f732fc7505f0467a14e135288ee018aef3" +
-			"d0412f6b0760573d8ee4ab455d2789b4d22a42eebdf60616fe403627cfca" +
-			"fea672bd0a49e8e7b80e7b7b8feebce3381f2fc16819a8996a99ea230c3a" +
-			"84b510cf2e0d914610d646a2f45a14268ec1d6fca03d0aea5c9ae1c8d519" +
-			"b0e8b0f6fb8ad176b5d6aa620b253cc492b5e5645353fbd9b6c02bea48f0" +
-			"286e2c669782b5ffefa4d8f3f1037151026d9cca78e7808dfbe61df29e82" +
-			"951d7154f3c97606cd1e99300012578ea6a776dcef0811338b56606b51a6" +
-			"9893fe68f762af6c9c26066b1d503e64877d8cd988b443af66a36af8bdfa" +
-			"41b4dfb3721d1d81895884755b9c52527030afdfaecd66d4638fab1d1786" +
-			"3d5517ef7ee7d081b5555d24991810f1edde30930fd392f817cfe632b4ca" +
-			"6fb0460c36bde4a5620b9c369bf51c7d870c43998b8171a553d2f643fe8a" +
-			"58aabfce8cf7363ea978ff4d53f58284db822ca95b80306ec02a64d26a29" +
-			"c98520f1924c70d161682c54d08a2c48f54bb72980a8cf5babd0aaf0fd72" +
-			"7d5b1b9d9b731dc49bad228fe83f7347750e277a4fbd526983c206e075d6" +
-			"a03d68957b3e925a71bc1ea7304c77660d112a5d19fd21a785d4a8d7f2eb" +
-			"dc4183376d8125341eb28b2df5be0b4e04bbf95c47d2fe2aed939619cb97" +
-			"79548b752f57b723cf8295dfce69c9b7486b75a4e900f91926636f3fc78f" +
-			"7b7720a5151abdf5868fecf1e1a1d830cd6a4c5e3cd739da4432cf1fe2af" +
-			"a1090d6a1eeb32e7236ecfddb9d07b97220ab8e23edcc93d91abc11b0c30" +
-			"460d2027869d1c2487070cf60b85ad0b8bc5df566f6fdb0e58fd044da530" +
-			"6d277e564ca6cbfa820ca73fb6201b240a5a94c4ecd11d466cdc44046a66" +
-			"32478221bfa69b3a2cebd16baa302a573c90895d7f4cab453b11e3a4d8bb" +
-			"b5a9bf264781ce5b9796e3c47d0fa57f46b923889af4d073270a360dae8d" +
-			"51d85ea916f14787c6500d2d906ccaaa92d20d93edd09139f79bfeb5fcd9" +
-			"8c1cdbcbe9f2587e9c9094e3c4a32ab9ba56f400b929e80c0551f953896b" +
-			"e8eda6ecf22e6d4a541957dec21d6a9cf388ff0ba58169ab934902892a58" +
-			"86e1126b16118e965a271495ffa339c49466209ed3875b568a4290b7b949" +
-			"69d0465744a3c2a75c599c3a04ab1a3fd09125fe8f45724b2f48c7822b9f" +
-			"ef95af4b758ae66a8b6646df7a0a1aabe2a24c052fd6d30561cae0389263" +
-			"e3388c4c1effe431a04356c334aac64f36593544885c4b7295b57dc39638" +
-			"b665b22dcbf7dd6da867615de38c6a575cc66391135d47f8e1f0c73c6129" +
-			"17ada4099723933a758d83311b384364263cad5fe14bdd7c825d9601c400" +
-			"3537a5aca7f9da4710c132ce8b0f1464cee625633ef57f507739a0ab1cd2" +
-			"21ae634d4d0b3ff07e9ecb1baaef0a82a97279d46543a0464855cd62c07d" +
-			"5e890265612906a9eac88bec07b1dea5f67054c31ae40f8c673296cc5df7" +
-			"f0dd8cc9e643b44fd90dc2d1e870ad8acdbe165237642fd04c00965837cf" +
-			"bd2344ae830887a5719a3c16dc8ec08bd9131d055bfb959b64ff4cb638a1" +
-			"002a4fe02e369871cc4e3ffda17dd85343e679fab43e11970e60198b424b" +
-			"676ab17fb0dee10cc9c2e92b32b68d5b05b7a559176f822850c0557ed98b" +
-			"7454916e32af549a0027db95f02b88cfc5e7e05f28f53757dd97cc0f0594" +
-			"212f8801e58043cb17b040413c226dfce2104a172d218caa4353890de17d" +
-			"be1f53af6ceda24b8781801516cc51de9ca459e469b3c322be13d8c9541f" +
-			"755c518ca41a0ed42e44b9f87faa2a968b0292216e9f3d3e8987282103e5" +
-			"016fe9f7681496e1e8d663eb2d8bc30b41d735465527f19e336a98d2dc54" +
-			"d7c020bfab30fe6c62cbae7d09f84af69bc2c51a1839ffba15015d381ba0" +
-			"a44a3758771c4f18d13827f518f30bb74f4bff29a87d4b9e949f1063f63f" +
-			"662721cfd64ffe1dab3761852387f78fa83fb48ae2c75fc567475b673da6" +
-			"fa8f53770b6e5a3c9fad951ec099c6bc1e72d1c489e1ae620e7f12ddc29f" +
-			"ed65f29c65cef75014b999d739e2e6e015f928a30f2fee3f2e59bf65b54d" +
-			"89948bf2bfde98b076e5460643952befd02fc1b0f472a8b75195c53ea296" +
-			"6403b9028db529cd04b97231bac3068855fa211f4d976a88bc27a0088f04" +
-			"576e2487ac0467992066ef7667ca8429faee92db38003728e5c219c751f6" +
-			"6f011b5d679fdd957f4575a0cfb6b54693a9624f2c7e66c578f5f0367005" +
-			"c66addd1e3ab7ea1ac404e357cbdab9438b9b4f80b3a6761b864b006f1df" +
-			"689ae4c0434b06b686d5353d3e421b57381ea24fdcf6199195ccdb3d5cf4" +
-			"623a6bb1f9eba9b22fa15395f65f8093b5f90455061c1cbf8128b44a31e3" +
-			"910862a59e187aa7f4d22e0317ae6c177cef24eebc44171f70c25efac73b" +
-			"38ada0cba0b74f72d1c171277a734819c1111ebe46d5db20a6ff20e2c1a9" +
-			"a57edae95a3c1f80ddf2b12c86d3df0078a7bf68695b16ccf92053c727a4" +
-			"80586b8d87d0d1772e456fde0c20a7927f351a641bff5f22f9ee2217b6a2" +
-			"d0983c8102d7d5356dea60a19e105ce366b9d000987c8c33396569f97c56" +
-			"2d0fc0bc5859779aa10efd1f8df0909c307a9110083cc6d9748456c9bddf" +
-			"16dccee52b7974867cec718bb0b76b3353379a621257094277a30148ac38" +
-			"e5cf67ed7cc9c1bae12dbdeb99d7d880ce98e17f0dc93c5330d1824a3c9e" +
-			"ffd86f89e15b59a4bee5a48d4f674766896e187abaa39917b83f8d2f3265" +
-			"bbe7aac44c9f8d92f775fe6493e85ab44e6e28f79f28eff156c21e1abdae" +
-			"d10a291b88c4020b1ae8be001080870847a852d073e82bfc751028ac62d5" +
-			"6aeac1b18f2cff1c0c7d336bf08f8cd5099d9d3b28f9e16077e9caabab49" +
-			"f2d234616a7522a6bde1a3b3c608df4cc74a6c633d4c8068138abda8d26b" +
-			"4ca70f95d152888fb32bdee5dfad8ff4a5b002a0a327c873656db8d6fdd8" +
-			"ed882e47ce8e47c729e1292db9122ce2e9fa275f9bb986eb7e0a1dccb7cf" +
-			"abd0449c92fd35e2aedc4aa89caf53bcd28170cae85e93f93988e723a896" +
-			"10cefb4edb6fa545835fba3107e21dceb272c5a32da26fa77df070f41d7c" +
-			"ad1d68b836199ff0f1221e36b9b976b5e69bed54b5bfec67fe9cbb383484" +
-			"696265204797634594bc335150daea92dbc1004f613b4c27bf5c699debf9" +
-			"4365041b5a894701da68a93bcb61f4e546c553fe61f14ab0322b45915da6" +
-			"ecacaa093b0071f2516ca8c3fef2f1e3c403993d734403c47bfe5f4379e9" +
-			"cb5b613fde3c0d880cecef4101aad8b8b1c60a92ac5185f6c243fdf1711b" +
-			"0b56f0fd8e5ed6cc0f99da888e4f156455a0f0eb365b8964347eedd15d80" +
-			"2f297977af667ed1376dfcc610f5152421b97afaaf16f9db57a435328595" +
-			"b9aa00b5ed9ff106c66970fafef379f4d2f98f2c5984ea05aad64651fbf7" +
-			"7968c8cbc4e959859b85302a88a3c2faed37765f3f6ced59d8feb6c72e71" +
-			"f9d4497d98bccf95fcb650f29131e1df1bf06a5443f8af844aa1a7b5a68e" +
-			"bb250c7de3a65ae9b1086cf83f832050e55030d0f67c6a54ea2a1dbe18e2" +
-			"8a96c9e0dea2966997bfc5c5afd4244e3c8477c4f5e8bee8fc8ca9a5cde4" +
-			"d9c5a2c7f3d2e811b1de7ce4279229319e432674c609b4c8b70dc6172e9e" +
-			"653fe1969bbc2cb3685e64fd81d96d33",
-	},
-	{
-		key: "b41db44465a0f0d70093f0303bbd7776017bca8461c92116595ae89f1da1e95f",
-		tag: "d8a111a09db22b841fa28367ce35438b",
-		in: "b074b0984fb83749586881e8ec2c5ce9e086cfb2aad17b42b2429d4cf43a" +
-			"0400fd15352d182e6c51e9338da892f886f460d40bd178d81c52e9ab9c1c" +
-			"bdd812594e6fe7a9bb7fb729c11328d3288604097600a0c151fa3d9e4268" +
-			"de75866558e9f47d8dd331994bf69f826fd4a6cb475ae5e18365f59a477a" +
-			"dde7fbcf7e40b4e3dee020a115830b86f0faae561751e9b596c07491c42d" +
-			"e02fc979e69071113953729d7b99f1867116d058a90f1b8c0f9ba12c6322" +
-			"4ebd1b563a87734f5d6e2d4e6715d5f0213e33316500cc4b23784f78a9bf" +
-			"13fdf99bfe149cf47aeaaeb9df1cee140c3c1264fe89bcde8acda6bde16c" +
-			"e3d770ba51950b67ad2c5232ae0cff048ddfda8540cf18e673582dc96987" +
-			"4b127f655e7d4e08859f2c6b95403cd5b4e2c21f72bb872e49e592306286" +
-			"48ba1b16fc9637709636b198f9a297aec364d4c3bc869dcad32b1830e434" +
-			"b556b429136f0012a0a0b6fb3797bc8668014b010ea51674ef8865348dcc" +
-			"197672047fcf72e6b6910a0e32a4f110d85e28db0e338d9cfdec715a8800" +
-			"b4f007a7951d09e41620815848c89f8768344c50bd522c46f64ac6c98e53" +
-			"92176651961c7a70b62f3d1819bfda674e2ecd3167415edc4b97419e8ae4" +
-			"9974b56cd8d52e1d05b82610b59606a750b34844ca33bfc9b21fb970738d" +
-			"b66f48928df79cf67730a30b0b612f8c15c22892120548ab460a6b9bb3ac" +
-			"e30554c86c9681c797821a1b1ce91d0e87fe90ad4097c974cfbdfd5c4c24" +
-			"a5f808f388e1b1473e858f48a387614501c8c39d6973ded69b1764663cd5" +
-			"166be02b596a49e392d637e3d8afc91323f7450318b79d5488c040e346cf" +
-			"0cee512044514b570aa66bb98d639a9ee23a7cebe28474592623d082873b" +
-			"73efb3eaa4721fc4761e15a390497cb13cce181107e8b1a0186b9e47a5a4" +
-			"b67a5be3cd88a43d341ef63f10af6970aaf56035db938655020809033a92" +
-			"8d4fe6d2f5424fbde2fe82adfd991d388edf293cb4e3eb68d876f225a5f1" +
-			"58208bcb1aaefcbc28d6763d267406aa8d6ecb413d18cff7a318ba031ba6" +
-			"0ac4560748c248de64eec56dd4540124b38581604f502d94a2004f9eb1d6" +
-			"edb009e16af6c6d3ccbea79b10743da98aee7ace407a90c6cfdde694f36b" +
-			"e0271e722618a457be68619b980754795f4ac95ebf4f1820b85ca8e3fbff" +
-			"a2430f8e01ab422d7140751f7741f2c921400dac404b04e049736738a87b" +
-			"6f49bd54b1b447b922c473831a65f224ab84fc96e4551a0333bc6187e15c" +
-			"c0f0ad628068bcd7c043bd1e3036ec01e7fdc3d157476149917baafaced0" +
-			"15d09fafb92181a0ec65b00c9c13631e65de184377416e04d3d93b847e0e" +
-			"286c1d88245d4d550d30d4fbfcb416ff26a39a94275631c2deafc7cb6780" +
-			"f149e4d0e9c4515b708fcd62be5252485407a6ceeb9247de34e0266ef384" +
-			"976f6d31284c97468b3b03e951d87a5a00836ea303a266147a79ff3431b4" +
-			"b382e86c74d92661e0f65e266b7d569c03994b667a8137f3080eda2ff542" +
-			"0f0b52b427558dc26932a22a615c9e6b1834a251c6b68fdfc0bbe0e8781e" +
-			"36adf669f2d78bd23509ef7e086634e526258e8d11a1e0be0a678ac09c7b" +
-			"b4e3c5758504011e701dc85997fe2a3e40c7af83f032bdbe7adc10ef1e4a" +
-			"666946c2bf31dd8e3a383211c9684d5302f89dafcf77976d5a02c14e2462" +
-			"09d2d99918e82402cb0eacaa12032ad8316315af1b3d3bd5058f7c935d35" +
-			"ef0d4e71373958fd5e4140a9a586d89c53e4144c00148a4706a524896eb0" +
-			"5b1479a0de5d3f57be46b3f5fa4e49bffe027c81a33e37abc01a4cafe08b" +
-			"8e21fa86b42be52d75d6407e6cdf399de7aedb9b61a6917b2677b211c979" +
-			"33536664c637a57ce2234e3319fe8b4a77d7285ae6347464dfd0aab3e6f1" +
-			"178e0029686770d3b0dd541490b097f001e95f27efe8eb16e4747937d643" +
-			"cdefd49e586ecad541270cedc3064bdb7c79f086bf1fa8c666304d977a15" +
-			"54ae268881e17d8bc3fe51fa9969f7e560e3d3e050424febec0998b35f2a" +
-			"7378b2c3e384cbfc80c4987734d76c78224cb81cc5376f88f0ceda28aa50" +
-			"44e956537c3ee209071d84a66173384e0aa466d989759fb1f2f17fe627a0" +
-			"ffeaae7c5a3884b237f5151278a07117c2e833f1815c7e0e0b1611f25058" +
-			"ca338d21deb1a571faf1d0486667cb7c58e2814c3722d24fb77ce1b7e018" +
-			"2ae5746442b5ad00208b17c0a68bab4df8a8f36edead4fbe79b4c9220dd6" +
-			"acea6d23c7caaf6ce7cabeeca677a1c764d610ea6c7e994d6a9c88f57fda" +
-			"ef160b251e7595578ea2cc1441d480c14b8b6945e76a001891b1f214979b" +
-			"c52ec15e9480d706a40cb6e3b259ee99a9e84e63a738f1b52cf71c8ecb04" +
-			"fc833c2c680bfed587aa1541e5ffe8bbd7b21302bbf745011e559f94f952" +
-			"8b7fad8a37f6d855306a5be22725859cc950bcc334179d49564af3b9c78c" +
-			"e1de59a9cb45086a33856ba7195c17cef573950155bea73ed16645768bf0" +
-			"a5cefce78ba3ff98a54a8e8afc5dfcb0d422bd811ba9b7770a663b081dbb" +
-			"40aefffbeabca955a9638830f0c5d70663cbf5b26067cd061c4a3f5cf8fa" +
-			"4b6678d82d9a2aa33f8538b7499a3466f6b0ae2a1daf280ab91a6c220684" +
-			"12705245f353b4b83db50bedd3bf99d42bde6363fd6212cb745467acb007" +
-			"b678128f6580629a06171f7f3af272f8900b801af3bf47439167871e7b0c" +
-			"33f198333992a6c52c32be46071738cfbf245937d48f816ebb88ff0e726a" +
-			"dc41de4c771ff0bd320a4c0b1fcccd9fd6c42ec9c5185943c70e9a4b7c26" +
-			"a980afe104bb1f99576671a254704c7d4233eaf9915e1d56c103ba9f6e8a" +
-			"46aff466933bf58c9842796ae9cd21f7ac6aa96ef42ca54e390203bac354" +
-			"b7c1de7d1887c48255201335f819020e2782a2ee8af92ceb206b651ae92b" +
-			"3f4fdefed05e08974aee0a353d104b1be9a5e75c7f958f1981271b0a6928" +
-			"05a7a2f28a0448d86102b4fadf9ab4ec2f98e31e64fcfdf2b524780b3342" +
-			"7a2a3100c2032fc93199f3ea7a9e8063fe73282dcb1fafaa9496c7da868f" +
-			"dcf33bbb761df0bfc6fef30fadd2b6efef4fd3216a8aee48a2ef28102491" +
-			"cf7278b567c272d1064a277eb193b3f6f01df641ddb729f72454943cbd3b" +
-			"671ec077f9e3548f5f57d063c653ebee4f228a78f8a128d26f7f4b44160a" +
-			"07e942bab87b2d043c77ecdf10c1a419e0a1c4162a99c21d4abae0558b8f" +
-			"4dc0b7f1ca3892a6babf71f2f70aaca26bb813ac884ee5d71abd273ff1c4" +
-			"add230a771b678afbb12a1ca7fbcb2c0f5589c9ce67fe8f78a8db87825b3" +
-			"09ca34f48ac35aa7ac69c2fb2423807650fcf47ee5529e9d79dd2628718e" +
-			"230ffe5b83f9d5bdfd9c5d211282e71cbcacf972995bf1b13d21419f7fa2" +
-			"8829ed1dcc459da35883b9269a474f7fceff01d44ab78caf1ef7d8117f50" +
-			"cc83eb624062b149a6ed06ddd1cd1feafccdee7122353e7b3eb82978ca69" +
-			"247fde52d2d6cfe7324f04af5259e1b5c2460889da4541b431ba342a1c25" +
-			"3a1b1b65fce7120829e5466e7ad2fe4e0f773c7c13954a9c92d906c91aa1" +
-			"de211f40916596bfa8245344e257e5907a2c49ebcc864cfbe28663e700d8" +
-			"472c50355313d5cf088e9e8a19cdd85bcfc483520498c6386050e53a3ff8" +
-			"1e2b77b55b116a853d71f60d621265166cd7e95ff5cb4466226d7cef68ff" +
-			"d0a35b61e76a43cdcfa8da7fff9558e2f89b981ec6be632b126303ca1fe8" +
-			"53d5c628d967d39317b60ac904d6a882beb0746f6925a86693aff4deaac2" +
-			"e5b64b611de86767d55a6e11221605508b1c5cc828251539b1b6f65c2c04" +
-			"8e65be5422c1b11194eb687d906c559068c0a810713b23b30d8b17f10df7" +
-			"0962c5e7e782aff7bb95adfe4cba9d90b0ebc975fa56822025100b5cb8b3" +
-			"8bdc8928c1a2a8034dd66e2a763696d7ce6cef4dd586b83f7d01749d37fc" +
-			"4fe8d7abd324d4ff1efdbdbfeb0a2fbb8b266fc2bce8e5e5b95d0089e7c5" +
-			"d7de4db837d1822ac8db8198889d6bfe778d0b19e842f12b5afd740aaecd" +
-			"e36e2cefc2cf0b082aa0c4f75684d024b8d828d8f2911fe1aae270251f62" +
-			"4f49584e40bb193577c9d8e04eb16c094653cdf9a15fe9210f724c7a7c73" +
-			"74cfd1a74abb5ceae88ea54f7e7569f8eb674529cbec965ed05bb62f1968" +
-			"8fdaa97297268bfeefd06eb21f700cc56f9bf7f6cecbbbe7278ada8399fb" +
-			"960371a2d5cdb852b11c9fa17650e614c5297bf46cb7889d52bcf49d2560" +
-			"720852822b75bb16524d88273cb366b84b88282da91875562e5a1fe73973" +
-			"afe90e5cdd3f5381612d3ba7bfa058d023a9326e403ec474d8938313fb32" +
-			"bdb5bf899b900c3818c43c8a0af6a061bd26e847ed75983402ee8a9cf4ef" +
-			"85bba5545a0d329ba81495157eda0286f1917de512fe448251697dea406d" +
-			"a510adcb05",
-	},
-	{
-		key: "b78d5b3019688e6ef5980c17d28d7f543ca5b8f9f360f805ee459717ca0d85a1",
-		tag: "f01babc4901e957d0c2032a7279321e1",
-		in: "ba7d35b2ef8af1118bce1e78018c9314b0c8c320591e103d23f715acb05e" +
-			"dc98fbc618de06627661df5842dbba9f604c2d20d664e5db06e949b11d49" +
-			"665088dbafdb0d39d20beaca7d723f8dcdc57e9c5583d303b6cdfdbecf95" +
-			"7d8daf2f1c72b2a6fa27e3d18841f4841abafd334c110cd2b74efb6191db" +
-			"ab9b8fc8427ee17664082f31db98d30bf15dda967e20730a9ef525abe9f3" +
-			"f620e559ed22bf74d347c9869f0311f33da7f1a3dc858b3a8aa73a35989d" +
-			"b055a4a2c269c95e352259c57de8b94d8de48984ecde426d3ef60ec1c7b4" +
-			"41cc950f7764f55bd0cf52d069b9ad446d1f765f35d02ec104ffcc00bf1e" +
-			"dc1b951ef953acd19984ff1b41041bea0e9f5326a7c9ed97e6aab42174ee" +
-			"971ea1dbe2fd1c1f67f977ab215962b0195417170f6b7748fd57262424d6" +
-			"cf7c235b34425f4047191232722932213b3eb73904cadd6a2e9c7571d7c6" +
-			"6c2f705b5039ff75e5e71c5aa738bf4177653e6eb0b49303a4bc0e641e91" +
-			"2691f217296a3325431d578d615afddf47784e4618a2ca40ccecb05d621d" +
-			"a52f272b8cf84f7fd8177c83af1580d25a764cc06436d67171cb5d1e3b39" +
-			"367b46d9a59d849d87ab6bfcf3fb9bac2b1ebfcd1cef4459e74b0e1b7080" +
-			"dabd2dea79f75581a55de63c4b23ff67d986ad060102933fc6cce8d614c9" +
-			"c86dc84068828dd9e21ffc5665c809d83b09432fd315dfce5d7a4ebd8143" +
-			"181953e3f8716e47b0b30cc1f753e31a7d509f2dbd4177b6da310cf3cd02" +
-			"5db270adf98e96259a5ae1b81f5be4d5c76f502a612ca73c76b91e0ca695" +
-			"aa921f9489948619482c2956205ae71fffc3aba4476ff754e4878e36c763" +
-			"2c935c076857c5b90cd63ea4764efbcee53e2ddc9bdce54b1cbbcf0e7544" +
-			"d023e7c2b79419ad92221a1f76abe31a8236e370d38e2493cc9ca2aaa811" +
-			"30fc713d11f500fd071d6eba6861e8b0859b372e62fe60b627a96c377f66" +
-			"236aedf307e1d148a61bdad072b93d7d2a73367c595b1e048f7023e72729" +
-			"1ec508326f5424a5bbf4e010d0240b71fa9137e6642ab40c5e4fff79877d" +
-			"b3253c663a221b49b3e77ea307c7b9f3f72a0f3a54d0112c45c64a0c0034" +
-			"baf2b55ae36ea6f811bbb480cee663136474dacac174c73b1e8be817916c" +
-			"fd4eb1876582bb3a36cfbabad91776aa676305ddf568a86e3a5eb687fa81" +
-			"67771fca7b5ca00e974b3cc3e322b4bd9bcee2a87d0ae7976da5e04fa18c" +
-			"219fa988d4f6fce62f194b05c26ed3ae1b066cd9751a2d916d53426a454d" +
-			"58f9c3b2fb49374e5791b412fdee1b6029144f1ca787f56fece4f64f4fac" +
-			"bfe4cfd8ba7c807a83cf44008fe5126a283ab2631a87acd8e2a3bd10979c" +
-			"4b07a84a49b0687a45a4798ded0b5e9b2acce30e714d78395bfa8f33ca91" +
-			"e68b2138bd67d8a694cd87c88dcefcd101a3b408d7a9095cc6a4b38898ec" +
-			"c8b375f5a67deaaf73eb7e99b10314ca6bba824658bee85dd731d9a1475f" +
-			"976b7c0aed4b67b088f0db5ca5091273217f724969dff6cf184181377c45" +
-			"5722beb23fd9d097a82ea2d8d527ba6284acc20cb30f2e52af28800c61fd" +
-			"1faf9f4f619550e0162a1a63758e202533889b27420fe7d0eac9a47a6e11" +
-			"1d80054412340e0426cdddbb3c7b9b823b8db3ef58230fad7a3ac21a7805" +
-			"d30878d4ea78dda95c951b7a5dc552e9434c35e03e1dd88652d3714f8fbe" +
-			"a39936cc0717c2e0335371f2a751204f5d9386baaec853f019325edfd1b0" +
-			"719d1fdac3fbd774a64bf957fc54039501f66df94b5b9b82c2076c597065" +
-			"dfcfe58b2e215a3734066aeb685ef97759c704b5f32dd672ba59b74806cf" +
-			"ad5daeeb98d16f7332ff0ca713d541c84e4aef0750bab7477ea707e2e497" +
-			"e12882dbc0765106070ec6a722d08fe5c84a677817b28fa3a41a6117f2f5" +
-			"465c2a2f0eb2b8be4f36e676b4115008bade3573c86cfb1370c03b6b0dc4" +
-			"bbbb0ada4dedac10a593655068a26febc2bf10d869cac84e046c9c846ce7" +
-			"927431f606f07b92abdfd81260199ae05ed01dfa07088c56a6a8de9c6d51" +
-			"d61d6a6d3f9904c216ea8329467a006a3d2495a768a39ef99a21827d2def" +
-			"909bb743fed7209f7fe59ff1c1e710095b05f166c6173deef5c6ec4105c5" +
-			"fc3b87c8269c786bebd999af4acbf12d20453b125f338aee87e9509ee405" +
-			"9c9e568e336304d7be9ffe81d1700555b0800242d9b7450d7256f2b17f6e" +
-			"d46a39f67bb2980572ce73169e352070dbafd4c7fa5a6be78cf9b72981c0" +
-			"a01f1e1e30ee3736c59828b791d2373799854497a28a44bbe0e074925723" +
-			"4986696fbb06ef9ea83fbd49c45a583ce12ff10258ba06127c67b0f66dd1" +
-			"09f1366d8036853973d8884f93de54fb2a12949eefc020717eff47898cef" +
-			"306b5de068411f1e113ffdfe2556e0faedc3e27d95a45b8afc15ba0eeeff" +
-			"eb86da7b4324e20af80c62bf0ceb4aee1515f5912f71c6bf2febf20123e3" +
-			"dd3a82dc1e58a108f1039942dcdacdeb1f0ad0b2ef34488d98d6a52311ae" +
-			"acbd03c12f6e775e375d5979c7c295bb049f2cfd3580e3da3841ddd8e6af" +
-			"4de5e6512ca79cebcab9280554524881da37984d340e8f0163fe10a02ed0" +
-			"88682560bc6d3c4dbcf1a542ffb3dcc2ed16a2eb96896e8269697ffeb50b" +
-			"73f2cc354092e782a0072fc12e1eaff117c2cc8a5a1ad8b47802ac9e23fb" +
-			"91a0cef9e4027595e0885464e61563093ee2b1dc5f22dfd04af7de6a70d5" +
-			"977d3751a4b3cc0c71a71c59c0534cb1f8c0eeddcf1c0e1b3e5ad0d083b6" +
-			"6e8b998ddf9ae9d3b365c851d42e995b9afdf8d66b2ac40bf514ce32e456" +
-			"0880afd38c42c08926067eb243c4b1184e667ba756c14ace5f525eb48df7" +
-			"ebb429d0a23d159664f8021d27dc7167081de331c7114c9c6456e1ffdb42" +
-			"2172a81c06d8deca995e158c48df27261a83f83e0127f5e056a139be9b76" +
-			"e25dadf534d3d1ed6ebc0b5d77d51e5b90ff86f30d4023066115bc11b33c" +
-			"c827b1103098826d0bf8777176b2da6f1e5b580e407ccf7e614fdf4f5b53" +
-			"3ef6d30b20c1bee61eab90e983b1a97173a62720ffd27abb8976a948d532" +
-			"d06596c23b0ef31c79831bead8f8e99ad209af3658cac0cb3c3f9c88379b" +
-			"9bc871d8e84171d53400902da1243f664afeaff60bd96ba2639a7644676c" +
-			"a79f43130af12ba2c877d67f7ec030a4217a72f5368af7c9f24e643db6ac" +
-			"97a04adaf57dbc53762d8dfa1afd49667c4041adcb5ec303e191b786273b" +
-			"bb065cd9f16a3a4a399c6a7aab9c1a6604998264e8b3dbd13d8f2228b13b" +
-			"2c2b9fec5055d8e9f2df1d9a25e4bfe2029776389877bbef7e2c7621f06b" +
-			"c0b7fc0786e2b2d042483ccd4a59d2872a6c5ac73e217123e5c8401580a8" +
-			"d967e0895aaa28f4d25ce68c90b4394d8113bc423e9fae46ac47bc2ac191" +
-			"fb97b80b5a85feb2bb54f84c493235c1408662fe253c6786fcf6fdb8be87" +
-			"dc66a72cc847f94dfb5214af5905b7039a7363a1b23a07853daa26862783" +
-			"ba08a80846fbb93ce98700a4f9961115128dd67bd7d19e0c588fdf6196c1" +
-			"1cb0154002ae862f11421f5dc3a57b6c0870b452272be556a1d14eab1af0" +
-			"a91ff5b89de6bbeed6e03bc64f5efddf9e54da71c594bc5ef78e0192cfde" +
-			"da36e4ad1a6b0b51110c1b24d20dea1f19e18cb1184d80189f842d4f07ac" +
-			"834744dd009aa3771b1e5502fe4b65a403a4bb319e1880ff6ba852e90a8f" +
-			"4fcb52cf374c88408428cdb1255291b04ed58c992310955198d61fa1fd9d" +
-			"762d48f2f65a287773efc67d549981c291b427889d3e3dfc0cc6cd68415c" +
-			"dbed81b516786dacf431472a7dfc99688d15bb6c1b85b1a2015a106e5de8" +
-			"cb9eec4c80b17d00fdcf4a9c64de4643a95dade8fa9f1bc5c839037d86c1" +
-			"3800a244188e3b18561a74912ed72f99f2365f0126732d037dd54a3ab77f" +
-			"9a9f6a1c1469ea92eb707482066bd4990dec4d7614ccb4ea6dd4deb8bee2" +
-			"2c4dc0b9b4d4cc70a500d2c8a5ac3ef88a38439b7dc254a6d920cfd317a8" +
-			"4d7747148c65b6730709e43369d4c995b03c58b9df444f77f216944e70f6" +
-			"6446554d8d513b8f7f28ef0a2d7ad5ca2f6110304196953247a7ac184f68" +
-			"61fba896c2d5a59007ec2b2c8e263957e54cdc1f3b4a145228823fdf0960" +
-			"c33a28f59b03ee4be21001d2f56fd49ed14db33b2c4eec2c3f41b250a624" +
-			"99a9b6602c1e838526a54cdcd058af1c252d56009d4c7769deace53bdb66" +
-			"543f5a081cdde775e61efa70956fe2a7a6019a164c6e413ded314bc928b4" +
-			"aebccb946ffdf3eb33e187bf421febe26112b3262a526de65678cd1fa03b" +
-			"83513705108fe0bb87aa99aceb28af3641c46a2c4427cc1063de01aedaea" +
-			"fba68155d4de494a27ff6b7fcc8f5c5c3f7d3a115c397a1a295bc55aec8f" +
-			"7f150cbce2a8aa4706d54ec863877bb966ad441c57e612a1b5d438b98d9e" +
-			"fcdfe6d4f66e885f96407e038015cf974ae5a3540692b054d2ddfde59b28" +
-			"ede7e2f581eeb56c5b88e2779aea60c1d8ca6107b0cdda1ac93e6c7520da" +
-			"edc66afeed12f980e20e1e1c327d15ade4bb90de30b011a9cb33855ca3ca" +
-			"e2",
-	},
-	{
-		key: "2b0b0fd3347e73c2fa3a9234e2787e690a11aec97a1c6d555ff7b4047b36f372",
-		tag: "81b1a6633f849ab0aa7baafa58a5d9b8",
-		in: "427f3a7a5f1142ffa68e83df5f917e07b2bc454f3adce068a8ae9e0908e1" +
-			"3e0099aaa9074697593c6d8c2528fedddeca05e3888be1a0a201c389a72d" +
-			"20cb661017544d95a431e70e7c6580d8fb46ea4495bc59db6ae2cd69510a" +
-			"02426c50de1b6110120f759960605aca718d4d0a497e003e1ea2b8ae9a53" +
-			"df3c1eb4f704eb32f8f05eb08cecba0fd4a94f0daa3b0984c30a38f94b7a" +
-			"10cde723182d30588bc40f1f9d38a3bab4800fdd5148e34e396144763696" +
-			"c9b3e9b8adfdb337123d54237c7413f98bb2056152b256e37a27bb947c67" +
-			"240fa3ce8da62ab367db540bcdd9eb873d6c71c75a08fe99b5c11ec8e6af" +
-			"f926d2adfcf073479de394d4aac5fdc6241824d944b8773db604c59afc01" +
-			"495ee755905e5616f256c8a64321d743a1c9368d46418826d99b762e2f6b" +
-			"f998d37a995969cdc1de85f0ce3987c6550459f5e5bfd9173bfcb9e0112a" +
-			"d91f092de446beba14fb3b8ce3fb2f9c941815b2cb5a3b406e2d887b7912" +
-			"bba07c8dc7caab9836827da93ca71fa5ada810da1e5e9b09738524564d8c" +
-			"923746d19c78dc9107b9f20f653e05d7f2eb6bd90cf5eb30fdd7b587eb46" +
-			"74a1064c70ef0af2e75373044d32b78d96eb1db3112342d38dca0e47b96e" +
-			"9307fcdd711b1c66355186369a28481cb47ef6bf6651c2ff7ee4665247cb" +
-			"12b573933d3b626d1c6264c88bd77873c2e73e73ee649216bf0b6d6615ab" +
-			"245c43569d0b8096596f25ceca8667661de1cd60dd575697370ebd63f7e9" +
-			"5333e8a2cdb829b75ea83d72cd246d50358f7c094c8a515805fda03165d5" +
-			"21391617c9f9a2ea562b419632df611a67912d2b369e5e505dbd5c719253" +
-			"16d66cd608cc4a9583a8eaa4661b7279870345fac3031631c1a220551527" +
-			"5be7d8d89b71960e687aace3a0e8f206e475053d6fbf97717b154c75406f" +
-			"2caa97d1ab66048f1c99281c188a2f37b8bfc736c25840a9130ef2031c05" +
-			"6acd9dc10592eddf94f5bac85319b10ae46cc136a0738aa803837287ed7e" +
-			"dafe08d1fcf31d5e63763e39a5e1f4d7d0edab368d44e63fdb33c28905ff" +
-			"d6be406a024c017081b4f2d70860776e9d2556cd008fa5017b58733da13c" +
-			"634938407a118827a80baa28d4e605db59430f65862b90cd8356baa287b8" +
-			"4e6d9199fd80abb9fa697e2c2c4c760128e4ec0438388cf407e2a2fe0f57" +
-			"908187ed8efd4c5cb83cc91dbe6a11444eede85099149ca82921bc28bdd6" +
-			"b9999594a41d97307f8854b1bf77b697e8cdd4daead2aa49fbc571aa44c0" +
-			"bc84a57cb5fd85f06847ad897ceaf449eec45bddd4e4eb1e1e119d15d5e7" +
-			"90957e686acbdda1bbe47ea935ebc4b8c2e3cf9b7157cc6dc03bcb19508d" +
-			"a9e19cb76d166da55559ec7e0995d9b50c6c45932d5b46eee400c56d9dee" +
-			"618977dcf6f76e3e86bc5207493afbc2aae9f569ec9277f33d9f61c03d59" +
-			"dd6d8250ee8cb3e54e5e941afb74f0735c41d52ef967610c9f55b2b52868" +
-			"4b549a99ae3392a7237bb52ff5f8d97327e2837268e767bed0bea51f76bf" +
-			"88bf0286bf22b881f93f1d54fab5cd4e3c148c96c39e7aeef375de249df0" +
-			"4d89d1bd97a7afb2be0cbfd3380cb861d31e4ad1ea8627721e4518b9db3c" +
-			"cda20273ec23549c4adc3c027e3ac9558de2010a0263c1225a77dac8be60" +
-			"d498b913f91391d8b2656ffddb06e748cb454dc2b7226745f11030a6b9ae" +
-			"09ac8ac428d9c6500801fb540650c94610ab70465b1210c6db2064dc84dd" +
-			"7f52573f8f40c281470e85176c85ec6de3c718663d30ad6b3dfc1a3a9606" +
-			"1936744357ca62fb8bb066aa1fcac6d7a2adf0a635cd546bef39fbd3ee0a" +
-			"8802ab0466ec9b049b5892a9befa4377cd199a887c34569b6f90852139a7" +
-			"86babc0049ee2b527aa96b988237a52eae8b4b49d2ee15ee5294118cee62" +
-			"3c3e11cecb836b21af88555f10be2eff8379beb615b7b3d6c01d545cacf6" +
-			"61be8ebbf7a3c58ac5e0e7b17997659a2bf15f2b2e3d680d142fd29d23a7" +
-			"aea9890f3ff7c337fce49ecedaf38573edfae07810ba9806723e576d687e" +
-			"a11700b8ccb96a6559259c367cef4e3999a05a373ab00a5672ce8b3d1dec" +
-			"a414187f383e449d10021b73c1f7e39ce01516b7af96193f9993036049fc" +
-			"72ac059ef36b2bcfbe13acf140d41592880fb8294ebffb98eb428ce9e65e" +
-			"1094521bcf8ecd71b84c7064539a7a1aac1ad2a8a22558fb3febe8a44b87" +
-			"72fc00c735773d4ce2868a0b478ee574b4f2e2ceb189221d36780b66212c" +
-			"dd8fd3627cf2faaa23a3d0b3cd7779b4d2b7f5b01eb8f1d78f5b6549c32a" +
-			"cc27945b5209f2dc82979324aebb5a80ab8a3b02129d358a7a98003e701c" +
-			"788a64de89726da470010eda8fdcf3da58b020fadc8970fafb08a29bef20" +
-			"2bd0707e994015258b08958fc2af4c86c3a570443fe6e1d786d7617b0c66" +
-			"29a6d9a97740c487622b5b8186c529d7f8af04d9f0a9f883043f08103ca4" +
-			"d70057ee76639f3b1046d86928d54cd79fb5bb7b46defdf15d2f8578568f" +
-			"1d7b73e475e798ec6812586700e038ed4791b23ac9439d679a1a4bc04cea" +
-			"e328330c24b065c9cdcdcedfbaf58e5299779e6f48783d29ec3b1643bc8f" +
-			"1095c724dea75770583b15797fc666f787510d91e65a8e2090cc1ed2013f" +
-			"e63ab17bc7640ee817487f4eac8326e9c4698cb4df05d01bae8c0d00fc00" +
-			"08919484d5e386c8f60b8ac097c93c025d74faa56e8cb688d1f0c554fc95" +
-			"aae30873e09aae39b2b53b1fd330b8546e82d9e09bbb80132d794c46263f" +
-			"4fd7b45fda61f86576dec52c49f2373e4dca31f276d033e155bbcdda82af" +
-			"8f823948498f4949bf23a08f4c8ca5fcc8598b89c7691a13e5aba3299ee0" +
-			"0b479b031463a11b97a9d0ed3189d60a6b6c2390fa5c27ce27e28384e4fb" +
-			"04291b476f01689292ace4db14abcb22a1a37556675c3497ac08098dfd94" +
-			"d682401cabec239377dff592c91aca7eb86634e9d5a2848161dc9f8c0c3a" +
-			"f7b6a728371fac9be057107b32634478476a34cbc8b95f83e5b7c08d28f6" +
-			"fb793e557513ca4c5342b124ad7808c7de9ecd2ac22d35d6d3c9ce2f8418" +
-			"7f16103879ed1f4827d1537f7a92b5bbd7cd12d1ecc13b91b2257ad073b7" +
-			"a9b1ea8f56b781bea1bddf19b3d7b5973f1065fb72105bb4aeecca5b7513" +
-			"ffd44d62bf41751e58490f171eb9e9eb6d57ffebedd4f77dd32f4016b769" +
-			"fed08dd96929e8efb39774d3c694b0d30c58610541dcfab3c1cd34970195" +
-			"7bf50204acd498da7e83947815e40f42338204392563a7b9039c8583a4dc" +
-			"faba5eaf2d0c27ada3b357b4fccd1595b9de09c607ebf20c537eb5b214b8" +
-			"e358cd97992fa5487bc1572c8459c583116a71e87c45c0ba2ca801931a47" +
-			"a18ef0785ebbe420790a30278d2d0d42a0225d211900618438d1a0b2d5be" +
-			"d14f8b4be850dc8cb08d775a011683a69ee1970bb114d8d5017de492f672" +
-			"09062d9ba3616e256d24078536f30489e4dacd6429ed37aab9b73c53fdd8" +
-			"a8a7aff1b914b9d82d75a46d0ccf85f48d3ce9a8d3f959b596ae9994ac3e" +
-			"3b4af137d0c8e07ece1b21fd8aa05522ba98f85a7ab24ed8c1e265fadf4e" +
-			"9a18c5ab5684d8ba8d3382ad53b415c73ebfaba35abeebaf973b6f18e0d8" +
-			"7f019420eb34e09bbb12afc5b149f1e9e9b6ae36ebde429d437ada1a2d52" +
-			"b998f7c75ef731132aafc3bb106a2ad3ae11223a355804d4869ebaa47166" +
-			"2df261d95d48ac6eb17c1781e81c0027ccf8f05c39e1eda7793cb16622be" +
-			"ce7a1ad5d2f72f8bf4bdb2f4f4dcadac3db3bf727f0d447adddad4500360" +
-			"09ee011bf4155e5e46c74b00d72e8e6a88de9a81a5a4685651b90e874dfe" +
-			"eba41698c98370fd9e99619ce59ebb8342417d03fc724f9c910ae36ac5e5" +
-			"b46c424141073199aaac34232a8e17ebbfdd80eb75e82290de92968f3893" +
-			"0ab53dc83ac433833576e86fbabfb9d7cd792c7e062811f4cb017710f841" +
-			"1e0fb65ea4b3cd68b0af132cb08330aa13579196ec632091476f268b44ba" +
-			"8f2e64b482427dfc535d40d3f58b4dee99053b35a3fed1cb245c711fa16f" +
-			"c141974c8db04f4c525205dad6ca23ccaebde585cd3bc91f5874452ed473" +
-			"08de95cb6164102744f90b3007e511e091653c97d364fe0cbd7f4cd3249c" +
-			"1f5c452becd722ccc8c6b4e371e2631337dff78efd903a8fc195a90ca5a2" +
-			"aa4513bc63cd43794ff06c5337329055c43d4fb547e63d6e4d14fbe37b52" +
-			"1411caf2f1b0df51a68f677db59aa227c725cf494ccb7f8cacc5a06ac5bd" +
-			"f135a2603175a5fd5e5af615fd2e7cea61934e6d938b9e672290aaccd99a" +
-			"7e26dc55efe928e56ae6354168264e61668a61f842a581cd0c4b39e0e429" +
-			"04631c01320857b4d7e260a39c7fbed0593875b495a76aa782b51fee4f88" +
-			"84ca8ddb8dda560b695323cdde78f82dd85757cadea12ef7cf205138c7ba" +
-			"db6a7361a8d7868c7aefa7aaf15f212f5f5ab090fd40113e5e3ad1ab04f9" +
-			"b7f68a12ad0c6db642d4efb3d9f54070cc80d05842272991bcdae54cd484" +
-			"9a017d2879fd2f6d6ebce27469dda28ad5c345c7f3c9738038667cc9a5bf" +
-			"97f8f3bc",
-	},
-	{
-		key: "aa3a83a6843cec16ab9a02db3725654cb177e55ec9c0c4abd03ada0fbafca99a",
-		tag: "719dbe5a028d634398ce98e6702a164b",
-		in: "643883153c215352a4ff2bb2d6c857bafa6444f910653cacd2bbdb50ffdb" +
-			"cae23cc297a66e3afefbd85ab885e8ccf8d8f4930e403662fb4db5121aca" +
-			"82dfcc3069bd5f90be4f5bfd3c10f8038272021f155e5de0a381d1716abe" +
-			"0b64b6d0f73c30baf6ddfe0e6a700483cad0fa14f637afb2f72361e84915" +
-			"78ba117e1c03f01fd61aa8f31da6464f3d0c529524d12dc53b68f4d4b326" +
-			"db7fc45c63f75244002b8f9a185556f8aab85948647818f1486d32c73614" +
-			"b8c4763e2645bdb457721ff3901327588da01622a37ccbbd0374fec6fd1b" +
-			"cce62157e64c4cde22c3a5f14c54cd6db63db0bd77e14579989f1dd46461" +
-			"4c8691ef26406984b3f794bb7b612e8b160374be11586ec91e3dbb3d2ccc" +
-			"dbfd9c4b52f0069df27f04853e7cc8b2e382323345b82ce19473c30296cc" +
-			"453f479af9a09ec759597337221e37e395b5ef958d91767eeb2df37069a4" +
-			"f3a530399961b6bf01a88ce9dfcc21c573e899b7951723d76d3993666b7e" +
-			"24dc2570afe738cbe215272ccedb9d752e1a2da00d76adb4bc0bd05b52c3" +
-			"fa08445671c7c99981a1b535582e9b3228ce61662a1d90a9c79afbdcfcd4" +
-			"74def2b7880cac6533ba0a73fa0ba595e81fd9a72ec26965acc0f4159ba5" +
-			"08cd42553c23540bc582e6e9ac996a95a63309f3fa012eac14128818a377" +
-			"4d39936338827bbaafad7316e500a89ed0df7af81be99e2f6aae6bb62568" +
-			"1dfa7e100ebca5c8d70f67be3c1e534f25446738d990ee821c195c98d19c" +
-			"fd901e7722b4e388da90b95ac0b5b5dc5d052ad6b54f6ea34a824bcf0cd8" +
-			"7f1fc9a07e8f5b8aa0793e3c9c1022109a7c7ae97ee2a2867fd0cf0f8971" +
-			"34b3d150d3b24fcf8323de929b73cca01244df02510393f0b3905caa0268" +
-			"7fe35f64391e7d4b30be1cc98319716528ca4f35bb75d7e55cf7749968c5" +
-			"37136eddb149a9f91c456fde51937c0f35e7e524647311077e6fbe7f3c12" +
-			"37b9584fcf3b0f78744c7b2d3b452823aca06d144e4463eb5b01014201cc" +
-			"bfed1adf3414427072135d48e705b1b36ab602cae69428e7c19d39cbb4e0" +
-			"ca26a871d607ed4daa158b5c58a0a9f4aa935c18a66bdeff42f3dc44166b" +
-			"a299d71a2141877f23213b11c52d068b5afadc1fad76387cf1e76571e334" +
-			"0b066ade8da02fe3b0bdc575b1d9ec5d5f5a5f78599f14b62db0bef7ccc6" +
-			"1711482dfa4787957d42a58fdc2f99525c32962b06492229399980601bd2" +
-			"ee252306b1464914424de9aa414a0a6e5dadf8ffbf789e6d18a761035d3e" +
-			"f2ff0753becbd2dd19fc1c28f9acebec86f934f20b608a9ef735ac91f6b7" +
-			"83d9327cce7f4870d39bbbfb0100838dee83e6baf2b40cfc98415dd174ed" +
-			"72e393ad0459e8035dce7eb18eb3af2f39d2712846b9e1852cd61d06dfc3" +
-			"5e34fb761b67e2a711ceb4a82557371ed32ca8db2e4cd7fea0b6bd026177" +
-			"4057b9abc45dae6869cab1097459473a389a80a4523e5de696554f8b0bec" +
-			"0ca605e6acfaa00386fb5a48e0f5893860a29f35e680be979cf3bf81ee7e" +
-			"ed88262dc80af042b8cfe6359cf8b475560bb704728034e2bd67e590bd76" +
-			"1632e516e3292b564c7265d7a6dc15c75ba6f6a447b1c98c25315ac7de59" +
-			"9edc4993e4dc7d1dbfcea7e50ebd0b226e096500216c42de3abe352e5b09" +
-			"a3c9754aa35d00883906599c90a80284d172a90abbeaf7e156fe2166ada1" +
-			"794420fe55b1a166d752d0eb7f04e822d021c615e84777101e7c9f9dd12e" +
-			"565b7d093fe978f85e6142c1ca26798b45f4b8d23ecff6be836e810e314f" +
-			"ebd2ea66f2ac95bad84b39b7a6bac41448f237b45e9ec579235ba2bf5fa1" +
-			"f00286379ec107c743f06ae0d11b57a2f5b32e3bc5f1697aae812d7ca303" +
-			"b196a8a43259257f7697bae67adc7f121be561b2d0725982532ffc06cb22" +
-			"839d9066dce0e4d683d9348899089f6732de62751ca77f1c439e43054468" +
-			"2c531b9c61977bc221b66030f7571dfb3ddfb91d9838529dbc99612f650a" +
-			"d72bb78de061192068941a81d6ac341101aeb745b61bd7a87a35a2714d50" +
-			"c3eb2c3ea148fb9ebed948307f8b491aec277ac01903ba36e6ad54f89fe4" +
-			"280a17f8e7ae639e75aec16d56576f03c2a1efe4af995eb825ccaa6efe0f" +
-			"d6d878299a351591d791c286cac5cb049834580d47a9bb7720d0603e3141" +
-			"ad7c1ec2dd23d3002e15d73c1828a7f08062848b1b6fcf816bd954743547" +
-			"6f0d6f882125bd03095eb1b1a846d535730e258fc279f7095de7c2d3fcca" +
-			"a4640a2e2d5ce0974c1e073c60bb78171c1c88ae62c7213a95d36ea9ab17" +
-			"59093813b85d17ff106e69100bd739ede9656388bf47cc52730766a8a186" +
-			"9dcc623e09e43cfba1f83ae1d9f16789064ec73504c29686760ea02c6634" +
-			"a929ca10c6d334b1751494c6d143671ce8e1e7dcc9bcda25af895a193032" +
-			"ce27c1016ccc4d85507fd2265ebf280d3419f54f66ba2a161c068491578f" +
-			"be056f02f97be745db443e25ed2647c5348f278f4ad8bf5b2a2c2d56e795" +
-			"532e25585984a3a94f435ef2742a0413abed7230ff2e9724187c91f73a7a" +
-			"726ebf36bc8d0d959418dd586452664990889358c56720c1001c004ff768" +
-			"54b9850890ce1b31735fd9f4a3640622ef0b25c659e8a937daa0df7a21f1" +
-			"77be13dfdb8f729da1f48e39a05f592d8c98da416b022fd8edab8e6132eb" +
-			"a80c00501f5cc1e0243b6b096c8dbe7f8c6ffa2f8bcc7f309fb80b489b92" +
-			"c4878fabad42d91876e10ee64ccd415124461cdc7d86c7bb6bcd9133f3c0" +
-			"dfa8f629ddb43ab914c0ac5ecddf4398052229876fd838b9ae72523946cb" +
-			"bba0906a6b3ef26672c78cb24cbf691a5ec869d9fc912009d840772b7da0" +
-			"c7f47856037c7608705cd533918c207a744f75fdfac618a6981778e09332" +
-			"5c7d22170da85bdc61044b4c397919d601a30746cefefa798c58f02cb827" +
-			"0d130c813cbeb67b77fe67da37a1b04bf3f1e9ee95b104939220fb8a0394" +
-			"86ab8954b2a1468016f546406d1946d531966eadce8af3e02a1f59043ff6" +
-			"e1efc237dbf4dfd482c876531d131c9b120af8b8fd9662cef1a47a32da40" +
-			"da96c57dc4efad707a4e86d0b84262d850b451bda48e630c482ef7ede5bd" +
-			"c55147f69e2ff8d49262d9fe66368d1e38ecdb5c1d4e4042effff0670e69" +
-			"04e47d7d3047a971d65372126ff5d0426d82b12b253bb4b55005e7a22de5" +
-			"6fa54f1dfcce30b1e4b4f12b1e3c0de27cea30ce79b08c8c1aceb1ffa285" +
-			"c317d203a9f2e01d542874fc8035b7670f3648eec79561d6ff2fc20d114f" +
-			"ba4fbed462f1cd975ee78763c41663849b44cb2827ee875e500b445193e1" +
-			"4556bcccfaba833bb4ea331d24a6a3bd8ec09906c7b75598b44ce1820a49" +
-			"fca4a0c1501e6c67515d4fa7f88f6aa3cd7fbc6802131a7b14b219e154db" +
-			"9ed241133e10ace40e4d963f904dd9f3bdaaade99f19de1ddfe8af2b3cc4" +
-			"0a48374dd8eb559782bea5410f8f9a1cd128523c0157b6baad9ea331c273" +
-			"311492fa65c032d0d3b513d23b13b86201840d51759021e4133f873f2781" +
-			"8f54f34ba73b4f33107d49c8de1533856ec37bb440f3c67d42148765610c" +
-			"3296bce932c839fd866bec3762a38406ac2b39d0d93730d0c88cb8f765dc" +
-			"d8ee71263fc96068b538da06fc49e25dbeaa10a5111a9af8e8f8d78e6ed1" +
-			"3752ad021d9f2c6b5ff18a859fee9651d23a7237bd5a5c29029db3882c47" +
-			"0470de59fd19fb3bfbd25d116f2f13ef5c534bf3a84284ae03e3cf9cf01d" +
-			"9e984af9a2e63de54e030857b1a071267cc33d22843b28b64b66e4e02803" +
-			"c6ab5635291aefa69cfeb3958c09d0b37176842b902da26caae3f0d305e7" +
-			"c6ab550414e862e1d13d9bb9dc6122cb90ddb1a7bc6d31c55f146659baa9" +
-			"6cca4ea283e5e1639967889543ecb6849e355b6c0227572097221dd46c1d" +
-			"f8600b230e9644ba611ba45cd83fa4ac7df647b3be57387b6db12682018a" +
-			"de9be50a8ea7d5f7c743bf0c6382964bb385b3c207c0cdd63279c16130b3" +
-			"73ba974125291673344b35c8ef9a33be5a8a394e28dc1448f54d46af675a" +
-			"edc88ce85a11ad7e50058df4f3f2364abd243683d58a2b13fcb0dc0eed21" +
-			"380b666eb87f4be75e7f2842bae916c15af3e9658c55408537b2301faa6e" +
-			"42af4d94e3eda6a41d6d302be281e2a9299e9d0fb1f20cf4ca978e66bdd7" +
-			"4c8bea0f15c84d6513cdea787dacbd4bb529ed03528284cb12f6ecd841d3" +
-			"c58c3a57c6bc19b65d6d10692f4e1ad63b091137c8acacc6bc1496953f81" +
-			"2972bf6362cf883bb75a2d10614029596bf9f35e92addbb50315b30161b7" +
-			"de8867a1393d9583887a292cadceb54078c9c846ec30882e6ff987494060" +
-			"721d3c761940b91a126e8d1e0118617bdae01a7f9c1aa96bdd6c78ca06f2" +
-			"6c8d85664a8705334f4997c724ef98fe265985593d5a9c30798714e6de1e" +
-			"bd04b648be47a6b5d986a3103e738a5cd114b19b7ba99d2e2eec6181bf3d" +
-			"ff0fec8c54ae6118be8702c3e775d493a6fafb509712a43ee66c3f4b75b0" +
-			"194c88937cffa5fa17b284d2556f2b0eebf876e05f92c065515198bd5e83" +
-			"00d0db432cb256a4a0f9963a05694ffce3ecbd182209e0b7bb50120f6be4" +
-			"eeb9d268b17790ee14a2c887dc5753e0086630b3123734053aa37595aa8f" +
-			"31968ddae4991af4ab970c1e3cfa1146a2efd9dc42abd6af14777b8a0455" +
-			"3865691cbac4b4417b3fa13c154d581b498f3b8cb77adf0e42dc2f2fb521" +
-			"732447de97271e542c6cf8cad3ba0148cc3ba1f2983ead836a25a2c022d0" +
-			"43ba18fcd009d518d07b53344a5bc4d626b3b38405a114471f75dc70e015" +
-			"d11e8f6f57d087fa72909785573008b1",
-	},
-	{
-		key: "1793bfda9c8666f0839b4b983776735a927bdaa3da99b13c9f3d1cc57d4d6b03",
-		tag: "bc89cfec34ab2f4f2d5308b8c1a5e70a",
-		in: "a09f661aa125471417d88912f0a4a14115df9a3a19c1de184878291acb0e" +
-			"89ee1f9d8213f62df442f8969a9a5a7c402fea09bdbe236fb832544e1f93" +
-			"9cdd4873802b2bb8fc35ba06b7ff96da6dc7efddfeeda84116bc525a7fc5" +
-			"2d84d2e63cbac00b122dc64f2d15b36595259d81a1d2a09f204c54072751" +
-			"dd812259df1104bb2d2ee58baee917c5d0aa2649c8a1503114501e6ed6fe" +
-			"239847d3d88dccd63d5f842426b600079c6bf06e80a2813b2208181163b8" +
-			"61dca07fa4d88254e84dac1c78c38397a016b5ad55a6b58878f99036db56" +
-			"89871ab3c321f6ed5895f218f8fd976c348b3f1269fcdf4d38c9492b4721" +
-			"6c45f499f5705830b33114d721f9731acf6c69fca681b74c2d82c92e145b" +
-			"7bab77110821d3a12cc818d7595a5c60c4b5e5219376c38a4dd52d435d41" +
-			"562802ff65ba2bba5c331c333d5adf194d29b2cd9ebb55927bb4ec17681a" +
-			"3f5574ad34fb4e964f2c756f6dbbb7a6876a21579a515263444de7a30a33" +
-			"15005458bc137ccfdff18a3892fc9f58f1de10d4de20bbcf860f5f036d8e" +
-			"8a188f18e5cf7ea3cd260710e7491befcb131d49a28dfb1ef688fd021a1e" +
-			"e4420d32fbfb03b47f5e85c37d91e49a1b0db85d966eb5434c4197433eb4" +
-			"9d56f2ff999c9a72230447032dc949202468261b48b6ac212e3f651d6c63" +
-			"03a06c90bb2d3a755ed91ba73bcdc28e1c5b0936e51e0a9f69c3ebabd3db" +
-			"add7abab6d8f6a44daeb3126429a01815f57444fb7022a4a510f8b564ae2" +
-			"dd9779b3a273fef15859a33e233724846c30d89fb78a595b6ff6c834812c" +
-			"00a991e405806aafd0c26a788895ad00a5e43c5426197aa8247207077548" +
-			"ee67db4cd6f878431a2e36e952d84b5fb89d681f553198e2c066310ea6ac" +
-			"3a31f5b1792620616f6c41d486fb844eeacc7fd36971abf416e8d6d50985" +
-			"c83cc92ea46ac37da8f0026aba30c945d8bb15080d2d95e4081bad626199" +
-			"3f95f57ed3252822a7caa035ae22a36c35e280cbbc82d729346cacdb1794" +
-			"ae9a9bb2793fd1d5c47121b135c2836063367339c5151b4e35278e97f62a" +
-			"fdd2f231d4b47812d083a829ebb9c374ff2ae8479cc4b76d55f9cef3ec6c" +
-			"4894f53e8caaeb0d8cd072960cedaf758e48e3640590d4f728626e0a08ee" +
-			"ebf719c96bf8ed4d0c283be09c0ae67b609e22d3b9aa6b03642854909de0" +
-			"5ed52b39673867bf586a632ab8072de15c637cc212cba8387515c9c9c433" +
-			"abd7ba6b02abd09da06a34694ad34f88515b65c0c9c247fdf9819fb05a1a" +
-			"ea4728c1182f8a08a64b7581cd0fb2131265edcb3d4874b009aede0e87ed" +
-			"463a2e4392aefd55e008eb7ba931788262f56e53193122a3555d4c08133b" +
-			"66020154b15643fa7f4f5e9f17621d350ede3dc70be02c59e40fea74dbbd" +
-			"7919d1a8d4e22ef07c916fa65e7d4b89fb11a7c24ddc4ca5f43344c753b6" +
-			"1331c3fa4558738ba7832b5b2a275bc9b7989b6e6888865793329806cd3b" +
-			"f0ba57c941d4428623e062f4ac05e7cd79ad5446f8838f2b247b66bddadf" +
-			"540845a1bb304a04b7edbbff579c8d37e2f6718f8690abd5231822c7e565" +
-			"69365ce532449a41ae963ec23a2a75e88307dc6b59cbb3fab913e43ed74d" +
-			"841ca9f6e4ef96dfd9f04e29e89361aece439c0b2e1943b30410a63d495c" +
-			"522ac3ec1b04ec4cb345f7f86969957ad750e5bd7dbf1d6a22eed02f70b8" +
-			"1cb5b2b020c0694d7f63044f9de0c3de1ede52009c858992d01ebb92ff19" +
-			"a9e0fbea18942fbafb77746c8e9e687dd58ccc569e767528bde43b62c7c1" +
-			"270a5721f1212de2b29a7aae2d6ba6cd173d7fbc78aec4356ce2e8ba9164" +
-			"d97dec061dd0c3a0e3c520a7611ac99739049dd5825537c70b7ef660046c" +
-			"1785546cd99aa400da848eb7c3c91247415c8e245d0f14c30d482c5849ae" +
-			"aaeab2568288229b08267818dae8f76fc674c684c99eb5faf88a0783813d" +
-			"f7298e0b50cb233f78471e5ca9cc3b04927c26a3871cf253798cc49aa717" +
-			"d8f18a1ddcbdc26497d188f15f86ec494dcf8f942c3e07e572385c6fa0ef" +
-			"40c0b625f1737543074a747a369482a0b342a08b3eccac9f9209be31aefe" +
-			"5a7794974f71ac0bc9a58026397ea3dd4f5e40511d58d2a3b45925c194ef" +
-			"13987037d736dd48b509d003a86471d5f161e0e5dd168b4f1ce32f703b89" +
-			"15004d8dfc708a5bb02b2e6fb67424b2cbcb31ddaa0114c4016b0917382d" +
-			"aad11815ff5b6e37d5af48daa5ef67cee3439283712bc51b5adf2356cb2a" +
-			"5181b8941fd78945c7c9d61497683e44fee456ad345e12b4258f15945d45" +
-			"b6ca4369ee792d849112d583fdb39cd4d333ee057355f0abc8d1eea4640c" +
-			"128cc1617982db0394233dbd416102eec1874081247d2982bbf9fed1b1b3" +
-			"8f4da923d68c8975c698f189a4d7840fd7aca9dceb7d91c076f85e1c546f" +
-			"4d5de4f60c91348455aaea30cac134c844dad93d583c139dd52b3be6346c" +
-			"4d2e6864125c5a2d0aed8f67930e1ebf8700ca88aacc914ea76ff17148f0" +
-			"777738cc126e75a2c81110faf02fefc47c91edbab7814599000ce55fe20e" +
-			"f313566e9b62457acf2f22e1141e220bd9d4747417d03e703d4e39282803" +
-			"386327fc65dd597f723ee28185c78d9195fc70a75706c36287ab9c6e00e8" +
-			"5cecbbd6043c6af8d30df6cdd8777be0686853b7c8a55a5b1e03e4431d39" +
-			"1725ff99875a85cae6926998723b36d13ad458220712209bfc5e8d2ca5d4" +
-			"4ea044d5ba846b4035e7ac7e9885f55d3f85c0c1b3d09fe929a74450f5d2" +
-			"9c9672e42d3f59be4ca9d864a4322cc454c2578493bd498a51bbe960e657" +
-			"3e5dd02c4a3a386d4f29e4578a39e9184024cd28d0e86ecac893b8e271bf" +
-			"ce3f944d130817378c74d471bd20a4086f2429ed66c5c99969fd8da358ff" +
-			"5c3be72bf356ae49a385aa0a631b588ddb63628fd162673e915cfc4de56e" +
-			"ae6ff7101df3b33125c9bab95928f6e61c60039b6cc07a66f9c733251447" +
-			"ef9c1ffefa2158a8ddf89dc08686a4cf9b86ea09914e79842d72a3236afc" +
-			"98a3afa0a1cac5590ab6a923e35a2ab8db6410a9d33cb84d1c48a054377e" +
-			"549774b25f50fbb343ecd5db095155cce9fb0c77d09752f62d4bbf16a770" +
-			"30452a75f6bdf73f7807d8f3a6bae16ad06b22175fee60549c22548de9c1" +
-			"3df35ef4e7bf7b66491a62b93c2c3fb0c5edc51f60f5704b56af30f1079d" +
-			"7c385b99f958ef8209e030e381d1ee8d67d3cb84f32e030e8ea2c1d0c77f" +
-			"d6b242a9f48707557c8682a08e1127f51221a55c733ab1edd00a9c2912cb" +
-			"36dde85f73b524e1a4f4da6414c5e4c18d9537722b2becc8a91bcc63f2b0" +
-			"9f32409c53c2beee0de6726dabcd6bf33118a5c23fb9c5c1810476efe658" +
-			"4bb6109c516b45e16b2f79f96755680374d82b91f2c519639a1815fd485b" +
-			"a3c00b46fbefeafcf25554ec5a6a5ae2da07c85b8a0f9fcde50263d9ed85" +
-			"038b2f7aadb9de765655bd201235218bfc74bcad6a9ddf4506167a649afa" +
-			"df400b85752d68a92b7a97f26b334dd77fce824862046b286a7c8e0adc36" +
-			"f713a252a673d4d995b268badf4bec8b8eefe85c25b823b6728582d35c4a" +
-			"60041114dab72b0623b99e2758f6a1e97365279bfba0eb1fc8952ca4f2c6" +
-			"fbffd9f5fd7dcad1125b18a796981b5ead0b6431141315898ace96f0d38f" +
-			"865698df8822ca7b65644b6b1f0a0f0d2e5850d4c93ec48ca3eba1b919e2" +
-			"4413a46d595ffa427715e499db3b7b9ab53c64abec7302bc737a5bd124bc" +
-			"da756abbca132f7f67e6989e09bfb23b497da31bf156bb9c69ae54588df1" +
-			"7420e8fe989f0472c8893b2bfe57cdae265a8cc7aeb39624167a567a6fbe" +
-			"bb1aa30c3dcfd14f2808a070994085e6e1fa79021e77c399f90ab1f995a7" +
-			"baff672cb693bd39b798b4c890b7d0a57978d6b9bcdc5bf3f4d205f8f24b" +
-			"2b43d3ae300a96971c9182be297618b9adceebedba1ab0f324b01d23d7e6" +
-			"35f009db3dbbc643c2d787567594bc639bfd78c4f3e6d948caf06f013423" +
-			"eb3c764666b58f886d5d28137c053c2a28535efcea400147e92ac6753574" +
-			"3b47f9cb48852abed1d057647d5b1c6f334eab1a813401fccd3dae332738" +
-			"776bb223e359f3c459b5c573ba64fa945bdd66c5ac0fcbd53b67032a7b80" +
-			"25f551e8d1fd2a4291bdb7941cbabe3a09765dc263e2bbb6db7077cc8fe6" +
-			"790d4bed5e36bd976d1e37dfdba36aafcdaa10c5f3ed51ba973379bcb8fd" +
-			"203d8b7282abbd271ecf947e54486e8653b7712c9df996a8ad035f41f29c" +
-			"ab81509f922c67dacb03f25f8f120cb1365ab3c1c286849c2722448ba9bc" +
-			"ff42a6b8a7a52f2c79b2bfcbdd22ef8a5651c18879a9575dac35f57d8107" +
-			"d6bece37b15d7dfff480c01f4461ef11f22228792accda4f7936d29d4c56" +
-			"cbba103b6d3e6db86e39e5f1bb9e9fd955df65b8a6e44a148620f02b5b90" +
-			"b2be9e5bb526d0ec75b1e723e94da933a356d7ca42d0ce8349699f730b8e" +
-			"59bac24a6b633759c88041d29399ce60a2ca2261c7eec1acb9a56e0e65bd" +
-			"e37653ce2cf7eb83a4d019c755bdc5d685b6394ecddb9006823182dd8138" +
-			"a1bf79a32d07a8e5e8ab221995c714e571b40bb255b79e328ab883542c16" +
-			"4899fffa16eb3296f310e302512352a864fd809beaab4169113027c6ccca" +
-			"99a92c6ce35c30f9449a3add70f10db1ed08078e8e6cbaafef630aab7e9f" +
-			"c8adb09c18e33fe1af3620d1e4d069ac11325e23cc18e5519a1ed249caf8" +
-			"ddba871c701f1287cc160019766988f63e089bd9bf1af7e6f5b9002e3b6c" +
-			"264d69a8bac16914ab55c418d3a8e974677cdcbea36c912e90386a839a37" +
-			"77b878e680c07c7cc99f42a7dd71924babf7fb0627d1f2cc60d9d390d1e1" +
-			"50d47386be6eefec9ddbb83b28fa7e2fd28cc3867cbe42d13b00545af8a0" +
-			"48cc07016ec79808b180e0b258c564739185da754f2e",
-	},
-	{
-		key: "0d41cb4ac25217feb20e86fc2490e8d2ea2e8225c051252a9395cc4f56e1ae5a",
-		tag: "42df9f9a59d6dc05c98fd9e9577f7176",
-		in: "01caba7a19cdb09dc0ec6c522c61c628eacf17ef15485aa5710fed723875" +
-			"2e4e8e93dd4bbc414e4c5620bab596876dfbea33987e568ddabf7814b318" +
-			"8210a5f8d70041351e4d8410840642a29cc8d901c25fa67cc8f9664ea5e1" +
-			"9e433eaff7c722d0258ae112b7aca47120aa8af4420d4412a10732551db2" +
-			"cd3e0af6e5855d5eea61035af15a4d0d898d04033809e995706eba750a7c" +
-			"ac07aaa0dc71477d3020f778d0347f1a8e37c18540deb9ae967e734c0264" +
-			"df0e1f52b0b5334805579ea744c8784c3ae0c3ff8217cd3f53cb747f6996" +
-			"f3d2147699799e649061b205f97f7992e147fb20f21ff862c6c512e95534" +
-			"f03075e8e52f162e0d70d7a259e3618474427f400f44f75198edebae6e40" +
-			"a2173257d114e1bb5a13cf419c821eb124d90e89a938d91f4d2e70dfd1ab" +
-			"60446f1b602614930a329e98a0c30f107d342281db25b8f8259933e14d20" +
-			"8bbd991e42969e8b0600272f9bd408483cddfc4cb8dfe7bc19be1989c7fa" +
-			"129d38e1078d094b82e0a845040ddd69f220dc4aa2b236c44101d7da7779" +
-			"9827a7b037561b51e50fa033a045571c7267af93b96192df3bf6180c9a30" +
-			"7e8c8f2b1d6b9391767369625015da02730ad6070df4595eb8099bd8e484" +
-			"59214310cb62c3a91a4fa8ac3b3d7b2017d4254fb465f0a248e1bf45819b" +
-			"4f0360f37c9a79d405e2bb72e5c25a1b4df192cfd524d61e1e8b274f2fe0" +
-			"634c73f0653c7c9e9062c9d081f22a8b0327897eed7c6e870f2815bbac8f" +
-			"585c1bd868759a98dcb5c3db2f6c53244b9cc494a56f28a9ba673167cea8" +
-			"b799f37049ee7b0772972b3a6603f0b80eddb58ef03f916106814d72f000" +
-			"250b3573c97c5c105910d79b2f85ad9d56002a76a1f43d9d1c244ef56d3e" +
-			"032a9bab95fe3bd5dd830ad7d7e341f28b58c0440658f7fc2ca98f157708" +
-			"1c647e91432cb0739d9acdbf973ceb9b0047634d695279e8837b04dc5357" +
-			"f013fde3c55c9c53bf1d817ec59a1b18ed0ac0081ed9bbb3bcd1a5d3634f" +
-			"50f7506f79dc6a4ebfa640bf65682fe9aeca68088e276937669250064de1" +
-			"c19ad6d5c697f862114d0f81d2cc52be831ed20d3aab1e41fe6f476b5392" +
-			"af4799392464c51394c2d1a8325ee2e84f1635d295ee663490e538eb338c" +
-			"7126a8e731ad5c0becf144c7a9cae5c6493350b589385de29e1a0ad6716c" +
-			"346ec4f0a31ca5ea35c59ab6b099f65d7f0b3d00925a1da1b5777c029aea" +
-			"9679e895d7100645dc83f81d82a6174beab2357f7888ea640900cf3ee67a" +
-			"e0724a123919d78e70e05288f67e5e69ffa6f345be8a96e58bbe260184b5" +
-			"ec5c0c1354cfd516ebdb8d420029137d41b029641959cc07fa7b4e16b39d" +
-			"17f36b2367057410a42e0550e9ec1dcd2df4604d52d4f9dd1140d57af08d" +
-			"50e1527dad793b6d649324de799754f755818bf10e6d1ab614958dbb24ac" +
-			"8e2c01270a90ec3df4379c3f509b5ef721b0fd4f91a1bdb8127ae4dc74d0" +
-			"75f6cd8bb28319d6f8e8d8ff64fb4a42d646e9365156c6bc72cc46e9cd1c" +
-			"f9e735549e3df9a8e6b5fe541948b126190117db71fd1d61ad84be0f725f" +
-			"20b99eb141b240326d399976c4f2ce5823d94649a9580e1e8820bf49184d" +
-			"fc34378a60bea89b12aca69cb996c17847b7fb517cf2d51f16d78e3875ce" +
-			"aa33be15f6a154004f0e1134c6652c815c705efc34bcf35bd7743d28f0a2" +
-			"77d82dea4709dab41fbfb4e0cbc118c17aa00808872f0edc6437c357cd31" +
-			"74a02aee61890464e03e9458853189431bf5df6a0ad5d69951e24be7f266" +
-			"5bb3c904aa03f799fe7edc7bc6779d621cab7e520b5994f81505d0f01e55" +
-			"96e14b4c1efdf3e8aadee866c5337c1e50066b3acc039c84567b29b7d957" +
-			"683cadfb04fb35402acaba631e46ca83dbdd8adf28e377ec147e4d555a21" +
-			"e6d779d7c5a3078ab72702234d36ca65f68bd01221c9411f68f32e16ef04" +
-			"99a20c2d945fa31b79d9965853d38ada9d48eead9084d868c6bad974b0f4" +
-			"0956aa0fcbce6dac905858e46c4b62c0ee576b8db7d484a524e951f4c179" +
-			"decfc7d6f619e86dee808f246dd71c7e0b51d28bc958110d122fa2717148" +
-			"77823242711632f6e1c7c15248655ced8e451a107707cec8c84929beece4" +
-			"efe5503d3c1763d0ab7f139f043e26027d5e52a00d5414dd98a324a8fc2a" +
-			"06a1345cbde747f41099c3377b86bbdc5a17c8f6e5b773a761f78573832e" +
-			"4359b143810361dedc79142fffc49ddc0b32f225d50d360ceec3920fb0ba" +
-			"0693b644ee07fbd1ce829e223a02794b197614061c4bfa46112d105c2b7b" +
-			"4efea448501d146dece44f6640d674d5749db498b32969de6e165e705a18" +
-			"2aa1f3d8e16892b0120337640d52c9bee35e5b4b17f03eaeb31205c8ecbe" +
-			"1ae1b110023016e40ee87370a65c5c20bfb00f100d3c6c1de6e4a1c90162" +
-			"f25bddbf300ed637330206788a4ff96903f971c9618493ad074412af625c" +
-			"ff9e0f8f183bbd5e96c1f28307e6cae8b50cc0eb1a3a8154e44e9de947af" +
-			"002e4d1098d6b0ee3f2e71a10d03eb444729c42461283f37be8af2ce81ba" +
-			"bac246a05c2c94efacc43f0cf9ff3df38ab6fc1648c796ae7026ea95752e" +
-			"b70873a6da59da10d8b5316126431c4a17289466e95dc739c061d7a4b13a" +
-			"450809479eef421bddcdade77a6df133410328c754af8999a09b1a5c056b" +
-			"ecbb6fc2c339586ab92100f46d2fa1fa689994b36aa70703d76bf7738adc" +
-			"f0589fdfa6bd215339ad69ed983f62efce0add5a63fe7dfe4bfa006ff16e" +
-			"0cc06d39199ad60adcae12b75ca98d764502a783373da3a41281e03c2037" +
-			"e1b3ca7f7eb60e2b67427e97ec72d36670db7662c6daa505701fd279f116" +
-			"ac0ef569471f204e1531c25a4ac3ce19b6f68a8994b6f89b5abf034a6507" +
-			"32c7fad4206eb4eaa7cd9a710d866bf3c3f13c16faa268ae0cf4f69be909" +
-			"bb9b79aab80dd25101d4cc813a48d3f38d870f10ac0b6768005aa0e69e87" +
-			"dfc0424deef06414c9ba6f498c93c41c692a7a6221fb5595b390a32c70e0" +
-			"2cd64471c797ee8a143725849c1e054ee2043dcfc0b4cb1c00be21a14be9" +
-			"2d9a07f1b4e975d4c86b8a5c1387e6c42bf393e078fe86d24612d497e14b" +
-			"874485a3cc922b5b6d91295d7b79ab8bfa1c7f64b51e761d19bb9da82a5a" +
-			"a34aa469699036b6b2c55e2b84f84942f10585027ab07e2e0e562e0fc3dd" +
-			"36047850ded84be4416e22aa41c7a2f7d4a4d8e3dd420d746a1d8d56d87e" +
-			"5133a1b4380bd9a89500fd6d7e68a1ec02eb9e79e4a13edfdde1273466e4" +
-			"6b0e6a75f59ff6175716629da52463ad21de27f40fa2e25a566eec4b2696" +
-			"4af3a717dfb0170a73144c0bd9b00bed67ad8c0a146eb5a055812d071209" +
-			"c9d530cd4f50a41488c2238898dea8bb36b0f1496d3ea8c4ff8e263b367f" +
-			"64977679e697d88e5295bd97ac16a0420850d1ead9621e25a3f58925c266" +
-			"ef5246488b1c15a8fe0d8ec4291864faa5a67b2388b7786f47b6d27e8fe8" +
-			"46f85f85163e54155ef95cea4901e712a44404a4d3f27f28dd961ce36b84" +
-			"f3856770f07f20a2ebd34d77405beab04ddfc09770167d7d6340f494dc6b" +
-			"7e4c3df896bd974730193b1e862b58d4a5938e6e4ae8897dba8812924379" +
-			"e54f51a71364d39f76e24fdf2c6c704479ce85b456558ca6947b8fd76f03" +
-			"78273f0a7bcd1d860ef1defe4eea8fdb81c73eda028d82fdcb2248582ac4" +
-			"59eb7698a811e6c5823be886410f6b8577ff2e8252343b6ea890016ae846" +
-			"01c5894cfb988121059fd9c8fbc1596da470a149404fc67baa15383d38cb" +
-			"d17ac107b4ff3c1ca4c76b7930de02b240e7547d39f4978e0cc1fa37f8c1" +
-			"012b677f07bb4df4486196e9b0beb823a3827585475b878e3f6f0a2d3836" +
-			"2c7d34f9f3c91ed46c39cec95c2a0b6f0279a03a00ed5035b0725c393849" +
-			"cdb1ed3c0ecbcf3c2ce108017f468e1c3d469c03e8231d4195344ced70cf" +
-			"daa667252cc1554dce8d0c54eb4cf4da62367d77d7dcc02f81e788ce9f8d" +
-			"d306ba1b48192359cfe92bdbea9980f87ea0677d7d2082205a436cf514e6" +
-			"fde5eadd21b13dc836ce33b5dfb6118bcac79ae00fbb16d61f00a923b145" +
-			"f9caa9f3a2c7f0104f8b052e390987e57c8dc80cd5f0358afb0111af1fc4" +
-			"e31f92bd832ad35fd2e0bdf768272de52ce0b152f74d43a8973ad516b3ea" +
-			"f5937ec8a236ebc86adeba610de0cf7168453111f3c983b64df07678cae0" +
-			"a75466ae15adfb127328e716448cdbd2c1b73424cc29d93df11a765441e0" +
-			"0eeed72228e1099bd20569d9d0e9e5a0b3c11d0002e2896631186483db61" +
-			"c1a0cb407951f9b1ea6d3ebc79b37afb5a7037e957985e4955979b91fb85" +
-			"61ca7d5e8b9cdd5b7ce0130a880d9241027b011fea7696b0c695d4949ca2" +
-			"d0cf22d44b9fee073ecaef66d4981e172e03ea71a6edc7144393bfea5071" +
-			"2afac137f091bae2f5700bfb073a6d57fddcba674a899d7349044a10aadb" +
-			"2e7f547887dd2f765f394de5dc9ef5dbf1eab4d869be8cb68aad8e2614ac" +
-			"37bbf21ccd5a832ee09fdd07ce50a580a2af36256b1046e646fe3dff6d20" +
-			"0c5110f1ad1311bc39b8114cd11ecdb87f94df43d4f6468932fc0ed892d0" +
-			"3d8f3db3f8323ebb29776ab7d260493a36700bcda668abd62126a8189e91" +
-			"df2d2970ef688d4e8172fc942e69ba63941a36b79ac546fff38f5f7d1176" +
-			"57612a662ea38134e1090c3e903c9adacdeefd3ac2a0467e9f5125058c19" +
-			"7b2260d2afad2b0e627a9ae52cd579ee27168065658089e1b83a2d8cdb47" +
-			"e08966e4ec0018e78c4d267f9575b8fea2a42de5c2d25356fe4b8c9cb1ac" +
-			"daf0d1af4bf58b9704cd4bc08471e3b9a0e45a5693433ede2eb1374bce44" +
-			"1f1811cdc7612d7bb61f4f34aea0a44757bbcc12a55c1ba41a7901eb004e" +
-			"689587a38e5b4df4574ddcc7b2eda97f6e480d7d39f45247ea3b03c90a93" +
-			"0dd168b65d52a59ce9c2cb4e860cc6aaa0ee02a58d0c8ba990194bce80fe" +
-			"8c34ba5693fb0943ec2cbfc919e534cc47c04f502b6c217c2f860d1d482a" +
-			"a016aa02adfc2bea3171fc4e27e2a262fd37b824099aa227fccca508f778" +
-			"b8c6ec7aaff1d15f6497753f439daa9e52060fd6e9e056e6843d770fb057" +
-			"6d9e2e782db4843c0c2c7f408a17376719a3c5cf9fa08f04f8a779885a16" +
-			"5cf93ce404be",
-	},
-	{
-		key: "ddbd5d6c5ebd61fa72b453dd849dc302c98a0f3e300f4768bf1dc698a3827dd2",
-		tag: "af608b71a353e63c64911558baa122f3",
-		in: "c67e2524b0de16483158a0232078fadcf611e4fbdb9e642e397b21222423" +
-			"cc2ed42ed34ffcb178448919ee337eff9d7d691f622e70fd3317cfd271df" +
-			"fe6a9d9b7e07db0d20813e2331164a654386db2ab06ae2983bf2460eaaa6" +
-			"3aa0171fb87afb82e85b40d95c8993b2039d32e9d38473dd13f41fb1ff1e" +
-			"261752ab004b221a4472b9b1a0e139f0c999f826a26a7e7df362b0611aac" +
-			"fa83c55cca2f7c0138d2c30313c2f6eb357278328ea6ebd6a5077947e18a" +
-			"a97c34b9dde3b6f2de4b83778ffcebc8c9cb58756691d5e2a3d15a759a2e" +
-			"5050b6da937a6f5551aec069a08027d60dd870d175d2a5b5f0b4f3143904" +
-			"7445c368a5c866370e9426abbc1a1c5a272b96731c4128aedeee93e8e00b" +
-			"b450601a6d31ea279b9450e738b4a47c0dc22d2d8ed5d44257f6318e0c59" +
-			"b951fb6b57746062ab95cd73c23ef0a5c000a7d14c18bfff172e59b6f6de" +
-			"aa61b81009e803eb05e24fb0b706870e18889a9180ac16a042d12dfff9d9" +
-			"1b88130f045d2342fd5ddc5f443681c31090459f262d1a65654c55251fc7" +
-			"d5a67bd2e62940ccd606f3e50700e4d1e992a3fdf0388b9ce3df9de6dda1" +
-			"5c1cd6b70622ac062dcb7ed7058872c00ff3df94032853927126cf6fa4cd" +
-			"c468d91c9b52dcbc272fd7ba920dcd3ea1e048af9c3286dba74d988ce9ce" +
-			"77174e25a87935352721dc23b60a9549322fadbe6a00dd1197dfa25b33fd" +
-			"9e5713afcfd0fae6dbcf27147fa58d995580d7e0a903c895752fe9819f5b" +
-			"b002ed752719552d0f3575312f2e618173a8ae7c147ca64a709053e5d2e1" +
-			"2f4d1ea337afa9ac4f9ba62760046ec1e48f4ed8f6df66786c9fd9f5bc7f" +
-			"9ca2526e1327b042f4657c405757690e190c91f260dee2dd3d2e6616b721" +
-			"e489c7c3cb828478a3d953b88f09904e7927cdf6dbd6a5419eeeb83c0be2" +
-			"51934a80dfe61e09442f0761aa2d013e10aeec3a32df204571ce8984a430" +
-			"9bbe30ccc91977790bf0305d2651ee450b749c3e7761534e45970e70a0a8" +
-			"473cadbc88f096970c275f188c9d2644e237fd50c2e24c1eabbf7578e80e" +
-			"6500762ac513fcd68cf6f8bb7a9d9eedadca059d9ecec07fe6fe7792b468" +
-			"9311861728dd482f087c28374cf9c5ea20b2c8630029e8485fa6fe518c74" +
-			"ef77d44eb7526ca764e50b5f34ed0f253a91fb2af6e59338e2af6e041e01" +
-			"084e1efade1aebb7d1b698ccdb8b4248ac89cd40d9517d840960c08f5e86" +
-			"88d8ba2b54889c1870d315498b70e0e9720f2c8c53a3377a8c0bd2d6a1c6" +
-			"f17c6ff847eb14def6855dc3886b99039e528b421ccbf6064e39263f8f3d" +
-			"340d5d20b1b14c264ac2310b5f3a0c6f0c1006d0d4f1a69af68d28ab447f" +
-			"cd17387e1fc98f164982a6d05dd32d6b4f0f1b04e40c6c6e0fb4467dd6b1" +
-			"0c5a9c92cc8c2bc97ef669b6d55cdd0aa8a15c46af954359165949012713" +
-			"4ea9f74181d54a300d3172c9f01db73288ef6a709c763a4891666d0baf88" +
-			"8531dcc77f0911412d096aef9033fa36b5c1ed283b8b5c109e45b5cde911" +
-			"6f3da2533fa0ab81929bd5783271d5501a9e4fce2aff9eb5a70a4215b253" +
-			"46885d7e4225fe34bb55b309a114a312693d60ccc61267359a8c2dd28141" +
-			"226e7cfd99f0f12c69df57d75dd790dbabfe3145f7fd1a24fa58e03bc2e2" +
-			"6ea19288af4929e5acc517d8f52a074745ff4644d94179eae6ba7d267292" +
-			"bbd2053167a0da9be5e4b6cd0a4200fcac5182d9957dffbefa857e662b82" +
-			"fc3a7cc32506e78030ed5c5d448d7f1b4fd854a735a0c50016bb85e6e716" +
-			"0f87527bca0de235f4b7dacb75be84919c15a5b8cf6bec035795cb67061b" +
-			"7855c2134c1b1bfa6affe04b7db239f73af6ea9c02bc9f7972b7f6400b6b" +
-			"838f4653aefc42179c21765e3ca7a5e96b4402ff544d4bc2332756a23500" +
-			"11241dc42ec6848afe127c00b9c333e69bb5a54ea5c7193e59ea22bd6d32" +
-			"af4f56b1bd2d5982ef7d9c1b02d7668525e4e81b68a400f7afc2653f0f41" +
-			"a03e11c7a02bd094830093481afbab96397245b9f37a568ea1c4ae248cdf" +
-			"afc87f88b1fb5dc300d8e9039af4e6e701b458ed3f32d693f2e869b76bb5" +
-			"1358cbbe5b5089013bf452734388a176cccfc1ae9b7cff603631ca48e129" +
-			"b5c9573d4e379547272cce8aeeeb407d3fc57f782a0eb5fcbd41e6fb13be" +
-			"7e4f1067cd407b42a6121b2969c384916ba2b32563e659f52aae09c8ce2e" +
-			"3c500fbb7e58be74cc1592dcfacd9f0d4cea1a90a18658147c81cccf6fb3" +
-			"078ed27f369e7646f551386a74e1b07074d93e0c1f298c761af46cdaae9f" +
-			"f4be86808b66d0e228016d27a3a77c843365cb847fddccb0bbcfb3b9008a" +
-			"1bacac59ffb0aa759a0568c72c556caf0ac1091431b574687c5fc7bd486e" +
-			"963e0fc3bdc828d988734a21070747c955cf8dba2df1c3a0ba8146cd58b5" +
-			"91b6d54712db67a9851b1607c8445bc97406eeb7488f5f85e547850d619c" +
-			"407f97632ca1801f52c09c2b314b4ab0f8e7fb5851fd60852f4666913ca6" +
-			"bc840c1ec8f8f06caefdbfbf02ce00f20b87b14ba9e651c80f40a31d0306" +
-			"403f541776075fbf23733a6b19e3b44d04b455b29ef8effa70cce0c59331" +
-			"7119abc07aa8c8d0246a760b0b36a3d87b244e83bae8a745b8277a531298" +
-			"f5d0283498a509c89898ddf0f7a7455be1f8a6889c46d323f1dd18c3babe" +
-			"1751a05f871f0639f50967afa46c19cb93d9c2a79c81e2436a7a62f225bc" +
-			"37c90698640f5b43673e1dc276de05ff1e29acdb4ace5121659db5f23c49" +
-			"57aae22f53e6f2cc935824fbd07c2ac87672eeeab895c3f06e09e178560e" +
-			"2fcfa7097f10201dfb8b1ebac08ca806c1b3ba3aff9284846a1a3beada53" +
-			"e9f7ade12eb89b5591f462b2543bb4090e081fee9fb53bbf821dc92d6b16" +
-			"fe820ab2ee4b1f6c0b6a6f19edb0bf6479e257fc73bcd60dc2261d0a4752" +
-			"e23a0be18abf355f3065177d8c3c14e21edc178d0abd1b39f703e6335131" +
-			"ec90cba3d9846cee7354a06c320a3f61b8a269abc7138831614f57ca6c19" +
-			"a4a621142889cd924bf4ffb82b57f871b854f3157e8874c22d43a5726900" +
-			"bafbb8f2260a1eba3a462e23d4def2ccf68ebaae8e52739a1ce67c039eaf" +
-			"9a6c3232fbb5a91d1e59a8dcd3798ba71345fbf83d09b83b41cc49d5ff5f" +
-			"2e809d2b1d5fbc1e7001ea76b9b2d8f896eb6609e2e1c5c562d2a6e74960" +
-			"2d67a0f6b43a201d5087509b8dc7b0440144e308c18ff8b96b607de2f20c" +
-			"6ee99bb05367a8b25947011889f724965a2b5c52c9db1e0622df9343c548" +
-			"d054699badeb15fc41055af0d79a2bfc1a5b4574634fa0dd9dd10a6213ed" +
-			"b6991187dc560facdc27440456a0a209fd7f5ee4fb350ae71f869723e5eb" +
-			"5338e3d1448bc993afca6957f4cc7b047a2c7c9593b7234725e66cc0eb23" +
-			"3824eb4cb905701cc522ec210950b871397c6c0bb3d0b839f2eb1a120f70" +
-			"36107246df4dfb2c24891bef0bd1dc131f2c9d7c295ee967e3184d963037" +
-			"fcc9e0b8c7011c8e04b4e70038150d34caab4f8c0230418cd2d8a91146e4" +
-			"4e11cf6707452ddc03d9b4e6380658135dfb48f62c0690ebad75167f4dd1" +
-			"c0df3ed555b5081a7b82616d9e501757c83c2193d0f640236d59f9c97a4a" +
-			"5c8bf532aea2cf5964ed2dbd8a70c01ca5c7677224cf2a37f3b24d8fe4ba" +
-			"91cd3b5033715de227de51deed15afb8eda9d2b9615d197b8f98322d7096" +
-			"79c5131eed48050fbe0145a9284e236605c25a4876e2adba42f4e35a8949" +
-			"3d59bbf44b3338d9d2e65a7d7ec6c863cd47cae9e23181b07298078a5e9b" +
-			"06a5c7e1059f474eb1a4247e8f02cdd4efdca67d22035b12abecf9b15982" +
-			"de4932a28e797bc4de38442cff2cba263eeddba0ab14fc706dbca04eaca1" +
-			"b4cc13000a10e35b32461424809b299798e4d8e66c92aa3181c5df16ab65" +
-			"9611cb625e895a8021af8c60960227d6f2ebeacb17b13536a5ff139734ef" +
-			"37cb67018ef9a410b856e6f6eddbe3f59b088d538c50a8f3f0912d06e47b" +
-			"88d773069aa759cc614e1f53cf6e572c127123d1ab56b79ee753a921cb22" +
-			"a60e4e6cae768c9966de4e2625484f2e990154da7fca84b6e6c0b59201e7" +
-			"fb8a729cb20b4c774381e84f1bd6e304543d952dc76ef741b72f3a4ca7a6" +
-			"ea7958b8b6337994ed82dcf988eb70f509610b9a279ab4d0f28cc2b2dd99" +
-			"3b8637a6be0cb4b5f67c79654c6b15e1b61120374ba9b974a628c547f11e" +
-			"52d72d39f8f9c5dbfc23a89f22d38984dd8d5c3ca72cd54e6adfe2b3d163" +
-			"86afdb50967846a4c311351a51e5fd322757bdb061d44c8796a61fa4db36" +
-			"793bc11984eac83bbcefb40d0bc7bab0ca81e7df3a7f58c6fe800396716d" +
-			"832acaddff6d72c8e19dc9ea838294ead800deadb6bc18d3e399fa76c46c" +
-			"5d88ee72a86a87399423b0578eb6e27d78156ea2abf6f08b5cbf747f2f74" +
-			"5301b694bfba84bfe3c5527acd50660eea5105a2644c1aa92f954a604fb6" +
-			"a1b3b2d0331497deafc3aaadc7040b9188a36cf607ee85a0655ae963fd32" +
-			"91dd58f8bb50b4e46dcf7c2957639bffa6b12d895660dc0323b7a092f999" +
-			"813380b820e1873c60d3e3038129c66d507862100a5d5842150869e7873d" +
-			"6bb6ad022350ffa3813aca26c80ccae72692bed9c77c9d4da23178c57153" +
-			"90b5f4505240a796ec9d10a7f280bd60a570b1b693453807707651fc0464" +
-			"03e4768965a6f42f112152942134f0a38c84137c7a6e086ef1ab9ad20d24" +
-			"3b93356b305c0996ab7d02c02c44cbaf8f7e60b8c0b8c9fece3f189b099d" +
-			"dbd126b7357c1c4ea1c8bc1ad93db91ea9bf043a4320acb60b502bec37b8" +
-			"6b2a5004b8225e549e613c6f83b97b7e4aeda1b013e0a442d7ce2f14e78e" +
-			"a94bab700c9ac0abba945e28f39fdadff223c4498cb204f01ddfcb450a41" +
-			"f32ae47f99a49114c6646a5cb103e9cd75f9d81dba417e48c4053e3b0295" +
-			"2267cd30589b0f5d993a5485a6ead1ffab9f2f4294c5853ba76383a326a6" +
-			"a42fb8b78948aa49f0f1f614bd0a3fbd2a58a3197daf2094605bd838285a" +
-			"1260f1265dca74aadd95652632335fd17cafcb73b202c3f0e5da836c2dcf" +
-			"2934f005935dca80154af43fa34c8ba440d1581b74ff17dfaca369dc9aa6" +
-			"734c03916d78e1b952691cef918fe033d33f7f4323cf724ffb8cd6c219bd" +
-			"046e9f268eb0601098e93daa59dde370e46269dd7c54891f71bee2829a53" +
-			"df86a2c7fb1046cd7c98fa21cd83597be554997a70acebe0b6e60f1f7098" +
-			"6f65adcae24385cb7102bdd3e01300ffd15d00f9764b3a5c51e35e5c9cdd" +
-			"da84f4b656fe514ec4ff8dcd774373f8a9103cf36abefe875f7084b9bbd9" +
-			"42e0c997ec2d860a4b622ff1a39a628582fd81f237d3d8f6843d26ac77cf" +
-			"bd48003e8e8c591ff813a9a897e3149ff0297ff476299d717e54d885cdd4" +
-			"4c3ba6ebf54bc7a1",
-	},
-	{
-		key: "b15578da1020f662ada0ad4f33a180d9f8ad4991b3720bc42a22b52625c7414a",
-		tag: "b0e4ad4a010afd6dd41ed82868cda555",
-		in: "6d2afb7a9154064341bdbb533f11990d4987e7c90fbfc0167c1e58d6efff" +
-			"6010f7ed569dac62ad37183b0d384519ebed0bf9c6e05a070b4858e6b846" +
-			"547ab5e45619c866f83cce83dcdab6a8a6c36b115ac832de1c6d433b94fa" +
-			"35803fa1a36f1ee114f8632402a027a74ac110394f32ec4006beb0057f09" +
-			"a94dada8bd0d1ca9a14b1f2efb8f526d79d6438bbbaac0ca1a43935627e5" +
-			"d129d52c06bf6413af07513bc579447eccc3a9406645c94dae59dab98d6a" +
-			"f92fa90fd4efaaa4bec466806ed401d2083cda587139ad7e9ee2adbb1dfe" +
-			"a88b59dd788b954a0f52c3854a3fffecb4bea83debbb2f5f8883e6415d3b" +
-			"ac1b872df1afe185468adc59364c173082f1dd6da9d348f5f5ba2d216243" +
-			"23de1f623eeec875bf31d12acec40dc0c1b9562826f3105cdad4c43cf45d" +
-			"829aa8b14012c47847aef7a2a6e3935fd972235f5d3a7ce4ad3582785393" +
-			"602e2e27329914021eff38ed2926c88acec1551f17a1b818fc1c3ed4b3b6" +
-			"6825d55bea269d710123b52e12ca9520a069d9c6a21df3a0253b3a4a6a8c" +
-			"dc226d667541548834da6bdbbdc165f39e40047d4b647c507d981be17b3a" +
-			"836063436241a8bb46b11a2867b621413c42d838e4578b72cc1982e34bde" +
-			"c303b5575ef4b8dd9fea8ed5bf69539413909d03461d3853b5fbf714a61c" +
-			"769569f42b38fac4b849104e2f2ac1dad0e388646278789f83e0b0511571" +
-			"019d3bfc5b03ca4cb5564e4e75e103ea1b6000be6588e27105d7cdc2d2f1" +
-			"f680ad34ef823ac4bd4068146e9997834665aec7dcc7a82ff28d85d52dd6" +
-			"9c18dd35f326bcf709f74df5981bb90ca8e765fef9f0698a19e12220b287" +
-			"24a6d9e4f4c7ce93f8ca9a126689ad1df820072557ce3db246cdf41599dd" +
-			"44ca841bece6c7869358005536e1189aa86b764e890ef90970d6e3831def" +
-			"fa890bf8692381123924e7d9df804fd770a0a30ee97d5dcdca302833efe8" +
-			"1d4b2505b17382f0b3429b38c41269ac95e36e9f5a1dbc6e6c8963741917" +
-			"02a23198decb4efe6809fcbeb5d0c9098a4c300155dc841610e55c8a6e27" +
-			"2a38a39de3d8ebf38a750af25836ffb1bb7822bb98886280f0cab6838c01" +
-			"cec57961bdc2e1bf158248309ff9294adcb962252b1c24646d132a3be2c9" +
-			"1ff82e8e101facbdb807826cc9d1840a90874ba08692e808c336c9d280ee" +
-			"f36a43a75c746fb864f85711e802546ab5cc3f8f117904ba1a85d6e4b729" +
-			"85122c5041891e16d55b93d6fc1b7fcfdc80ed3d72d55d64b8895bbf2f8e" +
-			"d188684e7e89afdc1e6a7ab9bd1d3da95d68698df2cdcbb2e1a4ae70e2fd" +
-			"dd4760f9e5cf4255eeb1e9e8009ab507395bacb8b2177e7c5757ad02baa9" +
-			"a96db967d20a150d2dd7f3081d90675fe0c82f94aa3cfdf6ac5585583901" +
-			"7a8e122170cc817f327a3c8ef44acd6e4fa81b73bcd0bcb5792eed470481" +
-			"152e87f7a20c3f7c69d5a8199bf9bb7c7269b450dc37a9b22102acaa8438" +
-			"134d6d733d231cee9522f7d02fbb37b5818ad3ca72df4752230ee11392ef" +
-			"8f8219be55202bc3d476f5a9078b32fb63d42bed4cda5ef90cc62467bf5e" +
-			"418ecd9d5d0cf1a33eb9a930e652ce96057fef40b65588aac67621d651a0" +
-			"9003dbc3925912e385296cd3b2b386a44113308ddf2af52ca390487eb20c" +
-			"716b76d78ad45129e7c285d918de7107ea8c3b0cfd9e73933b87c0b2b505" +
-			"cb4c95794f2ee6d6d43e2e76026923a0bbfbc3bb22df9ad729452283ce62" +
-			"dc9b26684fd45e07650581afd73713a708869a069c58b599ab478974f206" +
-			"dbd3e4e563e346ff1881723c5fd440bdf9f70f761c6f746113397d7c04b6" +
-			"b341d7e44de7de0aae79badaaef5ed372ef629dffd52926110683ab2d4da" +
-			"a4be83eb86c8700703a660edd5a5029f66f1581da96fe1feefc970ab4086" +
-			"a83ae02e959821967bd27b3b629652f5bc3db2b7f1af674f9f3fb3a788f7" +
-			"88e6dc1722382971831a7ed72502f85b25888c1534d81c0a4f7351ecc40f" +
-			"4e0412e05718403fae5746d313a78c80ac297f1391ad389070410e1330a1" +
-			"b07d683d1c795bda74bde947f2cf0dc9638b5d0851cda27df030403816dd" +
-			"3b70f042888c9c192656cc4b9fea10b81b5347900d9199c8f0f47d42f2ee" +
-			"482b68acfa5ff47d9950c950a926a497d94c6a796e0b715416520bd6c59f" +
-			"30217718d5f1d7bf7c24039f6467214ac8783cf011b25c37c67dfddde426" +
-			"40afe97f94879f4586954737b86701b32d560f08caec3fc45184bc719c7c" +
-			"5bf699074fde814acae32c189158c737665a8f94637068322f0c23ff8860" +
-			"f1b1c1bd766440afee290aa6f7150c7adefa6d72a738cd2268da7c94788e" +
-			"bb39002e9a328a51f3a92dc5c7cd9e4faed5702d3592ad16217c4978f84e" +
-			"af0fd2c9e4c6f4dcdd9112c781eb41a9aacb0f7935bb5c92d41e67cfff6b" +
-			"991ccefbd667ffeded1de325da50c33e28e2eef2f636c9726dc5bfe753ee" +
-			"c7bb6e1f080c89451f81bc8c29dc9067ce83deed02769714fa9bb477aca5" +
-			"c09089934674a0cc8e4b2c3136b2e4af8040cc601b90a4dec898dc922ca4" +
-			"976ab5ae4ac5af93fa5b1854a76ac3bcc2090bdeaa49ec4f319cf7c7b674" +
-			"6d8e617abb3361b28b27983dd1b139ec4f5af7e116439d7ecb16534817bf" +
-			"264dbd8f59e80b443be12c17fa013c7f4d029504c9bb62b296c2326f4f49" +
-			"cc3201b70ac3f62abb683c630179594a6d4cf30fd55b163bf8d01986bb6b" +
-			"cb7050fd527f095c45661920268e56f760fee80a29c9d37b7fc23f608710" +
-			"1e723038e64ee1b91c4849d69bd95fc9bc24fc4a234f4855f2a203e3f699" +
-			"c32698585c83781677739f2c48697c93b3388dcc64aa61f01118495ded33" +
-			"21ef9a1c949481f96005f8d5b277a7d6a0d906ec304cf4292df172e72d20" +
-			"29ecdeb65f06267a605f376804bf7bc5b82d5c8facfe7e41dc10806d27e0" +
-			"bcc5a341d80b3c1532407f75088716d732632cd88b0037f0d829bf385fec" +
-			"b52a202956489f61f16b0f4781bf59068b33d7330571d0b4a6ed91830258" +
-			"e1220b308784fa155be9bc821f5c0009a33802fa66dd66d1dde997dddd97" +
-			"873ddf65927dc1be979af2b5f110eee627dc1e210326ac20544a757ac168" +
-			"1823f3dd04b1ddc4bf96677a0a87633994e7af2ec99b7d5dfe44c6192be6" +
-			"a6e69d17b074256da3947808fbf68c7506a7e2c99e6b64d1ffadbd6285d8" +
-			"e7e032e24d42dde0594bf03fd550be05e5d66c91a660cd1ab7cb1f43fa9d" +
-			"69885203a7aee35a28f117427d7ac02b742f53d13b818f8631081b1730d1" +
-			"5b4e1e283cc8e5c4fc3b4652fce05fd8db821f99fcf93e6842816a549791" +
-			"7f6c49cc53d733788b2fe3c687de58bfe6153c70d99380df1fd566a7c758" +
-			"8052c62e73340d6a9eccd2ed26b763d518f3a0c4d6362212fbecebb4ffb7" +
-			"dc94d29944fcc4ab37725b105aa7571f364146782356d8ef056a0be93a55" +
-			"0c890df8fecc178776fe40703ad1bd2443d92c420be4306d99686592c030" +
-			"fd3e2230c0b48d8db79002e8a832ef27edb53a45532955f1171203d38414" +
-			"b4692e901e9f40f918528fc494430f86cf967452f456b01846ac6a383fc0" +
-			"de2243c7d804e8643aabcb78e2653b145f400a999670217c8da43bbb9c11" +
-			"e074176424be0c116c304a420120138e901eca4b12ce68fec460b23bc0c7" +
-			"765a74fc66cbda0e503e7b1baf5883744e468c97c5f1c4b0acc4b87de9f1" +
-			"4b537405dfb28195439d1ff848d9cd28a8d375038ebb540a9075b7b5074b" +
-			"ebc18418a370f1d3ac5d68f5d239513002ad11bfc2b7ff53e2e41ccffc4b" +
-			"0503acc4967c93ae8590a43439b5e7987d10cb8d1957bd9ef717ee3d12df" +
-			"5d6736c1d8bd8da102337a94b7d14f830f6c403cbaf7925a8a2a7af1311c" +
-			"57224967a38f6ca374013a9819c55fd2e2a5fac4f2490be5b059f4cd9c60" +
-			"2d62f80789eb8d9ab893c7f44a4945e41886af218179dfa754bbb59aab68" +
-			"13b71d2202eb8fc8a425625d21176a28a620e21bb0dad820c0b7051ce8d1" +
-			"3a33f3af0958bb6cd89f9d6414ab00ddd1d2f9fdece9183d0c05fcdfd117" +
-			"10d250e4b2029e6992a88293d0457e73e5b1b6a1aae182c69b9cb664992f" +
-			"073595ef68117026ad7ea579a4043cda318931eee7b2946a34cdc7c9755f" +
-			"80cc79a2bfe3ed9c79dc52faa5126b824868c965eeb37e9e4e6a49600f3a" +
-			"cce93c0853b546edb310dcd16a5755f15b1098b2f59dbd2d90e2ea8360ba" +
-			"f12108236e854465456598ae2f7bc380f008f2e3cd7c98c87643cafd7c36" +
-			"d40e2597236428d46aa5b260f84b4212d5e26804086adcf00363ce4becb4" +
-			"9b57eb2847b2f18ec82c99714ad4ddfe4ff3bcac1d0fcaa32660a1dccc68" +
-			"5bed83254c8e2ea0ae3632a70cfbcbeadef922d78a006d43ac7ab1f8a609" +
-			"c6e0ebc3ca6bb8430f1a562f41010db74b9febf931ca794fa08d1bc17780" +
-			"532ae76f25c4ee679d788835dfa4e70ca154c9e2865c3750ffe7b837eed1" +
-			"972be058fdf2bdb3eb301867bb132306c7aa237f6771d60bbc56cf31cb30" +
-			"32a87204d454542de747418470025ab84935d3eaaca01dbbdae9ef6b5d3a" +
-			"ca62ce9f871a3e1272b2b671582c096a349c00f32d742ddb17993994d8ae" +
-			"fc178cbcf9abc03114ff2bf7db8f757c63d6898faccd822f5c2e9a7570fb" +
-			"9cfff148570888be24ae42644c1a5bebb6f6287147a4bcc01c7675be9e4a" +
-			"897519dd3132a7cc2e778f8c90d23dc8073f6fa108d7ef82d561794bd9d5" +
-			"f1faa306334f338ac3ba99c853f79c24f7048fa906fde87d1ed28a7b11c0" +
-			"66a3bb98f8d21055aaafdf7e069b77b60b3d5cbe7c5e4379c7651af955cd" +
-			"82a19a09caf36becb6cd3fe9e12f40379941542709991066df21b7b12dfb" +
-			"2416d83fcdc33bb583e3b42f24f53edf8dc7c579ad3be831c99f72bf9fb7" +
-			"a35b6562e824e039e6bf1adc8f5ca53846de7bae11c4317e696d887df33c" +
-			"525f0a9c01fc29f2c26c90b85fe82ed8bd50954cd4e9ac7c85c7f3efec75" +
-			"da1da4ed173cb695cee295190527edb3cb06c5dbdabe0228cc60b6455153" +
-			"76244f27aa56da2db10f2659090137ffb82c57233c833e0bbf22d6f647fb" +
-			"97b3652d2888b3ab08010b8e8a6967d560b747757806736dc98b78226634" +
-			"f1eecaa4a2e23ba36591acb5737d735c5bc7a2e36f1a46946927e061fdf7" +
-			"7a3b68ef582c26b01f5aa9a438ecc26c6941221d1590c838072f9e471fe7" +
-			"fd59dacb0d092d40d76ea2f7c6e954a132a015bd4cb31147f3ebe4518322" +
-			"916438a62836ac85a4cf4492190a85bcc8edb37e38b99ea552d749c30f74" +
-			"ca20c298165e8ed02d4671e0b41cac3a32a345b9349ad22c2a4bb2c16a4c" +
-			"e0613ca0f0518759f7d2b33cfad2fae764f410d4d9ff8a76ae02a8107e7e" +
-			"01d9cd0552676b85ba002f19c01ad5f416d1d08bb84fec7c3555b098dbce" +
-			"48e1a5d847895e54db9c5b80cc22d5b87cd41a1a94be102bdd45a3cda5d1" +
-			"181e10446d213d6b3fdc350d486d2011d705c5f16ccf7519065c47bad7d6" +
-			"89c71e5fdf9d04bfb91eb1f07fa0f001009c1d4b1f6a116a570823a8580b",
-	},
-	{
-		key: "392468efccff36dade31fc1c62eb38bb61394fe448def9d9d9beec2413ddb418",
-		tag: "e1122e7c8e6965b90addbd46d8a548d6",
-		in: "6a13d37f0ec933194c227351f4a19b507d93465b1f3e88dcb5f1ed1262fa" +
-			"58ea99ff31e6fc85c39c04129fa69195b71b2060122fe618dd9430a63f97" +
-			"54b52a80b3cd099f248f91a468bae211a27bdb47ba005d29881ea5143a82" +
-			"967c4c30c9a4f0dba1a4975e6407fe296d40023a00efa06be763f2d73d46" +
-			"a2901ae28b3d8ce18009a462e223b71476d7b954c138e177d15a390847de" +
-			"96a7f7fd0598748e86b0f08e64d915e67c7e3cf936f3dcd60edebd36e2a1" +
-			"d65b6ac29530c48ab3bd52d45b4f938a19b9b31e2911105a8561600d5377" +
-			"905a67112ec28025aa680350ff85b808c5b4c98b7b9567d03f5ed3911ec9" +
-			"365a8de4b15ca62adaa69e5ba710eb1756a346016c67a297d8624f9f1ab5" +
-			"b3fbce98b141049f0ce26c85d2f8a9cc6ca8ab6c6e148be968931430dcc6" +
-			"2bf58ea9698ef52a5d271cf48e6748ac9e04bc7ae7da205a1a7535478322" +
-			"d820eca146cedf4b2f9aa9fcfd77ab56a7276977401dcc1f96baa1b607e0" +
-			"256bd04ec324ec67a4313e2d5a53d3a3fb5332927929b20c63bde805f637" +
-			"eb1050fee2a152a0405634f55c48a59fe370d54b2ab1671dae2c7fd92243" +
-			"10627808e553127c74f724362b4a6ee49b697daae7df3ddc5d2ed9d6befd" +
-			"77fb9f68fe3041f6ef13f46f34ab682ab8563e8996344f82b2ef006a8d54" +
-			"3dd9c1db4979d7da97bda45e722065f8a238f0873217b783a9a629a12b3a" +
-			"4de437445039997bd243efbf5e3b6059b9459d395290efb9081c632fb694" +
-			"81000dc74c395cb507422df181aba20f776ce3fd8765ac485021992c98b1" +
-			"67c68805662cb4356a0ee7ba6bdae51ac10cd06bb5b2f3a72841c714c8ed" +
-			"bc56998fe2fefb9bf69e172fdf54b2ab138ae59372c52a67e93882a3000f" +
-			"d966992aa2250c6ff93e9cac89645d70625d79332ade5dab7eb1adbe7dce" +
-			"5a013fb65ad32fe22ed16fb9bb35eca1f37a0433c320e8752f8fc4b7618c" +
-			"5e4df2efece832e259ad98b895c474e47d0e3fc488bea8f717a17de0dcf7" +
-			"597fb8fe12e62246296f9a887dcc3a700820c190a55a4931a7d44bd3bb2e" +
-			"ab6c8a8126f1be93790cebabc1d69e01796e6cc80e7c16bbc82fb333fb21" +
-			"c774ab7db843242838e82d8e1cb8ccab385e67a4271fe7031d74b6e8edcc" +
-			"8ed585d1c05a365c7665899c1dbc561151d3b44bceace77c4f53c0e0f6f7" +
-			"74d42f9ad3e56f1c2a8d53879d695f895690afb4698472a3d52d67159313" +
-			"133c87823fe0500eb68fe286f8b9a2f59f12785d026dc97bdbf793c7d1eb" +
-			"155f1f136aae66c256583e987f718afbe733e0a5ce30d021493fb84e2242" +
-			"5b18754d126235ef80335004fa84f88361a584753df409360cd8bd45bace" +
-			"8f48156bec66577bf2c685089f5ac7e7ec76c0df068fbaa47661f8517f92" +
-			"e14723b3b278f151816537a7212c96bd340a00c15c9c9bc9a2a5d163655d" +
-			"84b38073e2be9217cad97d362d89d4baf3ce0a8d8562f19a8c97a9aaf5e7" +
-			"77d60456360ffb77b30f177d2809052020d141697ecf9cb65f42b9190caf" +
-			"6540b2c82f6e5a8482934a6a1a5711a8c24546cd8ba432068404eae5a827" +
-			"2e09efc3c6037af4feaac0a46329229b010ecac6b9f077a9b076bb6d9ce1" +
-			"38401eb38d124baa11507a994185295020bf9b754fcf78430db9253f5929" +
-			"87c46c0f8589c4e463b15a3840b1cea795e24cf6b20f29a630136e0589b3" +
-			"8dd7fbe5ea21da72c88bd8e56473586822aa3765660a45a988df9b8eb8e8" +
-			"141939d3e4cc637c5d788064d40a9f7c734e43fdf8d7189a5d76700d9743" +
-			"fe0122944663afdb88c5201318ca782f6848b742ddebe7463fd4a32280ac" +
-			"1cf8311e9137d319de05ce9cd85abab24c5364041c14d3b4ce650400498e" +
-			"122166eccc12784b7ac3b262ac0b198ffc26eeed9a5da5374f7a2a53c87a" +
-			"78c217ea1fbf8d38f62511657b73109f31691aef14d82ce6e1010eae9e6f" +
-			"a419e5c1c16c0cc70651eb3374c03549a1bc7d3ed42d60f886102c798dbc" +
-			"ba56f0a2b3b9b412530c35f5f7ed06311ee14571f9c26ed9c81ef38ff000" +
-			"2f5ef3aab7351e32049a6ef8f48a43da1d84402d229df513dfaf1b2e4043" +
-			"6ce68c70ebeddd7477c9164f0dce45a6fc5de050f52ec269659d5854bcae" +
-			"f7762ed7400713c27a4d523eaf8c136c4a1ca00b9e9e55902daf6cdf8528" +
-			"c22ca1f2fa7ce87902d75a6850e1a5a4592497be1bb401878f18b189b0e2" +
-			"c59d10705bfabde3cd2da01eb452006b294108d5d42e88e9e15424d8cd0b" +
-			"8ab43a6c546b3dbf52e47b59cde6a3e417b0395220b6d63736d429da3458" +
-			"9a2524f1629320206fa7f1d8a041e17222c4a5814561937e1030e6375c77" +
-			"9dc988bb928bbdbe2c2eb20111639725d82b5d7192cd3e4acc27581f0ba7" +
-			"286cff41f97aa5a52ea0083de5057fd2ba985aa738e4d03fcf11ebab1d97" +
-			"e2ac77d1c2beb8799150a421a07b3777d0b850f24194b8309135b13da6c7" +
-			"e38653a711e407a1811290fbb7bc15d8b12efc6916e97ead41e042a44721" +
-			"e9cde3388073d921595bcddcac758dc675173f38242e65e4a284aaa7e8fa" +
-			"6adddaf00bc46428ab2d8601205b8895bcedfc80ca0aa4619ed6bb082ddf" +
-			"33ec04fa5d417f33fcdd238c6b11320c5a08f800e0f350b75d81e3bcbd15" +
-			"58a1eab87a3c8c2ffd7ba1d7e754e607cf98ba22a3fc766c45bd6f2569b4" +
-			"84639e6611714119d188a24a5e963089a16ed34e20b9f154cad8ac6031dd" +
-			"7a3a885afc2ae5e003ae8d4e4aabdb3e51dfc423b8cf4ed9ae2010072cbb" +
-			"b1108c7da1ff075e54ed827a0963ac5523ecdf3fc5eee7b4d1a6773764ec" +
-			"5c30f41690523fd70d895edb7ca6a1806d54240c4c7b43410da73503a323" +
-			"90d9070ed30da3a2fb5eccd40d083be7cf8bf40b4279f819cf795b6f075b" +
-			"5a67a10a06a6076d0d83c72efea05f244901c4b5fd9eb380432519311baf" +
-			"8c81f6325df4d37ff4d30d318f904ebb837ec76b341dd00a8f247cf0bbe9" +
-			"6f3784dc8f5feb344958fdf1a9ececb105f8770826db1f17a5281e997951" +
-			"d3c60cc28fc3e66ffeb5dbac315f98f6d240208043f28dee963d843e68ab" +
-			"57d847f76ae2f96ce6e37f377ef5dfef2176ecd7440ce4dadcec2231b606" +
-			"e4a80420fb3ed135640e1f05d6bd58b8dce062dd7d36b885d424f6318e5e" +
-			"a0753efbb33bbc7360d2b5dfab3ae0d5e000b8d31f2ba0f5fd8b34f96b55" +
-			"28fff35e769461d0f03cf3bfdf0b801dcbbf2838180cb9b108e06c353e3f" +
-			"0b9ef61678cfed1ea37ae76bccb5ef5957ac2c8e8f4794c8145a15f1cc88" +
-			"bfb0881080326c481b373c3bc9b07a9b60a0c8bd5fa4f6f90145590a5227" +
-			"6fcc0ccc2375d0ccb571d414d1b0c38b4e02c39db4d701c5e25e90785ef4" +
-			"d26f35edd8c4b96455bdca7245cfefd9cfbd2f319615e5fdf07bb9564fa0" +
-			"44bb35a58391d02e3927780b4076bc0893dfcb4b63a32cd7a541a4a8c253" +
-			"0349c6e96e378dbeb66dedf87d813d0b744452c1c4088507dca722193827" +
-			"9e2dfa24e4a409de494acf654f44262db9206a7717fa434ac4fdc6a6eb5b" +
-			"1fd5a193b6043bc4327c8c09fd6822eaa9df37bbcac1077754a295621601" +
-			"267b68733b62dadc2563f1700af180141f29899e2689dbbe9745ba8477f4" +
-			"352921900b403a01c9dd042a8c1b0e0489959fb0b0a8431c97b41e202204" +
-			"212ebfa00c593399dbd14d7aec07b8292d2e40b48f05fcd54a15da4a24d7" +
-			"2759e409f4c7b5b98fce4abac6c30e4872d92efa1f96479ec30f21699825" +
-			"50fa60584f5a09051a00f8e7dbb3853e66ca3f05fbfe43bef9b120a25a01" +
-			"eb436ba8ecda715201eda72e517d628f883386c1503aa8b8e75610f7155e" +
-			"9f916335ab6d6f0f9589b6220cd2b81c2c937dc065d3d14a7df8cc916cd0" +
-			"0ce1bb53fd9c8974298d3bd316f3658aa8cc6904f073a1472149e4b08c64" +
-			"5e11abe0428ccb6174df2103edd735965d6454b543d3f01410f77053f65e" +
-			"c1d1aee56fdd3af23bcd4e1a7fcc4e600c4831007c33fe5f0c8300f686eb" +
-			"9b4d1e4f08fe4ddc8a90be14dc3a5a88ff96716509341d5db24c0d016863" +
-			"998b1859c5021df815a6f1ca9845f1a8e99dbad132b406227c5897a1bdf3" +
-			"e698962f799133ff4429decbef6ce036296facf38e4812fec102b76c6d30" +
-			"beba1b70722254fafbc471096153478c971db7d96263660209265cb10f13" +
-			"b34b5fd55c4abe818a5f9715d8a85094e2946b7a001b47f629e26c636d86" +
-			"4968ad2ab616dfe28840bd60b4b9855c8dbe1cb873fcbc4577b5fefeb8bb" +
-			"4832039867dc35db9c036c83bc204396e3474ddfe806c77c65c936f488b6" +
-			"7c1028739562d7bb055d21441af29ae2921290e548dccf8a56021385422b" +
-			"15da6b232b24151309a75a00296d11aa1952a1513110b0faa93d1d8cd9ae" +
-			"fa9f1c59377ec9165b2c9e07cbde40db7b81bca6d58fc28bae8f473cd0e9" +
-			"a2420e0b943a83d284108626c24ac570b1d6c1ab971e71f43fbd6c00e171" +
-			"238141a6dc987a60385c3a04dd147a2f8e80dfe727b104c0fdd80b326f59" +
-			"0b9f86fd7b2fd1122a390979889eabd803ab57159c8509a1443eb6789382" +
-			"090a770ae4eba03306f96e50e19a7d44c584ccc230d104548946efca4520" +
-			"d61de5f473e2f4eada6c8ce9c7ee975eb4f63c0483cb775ed7d3cf690a61" +
-			"7d6656d683a8512707d81ca5ba176a42bcffcfa692129f292607d2a47536" +
-			"ccaeb464c9272d6f3816074b712af602470088b253deba18771e5f67734b" +
-			"587707cdd06f35264b2262fd253c25b5d38ee7db287610e5398062b7a34e" +
-			"6e4cf7447d00873b930ad148fd96f0ab18771bc468b874bb109924101c84" +
-			"c4e239ecc7687d875e4d94a1a973620ca61e35a872c2e2e61a502169f1bb" +
-			"4e5ff5fa2bff657be6195b3e2c7151a52fc0096d98e7f08f5a98f570aee1" +
-			"7b4275f1356e87e080ce0e1b9bbabe7dea48b5903bc390ce23472ad64a89" +
-			"41c3247bfd23ea90b2dee09085571bad85568040105e098f993bb37e43c3" +
-			"e6d511171c77cfc450570dfb9fc6a3930ef43c03f8213f6203d545d791c7" +
-			"d3fa42d5dde1655038d35c5dfacc12e9dee24fe833977549eda68ae8b508" +
-			"be277e743921b584f9dfa0eefbd8bf3c23f51efdef7f7487001d29e8097b" +
-			"ba63289cfca743023d1668555a46fe6d5b7421377414df1e9ef135480622" +
-			"22e2e9a7baa618d88f407517f6317b6a0ba3384ace16d68631d59ea169d5" +
-			"092d20afc1a481b82be5e734bb092953a0a94702bae1a0f48d2a22b9a05f" +
-			"f64493b7b2e984f27582b1eb937fddf8512c49830435d146dcc291a4118d" +
-			"5dc638b99cdcbcc5860de7a92c5b13cbd1e01e051f01af40afe124346320" +
-			"d3626bf9d8f7850744e032a993c276fd388718237740c6caf260fca60b8d" +
-			"d846102e3262b6e05ceca00c6affe938fac1847350865fc858d3ddd1d130" +
-			"71d1221ce7c5d575587fcba580e544b74d877ed5ca92763ef0ca0d7bfa08" +
-			"d57a0216b2a01a2b9ec74b8430051e0074862b7be25b6766ab520f2eb75d" +
-			"eeb979c28f03795f6f1e4b8410beab19a20febc91985b8a7c298534a6598" +
-			"f2c5b0dc5de9f5e55a97791507bc6373db26",
-	},
-}
diff --git a/vendor/golang.org/x/crypto/salsa20/salsa/salsa_test.go b/vendor/golang.org/x/crypto/salsa20/salsa/salsa_test.go
deleted file mode 100644
index f67e94eb..00000000
--- a/vendor/golang.org/x/crypto/salsa20/salsa/salsa_test.go
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package salsa
-
-import "testing"
-
-func TestCore208(t *testing.T) {
-	in := [64]byte{
-		0x7e, 0x87, 0x9a, 0x21, 0x4f, 0x3e, 0xc9, 0x86,
-		0x7c, 0xa9, 0x40, 0xe6, 0x41, 0x71, 0x8f, 0x26,
-		0xba, 0xee, 0x55, 0x5b, 0x8c, 0x61, 0xc1, 0xb5,
-		0x0d, 0xf8, 0x46, 0x11, 0x6d, 0xcd, 0x3b, 0x1d,
-		0xee, 0x24, 0xf3, 0x19, 0xdf, 0x9b, 0x3d, 0x85,
-		0x14, 0x12, 0x1e, 0x4b, 0x5a, 0xc5, 0xaa, 0x32,
-		0x76, 0x02, 0x1d, 0x29, 0x09, 0xc7, 0x48, 0x29,
-		0xed, 0xeb, 0xc6, 0x8d, 0xb8, 0xb8, 0xc2, 0x5e}
-
-	out := [64]byte{
-		0xa4, 0x1f, 0x85, 0x9c, 0x66, 0x08, 0xcc, 0x99,
-		0x3b, 0x81, 0xca, 0xcb, 0x02, 0x0c, 0xef, 0x05,
-		0x04, 0x4b, 0x21, 0x81, 0xa2, 0xfd, 0x33, 0x7d,
-		0xfd, 0x7b, 0x1c, 0x63, 0x96, 0x68, 0x2f, 0x29,
-		0xb4, 0x39, 0x31, 0x68, 0xe3, 0xc9, 0xe6, 0xbc,
-		0xfe, 0x6b, 0xc5, 0xb7, 0xa0, 0x6d, 0x96, 0xba,
-		0xe4, 0x24, 0xcc, 0x10, 0x2c, 0x91, 0x74, 0x5c,
-		0x24, 0xad, 0x67, 0x3d, 0xc7, 0x61, 0x8f, 0x81,
-	}
-
-	Core208(&in, &in)
-	if in != out {
-		t.Errorf("expected %x, got %x", out, in)
-	}
-}
-
-func TestOutOfBoundsWrite(t *testing.T) {
-	// encrypted "0123456789"
-	cipherText := []byte{170, 166, 196, 104, 175, 121, 68, 44, 174, 51}
-	var counter [16]byte
-	var key [32]byte
-	want := "abcdefghij"
-	plainText := []byte(want)
-	defer func() {
-		err := recover()
-		if err == nil {
-			t.Error("XORKeyStream expected to panic on len(dst) < len(src), but didn't")
-		}
-		if plainText[3] == '3' {
-			t.Errorf("XORKeyStream did out of bounds write, want %v, got %v", want, string(plainText))
-		}
-	}()
-	XORKeyStream(plainText[:3], cipherText, &counter, &key)
-}
diff --git a/vendor/golang.org/x/crypto/salsa20/salsa20.go b/vendor/golang.org/x/crypto/salsa20/salsa20.go
deleted file mode 100644
index 6f9bb106..00000000
--- a/vendor/golang.org/x/crypto/salsa20/salsa20.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-Package salsa20 implements the Salsa20 stream cipher as specified in https://cr.yp.to/snuffle/spec.pdf.
-
-Salsa20 differs from many other stream ciphers in that it is message orientated
-rather than byte orientated. Keystream blocks are not preserved between calls,
-therefore each side must encrypt/decrypt data with the same segmentation.
-
-Another aspect of this difference is that part of the counter is exposed as
-a nonce in each call. Encrypting two different messages with the same (key,
-nonce) pair leads to trivial plaintext recovery. This is analogous to
-encrypting two different messages with the same key with a traditional stream
-cipher.
-
-This package also implements XSalsa20: a version of Salsa20 with a 24-byte
-nonce as specified in https://cr.yp.to/snuffle/xsalsa-20081128.pdf. Simply
-passing a 24-byte slice as the nonce triggers XSalsa20.
-*/
-package salsa20 // import "golang.org/x/crypto/salsa20"
-
-// TODO(agl): implement XORKeyStream12 and XORKeyStream8 - the reduced round variants of Salsa20.
-
-import (
-	"golang.org/x/crypto/internal/subtle"
-	"golang.org/x/crypto/salsa20/salsa"
-)
-
-// XORKeyStream crypts bytes from in to out using the given key and nonce.
-// In and out must overlap entirely or not at all. Nonce must
-// be either 8 or 24 bytes long.
-func XORKeyStream(out, in []byte, nonce []byte, key *[32]byte) {
-	if len(out) < len(in) {
-		panic("salsa20: output smaller than input")
-	}
-	if subtle.InexactOverlap(out[:len(in)], in) {
-		panic("salsa20: invalid buffer overlap")
-	}
-
-	var subNonce [16]byte
-
-	if len(nonce) == 24 {
-		var subKey [32]byte
-		var hNonce [16]byte
-		copy(hNonce[:], nonce[:16])
-		salsa.HSalsa20(&subKey, &hNonce, key, &salsa.Sigma)
-		copy(subNonce[:], nonce[16:])
-		key = &subKey
-	} else if len(nonce) == 8 {
-		copy(subNonce[:], nonce[:])
-	} else {
-		panic("salsa20: nonce must be 8 or 24 bytes")
-	}
-
-	salsa.XORKeyStream(out, in, &subNonce, key)
-}
diff --git a/vendor/golang.org/x/crypto/salsa20/salsa20_test.go b/vendor/golang.org/x/crypto/salsa20/salsa20_test.go
deleted file mode 100644
index 0ef3328e..00000000
--- a/vendor/golang.org/x/crypto/salsa20/salsa20_test.go
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package salsa20
-
-import (
-	"bytes"
-	"encoding/hex"
-	"testing"
-)
-
-func fromHex(s string) []byte {
-	ret, err := hex.DecodeString(s)
-	if err != nil {
-		panic(err)
-	}
-	return ret
-}
-
-// testVectors was taken from set 6 of the ECRYPT test vectors:
-// http://www.ecrypt.eu.org/stream/svn/viewcvs.cgi/ecrypt/trunk/submissions/salsa20/full/verified.test-vectors?logsort=rev&rev=210&view=markup
-var testVectors = []struct {
-	key      []byte
-	iv       []byte
-	numBytes int
-	xor      []byte
-}{
-	{
-		fromHex("0053A6F94C9FF24598EB3E91E4378ADD3083D6297CCF2275C81B6EC11467BA0D"),
-		fromHex("0D74DB42A91077DE"),
-		131072,
-		fromHex("C349B6A51A3EC9B712EAED3F90D8BCEE69B7628645F251A996F55260C62EF31FD6C6B0AEA94E136C9D984AD2DF3578F78E457527B03A0450580DD874F63B1AB9"),
-	},
-	{
-		fromHex("0558ABFE51A4F74A9DF04396E93C8FE23588DB2E81D4277ACD2073C6196CBF12"),
-		fromHex("167DE44BB21980E7"),
-		131072,
-		fromHex("C3EAAF32836BACE32D04E1124231EF47E101367D6305413A0EEB07C60698A2876E4D031870A739D6FFDDD208597AFF0A47AC17EDB0167DD67EBA84F1883D4DFD"),
-	},
-	{
-		fromHex("0A5DB00356A9FC4FA2F5489BEE4194E73A8DE03386D92C7FD22578CB1E71C417"),
-		fromHex("1F86ED54BB2289F0"),
-		131072,
-		fromHex("3CD23C3DC90201ACC0CF49B440B6C417F0DC8D8410A716D5314C059E14B1A8D9A9FB8EA3D9C8DAE12B21402F674AA95C67B1FC514E994C9D3F3A6E41DFF5BBA6"),
-	},
-	{
-		fromHex("0F62B5085BAE0154A7FA4DA0F34699EC3F92E5388BDE3184D72A7DD02376C91C"),
-		fromHex("288FF65DC42B92F9"),
-		131072,
-		fromHex("E00EBCCD70D69152725F9987982178A2E2E139C7BCBE04CA8A0E99E318D9AB76F988C8549F75ADD790BA4F81C176DA653C1A043F11A958E169B6D2319F4EEC1A"),
-	},
-}
-
-func TestSalsa20(t *testing.T) {
-	var inBuf, outBuf []byte
-	var key [32]byte
-
-	for i, test := range testVectors {
-		if test.numBytes%64 != 0 {
-			t.Errorf("#%d: numBytes is not a multiple of 64", i)
-			continue
-		}
-
-		if test.numBytes > len(inBuf) {
-			inBuf = make([]byte, test.numBytes)
-			outBuf = make([]byte, test.numBytes)
-		}
-		in := inBuf[:test.numBytes]
-		out := outBuf[:test.numBytes]
-		copy(key[:], test.key)
-		XORKeyStream(out, in, test.iv, &key)
-
-		var xor [64]byte
-		for len(out) > 0 {
-			for i := 0; i < 64; i++ {
-				xor[i] ^= out[i]
-			}
-			out = out[64:]
-		}
-
-		if !bytes.Equal(xor[:], test.xor) {
-			t.Errorf("#%d: bad result", i)
-		}
-	}
-}
-
-var xSalsa20TestData = []struct {
-	in, nonce, key, out []byte
-}{
-	{
-		[]byte("Hello world!"),
-		[]byte("24-byte nonce for xsalsa"),
-		[]byte("this is 32-byte key for xsalsa20"),
-		[]byte{0x00, 0x2d, 0x45, 0x13, 0x84, 0x3f, 0xc2, 0x40, 0xc4, 0x01, 0xe5, 0x41},
-	},
-	{
-		make([]byte, 64),
-		[]byte("24-byte nonce for xsalsa"),
-		[]byte("this is 32-byte key for xsalsa20"),
-		[]byte{0x48, 0x48, 0x29, 0x7f, 0xeb, 0x1f, 0xb5, 0x2f, 0xb6,
-			0x6d, 0x81, 0x60, 0x9b, 0xd5, 0x47, 0xfa, 0xbc, 0xbe, 0x70,
-			0x26, 0xed, 0xc8, 0xb5, 0xe5, 0xe4, 0x49, 0xd0, 0x88, 0xbf,
-			0xa6, 0x9c, 0x08, 0x8f, 0x5d, 0x8d, 0xa1, 0xd7, 0x91, 0x26,
-			0x7c, 0x2c, 0x19, 0x5a, 0x7f, 0x8c, 0xae, 0x9c, 0x4b, 0x40,
-			0x50, 0xd0, 0x8c, 0xe6, 0xd3, 0xa1, 0x51, 0xec, 0x26, 0x5f,
-			0x3a, 0x58, 0xe4, 0x76, 0x48},
-	},
-}
-
-func TestXSalsa20(t *testing.T) {
-	var key [32]byte
-
-	for i, test := range xSalsa20TestData {
-		out := make([]byte, len(test.in))
-		copy(key[:], test.key)
-		XORKeyStream(out, test.in, test.nonce, &key)
-		if !bytes.Equal(out, test.out) {
-			t.Errorf("%d: expected %x, got %x", i, test.out, out)
-		}
-	}
-}
-
-var (
-	keyArray [32]byte
-	key      = &keyArray
-	nonce    [8]byte
-	msg      = make([]byte, 1<<10)
-)
-
-func BenchmarkXOR1K(b *testing.B) {
-	b.StopTimer()
-	out := make([]byte, 1024)
-	b.StartTimer()
-	for i := 0; i < b.N; i++ {
-		XORKeyStream(out, msg[:1024], nonce[:], key)
-	}
-	b.SetBytes(1024)
-}
diff --git a/vendor/golang.org/x/net/.gitattributes b/vendor/golang.org/x/net/.gitattributes
deleted file mode 100644
index d2f212e5..00000000
--- a/vendor/golang.org/x/net/.gitattributes
+++ /dev/null
@@ -1,10 +0,0 @@
-# Treat all files in this repo as binary, with no git magic updating
-# line endings. Windows users contributing to Go will need to use a
-# modern version of git and editors capable of LF line endings.
-#
-# We'll prevent accidental CRLF line endings from entering the repo
-# via the git-review gofmt checks.
-#
-# See golang.org/issue/9281
-
-* -text
diff --git a/vendor/golang.org/x/net/.gitignore b/vendor/golang.org/x/net/.gitignore
deleted file mode 100644
index 8339fd61..00000000
--- a/vendor/golang.org/x/net/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Add no patterns to .hgignore except for files generated by the build.
-last-change
diff --git a/vendor/golang.org/x/net/CONTRIBUTING.md b/vendor/golang.org/x/net/CONTRIBUTING.md
deleted file mode 100644
index d0485e88..00000000
--- a/vendor/golang.org/x/net/CONTRIBUTING.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Contributing to Go
-
-Go is an open source project.
-
-It is the work of hundreds of contributors. We appreciate your help!
-
-## Filing issues
-
-When [filing an issue](https://golang.org/issue/new), make sure to answer these five questions:
-
-1.  What version of Go are you using (`go version`)?
-2.  What operating system and processor architecture are you using?
-3.  What did you do?
-4.  What did you expect to see?
-5.  What did you see instead?
-
-General questions should go to the [golang-nuts mailing list](https://groups.google.com/group/golang-nuts) instead of the issue tracker.
-The gophers there will answer or ask you to file an issue if you've tripped over a bug.
-
-## Contributing code
-
-Please read the [Contribution Guidelines](https://golang.org/doc/contribute.html)
-before sending patches.
-
-Unless otherwise noted, the Go source files are distributed under
-the BSD-style license found in the LICENSE file.
diff --git a/vendor/golang.org/x/net/README.md b/vendor/golang.org/x/net/README.md
deleted file mode 100644
index 00a9b6eb..00000000
--- a/vendor/golang.org/x/net/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Go Networking
-
-This repository holds supplementary Go networking libraries.
-
-## Download/Install
-
-The easiest way to install is to run `go get -u golang.org/x/net`. You can
-also manually git clone the repository to `$GOPATH/src/golang.org/x/net`.
-
-## Report Issues / Send Patches
-
-This repository uses Gerrit for code changes. To learn how to submit
-changes to this repository, see https://golang.org/doc/contribute.html.
-The main issue tracker for the net repository is located at
-https://github.com/golang/go/issues. Prefix your issue with "x/net:" in the
-subject line, so it is easy to find.
diff --git a/vendor/golang.org/x/net/bpf/instructions_test.go b/vendor/golang.org/x/net/bpf/instructions_test.go
deleted file mode 100644
index dde474ab..00000000
--- a/vendor/golang.org/x/net/bpf/instructions_test.go
+++ /dev/null
@@ -1,525 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bpf
-
-import (
-	"fmt"
-	"io/ioutil"
-	"reflect"
-	"strconv"
-	"strings"
-	"testing"
-)
-
-// This is a direct translation of the program in
-// testdata/all_instructions.txt.
-var allInstructions = []Instruction{
-	LoadConstant{Dst: RegA, Val: 42},
-	LoadConstant{Dst: RegX, Val: 42},
-
-	LoadScratch{Dst: RegA, N: 3},
-	LoadScratch{Dst: RegX, N: 3},
-
-	LoadAbsolute{Off: 42, Size: 1},
-	LoadAbsolute{Off: 42, Size: 2},
-	LoadAbsolute{Off: 42, Size: 4},
-
-	LoadIndirect{Off: 42, Size: 1},
-	LoadIndirect{Off: 42, Size: 2},
-	LoadIndirect{Off: 42, Size: 4},
-
-	LoadMemShift{Off: 42},
-
-	LoadExtension{Num: ExtLen},
-	LoadExtension{Num: ExtProto},
-	LoadExtension{Num: ExtType},
-	LoadExtension{Num: ExtRand},
-
-	StoreScratch{Src: RegA, N: 3},
-	StoreScratch{Src: RegX, N: 3},
-
-	ALUOpConstant{Op: ALUOpAdd, Val: 42},
-	ALUOpConstant{Op: ALUOpSub, Val: 42},
-	ALUOpConstant{Op: ALUOpMul, Val: 42},
-	ALUOpConstant{Op: ALUOpDiv, Val: 42},
-	ALUOpConstant{Op: ALUOpOr, Val: 42},
-	ALUOpConstant{Op: ALUOpAnd, Val: 42},
-	ALUOpConstant{Op: ALUOpShiftLeft, Val: 42},
-	ALUOpConstant{Op: ALUOpShiftRight, Val: 42},
-	ALUOpConstant{Op: ALUOpMod, Val: 42},
-	ALUOpConstant{Op: ALUOpXor, Val: 42},
-
-	ALUOpX{Op: ALUOpAdd},
-	ALUOpX{Op: ALUOpSub},
-	ALUOpX{Op: ALUOpMul},
-	ALUOpX{Op: ALUOpDiv},
-	ALUOpX{Op: ALUOpOr},
-	ALUOpX{Op: ALUOpAnd},
-	ALUOpX{Op: ALUOpShiftLeft},
-	ALUOpX{Op: ALUOpShiftRight},
-	ALUOpX{Op: ALUOpMod},
-	ALUOpX{Op: ALUOpXor},
-
-	NegateA{},
-
-	Jump{Skip: 10},
-	JumpIf{Cond: JumpEqual, Val: 42, SkipTrue: 8, SkipFalse: 9},
-	JumpIf{Cond: JumpNotEqual, Val: 42, SkipTrue: 8},
-	JumpIf{Cond: JumpLessThan, Val: 42, SkipTrue: 7},
-	JumpIf{Cond: JumpLessOrEqual, Val: 42, SkipTrue: 6},
-	JumpIf{Cond: JumpGreaterThan, Val: 42, SkipTrue: 4, SkipFalse: 5},
-	JumpIf{Cond: JumpGreaterOrEqual, Val: 42, SkipTrue: 3, SkipFalse: 4},
-	JumpIf{Cond: JumpBitsSet, Val: 42, SkipTrue: 2, SkipFalse: 3},
-
-	TAX{},
-	TXA{},
-
-	RetA{},
-	RetConstant{Val: 42},
-}
-var allInstructionsExpected = "testdata/all_instructions.bpf"
-
-// Check that we produce the same output as the canonical bpf_asm
-// linux kernel tool.
-func TestInterop(t *testing.T) {
-	out, err := Assemble(allInstructions)
-	if err != nil {
-		t.Fatalf("assembly of allInstructions program failed: %s", err)
-	}
-	t.Logf("Assembled program is %d instructions long", len(out))
-
-	bs, err := ioutil.ReadFile(allInstructionsExpected)
-	if err != nil {
-		t.Fatalf("reading %s: %s", allInstructionsExpected, err)
-	}
-	// First statement is the number of statements, last statement is
-	// empty. We just ignore both and rely on slice length.
-	stmts := strings.Split(string(bs), ",")
-	if len(stmts)-2 != len(out) {
-		t.Fatalf("test program lengths don't match: %s has %d, Go implementation has %d", allInstructionsExpected, len(stmts)-2, len(allInstructions))
-	}
-
-	for i, stmt := range stmts[1 : len(stmts)-2] {
-		nums := strings.Split(stmt, " ")
-		if len(nums) != 4 {
-			t.Fatalf("malformed instruction %d in %s: %s", i+1, allInstructionsExpected, stmt)
-		}
-
-		actual := out[i]
-
-		op, err := strconv.ParseUint(nums[0], 10, 16)
-		if err != nil {
-			t.Fatalf("malformed opcode %s in instruction %d of %s", nums[0], i+1, allInstructionsExpected)
-		}
-		if actual.Op != uint16(op) {
-			t.Errorf("opcode mismatch on instruction %d (%#v): got 0x%02x, want 0x%02x", i+1, allInstructions[i], actual.Op, op)
-		}
-
-		jt, err := strconv.ParseUint(nums[1], 10, 8)
-		if err != nil {
-			t.Fatalf("malformed jt offset %s in instruction %d of %s", nums[1], i+1, allInstructionsExpected)
-		}
-		if actual.Jt != uint8(jt) {
-			t.Errorf("jt mismatch on instruction %d (%#v): got %d, want %d", i+1, allInstructions[i], actual.Jt, jt)
-		}
-
-		jf, err := strconv.ParseUint(nums[2], 10, 8)
-		if err != nil {
-			t.Fatalf("malformed jf offset %s in instruction %d of %s", nums[2], i+1, allInstructionsExpected)
-		}
-		if actual.Jf != uint8(jf) {
-			t.Errorf("jf mismatch on instruction %d (%#v): got %d, want %d", i+1, allInstructions[i], actual.Jf, jf)
-		}
-
-		k, err := strconv.ParseUint(nums[3], 10, 32)
-		if err != nil {
-			t.Fatalf("malformed constant %s in instruction %d of %s", nums[3], i+1, allInstructionsExpected)
-		}
-		if actual.K != uint32(k) {
-			t.Errorf("constant mismatch on instruction %d (%#v): got %d, want %d", i+1, allInstructions[i], actual.K, k)
-		}
-	}
-}
-
-// Check that assembly and disassembly match each other.
-func TestAsmDisasm(t *testing.T) {
-	prog1, err := Assemble(allInstructions)
-	if err != nil {
-		t.Fatalf("assembly of allInstructions program failed: %s", err)
-	}
-	t.Logf("Assembled program is %d instructions long", len(prog1))
-
-	got, allDecoded := Disassemble(prog1)
-	if !allDecoded {
-		t.Errorf("Disassemble(Assemble(allInstructions)) produced unrecognized instructions:")
-		for i, inst := range got {
-			if r, ok := inst.(RawInstruction); ok {
-				t.Logf("  insn %d, %#v --> %#v", i+1, allInstructions[i], r)
-			}
-		}
-	}
-
-	if len(allInstructions) != len(got) {
-		t.Fatalf("disassembly changed program size: %d insns before, %d insns after", len(allInstructions), len(got))
-	}
-	if !reflect.DeepEqual(allInstructions, got) {
-		t.Errorf("program mutated by disassembly:")
-		for i := range got {
-			if !reflect.DeepEqual(allInstructions[i], got[i]) {
-				t.Logf("  insn %d, s: %#v, p1: %#v, got: %#v", i+1, allInstructions[i], prog1[i], got[i])
-			}
-		}
-	}
-}
-
-type InvalidInstruction struct{}
-
-func (a InvalidInstruction) Assemble() (RawInstruction, error) {
-	return RawInstruction{}, fmt.Errorf("Invalid Instruction")
-}
-
-func (a InvalidInstruction) String() string {
-	return fmt.Sprintf("unknown instruction: %#v", a)
-}
-
-func TestString(t *testing.T) {
-	testCases := []struct {
-		instruction Instruction
-		assembler   string
-	}{
-		{
-			instruction: LoadConstant{Dst: RegA, Val: 42},
-			assembler:   "ld #42",
-		},
-		{
-			instruction: LoadConstant{Dst: RegX, Val: 42},
-			assembler:   "ldx #42",
-		},
-		{
-			instruction: LoadConstant{Dst: 0xffff, Val: 42},
-			assembler:   "unknown instruction: bpf.LoadConstant{Dst:0xffff, Val:0x2a}",
-		},
-		{
-			instruction: LoadScratch{Dst: RegA, N: 3},
-			assembler:   "ld M[3]",
-		},
-		{
-			instruction: LoadScratch{Dst: RegX, N: 3},
-			assembler:   "ldx M[3]",
-		},
-		{
-			instruction: LoadScratch{Dst: 0xffff, N: 3},
-			assembler:   "unknown instruction: bpf.LoadScratch{Dst:0xffff, N:3}",
-		},
-		{
-			instruction: LoadAbsolute{Off: 42, Size: 1},
-			assembler:   "ldb [42]",
-		},
-		{
-			instruction: LoadAbsolute{Off: 42, Size: 2},
-			assembler:   "ldh [42]",
-		},
-		{
-			instruction: LoadAbsolute{Off: 42, Size: 4},
-			assembler:   "ld [42]",
-		},
-		{
-			instruction: LoadAbsolute{Off: 42, Size: -1},
-			assembler:   "unknown instruction: bpf.LoadAbsolute{Off:0x2a, Size:-1}",
-		},
-		{
-			instruction: LoadIndirect{Off: 42, Size: 1},
-			assembler:   "ldb [x + 42]",
-		},
-		{
-			instruction: LoadIndirect{Off: 42, Size: 2},
-			assembler:   "ldh [x + 42]",
-		},
-		{
-			instruction: LoadIndirect{Off: 42, Size: 4},
-			assembler:   "ld [x + 42]",
-		},
-		{
-			instruction: LoadIndirect{Off: 42, Size: -1},
-			assembler:   "unknown instruction: bpf.LoadIndirect{Off:0x2a, Size:-1}",
-		},
-		{
-			instruction: LoadMemShift{Off: 42},
-			assembler:   "ldx 4*([42]&0xf)",
-		},
-		{
-			instruction: LoadExtension{Num: ExtLen},
-			assembler:   "ld #len",
-		},
-		{
-			instruction: LoadExtension{Num: ExtProto},
-			assembler:   "ld #proto",
-		},
-		{
-			instruction: LoadExtension{Num: ExtType},
-			assembler:   "ld #type",
-		},
-		{
-			instruction: LoadExtension{Num: ExtPayloadOffset},
-			assembler:   "ld #poff",
-		},
-		{
-			instruction: LoadExtension{Num: ExtInterfaceIndex},
-			assembler:   "ld #ifidx",
-		},
-		{
-			instruction: LoadExtension{Num: ExtNetlinkAttr},
-			assembler:   "ld #nla",
-		},
-		{
-			instruction: LoadExtension{Num: ExtNetlinkAttrNested},
-			assembler:   "ld #nlan",
-		},
-		{
-			instruction: LoadExtension{Num: ExtMark},
-			assembler:   "ld #mark",
-		},
-		{
-			instruction: LoadExtension{Num: ExtQueue},
-			assembler:   "ld #queue",
-		},
-		{
-			instruction: LoadExtension{Num: ExtLinkLayerType},
-			assembler:   "ld #hatype",
-		},
-		{
-			instruction: LoadExtension{Num: ExtRXHash},
-			assembler:   "ld #rxhash",
-		},
-		{
-			instruction: LoadExtension{Num: ExtCPUID},
-			assembler:   "ld #cpu",
-		},
-		{
-			instruction: LoadExtension{Num: ExtVLANTag},
-			assembler:   "ld #vlan_tci",
-		},
-		{
-			instruction: LoadExtension{Num: ExtVLANTagPresent},
-			assembler:   "ld #vlan_avail",
-		},
-		{
-			instruction: LoadExtension{Num: ExtVLANProto},
-			assembler:   "ld #vlan_tpid",
-		},
-		{
-			instruction: LoadExtension{Num: ExtRand},
-			assembler:   "ld #rand",
-		},
-		{
-			instruction: LoadAbsolute{Off: 0xfffff038, Size: 4},
-			assembler:   "ld #rand",
-		},
-		{
-			instruction: LoadExtension{Num: 0xfff},
-			assembler:   "unknown instruction: bpf.LoadExtension{Num:4095}",
-		},
-		{
-			instruction: StoreScratch{Src: RegA, N: 3},
-			assembler:   "st M[3]",
-		},
-		{
-			instruction: StoreScratch{Src: RegX, N: 3},
-			assembler:   "stx M[3]",
-		},
-		{
-			instruction: StoreScratch{Src: 0xffff, N: 3},
-			assembler:   "unknown instruction: bpf.StoreScratch{Src:0xffff, N:3}",
-		},
-		{
-			instruction: ALUOpConstant{Op: ALUOpAdd, Val: 42},
-			assembler:   "add #42",
-		},
-		{
-			instruction: ALUOpConstant{Op: ALUOpSub, Val: 42},
-			assembler:   "sub #42",
-		},
-		{
-			instruction: ALUOpConstant{Op: ALUOpMul, Val: 42},
-			assembler:   "mul #42",
-		},
-		{
-			instruction: ALUOpConstant{Op: ALUOpDiv, Val: 42},
-			assembler:   "div #42",
-		},
-		{
-			instruction: ALUOpConstant{Op: ALUOpOr, Val: 42},
-			assembler:   "or #42",
-		},
-		{
-			instruction: ALUOpConstant{Op: ALUOpAnd, Val: 42},
-			assembler:   "and #42",
-		},
-		{
-			instruction: ALUOpConstant{Op: ALUOpShiftLeft, Val: 42},
-			assembler:   "lsh #42",
-		},
-		{
-			instruction: ALUOpConstant{Op: ALUOpShiftRight, Val: 42},
-			assembler:   "rsh #42",
-		},
-		{
-			instruction: ALUOpConstant{Op: ALUOpMod, Val: 42},
-			assembler:   "mod #42",
-		},
-		{
-			instruction: ALUOpConstant{Op: ALUOpXor, Val: 42},
-			assembler:   "xor #42",
-		},
-		{
-			instruction: ALUOpConstant{Op: 0xffff, Val: 42},
-			assembler:   "unknown instruction: bpf.ALUOpConstant{Op:0xffff, Val:0x2a}",
-		},
-		{
-			instruction: ALUOpX{Op: ALUOpAdd},
-			assembler:   "add x",
-		},
-		{
-			instruction: ALUOpX{Op: ALUOpSub},
-			assembler:   "sub x",
-		},
-		{
-			instruction: ALUOpX{Op: ALUOpMul},
-			assembler:   "mul x",
-		},
-		{
-			instruction: ALUOpX{Op: ALUOpDiv},
-			assembler:   "div x",
-		},
-		{
-			instruction: ALUOpX{Op: ALUOpOr},
-			assembler:   "or x",
-		},
-		{
-			instruction: ALUOpX{Op: ALUOpAnd},
-			assembler:   "and x",
-		},
-		{
-			instruction: ALUOpX{Op: ALUOpShiftLeft},
-			assembler:   "lsh x",
-		},
-		{
-			instruction: ALUOpX{Op: ALUOpShiftRight},
-			assembler:   "rsh x",
-		},
-		{
-			instruction: ALUOpX{Op: ALUOpMod},
-			assembler:   "mod x",
-		},
-		{
-			instruction: ALUOpX{Op: ALUOpXor},
-			assembler:   "xor x",
-		},
-		{
-			instruction: ALUOpX{Op: 0xffff},
-			assembler:   "unknown instruction: bpf.ALUOpX{Op:0xffff}",
-		},
-		{
-			instruction: NegateA{},
-			assembler:   "neg",
-		},
-		{
-			instruction: Jump{Skip: 10},
-			assembler:   "ja 10",
-		},
-		{
-			instruction: JumpIf{Cond: JumpEqual, Val: 42, SkipTrue: 8, SkipFalse: 9},
-			assembler:   "jeq #42,8,9",
-		},
-		{
-			instruction: JumpIf{Cond: JumpEqual, Val: 42, SkipTrue: 8},
-			assembler:   "jeq #42,8",
-		},
-		{
-			instruction: JumpIf{Cond: JumpEqual, Val: 42, SkipFalse: 8},
-			assembler:   "jneq #42,8",
-		},
-		{
-			instruction: JumpIf{Cond: JumpNotEqual, Val: 42, SkipTrue: 8},
-			assembler:   "jneq #42,8",
-		},
-		{
-			instruction: JumpIf{Cond: JumpLessThan, Val: 42, SkipTrue: 7},
-			assembler:   "jlt #42,7",
-		},
-		{
-			instruction: JumpIf{Cond: JumpLessOrEqual, Val: 42, SkipTrue: 6},
-			assembler:   "jle #42,6",
-		},
-		{
-			instruction: JumpIf{Cond: JumpGreaterThan, Val: 42, SkipTrue: 4, SkipFalse: 5},
-			assembler:   "jgt #42,4,5",
-		},
-		{
-			instruction: JumpIf{Cond: JumpGreaterThan, Val: 42, SkipTrue: 4},
-			assembler:   "jgt #42,4",
-		},
-		{
-			instruction: JumpIf{Cond: JumpGreaterOrEqual, Val: 42, SkipTrue: 3, SkipFalse: 4},
-			assembler:   "jge #42,3,4",
-		},
-		{
-			instruction: JumpIf{Cond: JumpGreaterOrEqual, Val: 42, SkipTrue: 3},
-			assembler:   "jge #42,3",
-		},
-		{
-			instruction: JumpIf{Cond: JumpBitsSet, Val: 42, SkipTrue: 2, SkipFalse: 3},
-			assembler:   "jset #42,2,3",
-		},
-		{
-			instruction: JumpIf{Cond: JumpBitsSet, Val: 42, SkipTrue: 2},
-			assembler:   "jset #42,2",
-		},
-		{
-			instruction: JumpIf{Cond: JumpBitsNotSet, Val: 42, SkipTrue: 2, SkipFalse: 3},
-			assembler:   "jset #42,3,2",
-		},
-		{
-			instruction: JumpIf{Cond: JumpBitsNotSet, Val: 42, SkipTrue: 2},
-			assembler:   "jset #42,0,2",
-		},
-		{
-			instruction: JumpIf{Cond: 0xffff, Val: 42, SkipTrue: 1, SkipFalse: 2},
-			assembler:   "unknown instruction: bpf.JumpIf{Cond:0xffff, Val:0x2a, SkipTrue:0x1, SkipFalse:0x2}",
-		},
-		{
-			instruction: TAX{},
-			assembler:   "tax",
-		},
-		{
-			instruction: TXA{},
-			assembler:   "txa",
-		},
-		{
-			instruction: RetA{},
-			assembler:   "ret a",
-		},
-		{
-			instruction: RetConstant{Val: 42},
-			assembler:   "ret #42",
-		},
-		// Invalid instruction
-		{
-			instruction: InvalidInstruction{},
-			assembler:   "unknown instruction: bpf.InvalidInstruction{}",
-		},
-	}
-
-	for _, testCase := range testCases {
-		if input, ok := testCase.instruction.(fmt.Stringer); ok {
-			got := input.String()
-			if got != testCase.assembler {
-				t.Errorf("String did not return expected assembler notation, expected: %s, got: %s", testCase.assembler, got)
-			}
-		} else {
-			t.Errorf("Instruction %#v is not a fmt.Stringer", testCase.instruction)
-		}
-	}
-}
diff --git a/vendor/golang.org/x/net/bpf/vm_aluop_test.go b/vendor/golang.org/x/net/bpf/vm_aluop_test.go
deleted file mode 100644
index 16678244..00000000
--- a/vendor/golang.org/x/net/bpf/vm_aluop_test.go
+++ /dev/null
@@ -1,512 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bpf_test
-
-import (
-	"testing"
-
-	"golang.org/x/net/bpf"
-)
-
-func TestVMALUOpAdd(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		bpf.ALUOpConstant{
-			Op:  bpf.ALUOpAdd,
-			Val: 3,
-		},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		8, 2, 3,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 3, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMALUOpSub(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		bpf.TAX{},
-		bpf.ALUOpX{
-			Op: bpf.ALUOpSub,
-		},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		1, 2, 3,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 0, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMALUOpMul(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		bpf.ALUOpConstant{
-			Op:  bpf.ALUOpMul,
-			Val: 2,
-		},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		6, 2, 3, 4,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 4, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMALUOpDiv(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		bpf.ALUOpConstant{
-			Op:  bpf.ALUOpDiv,
-			Val: 2,
-		},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		20, 2, 3, 4,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 2, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMALUOpDivByZeroALUOpConstant(t *testing.T) {
-	_, _, err := testVM(t, []bpf.Instruction{
-		bpf.ALUOpConstant{
-			Op:  bpf.ALUOpDiv,
-			Val: 0,
-		},
-		bpf.RetA{},
-	})
-	if errStr(err) != "cannot divide by zero using ALUOpConstant" {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestVMALUOpDivByZeroALUOpX(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		// Load byte 0 into X
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		bpf.TAX{},
-		// Load byte 1 into A
-		bpf.LoadAbsolute{
-			Off:  9,
-			Size: 1,
-		},
-		// Attempt to perform 1/0
-		bpf.ALUOpX{
-			Op: bpf.ALUOpDiv,
-		},
-		// Return 4 bytes if program does not terminate
-		bpf.LoadConstant{
-			Val: 12,
-		},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0, 1, 3, 4,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 0, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMALUOpOr(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 2,
-		},
-		bpf.ALUOpConstant{
-			Op:  bpf.ALUOpOr,
-			Val: 0x01,
-		},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0x00, 0x10, 0x03, 0x04,
-		0x05, 0x06, 0x07, 0x08,
-		0x09, 0xff,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 9, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMALUOpAnd(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 2,
-		},
-		bpf.ALUOpConstant{
-			Op:  bpf.ALUOpAnd,
-			Val: 0x0019,
-		},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0xaa, 0x09,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 1, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMALUOpShiftLeft(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		bpf.ALUOpConstant{
-			Op:  bpf.ALUOpShiftLeft,
-			Val: 0x01,
-		},
-		bpf.JumpIf{
-			Cond:     bpf.JumpEqual,
-			Val:      0x02,
-			SkipTrue: 1,
-		},
-		bpf.RetConstant{
-			Val: 0,
-		},
-		bpf.RetConstant{
-			Val: 9,
-		},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0x01, 0xaa,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 1, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMALUOpShiftRight(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		bpf.ALUOpConstant{
-			Op:  bpf.ALUOpShiftRight,
-			Val: 0x01,
-		},
-		bpf.JumpIf{
-			Cond:     bpf.JumpEqual,
-			Val:      0x04,
-			SkipTrue: 1,
-		},
-		bpf.RetConstant{
-			Val: 0,
-		},
-		bpf.RetConstant{
-			Val: 9,
-		},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0x08, 0xff, 0xff,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 1, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMALUOpMod(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		bpf.ALUOpConstant{
-			Op:  bpf.ALUOpMod,
-			Val: 20,
-		},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		30, 0, 0,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 2, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMALUOpModByZeroALUOpConstant(t *testing.T) {
-	_, _, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		bpf.ALUOpConstant{
-			Op:  bpf.ALUOpMod,
-			Val: 0,
-		},
-		bpf.RetA{},
-	})
-	if errStr(err) != "cannot divide by zero using ALUOpConstant" {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestVMALUOpModByZeroALUOpX(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		// Load byte 0 into X
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		bpf.TAX{},
-		// Load byte 1 into A
-		bpf.LoadAbsolute{
-			Off:  9,
-			Size: 1,
-		},
-		// Attempt to perform 1%0
-		bpf.ALUOpX{
-			Op: bpf.ALUOpMod,
-		},
-		// Return 4 bytes if program does not terminate
-		bpf.LoadConstant{
-			Val: 12,
-		},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0, 1, 3, 4,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 0, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMALUOpXor(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		bpf.ALUOpConstant{
-			Op:  bpf.ALUOpXor,
-			Val: 0x0a,
-		},
-		bpf.JumpIf{
-			Cond:     bpf.JumpEqual,
-			Val:      0x01,
-			SkipTrue: 1,
-		},
-		bpf.RetConstant{
-			Val: 0,
-		},
-		bpf.RetConstant{
-			Val: 9,
-		},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0x0b, 0x00, 0x00, 0x00,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 1, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMALUOpUnknown(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		bpf.ALUOpConstant{
-			Op:  bpf.ALUOpAdd,
-			Val: 1,
-		},
-		// Verify that an unknown operation is a no-op
-		bpf.ALUOpConstant{
-			Op: 100,
-		},
-		bpf.JumpIf{
-			Cond:     bpf.JumpEqual,
-			Val:      0x02,
-			SkipTrue: 1,
-		},
-		bpf.RetConstant{
-			Val: 0,
-		},
-		bpf.RetConstant{
-			Val: 9,
-		},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		1,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 1, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
diff --git a/vendor/golang.org/x/net/bpf/vm_bpf_test.go b/vendor/golang.org/x/net/bpf/vm_bpf_test.go
deleted file mode 100644
index 77fa8fe4..00000000
--- a/vendor/golang.org/x/net/bpf/vm_bpf_test.go
+++ /dev/null
@@ -1,192 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bpf_test
-
-import (
-	"net"
-	"runtime"
-	"testing"
-	"time"
-
-	"golang.org/x/net/bpf"
-	"golang.org/x/net/ipv4"
-)
-
-// A virtualMachine is a BPF virtual machine which can process an
-// input packet against a BPF program and render a verdict.
-type virtualMachine interface {
-	Run(in []byte) (int, error)
-}
-
-// canUseOSVM indicates if the OS BPF VM is available on this platform.
-func canUseOSVM() bool {
-	// OS BPF VM can only be used on platforms where x/net/ipv4 supports
-	// attaching a BPF program to a socket.
-	switch runtime.GOOS {
-	case "linux":
-		return true
-	}
-
-	return false
-}
-
-// All BPF tests against both the Go VM and OS VM are assumed to
-// be used with a UDP socket. As a result, the entire contents
-// of a UDP datagram is sent through the BPF program, but only
-// the body after the UDP header will ever be returned in output.
-
-// testVM sets up a Go BPF VM, and if available, a native OS BPF VM
-// for integration testing.
-func testVM(t *testing.T, filter []bpf.Instruction) (virtualMachine, func(), error) {
-	goVM, err := bpf.NewVM(filter)
-	if err != nil {
-		// Some tests expect an error, so this error must be returned
-		// instead of fatally exiting the test
-		return nil, nil, err
-	}
-
-	mvm := &multiVirtualMachine{
-		goVM: goVM,
-
-		t: t,
-	}
-
-	// If available, add the OS VM for tests which verify that both the Go
-	// VM and OS VM have exactly the same output for the same input program
-	// and packet.
-	done := func() {}
-	if canUseOSVM() {
-		osVM, osVMDone := testOSVM(t, filter)
-		done = func() { osVMDone() }
-		mvm.osVM = osVM
-	}
-
-	return mvm, done, nil
-}
-
-// udpHeaderLen is the length of a UDP header.
-const udpHeaderLen = 8
-
-// A multiVirtualMachine is a virtualMachine which can call out to both the Go VM
-// and the native OS VM, if the OS VM is available.
-type multiVirtualMachine struct {
-	goVM virtualMachine
-	osVM virtualMachine
-
-	t *testing.T
-}
-
-func (mvm *multiVirtualMachine) Run(in []byte) (int, error) {
-	if len(in) < udpHeaderLen {
-		mvm.t.Fatalf("input must be at least length of UDP header (%d), got: %d",
-			udpHeaderLen, len(in))
-	}
-
-	// All tests have a UDP header as part of input, because the OS VM
-	// packets always will. For the Go VM, this output is trimmed before
-	// being sent back to tests.
-	goOut, goErr := mvm.goVM.Run(in)
-	if goOut >= udpHeaderLen {
-		goOut -= udpHeaderLen
-	}
-
-	// If Go output is larger than the size of the packet, packet filtering
-	// interop tests must trim the output bytes to the length of the packet.
-	// The BPF VM should not do this on its own, as other uses of it do
-	// not trim the output byte count.
-	trim := len(in) - udpHeaderLen
-	if goOut > trim {
-		goOut = trim
-	}
-
-	// When the OS VM is not available, process using the Go VM alone
-	if mvm.osVM == nil {
-		return goOut, goErr
-	}
-
-	// The OS VM will apply its own UDP header, so remove the pseudo header
-	// that the Go VM needs.
-	osOut, err := mvm.osVM.Run(in[udpHeaderLen:])
-	if err != nil {
-		mvm.t.Fatalf("error while running OS VM: %v", err)
-	}
-
-	// Verify both VMs return same number of bytes
-	var mismatch bool
-	if goOut != osOut {
-		mismatch = true
-		mvm.t.Logf("output byte count does not match:\n- go: %v\n- os: %v", goOut, osOut)
-	}
-
-	if mismatch {
-		mvm.t.Fatal("Go BPF and OS BPF packet outputs do not match")
-	}
-
-	return goOut, goErr
-}
-
-// An osVirtualMachine is a virtualMachine which uses the OS's BPF VM for
-// processing BPF programs.
-type osVirtualMachine struct {
-	l net.PacketConn
-	s net.Conn
-}
-
-// testOSVM creates a virtualMachine which uses the OS's BPF VM by injecting
-// packets into a UDP listener with a BPF program attached to it.
-func testOSVM(t *testing.T, filter []bpf.Instruction) (virtualMachine, func()) {
-	l, err := net.ListenPacket("udp4", "127.0.0.1:0")
-	if err != nil {
-		t.Fatalf("failed to open OS VM UDP listener: %v", err)
-	}
-
-	prog, err := bpf.Assemble(filter)
-	if err != nil {
-		t.Fatalf("failed to compile BPF program: %v", err)
-	}
-
-	p := ipv4.NewPacketConn(l)
-	if err = p.SetBPF(prog); err != nil {
-		t.Fatalf("failed to attach BPF program to listener: %v", err)
-	}
-
-	s, err := net.Dial("udp4", l.LocalAddr().String())
-	if err != nil {
-		t.Fatalf("failed to dial connection to listener: %v", err)
-	}
-
-	done := func() {
-		_ = s.Close()
-		_ = l.Close()
-	}
-
-	return &osVirtualMachine{
-		l: l,
-		s: s,
-	}, done
-}
-
-// Run sends the input bytes into the OS's BPF VM and returns its verdict.
-func (vm *osVirtualMachine) Run(in []byte) (int, error) {
-	go func() {
-		_, _ = vm.s.Write(in)
-	}()
-
-	vm.l.SetDeadline(time.Now().Add(50 * time.Millisecond))
-
-	var b [512]byte
-	n, _, err := vm.l.ReadFrom(b[:])
-	if err != nil {
-		// A timeout indicates that BPF filtered out the packet, and thus,
-		// no input should be returned.
-		if nerr, ok := err.(net.Error); ok && nerr.Timeout() {
-			return n, nil
-		}
-
-		return n, err
-	}
-
-	return n, nil
-}
diff --git a/vendor/golang.org/x/net/bpf/vm_extension_test.go b/vendor/golang.org/x/net/bpf/vm_extension_test.go
deleted file mode 100644
index 7a48c82f..00000000
--- a/vendor/golang.org/x/net/bpf/vm_extension_test.go
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bpf_test
-
-import (
-	"testing"
-
-	"golang.org/x/net/bpf"
-)
-
-func TestVMLoadExtensionNotImplemented(t *testing.T) {
-	_, _, err := testVM(t, []bpf.Instruction{
-		bpf.LoadExtension{
-			Num: 100,
-		},
-		bpf.RetA{},
-	})
-	if errStr(err) != "extension 100 not implemented" {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestVMLoadExtensionExtLen(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadExtension{
-			Num: bpf.ExtLen,
-		},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0, 1, 2, 3,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 4, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
diff --git a/vendor/golang.org/x/net/bpf/vm_jump_test.go b/vendor/golang.org/x/net/bpf/vm_jump_test.go
deleted file mode 100644
index e0a3a988..00000000
--- a/vendor/golang.org/x/net/bpf/vm_jump_test.go
+++ /dev/null
@@ -1,380 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bpf_test
-
-import (
-	"testing"
-
-	"golang.org/x/net/bpf"
-)
-
-func TestVMJumpOne(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		bpf.Jump{
-			Skip: 1,
-		},
-		bpf.RetConstant{
-			Val: 0,
-		},
-		bpf.RetConstant{
-			Val: 9,
-		},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		1,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 1, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMJumpOutOfProgram(t *testing.T) {
-	_, _, err := testVM(t, []bpf.Instruction{
-		bpf.Jump{
-			Skip: 1,
-		},
-		bpf.RetA{},
-	})
-	if errStr(err) != "cannot jump 1 instructions; jumping past program bounds" {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestVMJumpIfTrueOutOfProgram(t *testing.T) {
-	_, _, err := testVM(t, []bpf.Instruction{
-		bpf.JumpIf{
-			Cond:     bpf.JumpEqual,
-			SkipTrue: 2,
-		},
-		bpf.RetA{},
-	})
-	if errStr(err) != "cannot jump 2 instructions in true case; jumping past program bounds" {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestVMJumpIfFalseOutOfProgram(t *testing.T) {
-	_, _, err := testVM(t, []bpf.Instruction{
-		bpf.JumpIf{
-			Cond:      bpf.JumpEqual,
-			SkipFalse: 3,
-		},
-		bpf.RetA{},
-	})
-	if errStr(err) != "cannot jump 3 instructions in false case; jumping past program bounds" {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestVMJumpIfEqual(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		bpf.JumpIf{
-			Cond:     bpf.JumpEqual,
-			Val:      1,
-			SkipTrue: 1,
-		},
-		bpf.RetConstant{
-			Val: 0,
-		},
-		bpf.RetConstant{
-			Val: 9,
-		},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		1,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 1, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMJumpIfNotEqual(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		bpf.JumpIf{
-			Cond:      bpf.JumpNotEqual,
-			Val:       1,
-			SkipFalse: 1,
-		},
-		bpf.RetConstant{
-			Val: 0,
-		},
-		bpf.RetConstant{
-			Val: 9,
-		},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		1,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 1, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMJumpIfGreaterThan(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 4,
-		},
-		bpf.JumpIf{
-			Cond:     bpf.JumpGreaterThan,
-			Val:      0x00010202,
-			SkipTrue: 1,
-		},
-		bpf.RetConstant{
-			Val: 0,
-		},
-		bpf.RetConstant{
-			Val: 12,
-		},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0, 1, 2, 3,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 4, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMJumpIfLessThan(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 4,
-		},
-		bpf.JumpIf{
-			Cond:     bpf.JumpLessThan,
-			Val:      0xff010203,
-			SkipTrue: 1,
-		},
-		bpf.RetConstant{
-			Val: 0,
-		},
-		bpf.RetConstant{
-			Val: 12,
-		},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0, 1, 2, 3,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 4, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMJumpIfGreaterOrEqual(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 4,
-		},
-		bpf.JumpIf{
-			Cond:     bpf.JumpGreaterOrEqual,
-			Val:      0x00010203,
-			SkipTrue: 1,
-		},
-		bpf.RetConstant{
-			Val: 0,
-		},
-		bpf.RetConstant{
-			Val: 12,
-		},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0, 1, 2, 3,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 4, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMJumpIfLessOrEqual(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 4,
-		},
-		bpf.JumpIf{
-			Cond:     bpf.JumpLessOrEqual,
-			Val:      0xff010203,
-			SkipTrue: 1,
-		},
-		bpf.RetConstant{
-			Val: 0,
-		},
-		bpf.RetConstant{
-			Val: 12,
-		},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0, 1, 2, 3,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 4, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMJumpIfBitsSet(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 2,
-		},
-		bpf.JumpIf{
-			Cond:     bpf.JumpBitsSet,
-			Val:      0x1122,
-			SkipTrue: 1,
-		},
-		bpf.RetConstant{
-			Val: 0,
-		},
-		bpf.RetConstant{
-			Val: 10,
-		},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0x01, 0x02,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 2, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMJumpIfBitsNotSet(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 2,
-		},
-		bpf.JumpIf{
-			Cond:     bpf.JumpBitsNotSet,
-			Val:      0x1221,
-			SkipTrue: 1,
-		},
-		bpf.RetConstant{
-			Val: 0,
-		},
-		bpf.RetConstant{
-			Val: 10,
-		},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0x01, 0x02,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 2, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
diff --git a/vendor/golang.org/x/net/bpf/vm_load_test.go b/vendor/golang.org/x/net/bpf/vm_load_test.go
deleted file mode 100644
index 04578b66..00000000
--- a/vendor/golang.org/x/net/bpf/vm_load_test.go
+++ /dev/null
@@ -1,246 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bpf_test
-
-import (
-	"net"
-	"testing"
-
-	"golang.org/x/net/bpf"
-	"golang.org/x/net/ipv4"
-)
-
-func TestVMLoadAbsoluteOffsetOutOfBounds(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  100,
-			Size: 2,
-		},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0, 1, 2, 3,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 0, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMLoadAbsoluteOffsetPlusSizeOutOfBounds(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 2,
-		},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 0, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMLoadAbsoluteBadInstructionSize(t *testing.T) {
-	_, _, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Size: 5,
-		},
-		bpf.RetA{},
-	})
-	if errStr(err) != "assembling instruction 1: invalid load byte length 0" {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestVMLoadConstantOK(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadConstant{
-			Dst: bpf.RegX,
-			Val: 9,
-		},
-		bpf.TXA{},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 1, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMLoadIndirectOutOfBounds(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadIndirect{
-			Off:  100,
-			Size: 1,
-		},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 0, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMLoadMemShiftOutOfBounds(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadMemShift{
-			Off: 100,
-		},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 0, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-const (
-	dhcp4Port = 53
-)
-
-func TestVMLoadMemShiftLoadIndirectNoResult(t *testing.T) {
-	vm, in, done := testDHCPv4(t)
-	defer done()
-
-	// Append mostly empty UDP header with incorrect DHCPv4 port
-	in = append(in, []byte{
-		0, 0,
-		0, dhcp4Port + 1,
-		0, 0,
-		0, 0,
-	}...)
-
-	out, err := vm.Run(in)
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 0, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMLoadMemShiftLoadIndirectOK(t *testing.T) {
-	vm, in, done := testDHCPv4(t)
-	defer done()
-
-	// Append mostly empty UDP header with correct DHCPv4 port
-	in = append(in, []byte{
-		0, 0,
-		0, dhcp4Port,
-		0, 0,
-		0, 0,
-	}...)
-
-	out, err := vm.Run(in)
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := len(in)-8, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func testDHCPv4(t *testing.T) (virtualMachine, []byte, func()) {
-	// DHCPv4 test data courtesy of David Anderson:
-	// https://github.com/google/netboot/blob/master/dhcp4/conn_linux.go#L59-L70
-	vm, done, err := testVM(t, []bpf.Instruction{
-		// Load IPv4 packet length
-		bpf.LoadMemShift{Off: 8},
-		// Get UDP dport
-		bpf.LoadIndirect{Off: 8 + 2, Size: 2},
-		// Correct dport?
-		bpf.JumpIf{Cond: bpf.JumpEqual, Val: dhcp4Port, SkipFalse: 1},
-		// Accept
-		bpf.RetConstant{Val: 1500},
-		// Ignore
-		bpf.RetConstant{Val: 0},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-
-	// Minimal requirements to make a valid IPv4 header
-	h := &ipv4.Header{
-		Len: ipv4.HeaderLen,
-		Src: net.IPv4(192, 168, 1, 1),
-		Dst: net.IPv4(192, 168, 1, 2),
-	}
-	hb, err := h.Marshal()
-	if err != nil {
-		t.Fatalf("failed to marshal IPv4 header: %v", err)
-	}
-
-	hb = append([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-	}, hb...)
-
-	return vm, hb, done
-}
diff --git a/vendor/golang.org/x/net/bpf/vm_ret_test.go b/vendor/golang.org/x/net/bpf/vm_ret_test.go
deleted file mode 100644
index 2d86eae3..00000000
--- a/vendor/golang.org/x/net/bpf/vm_ret_test.go
+++ /dev/null
@@ -1,115 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bpf_test
-
-import (
-	"testing"
-
-	"golang.org/x/net/bpf"
-)
-
-func TestVMRetA(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		9,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 1, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMRetALargerThanInput(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 2,
-		},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0, 255,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 2, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMRetConstant(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.RetConstant{
-			Val: 9,
-		},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0, 1,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 1, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMRetConstantLargerThanInput(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.RetConstant{
-			Val: 16,
-		},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0, 1,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 2, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
diff --git a/vendor/golang.org/x/net/bpf/vm_scratch_test.go b/vendor/golang.org/x/net/bpf/vm_scratch_test.go
deleted file mode 100644
index e600e3c2..00000000
--- a/vendor/golang.org/x/net/bpf/vm_scratch_test.go
+++ /dev/null
@@ -1,247 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bpf_test
-
-import (
-	"testing"
-
-	"golang.org/x/net/bpf"
-)
-
-func TestVMStoreScratchInvalidScratchRegisterTooSmall(t *testing.T) {
-	_, _, err := testVM(t, []bpf.Instruction{
-		bpf.StoreScratch{
-			Src: bpf.RegA,
-			N:   -1,
-		},
-		bpf.RetA{},
-	})
-	if errStr(err) != "assembling instruction 1: invalid scratch slot -1" {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestVMStoreScratchInvalidScratchRegisterTooLarge(t *testing.T) {
-	_, _, err := testVM(t, []bpf.Instruction{
-		bpf.StoreScratch{
-			Src: bpf.RegA,
-			N:   16,
-		},
-		bpf.RetA{},
-	})
-	if errStr(err) != "assembling instruction 1: invalid scratch slot 16" {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestVMStoreScratchUnknownSourceRegister(t *testing.T) {
-	_, _, err := testVM(t, []bpf.Instruction{
-		bpf.StoreScratch{
-			Src: 100,
-			N:   0,
-		},
-		bpf.RetA{},
-	})
-	if errStr(err) != "assembling instruction 1: invalid source register 100" {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestVMLoadScratchInvalidScratchRegisterTooSmall(t *testing.T) {
-	_, _, err := testVM(t, []bpf.Instruction{
-		bpf.LoadScratch{
-			Dst: bpf.RegX,
-			N:   -1,
-		},
-		bpf.RetA{},
-	})
-	if errStr(err) != "assembling instruction 1: invalid scratch slot -1" {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestVMLoadScratchInvalidScratchRegisterTooLarge(t *testing.T) {
-	_, _, err := testVM(t, []bpf.Instruction{
-		bpf.LoadScratch{
-			Dst: bpf.RegX,
-			N:   16,
-		},
-		bpf.RetA{},
-	})
-	if errStr(err) != "assembling instruction 1: invalid scratch slot 16" {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestVMLoadScratchUnknownDestinationRegister(t *testing.T) {
-	_, _, err := testVM(t, []bpf.Instruction{
-		bpf.LoadScratch{
-			Dst: 100,
-			N:   0,
-		},
-		bpf.RetA{},
-	})
-	if errStr(err) != "assembling instruction 1: invalid target register 100" {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestVMStoreScratchLoadScratchOneValue(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		// Load byte 255
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		// Copy to X and store in scratch[0]
-		bpf.TAX{},
-		bpf.StoreScratch{
-			Src: bpf.RegX,
-			N:   0,
-		},
-		// Load byte 1
-		bpf.LoadAbsolute{
-			Off:  9,
-			Size: 1,
-		},
-		// Overwrite 1 with 255 from scratch[0]
-		bpf.LoadScratch{
-			Dst: bpf.RegA,
-			N:   0,
-		},
-		// Return 255
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		255, 1, 2,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 3, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMStoreScratchLoadScratchMultipleValues(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		// Load byte 10
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		// Store in scratch[0]
-		bpf.StoreScratch{
-			Src: bpf.RegA,
-			N:   0,
-		},
-		// Load byte 20
-		bpf.LoadAbsolute{
-			Off:  9,
-			Size: 1,
-		},
-		// Store in scratch[1]
-		bpf.StoreScratch{
-			Src: bpf.RegA,
-			N:   1,
-		},
-		// Load byte 30
-		bpf.LoadAbsolute{
-			Off:  10,
-			Size: 1,
-		},
-		// Store in scratch[2]
-		bpf.StoreScratch{
-			Src: bpf.RegA,
-			N:   2,
-		},
-		// Load byte 1
-		bpf.LoadAbsolute{
-			Off:  11,
-			Size: 1,
-		},
-		// Store in scratch[3]
-		bpf.StoreScratch{
-			Src: bpf.RegA,
-			N:   3,
-		},
-		// Load in byte 10 to X
-		bpf.LoadScratch{
-			Dst: bpf.RegX,
-			N:   0,
-		},
-		// Copy X -> A
-		bpf.TXA{},
-		// Verify value is 10
-		bpf.JumpIf{
-			Cond:     bpf.JumpEqual,
-			Val:      10,
-			SkipTrue: 1,
-		},
-		// Fail test if incorrect
-		bpf.RetConstant{
-			Val: 0,
-		},
-		// Load in byte 20 to A
-		bpf.LoadScratch{
-			Dst: bpf.RegA,
-			N:   1,
-		},
-		// Verify value is 20
-		bpf.JumpIf{
-			Cond:     bpf.JumpEqual,
-			Val:      20,
-			SkipTrue: 1,
-		},
-		// Fail test if incorrect
-		bpf.RetConstant{
-			Val: 0,
-		},
-		// Load in byte 30 to A
-		bpf.LoadScratch{
-			Dst: bpf.RegA,
-			N:   2,
-		},
-		// Verify value is 30
-		bpf.JumpIf{
-			Cond:     bpf.JumpEqual,
-			Val:      30,
-			SkipTrue: 1,
-		},
-		// Fail test if incorrect
-		bpf.RetConstant{
-			Val: 0,
-		},
-		// Return first two bytes on success
-		bpf.RetConstant{
-			Val: 10,
-		},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		10, 20, 30, 1,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 2, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
diff --git a/vendor/golang.org/x/net/bpf/vm_test.go b/vendor/golang.org/x/net/bpf/vm_test.go
deleted file mode 100644
index 6bd4dd5c..00000000
--- a/vendor/golang.org/x/net/bpf/vm_test.go
+++ /dev/null
@@ -1,144 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bpf_test
-
-import (
-	"fmt"
-	"testing"
-
-	"golang.org/x/net/bpf"
-)
-
-var _ bpf.Instruction = unknown{}
-
-type unknown struct{}
-
-func (unknown) Assemble() (bpf.RawInstruction, error) {
-	return bpf.RawInstruction{}, nil
-}
-
-func TestVMUnknownInstruction(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadConstant{
-			Dst: bpf.RegA,
-			Val: 100,
-		},
-		// Should terminate the program with an error immediately
-		unknown{},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	defer done()
-
-	_, err = vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0x00, 0x00,
-	})
-	if errStr(err) != "unknown Instruction at index 1: bpf_test.unknown" {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-}
-
-func TestVMNoReturnInstruction(t *testing.T) {
-	_, _, err := testVM(t, []bpf.Instruction{
-		bpf.LoadConstant{
-			Dst: bpf.RegA,
-			Val: 1,
-		},
-	})
-	if errStr(err) != "BPF program must end with RetA or RetConstant" {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestVMNoInputInstructions(t *testing.T) {
-	_, _, err := testVM(t, []bpf.Instruction{})
-	if errStr(err) != "one or more Instructions must be specified" {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-// ExampleNewVM demonstrates usage of a VM, using an Ethernet frame
-// as input and checking its EtherType to determine if it should be accepted.
-func ExampleNewVM() {
-	// Offset | Length | Comment
-	// -------------------------
-	//   00   |   06   | Ethernet destination MAC address
-	//   06   |   06   | Ethernet source MAC address
-	//   12   |   02   | Ethernet EtherType
-	const (
-		etOff = 12
-		etLen = 2
-
-		etARP = 0x0806
-	)
-
-	// Set up a VM to filter traffic based on if its EtherType
-	// matches the ARP EtherType.
-	vm, err := bpf.NewVM([]bpf.Instruction{
-		// Load EtherType value from Ethernet header
-		bpf.LoadAbsolute{
-			Off:  etOff,
-			Size: etLen,
-		},
-		// If EtherType is equal to the ARP EtherType, jump to allow
-		// packet to be accepted
-		bpf.JumpIf{
-			Cond:     bpf.JumpEqual,
-			Val:      etARP,
-			SkipTrue: 1,
-		},
-		// EtherType does not match the ARP EtherType
-		bpf.RetConstant{
-			Val: 0,
-		},
-		// EtherType matches the ARP EtherType, accept up to 1500
-		// bytes of packet
-		bpf.RetConstant{
-			Val: 1500,
-		},
-	})
-	if err != nil {
-		panic(fmt.Sprintf("failed to load BPF program: %v", err))
-	}
-
-	// Create an Ethernet frame with the ARP EtherType for testing
-	frame := []byte{
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-		0x00, 0x11, 0x22, 0x33, 0x44, 0x55,
-		0x08, 0x06,
-		// Payload omitted for brevity
-	}
-
-	// Run our VM's BPF program using the Ethernet frame as input
-	out, err := vm.Run(frame)
-	if err != nil {
-		panic(fmt.Sprintf("failed to accept Ethernet frame: %v", err))
-	}
-
-	// BPF VM can return a byte count greater than the number of input
-	// bytes, so trim the output to match the input byte length
-	if out > len(frame) {
-		out = len(frame)
-	}
-
-	fmt.Printf("out: %d bytes", out)
-
-	// Output:
-	// out: 14 bytes
-}
-
-// errStr returns the string representation of an error, or
-// "<nil>" if it is nil.
-func errStr(err error) string {
-	if err == nil {
-		return "<nil>"
-	}
-
-	return err.Error()
-}
diff --git a/vendor/golang.org/x/net/codereview.cfg b/vendor/golang.org/x/net/codereview.cfg
deleted file mode 100644
index 3f8b14b6..00000000
--- a/vendor/golang.org/x/net/codereview.cfg
+++ /dev/null
@@ -1 +0,0 @@
-issuerepo: golang/go
diff --git a/vendor/golang.org/x/net/http/httpguts/httplex_test.go b/vendor/golang.org/x/net/http/httpguts/httplex_test.go
deleted file mode 100644
index a2c57f39..00000000
--- a/vendor/golang.org/x/net/http/httpguts/httplex_test.go
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package httpguts
-
-import (
-	"testing"
-)
-
-func isChar(c rune) bool { return c <= 127 }
-
-func isCtl(c rune) bool { return c <= 31 || c == 127 }
-
-func isSeparator(c rune) bool {
-	switch c {
-	case '(', ')', '<', '>', '@', ',', ';', ':', '\\', '"', '/', '[', ']', '?', '=', '{', '}', ' ', '\t':
-		return true
-	}
-	return false
-}
-
-func TestIsToken(t *testing.T) {
-	for i := 0; i <= 130; i++ {
-		r := rune(i)
-		expected := isChar(r) && !isCtl(r) && !isSeparator(r)
-		if IsTokenRune(r) != expected {
-			t.Errorf("isToken(0x%x) = %v", r, !expected)
-		}
-	}
-}
-
-func TestHeaderValuesContainsToken(t *testing.T) {
-	tests := []struct {
-		vals  []string
-		token string
-		want  bool
-	}{
-		{
-			vals:  []string{"foo"},
-			token: "foo",
-			want:  true,
-		},
-		{
-			vals:  []string{"bar", "foo"},
-			token: "foo",
-			want:  true,
-		},
-		{
-			vals:  []string{"foo"},
-			token: "FOO",
-			want:  true,
-		},
-		{
-			vals:  []string{"foo"},
-			token: "bar",
-			want:  false,
-		},
-		{
-			vals:  []string{" foo "},
-			token: "FOO",
-			want:  true,
-		},
-		{
-			vals:  []string{"foo,bar"},
-			token: "FOO",
-			want:  true,
-		},
-		{
-			vals:  []string{"bar,foo,bar"},
-			token: "FOO",
-			want:  true,
-		},
-		{
-			vals:  []string{"bar , foo"},
-			token: "FOO",
-			want:  true,
-		},
-		{
-			vals:  []string{"foo ,bar "},
-			token: "FOO",
-			want:  true,
-		},
-		{
-			vals:  []string{"bar, foo ,bar"},
-			token: "FOO",
-			want:  true,
-		},
-		{
-			vals:  []string{"bar , foo"},
-			token: "FOO",
-			want:  true,
-		},
-	}
-	for _, tt := range tests {
-		got := HeaderValuesContainsToken(tt.vals, tt.token)
-		if got != tt.want {
-			t.Errorf("headerValuesContainsToken(%q, %q) = %v; want %v", tt.vals, tt.token, got, tt.want)
-		}
-	}
-}
-
-func TestPunycodeHostPort(t *testing.T) {
-	tests := []struct {
-		in, want string
-	}{
-		{"www.google.com", "www.google.com"},
-		{"гофер.рф", "xn--c1ae0ajs.xn--p1ai"},
-		{"bücher.de", "xn--bcher-kva.de"},
-		{"bücher.de:8080", "xn--bcher-kva.de:8080"},
-		{"[1::6]:8080", "[1::6]:8080"},
-	}
-	for _, tt := range tests {
-		got, err := PunycodeHostPort(tt.in)
-		if tt.want != got || err != nil {
-			t.Errorf("PunycodeHostPort(%q) = %q, %v, want %q, nil", tt.in, got, err, tt.want)
-		}
-	}
-}
diff --git a/vendor/golang.org/x/net/http2/ciphers_test.go b/vendor/golang.org/x/net/http2/ciphers_test.go
deleted file mode 100644
index 764bbc8c..00000000
--- a/vendor/golang.org/x/net/http2/ciphers_test.go
+++ /dev/null
@@ -1,309 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import "testing"
-
-func TestIsBadCipherBad(t *testing.T) {
-	for _, c := range badCiphers {
-		if !isBadCipher(c) {
-			t.Errorf("Wrong result for isBadCipher(%d), want true", c)
-		}
-	}
-}
-
-// verify we don't give false positives on ciphers not on blacklist
-func TestIsBadCipherGood(t *testing.T) {
-	goodCiphers := map[uint16]string{
-		cipher_TLS_DHE_RSA_WITH_AES_256_CCM:                "cipher_TLS_DHE_RSA_WITH_AES_256_CCM",
-		cipher_TLS_ECDHE_ECDSA_WITH_AES_128_CCM:            "cipher_TLS_ECDHE_ECDSA_WITH_AES_128_CCM",
-		cipher_TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256: "cipher_TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256",
-	}
-	for c, name := range goodCiphers {
-		if isBadCipher(c) {
-			t.Errorf("Wrong result for isBadCipher(%d) %s, want false", c, name)
-		}
-	}
-}
-
-// copied from https://http2.github.io/http2-spec/#BadCipherSuites,
-var badCiphers = []uint16{
-	cipher_TLS_NULL_WITH_NULL_NULL,
-	cipher_TLS_RSA_WITH_NULL_MD5,
-	cipher_TLS_RSA_WITH_NULL_SHA,
-	cipher_TLS_RSA_EXPORT_WITH_RC4_40_MD5,
-	cipher_TLS_RSA_WITH_RC4_128_MD5,
-	cipher_TLS_RSA_WITH_RC4_128_SHA,
-	cipher_TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5,
-	cipher_TLS_RSA_WITH_IDEA_CBC_SHA,
-	cipher_TLS_RSA_EXPORT_WITH_DES40_CBC_SHA,
-	cipher_TLS_RSA_WITH_DES_CBC_SHA,
-	cipher_TLS_RSA_WITH_3DES_EDE_CBC_SHA,
-	cipher_TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA,
-	cipher_TLS_DH_DSS_WITH_DES_CBC_SHA,
-	cipher_TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA,
-	cipher_TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA,
-	cipher_TLS_DH_RSA_WITH_DES_CBC_SHA,
-	cipher_TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA,
-	cipher_TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA,
-	cipher_TLS_DHE_DSS_WITH_DES_CBC_SHA,
-	cipher_TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA,
-	cipher_TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA,
-	cipher_TLS_DHE_RSA_WITH_DES_CBC_SHA,
-	cipher_TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA,
-	cipher_TLS_DH_anon_EXPORT_WITH_RC4_40_MD5,
-	cipher_TLS_DH_anon_WITH_RC4_128_MD5,
-	cipher_TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA,
-	cipher_TLS_DH_anon_WITH_DES_CBC_SHA,
-	cipher_TLS_DH_anon_WITH_3DES_EDE_CBC_SHA,
-	cipher_TLS_KRB5_WITH_DES_CBC_SHA,
-	cipher_TLS_KRB5_WITH_3DES_EDE_CBC_SHA,
-	cipher_TLS_KRB5_WITH_RC4_128_SHA,
-	cipher_TLS_KRB5_WITH_IDEA_CBC_SHA,
-	cipher_TLS_KRB5_WITH_DES_CBC_MD5,
-	cipher_TLS_KRB5_WITH_3DES_EDE_CBC_MD5,
-	cipher_TLS_KRB5_WITH_RC4_128_MD5,
-	cipher_TLS_KRB5_WITH_IDEA_CBC_MD5,
-	cipher_TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA,
-	cipher_TLS_KRB5_EXPORT_WITH_RC2_CBC_40_SHA,
-	cipher_TLS_KRB5_EXPORT_WITH_RC4_40_SHA,
-	cipher_TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5,
-	cipher_TLS_KRB5_EXPORT_WITH_RC2_CBC_40_MD5,
-	cipher_TLS_KRB5_EXPORT_WITH_RC4_40_MD5,
-	cipher_TLS_PSK_WITH_NULL_SHA,
-	cipher_TLS_DHE_PSK_WITH_NULL_SHA,
-	cipher_TLS_RSA_PSK_WITH_NULL_SHA,
-	cipher_TLS_RSA_WITH_AES_128_CBC_SHA,
-	cipher_TLS_DH_DSS_WITH_AES_128_CBC_SHA,
-	cipher_TLS_DH_RSA_WITH_AES_128_CBC_SHA,
-	cipher_TLS_DHE_DSS_WITH_AES_128_CBC_SHA,
-	cipher_TLS_DHE_RSA_WITH_AES_128_CBC_SHA,
-	cipher_TLS_DH_anon_WITH_AES_128_CBC_SHA,
-	cipher_TLS_RSA_WITH_AES_256_CBC_SHA,
-	cipher_TLS_DH_DSS_WITH_AES_256_CBC_SHA,
-	cipher_TLS_DH_RSA_WITH_AES_256_CBC_SHA,
-	cipher_TLS_DHE_DSS_WITH_AES_256_CBC_SHA,
-	cipher_TLS_DHE_RSA_WITH_AES_256_CBC_SHA,
-	cipher_TLS_DH_anon_WITH_AES_256_CBC_SHA,
-	cipher_TLS_RSA_WITH_NULL_SHA256,
-	cipher_TLS_RSA_WITH_AES_128_CBC_SHA256,
-	cipher_TLS_RSA_WITH_AES_256_CBC_SHA256,
-	cipher_TLS_DH_DSS_WITH_AES_128_CBC_SHA256,
-	cipher_TLS_DH_RSA_WITH_AES_128_CBC_SHA256,
-	cipher_TLS_DHE_DSS_WITH_AES_128_CBC_SHA256,
-	cipher_TLS_RSA_WITH_CAMELLIA_128_CBC_SHA,
-	cipher_TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA,
-	cipher_TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA,
-	cipher_TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA,
-	cipher_TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA,
-	cipher_TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA,
-	cipher_TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,
-	cipher_TLS_DH_DSS_WITH_AES_256_CBC_SHA256,
-	cipher_TLS_DH_RSA_WITH_AES_256_CBC_SHA256,
-	cipher_TLS_DHE_DSS_WITH_AES_256_CBC_SHA256,
-	cipher_TLS_DHE_RSA_WITH_AES_256_CBC_SHA256,
-	cipher_TLS_DH_anon_WITH_AES_128_CBC_SHA256,
-	cipher_TLS_DH_anon_WITH_AES_256_CBC_SHA256,
-	cipher_TLS_RSA_WITH_CAMELLIA_256_CBC_SHA,
-	cipher_TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA,
-	cipher_TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA,
-	cipher_TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA,
-	cipher_TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA,
-	cipher_TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA,
-	cipher_TLS_PSK_WITH_RC4_128_SHA,
-	cipher_TLS_PSK_WITH_3DES_EDE_CBC_SHA,
-	cipher_TLS_PSK_WITH_AES_128_CBC_SHA,
-	cipher_TLS_PSK_WITH_AES_256_CBC_SHA,
-	cipher_TLS_DHE_PSK_WITH_RC4_128_SHA,
-	cipher_TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA,
-	cipher_TLS_DHE_PSK_WITH_AES_128_CBC_SHA,
-	cipher_TLS_DHE_PSK_WITH_AES_256_CBC_SHA,
-	cipher_TLS_RSA_PSK_WITH_RC4_128_SHA,
-	cipher_TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA,
-	cipher_TLS_RSA_PSK_WITH_AES_128_CBC_SHA,
-	cipher_TLS_RSA_PSK_WITH_AES_256_CBC_SHA,
-	cipher_TLS_RSA_WITH_SEED_CBC_SHA,
-	cipher_TLS_DH_DSS_WITH_SEED_CBC_SHA,
-	cipher_TLS_DH_RSA_WITH_SEED_CBC_SHA,
-	cipher_TLS_DHE_DSS_WITH_SEED_CBC_SHA,
-	cipher_TLS_DHE_RSA_WITH_SEED_CBC_SHA,
-	cipher_TLS_DH_anon_WITH_SEED_CBC_SHA,
-	cipher_TLS_RSA_WITH_AES_128_GCM_SHA256,
-	cipher_TLS_RSA_WITH_AES_256_GCM_SHA384,
-	cipher_TLS_DH_RSA_WITH_AES_128_GCM_SHA256,
-	cipher_TLS_DH_RSA_WITH_AES_256_GCM_SHA384,
-	cipher_TLS_DH_DSS_WITH_AES_128_GCM_SHA256,
-	cipher_TLS_DH_DSS_WITH_AES_256_GCM_SHA384,
-	cipher_TLS_DH_anon_WITH_AES_128_GCM_SHA256,
-	cipher_TLS_DH_anon_WITH_AES_256_GCM_SHA384,
-	cipher_TLS_PSK_WITH_AES_128_GCM_SHA256,
-	cipher_TLS_PSK_WITH_AES_256_GCM_SHA384,
-	cipher_TLS_RSA_PSK_WITH_AES_128_GCM_SHA256,
-	cipher_TLS_RSA_PSK_WITH_AES_256_GCM_SHA384,
-	cipher_TLS_PSK_WITH_AES_128_CBC_SHA256,
-	cipher_TLS_PSK_WITH_AES_256_CBC_SHA384,
-	cipher_TLS_PSK_WITH_NULL_SHA256,
-	cipher_TLS_PSK_WITH_NULL_SHA384,
-	cipher_TLS_DHE_PSK_WITH_AES_128_CBC_SHA256,
-	cipher_TLS_DHE_PSK_WITH_AES_256_CBC_SHA384,
-	cipher_TLS_DHE_PSK_WITH_NULL_SHA256,
-	cipher_TLS_DHE_PSK_WITH_NULL_SHA384,
-	cipher_TLS_RSA_PSK_WITH_AES_128_CBC_SHA256,
-	cipher_TLS_RSA_PSK_WITH_AES_256_CBC_SHA384,
-	cipher_TLS_RSA_PSK_WITH_NULL_SHA256,
-	cipher_TLS_RSA_PSK_WITH_NULL_SHA384,
-	cipher_TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256,
-	cipher_TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256,
-	cipher_TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256,
-	cipher_TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256,
-	cipher_TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256,
-	cipher_TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA256,
-	cipher_TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256,
-	cipher_TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256,
-	cipher_TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256,
-	cipher_TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256,
-	cipher_TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256,
-	cipher_TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA256,
-	cipher_TLS_EMPTY_RENEGOTIATION_INFO_SCSV,
-	cipher_TLS_ECDH_ECDSA_WITH_NULL_SHA,
-	cipher_TLS_ECDH_ECDSA_WITH_RC4_128_SHA,
-	cipher_TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA,
-	cipher_TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA,
-	cipher_TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA,
-	cipher_TLS_ECDHE_ECDSA_WITH_NULL_SHA,
-	cipher_TLS_ECDHE_ECDSA_WITH_RC4_128_SHA,
-	cipher_TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA,
-	cipher_TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
-	cipher_TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
-	cipher_TLS_ECDH_RSA_WITH_NULL_SHA,
-	cipher_TLS_ECDH_RSA_WITH_RC4_128_SHA,
-	cipher_TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA,
-	cipher_TLS_ECDH_RSA_WITH_AES_128_CBC_SHA,
-	cipher_TLS_ECDH_RSA_WITH_AES_256_CBC_SHA,
-	cipher_TLS_ECDHE_RSA_WITH_NULL_SHA,
-	cipher_TLS_ECDHE_RSA_WITH_RC4_128_SHA,
-	cipher_TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,
-	cipher_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
-	cipher_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
-	cipher_TLS_ECDH_anon_WITH_NULL_SHA,
-	cipher_TLS_ECDH_anon_WITH_RC4_128_SHA,
-	cipher_TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA,
-	cipher_TLS_ECDH_anon_WITH_AES_128_CBC_SHA,
-	cipher_TLS_ECDH_anon_WITH_AES_256_CBC_SHA,
-	cipher_TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA,
-	cipher_TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA,
-	cipher_TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA,
-	cipher_TLS_SRP_SHA_WITH_AES_128_CBC_SHA,
-	cipher_TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA,
-	cipher_TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA,
-	cipher_TLS_SRP_SHA_WITH_AES_256_CBC_SHA,
-	cipher_TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA,
-	cipher_TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA,
-	cipher_TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
-	cipher_TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384,
-	cipher_TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256,
-	cipher_TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384,
-	cipher_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,
-	cipher_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384,
-	cipher_TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256,
-	cipher_TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384,
-	cipher_TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256,
-	cipher_TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384,
-	cipher_TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256,
-	cipher_TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384,
-	cipher_TLS_ECDHE_PSK_WITH_RC4_128_SHA,
-	cipher_TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA,
-	cipher_TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA,
-	cipher_TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA,
-	cipher_TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256,
-	cipher_TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384,
-	cipher_TLS_ECDHE_PSK_WITH_NULL_SHA,
-	cipher_TLS_ECDHE_PSK_WITH_NULL_SHA256,
-	cipher_TLS_ECDHE_PSK_WITH_NULL_SHA384,
-	cipher_TLS_RSA_WITH_ARIA_128_CBC_SHA256,
-	cipher_TLS_RSA_WITH_ARIA_256_CBC_SHA384,
-	cipher_TLS_DH_DSS_WITH_ARIA_128_CBC_SHA256,
-	cipher_TLS_DH_DSS_WITH_ARIA_256_CBC_SHA384,
-	cipher_TLS_DH_RSA_WITH_ARIA_128_CBC_SHA256,
-	cipher_TLS_DH_RSA_WITH_ARIA_256_CBC_SHA384,
-	cipher_TLS_DHE_DSS_WITH_ARIA_128_CBC_SHA256,
-	cipher_TLS_DHE_DSS_WITH_ARIA_256_CBC_SHA384,
-	cipher_TLS_DHE_RSA_WITH_ARIA_128_CBC_SHA256,
-	cipher_TLS_DHE_RSA_WITH_ARIA_256_CBC_SHA384,
-	cipher_TLS_DH_anon_WITH_ARIA_128_CBC_SHA256,
-	cipher_TLS_DH_anon_WITH_ARIA_256_CBC_SHA384,
-	cipher_TLS_ECDHE_ECDSA_WITH_ARIA_128_CBC_SHA256,
-	cipher_TLS_ECDHE_ECDSA_WITH_ARIA_256_CBC_SHA384,
-	cipher_TLS_ECDH_ECDSA_WITH_ARIA_128_CBC_SHA256,
-	cipher_TLS_ECDH_ECDSA_WITH_ARIA_256_CBC_SHA384,
-	cipher_TLS_ECDHE_RSA_WITH_ARIA_128_CBC_SHA256,
-	cipher_TLS_ECDHE_RSA_WITH_ARIA_256_CBC_SHA384,
-	cipher_TLS_ECDH_RSA_WITH_ARIA_128_CBC_SHA256,
-	cipher_TLS_ECDH_RSA_WITH_ARIA_256_CBC_SHA384,
-	cipher_TLS_RSA_WITH_ARIA_128_GCM_SHA256,
-	cipher_TLS_RSA_WITH_ARIA_256_GCM_SHA384,
-	cipher_TLS_DH_RSA_WITH_ARIA_128_GCM_SHA256,
-	cipher_TLS_DH_RSA_WITH_ARIA_256_GCM_SHA384,
-	cipher_TLS_DH_DSS_WITH_ARIA_128_GCM_SHA256,
-	cipher_TLS_DH_DSS_WITH_ARIA_256_GCM_SHA384,
-	cipher_TLS_DH_anon_WITH_ARIA_128_GCM_SHA256,
-	cipher_TLS_DH_anon_WITH_ARIA_256_GCM_SHA384,
-	cipher_TLS_ECDH_ECDSA_WITH_ARIA_128_GCM_SHA256,
-	cipher_TLS_ECDH_ECDSA_WITH_ARIA_256_GCM_SHA384,
-	cipher_TLS_ECDH_RSA_WITH_ARIA_128_GCM_SHA256,
-	cipher_TLS_ECDH_RSA_WITH_ARIA_256_GCM_SHA384,
-	cipher_TLS_PSK_WITH_ARIA_128_CBC_SHA256,
-	cipher_TLS_PSK_WITH_ARIA_256_CBC_SHA384,
-	cipher_TLS_DHE_PSK_WITH_ARIA_128_CBC_SHA256,
-	cipher_TLS_DHE_PSK_WITH_ARIA_256_CBC_SHA384,
-	cipher_TLS_RSA_PSK_WITH_ARIA_128_CBC_SHA256,
-	cipher_TLS_RSA_PSK_WITH_ARIA_256_CBC_SHA384,
-	cipher_TLS_PSK_WITH_ARIA_128_GCM_SHA256,
-	cipher_TLS_PSK_WITH_ARIA_256_GCM_SHA384,
-	cipher_TLS_RSA_PSK_WITH_ARIA_128_GCM_SHA256,
-	cipher_TLS_RSA_PSK_WITH_ARIA_256_GCM_SHA384,
-	cipher_TLS_ECDHE_PSK_WITH_ARIA_128_CBC_SHA256,
-	cipher_TLS_ECDHE_PSK_WITH_ARIA_256_CBC_SHA384,
-	cipher_TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256,
-	cipher_TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384,
-	cipher_TLS_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256,
-	cipher_TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384,
-	cipher_TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256,
-	cipher_TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384,
-	cipher_TLS_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256,
-	cipher_TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384,
-	cipher_TLS_RSA_WITH_CAMELLIA_128_GCM_SHA256,
-	cipher_TLS_RSA_WITH_CAMELLIA_256_GCM_SHA384,
-	cipher_TLS_DH_RSA_WITH_CAMELLIA_128_GCM_SHA256,
-	cipher_TLS_DH_RSA_WITH_CAMELLIA_256_GCM_SHA384,
-	cipher_TLS_DH_DSS_WITH_CAMELLIA_128_GCM_SHA256,
-	cipher_TLS_DH_DSS_WITH_CAMELLIA_256_GCM_SHA384,
-	cipher_TLS_DH_anon_WITH_CAMELLIA_128_GCM_SHA256,
-	cipher_TLS_DH_anon_WITH_CAMELLIA_256_GCM_SHA384,
-	cipher_TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256,
-	cipher_TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384,
-	cipher_TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256,
-	cipher_TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384,
-	cipher_TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256,
-	cipher_TLS_PSK_WITH_CAMELLIA_256_GCM_SHA384,
-	cipher_TLS_RSA_PSK_WITH_CAMELLIA_128_GCM_SHA256,
-	cipher_TLS_RSA_PSK_WITH_CAMELLIA_256_GCM_SHA384,
-	cipher_TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256,
-	cipher_TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384,
-	cipher_TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256,
-	cipher_TLS_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384,
-	cipher_TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256,
-	cipher_TLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384,
-	cipher_TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256,
-	cipher_TLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384,
-	cipher_TLS_RSA_WITH_AES_128_CCM,
-	cipher_TLS_RSA_WITH_AES_256_CCM,
-	cipher_TLS_RSA_WITH_AES_128_CCM_8,
-	cipher_TLS_RSA_WITH_AES_256_CCM_8,
-	cipher_TLS_PSK_WITH_AES_128_CCM,
-	cipher_TLS_PSK_WITH_AES_256_CCM,
-	cipher_TLS_PSK_WITH_AES_128_CCM_8,
-	cipher_TLS_PSK_WITH_AES_256_CCM_8,
-}
diff --git a/vendor/golang.org/x/net/http2/client_conn_pool.go b/vendor/golang.org/x/net/http2/client_conn_pool.go
index bdf5652b..f4d9b5ec 100644
--- a/vendor/golang.org/x/net/http2/client_conn_pool.go
+++ b/vendor/golang.org/x/net/http2/client_conn_pool.go
@@ -52,9 +52,31 @@ const (
 	noDialOnMiss = false
 )
 
+// shouldTraceGetConn reports whether getClientConn should call any
+// ClientTrace.GetConn hook associated with the http.Request.
+//
+// This complexity is needed to avoid double calls of the GetConn hook
+// during the back-and-forth between net/http and x/net/http2 (when the
+// net/http.Transport is upgraded to also speak http2), as well as support
+// the case where x/net/http2 is being used directly.
+func (p *clientConnPool) shouldTraceGetConn(st clientConnIdleState) bool {
+	// If our Transport wasn't made via ConfigureTransport, always
+	// trace the GetConn hook if provided, because that means the
+	// http2 package is being used directly and it's the one
+	// dialing, as opposed to net/http.
+	if _, ok := p.t.ConnPool.(noDialClientConnPool); !ok {
+		return true
+	}
+	// Otherwise, only use the GetConn hook if this connection has
+	// been used previously for other requests. For fresh
+	// connections, the net/http package does the dialing.
+	return !st.freshConn
+}
+
 func (p *clientConnPool) getClientConn(req *http.Request, addr string, dialOnMiss bool) (*ClientConn, error) {
 	if isConnectionCloseRequest(req) && dialOnMiss {
 		// It gets its own connection.
+		traceGetConn(req, addr)
 		const singleUse = true
 		cc, err := p.t.dialClientConn(addr, singleUse)
 		if err != nil {
@@ -64,7 +86,10 @@ func (p *clientConnPool) getClientConn(req *http.Request, addr string, dialOnMis
 	}
 	p.mu.Lock()
 	for _, cc := range p.conns[addr] {
-		if cc.CanTakeNewRequest() {
+		if st := cc.idleState(); st.canTakeNewRequest {
+			if p.shouldTraceGetConn(st) {
+				traceGetConn(req, addr)
+			}
 			p.mu.Unlock()
 			return cc, nil
 		}
@@ -73,6 +98,7 @@ func (p *clientConnPool) getClientConn(req *http.Request, addr string, dialOnMis
 		p.mu.Unlock()
 		return nil, ErrNoCachedConn
 	}
+	traceGetConn(req, addr)
 	call := p.getStartDialLocked(addr)
 	p.mu.Unlock()
 	<-call.done
diff --git a/vendor/golang.org/x/net/http2/configure_transport.go b/vendor/golang.org/x/net/http2/configure_transport.go
index 088d6e2b..6356b328 100644
--- a/vendor/golang.org/x/net/http2/configure_transport.go
+++ b/vendor/golang.org/x/net/http2/configure_transport.go
@@ -57,7 +57,7 @@ func configureTransport(t1 *http.Transport) (*Transport, error) {
 
 // registerHTTPSProtocol calls Transport.RegisterProtocol but
 // converting panics into errors.
-func registerHTTPSProtocol(t *http.Transport, rt http.RoundTripper) (err error) {
+func registerHTTPSProtocol(t *http.Transport, rt noDialH2RoundTripper) (err error) {
 	defer func() {
 		if e := recover(); e != nil {
 			err = fmt.Errorf("%v", e)
@@ -69,10 +69,12 @@ func registerHTTPSProtocol(t *http.Transport, rt http.RoundTripper) (err error)
 
 // noDialH2RoundTripper is a RoundTripper which only tries to complete the request
 // if there's already has a cached connection to the host.
-type noDialH2RoundTripper struct{ t *Transport }
+// (The field is exported so it can be accessed via reflect from net/http; tested
+// by TestNoDialH2RoundTripperType)
+type noDialH2RoundTripper struct{ *Transport }
 
 func (rt noDialH2RoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
-	res, err := rt.t.RoundTrip(req)
+	res, err := rt.Transport.RoundTrip(req)
 	if isNoCachedConnError(err) {
 		return nil, http.ErrSkipAltProtocol
 	}
diff --git a/vendor/golang.org/x/net/http2/databuffer_test.go b/vendor/golang.org/x/net/http2/databuffer_test.go
deleted file mode 100644
index 028e12e5..00000000
--- a/vendor/golang.org/x/net/http2/databuffer_test.go
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.7
-
-package http2
-
-import (
-	"bytes"
-	"fmt"
-	"reflect"
-	"testing"
-)
-
-func fmtDataChunk(chunk []byte) string {
-	out := ""
-	var last byte
-	var count int
-	for _, c := range chunk {
-		if c != last {
-			if count > 0 {
-				out += fmt.Sprintf(" x %d ", count)
-				count = 0
-			}
-			out += string([]byte{c})
-			last = c
-		}
-		count++
-	}
-	if count > 0 {
-		out += fmt.Sprintf(" x %d", count)
-	}
-	return out
-}
-
-func fmtDataChunks(chunks [][]byte) string {
-	var out string
-	for _, chunk := range chunks {
-		out += fmt.Sprintf("{%q}", fmtDataChunk(chunk))
-	}
-	return out
-}
-
-func testDataBuffer(t *testing.T, wantBytes []byte, setup func(t *testing.T) *dataBuffer) {
-	// Run setup, then read the remaining bytes from the dataBuffer and check
-	// that they match wantBytes. We use different read sizes to check corner
-	// cases in Read.
-	for _, readSize := range []int{1, 2, 1 * 1024, 32 * 1024} {
-		t.Run(fmt.Sprintf("ReadSize=%d", readSize), func(t *testing.T) {
-			b := setup(t)
-			buf := make([]byte, readSize)
-			var gotRead bytes.Buffer
-			for {
-				n, err := b.Read(buf)
-				gotRead.Write(buf[:n])
-				if err == errReadEmpty {
-					break
-				}
-				if err != nil {
-					t.Fatalf("error after %v bytes: %v", gotRead.Len(), err)
-				}
-			}
-			if got, want := gotRead.Bytes(), wantBytes; !bytes.Equal(got, want) {
-				t.Errorf("FinalRead=%q, want %q", fmtDataChunk(got), fmtDataChunk(want))
-			}
-		})
-	}
-}
-
-func TestDataBufferAllocation(t *testing.T) {
-	writes := [][]byte{
-		bytes.Repeat([]byte("a"), 1*1024-1),
-		[]byte("a"),
-		bytes.Repeat([]byte("b"), 4*1024-1),
-		[]byte("b"),
-		bytes.Repeat([]byte("c"), 8*1024-1),
-		[]byte("c"),
-		bytes.Repeat([]byte("d"), 16*1024-1),
-		[]byte("d"),
-		bytes.Repeat([]byte("e"), 32*1024),
-	}
-	var wantRead bytes.Buffer
-	for _, p := range writes {
-		wantRead.Write(p)
-	}
-
-	testDataBuffer(t, wantRead.Bytes(), func(t *testing.T) *dataBuffer {
-		b := &dataBuffer{}
-		for _, p := range writes {
-			if n, err := b.Write(p); n != len(p) || err != nil {
-				t.Fatalf("Write(%q x %d)=%v,%v want %v,nil", p[:1], len(p), n, err, len(p))
-			}
-		}
-		want := [][]byte{
-			bytes.Repeat([]byte("a"), 1*1024),
-			bytes.Repeat([]byte("b"), 4*1024),
-			bytes.Repeat([]byte("c"), 8*1024),
-			bytes.Repeat([]byte("d"), 16*1024),
-			bytes.Repeat([]byte("e"), 16*1024),
-			bytes.Repeat([]byte("e"), 16*1024),
-		}
-		if !reflect.DeepEqual(b.chunks, want) {
-			t.Errorf("dataBuffer.chunks\ngot:  %s\nwant: %s", fmtDataChunks(b.chunks), fmtDataChunks(want))
-		}
-		return b
-	})
-}
-
-func TestDataBufferAllocationWithExpected(t *testing.T) {
-	writes := [][]byte{
-		bytes.Repeat([]byte("a"), 1*1024), // allocates 16KB
-		bytes.Repeat([]byte("b"), 14*1024),
-		bytes.Repeat([]byte("c"), 15*1024), // allocates 16KB more
-		bytes.Repeat([]byte("d"), 2*1024),
-		bytes.Repeat([]byte("e"), 1*1024), // overflows 32KB expectation, allocates just 1KB
-	}
-	var wantRead bytes.Buffer
-	for _, p := range writes {
-		wantRead.Write(p)
-	}
-
-	testDataBuffer(t, wantRead.Bytes(), func(t *testing.T) *dataBuffer {
-		b := &dataBuffer{expected: 32 * 1024}
-		for _, p := range writes {
-			if n, err := b.Write(p); n != len(p) || err != nil {
-				t.Fatalf("Write(%q x %d)=%v,%v want %v,nil", p[:1], len(p), n, err, len(p))
-			}
-		}
-		want := [][]byte{
-			append(bytes.Repeat([]byte("a"), 1*1024), append(bytes.Repeat([]byte("b"), 14*1024), bytes.Repeat([]byte("c"), 1*1024)...)...),
-			append(bytes.Repeat([]byte("c"), 14*1024), bytes.Repeat([]byte("d"), 2*1024)...),
-			bytes.Repeat([]byte("e"), 1*1024),
-		}
-		if !reflect.DeepEqual(b.chunks, want) {
-			t.Errorf("dataBuffer.chunks\ngot:  %s\nwant: %s", fmtDataChunks(b.chunks), fmtDataChunks(want))
-		}
-		return b
-	})
-}
-
-func TestDataBufferWriteAfterPartialRead(t *testing.T) {
-	testDataBuffer(t, []byte("cdxyz"), func(t *testing.T) *dataBuffer {
-		b := &dataBuffer{}
-		if n, err := b.Write([]byte("abcd")); n != 4 || err != nil {
-			t.Fatalf("Write(\"abcd\")=%v,%v want 4,nil", n, err)
-		}
-		p := make([]byte, 2)
-		if n, err := b.Read(p); n != 2 || err != nil || !bytes.Equal(p, []byte("ab")) {
-			t.Fatalf("Read()=%q,%v,%v want \"ab\",2,nil", p, n, err)
-		}
-		if n, err := b.Write([]byte("xyz")); n != 3 || err != nil {
-			t.Fatalf("Write(\"xyz\")=%v,%v want 3,nil", n, err)
-		}
-		return b
-	})
-}
diff --git a/vendor/golang.org/x/net/http2/errors_test.go b/vendor/golang.org/x/net/http2/errors_test.go
deleted file mode 100644
index da5c58c3..00000000
--- a/vendor/golang.org/x/net/http2/errors_test.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import "testing"
-
-func TestErrCodeString(t *testing.T) {
-	tests := []struct {
-		err  ErrCode
-		want string
-	}{
-		{ErrCodeProtocol, "PROTOCOL_ERROR"},
-		{0xd, "HTTP_1_1_REQUIRED"},
-		{0xf, "unknown error code 0xf"},
-	}
-	for i, tt := range tests {
-		got := tt.err.String()
-		if got != tt.want {
-			t.Errorf("%d. Error = %q; want %q", i, got, tt.want)
-		}
-	}
-}
diff --git a/vendor/golang.org/x/net/http2/flow_test.go b/vendor/golang.org/x/net/http2/flow_test.go
deleted file mode 100644
index 7ae82c78..00000000
--- a/vendor/golang.org/x/net/http2/flow_test.go
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import "testing"
-
-func TestFlow(t *testing.T) {
-	var st flow
-	var conn flow
-	st.add(3)
-	conn.add(2)
-
-	if got, want := st.available(), int32(3); got != want {
-		t.Errorf("available = %d; want %d", got, want)
-	}
-	st.setConnFlow(&conn)
-	if got, want := st.available(), int32(2); got != want {
-		t.Errorf("after parent setup, available = %d; want %d", got, want)
-	}
-
-	st.take(2)
-	if got, want := conn.available(), int32(0); got != want {
-		t.Errorf("after taking 2, conn = %d; want %d", got, want)
-	}
-	if got, want := st.available(), int32(0); got != want {
-		t.Errorf("after taking 2, stream = %d; want %d", got, want)
-	}
-}
-
-func TestFlowAdd(t *testing.T) {
-	var f flow
-	if !f.add(1) {
-		t.Fatal("failed to add 1")
-	}
-	if !f.add(-1) {
-		t.Fatal("failed to add -1")
-	}
-	if got, want := f.available(), int32(0); got != want {
-		t.Fatalf("size = %d; want %d", got, want)
-	}
-	if !f.add(1<<31 - 1) {
-		t.Fatal("failed to add 2^31-1")
-	}
-	if got, want := f.available(), int32(1<<31-1); got != want {
-		t.Fatalf("size = %d; want %d", got, want)
-	}
-	if f.add(1) {
-		t.Fatal("adding 1 to max shouldn't be allowed")
-	}
-}
-
-func TestFlowAddOverflow(t *testing.T) {
-	var f flow
-	if !f.add(0) {
-		t.Fatal("failed to add 0")
-	}
-	if !f.add(-1) {
-		t.Fatal("failed to add -1")
-	}
-	if !f.add(0) {
-		t.Fatal("failed to add 0")
-	}
-	if !f.add(1) {
-		t.Fatal("failed to add 1")
-	}
-	if !f.add(1) {
-		t.Fatal("failed to add 1")
-	}
-	if !f.add(0) {
-		t.Fatal("failed to add 0")
-	}
-	if !f.add(-3) {
-		t.Fatal("failed to add -3")
-	}
-	if got, want := f.available(), int32(-2); got != want {
-		t.Fatalf("size = %d; want %d", got, want)
-	}
-	if !f.add(1<<31 - 1) {
-		t.Fatal("failed to add 2^31-1")
-	}
-	if got, want := f.available(), int32(1+-3+(1<<31-1)); got != want {
-		t.Fatalf("size = %d; want %d", got, want)
-	}
-
-}
diff --git a/vendor/golang.org/x/net/http2/frame.go b/vendor/golang.org/x/net/http2/frame.go
index e3250077..c85e31f2 100644
--- a/vendor/golang.org/x/net/http2/frame.go
+++ b/vendor/golang.org/x/net/http2/frame.go
@@ -733,32 +733,67 @@ func (f *SettingsFrame) IsAck() bool {
 	return f.FrameHeader.Flags.Has(FlagSettingsAck)
 }
 
-func (f *SettingsFrame) Value(s SettingID) (v uint32, ok bool) {
+func (f *SettingsFrame) Value(id SettingID) (v uint32, ok bool) {
 	f.checkValid()
-	buf := f.p
-	for len(buf) > 0 {
-		settingID := SettingID(binary.BigEndian.Uint16(buf[:2]))
-		if settingID == s {
-			return binary.BigEndian.Uint32(buf[2:6]), true
+	for i := 0; i < f.NumSettings(); i++ {
+		if s := f.Setting(i); s.ID == id {
+			return s.Val, true
 		}
-		buf = buf[6:]
 	}
 	return 0, false
 }
 
+// Setting returns the setting from the frame at the given 0-based index.
+// The index must be >= 0 and less than f.NumSettings().
+func (f *SettingsFrame) Setting(i int) Setting {
+	buf := f.p
+	return Setting{
+		ID:  SettingID(binary.BigEndian.Uint16(buf[i*6 : i*6+2])),
+		Val: binary.BigEndian.Uint32(buf[i*6+2 : i*6+6]),
+	}
+}
+
+func (f *SettingsFrame) NumSettings() int { return len(f.p) / 6 }
+
+// HasDuplicates reports whether f contains any duplicate setting IDs.
+func (f *SettingsFrame) HasDuplicates() bool {
+	num := f.NumSettings()
+	if num == 0 {
+		return false
+	}
+	// If it's small enough (the common case), just do the n^2
+	// thing and avoid a map allocation.
+	if num < 10 {
+		for i := 0; i < num; i++ {
+			idi := f.Setting(i).ID
+			for j := i + 1; j < num; j++ {
+				idj := f.Setting(j).ID
+				if idi == idj {
+					return true
+				}
+			}
+		}
+		return false
+	}
+	seen := map[SettingID]bool{}
+	for i := 0; i < num; i++ {
+		id := f.Setting(i).ID
+		if seen[id] {
+			return true
+		}
+		seen[id] = true
+	}
+	return false
+}
+
 // ForeachSetting runs fn for each setting.
 // It stops and returns the first error.
 func (f *SettingsFrame) ForeachSetting(fn func(Setting) error) error {
 	f.checkValid()
-	buf := f.p
-	for len(buf) > 0 {
-		if err := fn(Setting{
-			SettingID(binary.BigEndian.Uint16(buf[:2])),
-			binary.BigEndian.Uint32(buf[2:6]),
-		}); err != nil {
+	for i := 0; i < f.NumSettings(); i++ {
+		if err := fn(f.Setting(i)); err != nil {
 			return err
 		}
-		buf = buf[6:]
 	}
 	return nil
 }
diff --git a/vendor/golang.org/x/net/http2/frame_test.go b/vendor/golang.org/x/net/http2/frame_test.go
deleted file mode 100644
index 37266bc5..00000000
--- a/vendor/golang.org/x/net/http2/frame_test.go
+++ /dev/null
@@ -1,1191 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"reflect"
-	"strings"
-	"testing"
-	"unsafe"
-
-	"golang.org/x/net/http2/hpack"
-)
-
-func testFramer() (*Framer, *bytes.Buffer) {
-	buf := new(bytes.Buffer)
-	return NewFramer(buf, buf), buf
-}
-
-func TestFrameSizes(t *testing.T) {
-	// Catch people rearranging the FrameHeader fields.
-	if got, want := int(unsafe.Sizeof(FrameHeader{})), 12; got != want {
-		t.Errorf("FrameHeader size = %d; want %d", got, want)
-	}
-}
-
-func TestFrameTypeString(t *testing.T) {
-	tests := []struct {
-		ft   FrameType
-		want string
-	}{
-		{FrameData, "DATA"},
-		{FramePing, "PING"},
-		{FrameGoAway, "GOAWAY"},
-		{0xf, "UNKNOWN_FRAME_TYPE_15"},
-	}
-
-	for i, tt := range tests {
-		got := tt.ft.String()
-		if got != tt.want {
-			t.Errorf("%d. String(FrameType %d) = %q; want %q", i, int(tt.ft), got, tt.want)
-		}
-	}
-}
-
-func TestWriteRST(t *testing.T) {
-	fr, buf := testFramer()
-	var streamID uint32 = 1<<24 + 2<<16 + 3<<8 + 4
-	var errCode uint32 = 7<<24 + 6<<16 + 5<<8 + 4
-	fr.WriteRSTStream(streamID, ErrCode(errCode))
-	const wantEnc = "\x00\x00\x04\x03\x00\x01\x02\x03\x04\x07\x06\x05\x04"
-	if buf.String() != wantEnc {
-		t.Errorf("encoded as %q; want %q", buf.Bytes(), wantEnc)
-	}
-	f, err := fr.ReadFrame()
-	if err != nil {
-		t.Fatal(err)
-	}
-	want := &RSTStreamFrame{
-		FrameHeader: FrameHeader{
-			valid:    true,
-			Type:     0x3,
-			Flags:    0x0,
-			Length:   0x4,
-			StreamID: 0x1020304,
-		},
-		ErrCode: 0x7060504,
-	}
-	if !reflect.DeepEqual(f, want) {
-		t.Errorf("parsed back %#v; want %#v", f, want)
-	}
-}
-
-func TestWriteData(t *testing.T) {
-	fr, buf := testFramer()
-	var streamID uint32 = 1<<24 + 2<<16 + 3<<8 + 4
-	data := []byte("ABC")
-	fr.WriteData(streamID, true, data)
-	const wantEnc = "\x00\x00\x03\x00\x01\x01\x02\x03\x04ABC"
-	if buf.String() != wantEnc {
-		t.Errorf("encoded as %q; want %q", buf.Bytes(), wantEnc)
-	}
-	f, err := fr.ReadFrame()
-	if err != nil {
-		t.Fatal(err)
-	}
-	df, ok := f.(*DataFrame)
-	if !ok {
-		t.Fatalf("got %T; want *DataFrame", f)
-	}
-	if !bytes.Equal(df.Data(), data) {
-		t.Errorf("got %q; want %q", df.Data(), data)
-	}
-	if f.Header().Flags&1 == 0 {
-		t.Errorf("didn't see END_STREAM flag")
-	}
-}
-
-func TestWriteDataPadded(t *testing.T) {
-	tests := [...]struct {
-		streamID   uint32
-		endStream  bool
-		data       []byte
-		pad        []byte
-		wantHeader FrameHeader
-	}{
-		// Unpadded:
-		0: {
-			streamID:  1,
-			endStream: true,
-			data:      []byte("foo"),
-			pad:       nil,
-			wantHeader: FrameHeader{
-				Type:     FrameData,
-				Flags:    FlagDataEndStream,
-				Length:   3,
-				StreamID: 1,
-			},
-		},
-
-		// Padded bit set, but no padding:
-		1: {
-			streamID:  1,
-			endStream: true,
-			data:      []byte("foo"),
-			pad:       []byte{},
-			wantHeader: FrameHeader{
-				Type:     FrameData,
-				Flags:    FlagDataEndStream | FlagDataPadded,
-				Length:   4,
-				StreamID: 1,
-			},
-		},
-
-		// Padded bit set, with padding:
-		2: {
-			streamID:  1,
-			endStream: false,
-			data:      []byte("foo"),
-			pad:       []byte{0, 0, 0},
-			wantHeader: FrameHeader{
-				Type:     FrameData,
-				Flags:    FlagDataPadded,
-				Length:   7,
-				StreamID: 1,
-			},
-		},
-	}
-	for i, tt := range tests {
-		fr, _ := testFramer()
-		fr.WriteDataPadded(tt.streamID, tt.endStream, tt.data, tt.pad)
-		f, err := fr.ReadFrame()
-		if err != nil {
-			t.Errorf("%d. ReadFrame: %v", i, err)
-			continue
-		}
-		got := f.Header()
-		tt.wantHeader.valid = true
-		if got != tt.wantHeader {
-			t.Errorf("%d. read %+v; want %+v", i, got, tt.wantHeader)
-			continue
-		}
-		df := f.(*DataFrame)
-		if !bytes.Equal(df.Data(), tt.data) {
-			t.Errorf("%d. got %q; want %q", i, df.Data(), tt.data)
-		}
-	}
-}
-
-func TestWriteHeaders(t *testing.T) {
-	tests := []struct {
-		name      string
-		p         HeadersFrameParam
-		wantEnc   string
-		wantFrame *HeadersFrame
-	}{
-		{
-			"basic",
-			HeadersFrameParam{
-				StreamID:      42,
-				BlockFragment: []byte("abc"),
-				Priority:      PriorityParam{},
-			},
-			"\x00\x00\x03\x01\x00\x00\x00\x00*abc",
-			&HeadersFrame{
-				FrameHeader: FrameHeader{
-					valid:    true,
-					StreamID: 42,
-					Type:     FrameHeaders,
-					Length:   uint32(len("abc")),
-				},
-				Priority:      PriorityParam{},
-				headerFragBuf: []byte("abc"),
-			},
-		},
-		{
-			"basic + end flags",
-			HeadersFrameParam{
-				StreamID:      42,
-				BlockFragment: []byte("abc"),
-				EndStream:     true,
-				EndHeaders:    true,
-				Priority:      PriorityParam{},
-			},
-			"\x00\x00\x03\x01\x05\x00\x00\x00*abc",
-			&HeadersFrame{
-				FrameHeader: FrameHeader{
-					valid:    true,
-					StreamID: 42,
-					Type:     FrameHeaders,
-					Flags:    FlagHeadersEndStream | FlagHeadersEndHeaders,
-					Length:   uint32(len("abc")),
-				},
-				Priority:      PriorityParam{},
-				headerFragBuf: []byte("abc"),
-			},
-		},
-		{
-			"with padding",
-			HeadersFrameParam{
-				StreamID:      42,
-				BlockFragment: []byte("abc"),
-				EndStream:     true,
-				EndHeaders:    true,
-				PadLength:     5,
-				Priority:      PriorityParam{},
-			},
-			"\x00\x00\t\x01\r\x00\x00\x00*\x05abc\x00\x00\x00\x00\x00",
-			&HeadersFrame{
-				FrameHeader: FrameHeader{
-					valid:    true,
-					StreamID: 42,
-					Type:     FrameHeaders,
-					Flags:    FlagHeadersEndStream | FlagHeadersEndHeaders | FlagHeadersPadded,
-					Length:   uint32(1 + len("abc") + 5), // pad length + contents + padding
-				},
-				Priority:      PriorityParam{},
-				headerFragBuf: []byte("abc"),
-			},
-		},
-		{
-			"with priority",
-			HeadersFrameParam{
-				StreamID:      42,
-				BlockFragment: []byte("abc"),
-				EndStream:     true,
-				EndHeaders:    true,
-				PadLength:     2,
-				Priority: PriorityParam{
-					StreamDep: 15,
-					Exclusive: true,
-					Weight:    127,
-				},
-			},
-			"\x00\x00\v\x01-\x00\x00\x00*\x02\x80\x00\x00\x0f\u007fabc\x00\x00",
-			&HeadersFrame{
-				FrameHeader: FrameHeader{
-					valid:    true,
-					StreamID: 42,
-					Type:     FrameHeaders,
-					Flags:    FlagHeadersEndStream | FlagHeadersEndHeaders | FlagHeadersPadded | FlagHeadersPriority,
-					Length:   uint32(1 + 5 + len("abc") + 2), // pad length + priority + contents + padding
-				},
-				Priority: PriorityParam{
-					StreamDep: 15,
-					Exclusive: true,
-					Weight:    127,
-				},
-				headerFragBuf: []byte("abc"),
-			},
-		},
-		{
-			"with priority stream dep zero", // golang.org/issue/15444
-			HeadersFrameParam{
-				StreamID:      42,
-				BlockFragment: []byte("abc"),
-				EndStream:     true,
-				EndHeaders:    true,
-				PadLength:     2,
-				Priority: PriorityParam{
-					StreamDep: 0,
-					Exclusive: true,
-					Weight:    127,
-				},
-			},
-			"\x00\x00\v\x01-\x00\x00\x00*\x02\x80\x00\x00\x00\u007fabc\x00\x00",
-			&HeadersFrame{
-				FrameHeader: FrameHeader{
-					valid:    true,
-					StreamID: 42,
-					Type:     FrameHeaders,
-					Flags:    FlagHeadersEndStream | FlagHeadersEndHeaders | FlagHeadersPadded | FlagHeadersPriority,
-					Length:   uint32(1 + 5 + len("abc") + 2), // pad length + priority + contents + padding
-				},
-				Priority: PriorityParam{
-					StreamDep: 0,
-					Exclusive: true,
-					Weight:    127,
-				},
-				headerFragBuf: []byte("abc"),
-			},
-		},
-	}
-	for _, tt := range tests {
-		fr, buf := testFramer()
-		if err := fr.WriteHeaders(tt.p); err != nil {
-			t.Errorf("test %q: %v", tt.name, err)
-			continue
-		}
-		if buf.String() != tt.wantEnc {
-			t.Errorf("test %q: encoded %q; want %q", tt.name, buf.Bytes(), tt.wantEnc)
-		}
-		f, err := fr.ReadFrame()
-		if err != nil {
-			t.Errorf("test %q: failed to read the frame back: %v", tt.name, err)
-			continue
-		}
-		if !reflect.DeepEqual(f, tt.wantFrame) {
-			t.Errorf("test %q: mismatch.\n got: %#v\nwant: %#v\n", tt.name, f, tt.wantFrame)
-		}
-	}
-}
-
-func TestWriteInvalidStreamDep(t *testing.T) {
-	fr, _ := testFramer()
-	err := fr.WriteHeaders(HeadersFrameParam{
-		StreamID: 42,
-		Priority: PriorityParam{
-			StreamDep: 1 << 31,
-		},
-	})
-	if err != errDepStreamID {
-		t.Errorf("header error = %v; want %q", err, errDepStreamID)
-	}
-
-	err = fr.WritePriority(2, PriorityParam{StreamDep: 1 << 31})
-	if err != errDepStreamID {
-		t.Errorf("priority error = %v; want %q", err, errDepStreamID)
-	}
-}
-
-func TestWriteContinuation(t *testing.T) {
-	const streamID = 42
-	tests := []struct {
-		name string
-		end  bool
-		frag []byte
-
-		wantFrame *ContinuationFrame
-	}{
-		{
-			"not end",
-			false,
-			[]byte("abc"),
-			&ContinuationFrame{
-				FrameHeader: FrameHeader{
-					valid:    true,
-					StreamID: streamID,
-					Type:     FrameContinuation,
-					Length:   uint32(len("abc")),
-				},
-				headerFragBuf: []byte("abc"),
-			},
-		},
-		{
-			"end",
-			true,
-			[]byte("def"),
-			&ContinuationFrame{
-				FrameHeader: FrameHeader{
-					valid:    true,
-					StreamID: streamID,
-					Type:     FrameContinuation,
-					Flags:    FlagContinuationEndHeaders,
-					Length:   uint32(len("def")),
-				},
-				headerFragBuf: []byte("def"),
-			},
-		},
-	}
-	for _, tt := range tests {
-		fr, _ := testFramer()
-		if err := fr.WriteContinuation(streamID, tt.end, tt.frag); err != nil {
-			t.Errorf("test %q: %v", tt.name, err)
-			continue
-		}
-		fr.AllowIllegalReads = true
-		f, err := fr.ReadFrame()
-		if err != nil {
-			t.Errorf("test %q: failed to read the frame back: %v", tt.name, err)
-			continue
-		}
-		if !reflect.DeepEqual(f, tt.wantFrame) {
-			t.Errorf("test %q: mismatch.\n got: %#v\nwant: %#v\n", tt.name, f, tt.wantFrame)
-		}
-	}
-}
-
-func TestWritePriority(t *testing.T) {
-	const streamID = 42
-	tests := []struct {
-		name      string
-		priority  PriorityParam
-		wantFrame *PriorityFrame
-	}{
-		{
-			"not exclusive",
-			PriorityParam{
-				StreamDep: 2,
-				Exclusive: false,
-				Weight:    127,
-			},
-			&PriorityFrame{
-				FrameHeader{
-					valid:    true,
-					StreamID: streamID,
-					Type:     FramePriority,
-					Length:   5,
-				},
-				PriorityParam{
-					StreamDep: 2,
-					Exclusive: false,
-					Weight:    127,
-				},
-			},
-		},
-
-		{
-			"exclusive",
-			PriorityParam{
-				StreamDep: 3,
-				Exclusive: true,
-				Weight:    77,
-			},
-			&PriorityFrame{
-				FrameHeader{
-					valid:    true,
-					StreamID: streamID,
-					Type:     FramePriority,
-					Length:   5,
-				},
-				PriorityParam{
-					StreamDep: 3,
-					Exclusive: true,
-					Weight:    77,
-				},
-			},
-		},
-	}
-	for _, tt := range tests {
-		fr, _ := testFramer()
-		if err := fr.WritePriority(streamID, tt.priority); err != nil {
-			t.Errorf("test %q: %v", tt.name, err)
-			continue
-		}
-		f, err := fr.ReadFrame()
-		if err != nil {
-			t.Errorf("test %q: failed to read the frame back: %v", tt.name, err)
-			continue
-		}
-		if !reflect.DeepEqual(f, tt.wantFrame) {
-			t.Errorf("test %q: mismatch.\n got: %#v\nwant: %#v\n", tt.name, f, tt.wantFrame)
-		}
-	}
-}
-
-func TestWriteSettings(t *testing.T) {
-	fr, buf := testFramer()
-	settings := []Setting{{1, 2}, {3, 4}}
-	fr.WriteSettings(settings...)
-	const wantEnc = "\x00\x00\f\x04\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x02\x00\x03\x00\x00\x00\x04"
-	if buf.String() != wantEnc {
-		t.Errorf("encoded as %q; want %q", buf.Bytes(), wantEnc)
-	}
-	f, err := fr.ReadFrame()
-	if err != nil {
-		t.Fatal(err)
-	}
-	sf, ok := f.(*SettingsFrame)
-	if !ok {
-		t.Fatalf("Got a %T; want a SettingsFrame", f)
-	}
-	var got []Setting
-	sf.ForeachSetting(func(s Setting) error {
-		got = append(got, s)
-		valBack, ok := sf.Value(s.ID)
-		if !ok || valBack != s.Val {
-			t.Errorf("Value(%d) = %v, %v; want %v, true", s.ID, valBack, ok, s.Val)
-		}
-		return nil
-	})
-	if !reflect.DeepEqual(settings, got) {
-		t.Errorf("Read settings %+v != written settings %+v", got, settings)
-	}
-}
-
-func TestWriteSettingsAck(t *testing.T) {
-	fr, buf := testFramer()
-	fr.WriteSettingsAck()
-	const wantEnc = "\x00\x00\x00\x04\x01\x00\x00\x00\x00"
-	if buf.String() != wantEnc {
-		t.Errorf("encoded as %q; want %q", buf.Bytes(), wantEnc)
-	}
-}
-
-func TestWriteWindowUpdate(t *testing.T) {
-	fr, buf := testFramer()
-	const streamID = 1<<24 + 2<<16 + 3<<8 + 4
-	const incr = 7<<24 + 6<<16 + 5<<8 + 4
-	if err := fr.WriteWindowUpdate(streamID, incr); err != nil {
-		t.Fatal(err)
-	}
-	const wantEnc = "\x00\x00\x04\x08\x00\x01\x02\x03\x04\x07\x06\x05\x04"
-	if buf.String() != wantEnc {
-		t.Errorf("encoded as %q; want %q", buf.Bytes(), wantEnc)
-	}
-	f, err := fr.ReadFrame()
-	if err != nil {
-		t.Fatal(err)
-	}
-	want := &WindowUpdateFrame{
-		FrameHeader: FrameHeader{
-			valid:    true,
-			Type:     0x8,
-			Flags:    0x0,
-			Length:   0x4,
-			StreamID: 0x1020304,
-		},
-		Increment: 0x7060504,
-	}
-	if !reflect.DeepEqual(f, want) {
-		t.Errorf("parsed back %#v; want %#v", f, want)
-	}
-}
-
-func TestWritePing(t *testing.T)    { testWritePing(t, false) }
-func TestWritePingAck(t *testing.T) { testWritePing(t, true) }
-
-func testWritePing(t *testing.T, ack bool) {
-	fr, buf := testFramer()
-	if err := fr.WritePing(ack, [8]byte{1, 2, 3, 4, 5, 6, 7, 8}); err != nil {
-		t.Fatal(err)
-	}
-	var wantFlags Flags
-	if ack {
-		wantFlags = FlagPingAck
-	}
-	var wantEnc = "\x00\x00\x08\x06" + string(wantFlags) + "\x00\x00\x00\x00" + "\x01\x02\x03\x04\x05\x06\x07\x08"
-	if buf.String() != wantEnc {
-		t.Errorf("encoded as %q; want %q", buf.Bytes(), wantEnc)
-	}
-
-	f, err := fr.ReadFrame()
-	if err != nil {
-		t.Fatal(err)
-	}
-	want := &PingFrame{
-		FrameHeader: FrameHeader{
-			valid:    true,
-			Type:     0x6,
-			Flags:    wantFlags,
-			Length:   0x8,
-			StreamID: 0,
-		},
-		Data: [8]byte{1, 2, 3, 4, 5, 6, 7, 8},
-	}
-	if !reflect.DeepEqual(f, want) {
-		t.Errorf("parsed back %#v; want %#v", f, want)
-	}
-}
-
-func TestReadFrameHeader(t *testing.T) {
-	tests := []struct {
-		in   string
-		want FrameHeader
-	}{
-		{in: "\x00\x00\x00" + "\x00" + "\x00" + "\x00\x00\x00\x00", want: FrameHeader{}},
-		{in: "\x01\x02\x03" + "\x04" + "\x05" + "\x06\x07\x08\x09", want: FrameHeader{
-			Length: 66051, Type: 4, Flags: 5, StreamID: 101124105,
-		}},
-		// Ignore high bit:
-		{in: "\xff\xff\xff" + "\xff" + "\xff" + "\xff\xff\xff\xff", want: FrameHeader{
-			Length: 16777215, Type: 255, Flags: 255, StreamID: 2147483647}},
-		{in: "\xff\xff\xff" + "\xff" + "\xff" + "\x7f\xff\xff\xff", want: FrameHeader{
-			Length: 16777215, Type: 255, Flags: 255, StreamID: 2147483647}},
-	}
-	for i, tt := range tests {
-		got, err := readFrameHeader(make([]byte, 9), strings.NewReader(tt.in))
-		if err != nil {
-			t.Errorf("%d. readFrameHeader(%q) = %v", i, tt.in, err)
-			continue
-		}
-		tt.want.valid = true
-		if got != tt.want {
-			t.Errorf("%d. readFrameHeader(%q) = %+v; want %+v", i, tt.in, got, tt.want)
-		}
-	}
-}
-
-func TestReadWriteFrameHeader(t *testing.T) {
-	tests := []struct {
-		len      uint32
-		typ      FrameType
-		flags    Flags
-		streamID uint32
-	}{
-		{len: 0, typ: 255, flags: 1, streamID: 0},
-		{len: 0, typ: 255, flags: 1, streamID: 1},
-		{len: 0, typ: 255, flags: 1, streamID: 255},
-		{len: 0, typ: 255, flags: 1, streamID: 256},
-		{len: 0, typ: 255, flags: 1, streamID: 65535},
-		{len: 0, typ: 255, flags: 1, streamID: 65536},
-
-		{len: 0, typ: 1, flags: 255, streamID: 1},
-		{len: 255, typ: 1, flags: 255, streamID: 1},
-		{len: 256, typ: 1, flags: 255, streamID: 1},
-		{len: 65535, typ: 1, flags: 255, streamID: 1},
-		{len: 65536, typ: 1, flags: 255, streamID: 1},
-		{len: 16777215, typ: 1, flags: 255, streamID: 1},
-	}
-	for _, tt := range tests {
-		fr, buf := testFramer()
-		fr.startWrite(tt.typ, tt.flags, tt.streamID)
-		fr.writeBytes(make([]byte, tt.len))
-		fr.endWrite()
-		fh, err := ReadFrameHeader(buf)
-		if err != nil {
-			t.Errorf("ReadFrameHeader(%+v) = %v", tt, err)
-			continue
-		}
-		if fh.Type != tt.typ || fh.Flags != tt.flags || fh.Length != tt.len || fh.StreamID != tt.streamID {
-			t.Errorf("ReadFrameHeader(%+v) = %+v; mismatch", tt, fh)
-		}
-	}
-
-}
-
-func TestWriteTooLargeFrame(t *testing.T) {
-	fr, _ := testFramer()
-	fr.startWrite(0, 1, 1)
-	fr.writeBytes(make([]byte, 1<<24))
-	err := fr.endWrite()
-	if err != ErrFrameTooLarge {
-		t.Errorf("endWrite = %v; want errFrameTooLarge", err)
-	}
-}
-
-func TestWriteGoAway(t *testing.T) {
-	const debug = "foo"
-	fr, buf := testFramer()
-	if err := fr.WriteGoAway(0x01020304, 0x05060708, []byte(debug)); err != nil {
-		t.Fatal(err)
-	}
-	const wantEnc = "\x00\x00\v\a\x00\x00\x00\x00\x00\x01\x02\x03\x04\x05\x06\x07\x08" + debug
-	if buf.String() != wantEnc {
-		t.Errorf("encoded as %q; want %q", buf.Bytes(), wantEnc)
-	}
-	f, err := fr.ReadFrame()
-	if err != nil {
-		t.Fatal(err)
-	}
-	want := &GoAwayFrame{
-		FrameHeader: FrameHeader{
-			valid:    true,
-			Type:     0x7,
-			Flags:    0,
-			Length:   uint32(4 + 4 + len(debug)),
-			StreamID: 0,
-		},
-		LastStreamID: 0x01020304,
-		ErrCode:      0x05060708,
-		debugData:    []byte(debug),
-	}
-	if !reflect.DeepEqual(f, want) {
-		t.Fatalf("parsed back:\n%#v\nwant:\n%#v", f, want)
-	}
-	if got := string(f.(*GoAwayFrame).DebugData()); got != debug {
-		t.Errorf("debug data = %q; want %q", got, debug)
-	}
-}
-
-func TestWritePushPromise(t *testing.T) {
-	pp := PushPromiseParam{
-		StreamID:      42,
-		PromiseID:     42,
-		BlockFragment: []byte("abc"),
-	}
-	fr, buf := testFramer()
-	if err := fr.WritePushPromise(pp); err != nil {
-		t.Fatal(err)
-	}
-	const wantEnc = "\x00\x00\x07\x05\x00\x00\x00\x00*\x00\x00\x00*abc"
-	if buf.String() != wantEnc {
-		t.Errorf("encoded as %q; want %q", buf.Bytes(), wantEnc)
-	}
-	f, err := fr.ReadFrame()
-	if err != nil {
-		t.Fatal(err)
-	}
-	_, ok := f.(*PushPromiseFrame)
-	if !ok {
-		t.Fatalf("got %T; want *PushPromiseFrame", f)
-	}
-	want := &PushPromiseFrame{
-		FrameHeader: FrameHeader{
-			valid:    true,
-			Type:     0x5,
-			Flags:    0x0,
-			Length:   0x7,
-			StreamID: 42,
-		},
-		PromiseID:     42,
-		headerFragBuf: []byte("abc"),
-	}
-	if !reflect.DeepEqual(f, want) {
-		t.Fatalf("parsed back:\n%#v\nwant:\n%#v", f, want)
-	}
-}
-
-// test checkFrameOrder and that HEADERS and CONTINUATION frames can't be intermingled.
-func TestReadFrameOrder(t *testing.T) {
-	head := func(f *Framer, id uint32, end bool) {
-		f.WriteHeaders(HeadersFrameParam{
-			StreamID:      id,
-			BlockFragment: []byte("foo"), // unused, but non-empty
-			EndHeaders:    end,
-		})
-	}
-	cont := func(f *Framer, id uint32, end bool) {
-		f.WriteContinuation(id, end, []byte("foo"))
-	}
-
-	tests := [...]struct {
-		name    string
-		w       func(*Framer)
-		atLeast int
-		wantErr string
-	}{
-		0: {
-			w: func(f *Framer) {
-				head(f, 1, true)
-			},
-		},
-		1: {
-			w: func(f *Framer) {
-				head(f, 1, true)
-				head(f, 2, true)
-			},
-		},
-		2: {
-			wantErr: "got HEADERS for stream 2; expected CONTINUATION following HEADERS for stream 1",
-			w: func(f *Framer) {
-				head(f, 1, false)
-				head(f, 2, true)
-			},
-		},
-		3: {
-			wantErr: "got DATA for stream 1; expected CONTINUATION following HEADERS for stream 1",
-			w: func(f *Framer) {
-				head(f, 1, false)
-			},
-		},
-		4: {
-			w: func(f *Framer) {
-				head(f, 1, false)
-				cont(f, 1, true)
-				head(f, 2, true)
-			},
-		},
-		5: {
-			wantErr: "got CONTINUATION for stream 2; expected stream 1",
-			w: func(f *Framer) {
-				head(f, 1, false)
-				cont(f, 2, true)
-				head(f, 2, true)
-			},
-		},
-		6: {
-			wantErr: "unexpected CONTINUATION for stream 1",
-			w: func(f *Framer) {
-				cont(f, 1, true)
-			},
-		},
-		7: {
-			wantErr: "unexpected CONTINUATION for stream 1",
-			w: func(f *Framer) {
-				cont(f, 1, false)
-			},
-		},
-		8: {
-			wantErr: "HEADERS frame with stream ID 0",
-			w: func(f *Framer) {
-				head(f, 0, true)
-			},
-		},
-		9: {
-			wantErr: "CONTINUATION frame with stream ID 0",
-			w: func(f *Framer) {
-				cont(f, 0, true)
-			},
-		},
-		10: {
-			wantErr: "unexpected CONTINUATION for stream 1",
-			atLeast: 5,
-			w: func(f *Framer) {
-				head(f, 1, false)
-				cont(f, 1, false)
-				cont(f, 1, false)
-				cont(f, 1, false)
-				cont(f, 1, true)
-				cont(f, 1, false)
-			},
-		},
-	}
-	for i, tt := range tests {
-		buf := new(bytes.Buffer)
-		f := NewFramer(buf, buf)
-		f.AllowIllegalWrites = true
-		tt.w(f)
-		f.WriteData(1, true, nil) // to test transition away from last step
-
-		var err error
-		n := 0
-		var log bytes.Buffer
-		for {
-			var got Frame
-			got, err = f.ReadFrame()
-			fmt.Fprintf(&log, "  read %v, %v\n", got, err)
-			if err != nil {
-				break
-			}
-			n++
-		}
-		if err == io.EOF {
-			err = nil
-		}
-		ok := tt.wantErr == ""
-		if ok && err != nil {
-			t.Errorf("%d. after %d good frames, ReadFrame = %v; want success\n%s", i, n, err, log.Bytes())
-			continue
-		}
-		if !ok && err != ConnectionError(ErrCodeProtocol) {
-			t.Errorf("%d. after %d good frames, ReadFrame = %v; want ConnectionError(ErrCodeProtocol)\n%s", i, n, err, log.Bytes())
-			continue
-		}
-		if !((f.errDetail == nil && tt.wantErr == "") || (fmt.Sprint(f.errDetail) == tt.wantErr)) {
-			t.Errorf("%d. framer eror = %q; want %q\n%s", i, f.errDetail, tt.wantErr, log.Bytes())
-		}
-		if n < tt.atLeast {
-			t.Errorf("%d. framer only read %d frames; want at least %d\n%s", i, n, tt.atLeast, log.Bytes())
-		}
-	}
-}
-
-func TestMetaFrameHeader(t *testing.T) {
-	write := func(f *Framer, frags ...[]byte) {
-		for i, frag := range frags {
-			end := (i == len(frags)-1)
-			if i == 0 {
-				f.WriteHeaders(HeadersFrameParam{
-					StreamID:      1,
-					BlockFragment: frag,
-					EndHeaders:    end,
-				})
-			} else {
-				f.WriteContinuation(1, end, frag)
-			}
-		}
-	}
-
-	want := func(flags Flags, length uint32, pairs ...string) *MetaHeadersFrame {
-		mh := &MetaHeadersFrame{
-			HeadersFrame: &HeadersFrame{
-				FrameHeader: FrameHeader{
-					Type:     FrameHeaders,
-					Flags:    flags,
-					Length:   length,
-					StreamID: 1,
-				},
-			},
-			Fields: []hpack.HeaderField(nil),
-		}
-		for len(pairs) > 0 {
-			mh.Fields = append(mh.Fields, hpack.HeaderField{
-				Name:  pairs[0],
-				Value: pairs[1],
-			})
-			pairs = pairs[2:]
-		}
-		return mh
-	}
-	truncated := func(mh *MetaHeadersFrame) *MetaHeadersFrame {
-		mh.Truncated = true
-		return mh
-	}
-
-	const noFlags Flags = 0
-
-	oneKBString := strings.Repeat("a", 1<<10)
-
-	tests := [...]struct {
-		name              string
-		w                 func(*Framer)
-		want              interface{} // *MetaHeaderFrame or error
-		wantErrReason     string
-		maxHeaderListSize uint32
-	}{
-		0: {
-			name: "single_headers",
-			w: func(f *Framer) {
-				var he hpackEncoder
-				all := he.encodeHeaderRaw(t, ":method", "GET", ":path", "/")
-				write(f, all)
-			},
-			want: want(FlagHeadersEndHeaders, 2, ":method", "GET", ":path", "/"),
-		},
-		1: {
-			name: "with_continuation",
-			w: func(f *Framer) {
-				var he hpackEncoder
-				all := he.encodeHeaderRaw(t, ":method", "GET", ":path", "/", "foo", "bar")
-				write(f, all[:1], all[1:])
-			},
-			want: want(noFlags, 1, ":method", "GET", ":path", "/", "foo", "bar"),
-		},
-		2: {
-			name: "with_two_continuation",
-			w: func(f *Framer) {
-				var he hpackEncoder
-				all := he.encodeHeaderRaw(t, ":method", "GET", ":path", "/", "foo", "bar")
-				write(f, all[:2], all[2:4], all[4:])
-			},
-			want: want(noFlags, 2, ":method", "GET", ":path", "/", "foo", "bar"),
-		},
-		3: {
-			name: "big_string_okay",
-			w: func(f *Framer) {
-				var he hpackEncoder
-				all := he.encodeHeaderRaw(t, ":method", "GET", ":path", "/", "foo", oneKBString)
-				write(f, all[:2], all[2:])
-			},
-			want: want(noFlags, 2, ":method", "GET", ":path", "/", "foo", oneKBString),
-		},
-		4: {
-			name: "big_string_error",
-			w: func(f *Framer) {
-				var he hpackEncoder
-				all := he.encodeHeaderRaw(t, ":method", "GET", ":path", "/", "foo", oneKBString)
-				write(f, all[:2], all[2:])
-			},
-			maxHeaderListSize: (1 << 10) / 2,
-			want:              ConnectionError(ErrCodeCompression),
-		},
-		5: {
-			name: "max_header_list_truncated",
-			w: func(f *Framer) {
-				var he hpackEncoder
-				var pairs = []string{":method", "GET", ":path", "/"}
-				for i := 0; i < 100; i++ {
-					pairs = append(pairs, "foo", "bar")
-				}
-				all := he.encodeHeaderRaw(t, pairs...)
-				write(f, all[:2], all[2:])
-			},
-			maxHeaderListSize: (1 << 10) / 2,
-			want: truncated(want(noFlags, 2,
-				":method", "GET",
-				":path", "/",
-				"foo", "bar",
-				"foo", "bar",
-				"foo", "bar",
-				"foo", "bar",
-				"foo", "bar",
-				"foo", "bar",
-				"foo", "bar",
-				"foo", "bar",
-				"foo", "bar",
-				"foo", "bar",
-				"foo", "bar", // 11
-			)),
-		},
-		6: {
-			name: "pseudo_order",
-			w: func(f *Framer) {
-				write(f, encodeHeaderRaw(t,
-					":method", "GET",
-					"foo", "bar",
-					":path", "/", // bogus
-				))
-			},
-			want:          streamError(1, ErrCodeProtocol),
-			wantErrReason: "pseudo header field after regular",
-		},
-		7: {
-			name: "pseudo_unknown",
-			w: func(f *Framer) {
-				write(f, encodeHeaderRaw(t,
-					":unknown", "foo", // bogus
-					"foo", "bar",
-				))
-			},
-			want:          streamError(1, ErrCodeProtocol),
-			wantErrReason: "invalid pseudo-header \":unknown\"",
-		},
-		8: {
-			name: "pseudo_mix_request_response",
-			w: func(f *Framer) {
-				write(f, encodeHeaderRaw(t,
-					":method", "GET",
-					":status", "100",
-				))
-			},
-			want:          streamError(1, ErrCodeProtocol),
-			wantErrReason: "mix of request and response pseudo headers",
-		},
-		9: {
-			name: "pseudo_dup",
-			w: func(f *Framer) {
-				write(f, encodeHeaderRaw(t,
-					":method", "GET",
-					":method", "POST",
-				))
-			},
-			want:          streamError(1, ErrCodeProtocol),
-			wantErrReason: "duplicate pseudo-header \":method\"",
-		},
-		10: {
-			name: "trailer_okay_no_pseudo",
-			w:    func(f *Framer) { write(f, encodeHeaderRaw(t, "foo", "bar")) },
-			want: want(FlagHeadersEndHeaders, 8, "foo", "bar"),
-		},
-		11: {
-			name:          "invalid_field_name",
-			w:             func(f *Framer) { write(f, encodeHeaderRaw(t, "CapitalBad", "x")) },
-			want:          streamError(1, ErrCodeProtocol),
-			wantErrReason: "invalid header field name \"CapitalBad\"",
-		},
-		12: {
-			name:          "invalid_field_value",
-			w:             func(f *Framer) { write(f, encodeHeaderRaw(t, "key", "bad_null\x00")) },
-			want:          streamError(1, ErrCodeProtocol),
-			wantErrReason: "invalid header field value \"bad_null\\x00\"",
-		},
-	}
-	for i, tt := range tests {
-		buf := new(bytes.Buffer)
-		f := NewFramer(buf, buf)
-		f.ReadMetaHeaders = hpack.NewDecoder(initialHeaderTableSize, nil)
-		f.MaxHeaderListSize = tt.maxHeaderListSize
-		tt.w(f)
-
-		name := tt.name
-		if name == "" {
-			name = fmt.Sprintf("test index %d", i)
-		}
-
-		var got interface{}
-		var err error
-		got, err = f.ReadFrame()
-		if err != nil {
-			got = err
-
-			// Ignore the StreamError.Cause field, if it matches the wantErrReason.
-			// The test table above predates the Cause field.
-			if se, ok := err.(StreamError); ok && se.Cause != nil && se.Cause.Error() == tt.wantErrReason {
-				se.Cause = nil
-				got = se
-			}
-		}
-		if !reflect.DeepEqual(got, tt.want) {
-			if mhg, ok := got.(*MetaHeadersFrame); ok {
-				if mhw, ok := tt.want.(*MetaHeadersFrame); ok {
-					hg := mhg.HeadersFrame
-					hw := mhw.HeadersFrame
-					if hg != nil && hw != nil && !reflect.DeepEqual(*hg, *hw) {
-						t.Errorf("%s: headers differ:\n got: %+v\nwant: %+v\n", name, *hg, *hw)
-					}
-				}
-			}
-			str := func(v interface{}) string {
-				if _, ok := v.(error); ok {
-					return fmt.Sprintf("error %v", v)
-				} else {
-					return fmt.Sprintf("value %#v", v)
-				}
-			}
-			t.Errorf("%s:\n got: %v\nwant: %s", name, str(got), str(tt.want))
-		}
-		if tt.wantErrReason != "" && tt.wantErrReason != fmt.Sprint(f.errDetail) {
-			t.Errorf("%s: got error reason %q; want %q", name, f.errDetail, tt.wantErrReason)
-		}
-	}
-}
-
-func TestSetReuseFrames(t *testing.T) {
-	fr, buf := testFramer()
-	fr.SetReuseFrames()
-
-	// Check that DataFrames are reused. Note that
-	// SetReuseFrames only currently implements reuse of DataFrames.
-	firstDf := readAndVerifyDataFrame("ABC", 3, fr, buf, t)
-
-	for i := 0; i < 10; i++ {
-		df := readAndVerifyDataFrame("XYZ", 3, fr, buf, t)
-		if df != firstDf {
-			t.Errorf("Expected Framer to return references to the same DataFrame. Have %v and %v", &df, &firstDf)
-		}
-	}
-
-	for i := 0; i < 10; i++ {
-		df := readAndVerifyDataFrame("", 0, fr, buf, t)
-		if df != firstDf {
-			t.Errorf("Expected Framer to return references to the same DataFrame. Have %v and %v", &df, &firstDf)
-		}
-	}
-
-	for i := 0; i < 10; i++ {
-		df := readAndVerifyDataFrame("HHH", 3, fr, buf, t)
-		if df != firstDf {
-			t.Errorf("Expected Framer to return references to the same DataFrame. Have %v and %v", &df, &firstDf)
-		}
-	}
-}
-
-func TestSetReuseFramesMoreThanOnce(t *testing.T) {
-	fr, buf := testFramer()
-	fr.SetReuseFrames()
-
-	firstDf := readAndVerifyDataFrame("ABC", 3, fr, buf, t)
-	fr.SetReuseFrames()
-
-	for i := 0; i < 10; i++ {
-		df := readAndVerifyDataFrame("XYZ", 3, fr, buf, t)
-		// SetReuseFrames should be idempotent
-		fr.SetReuseFrames()
-		if df != firstDf {
-			t.Errorf("Expected Framer to return references to the same DataFrame. Have %v and %v", &df, &firstDf)
-		}
-	}
-}
-
-func TestNoSetReuseFrames(t *testing.T) {
-	fr, buf := testFramer()
-	const numNewDataFrames = 10
-	dfSoFar := make([]interface{}, numNewDataFrames)
-
-	// Check that DataFrames are not reused if SetReuseFrames wasn't called.
-	// SetReuseFrames only currently implements reuse of DataFrames.
-	for i := 0; i < numNewDataFrames; i++ {
-		df := readAndVerifyDataFrame("XYZ", 3, fr, buf, t)
-		for _, item := range dfSoFar {
-			if df == item {
-				t.Errorf("Expected Framer to return new DataFrames since SetNoReuseFrames not set.")
-			}
-		}
-		dfSoFar[i] = df
-	}
-}
-
-func readAndVerifyDataFrame(data string, length byte, fr *Framer, buf *bytes.Buffer, t *testing.T) *DataFrame {
-	var streamID uint32 = 1<<24 + 2<<16 + 3<<8 + 4
-	fr.WriteData(streamID, true, []byte(data))
-	wantEnc := "\x00\x00" + string(length) + "\x00\x01\x01\x02\x03\x04" + data
-	if buf.String() != wantEnc {
-		t.Errorf("encoded as %q; want %q", buf.Bytes(), wantEnc)
-	}
-	f, err := fr.ReadFrame()
-	if err != nil {
-		t.Fatal(err)
-	}
-	df, ok := f.(*DataFrame)
-	if !ok {
-		t.Fatalf("got %T; want *DataFrame", f)
-	}
-	if !bytes.Equal(df.Data(), []byte(data)) {
-		t.Errorf("got %q; want %q", df.Data(), []byte(data))
-	}
-	if f.Header().Flags&1 == 0 {
-		t.Errorf("didn't see END_STREAM flag")
-	}
-	return df
-}
-
-func encodeHeaderRaw(t *testing.T, pairs ...string) []byte {
-	var he hpackEncoder
-	return he.encodeHeaderRaw(t, pairs...)
-}
diff --git a/vendor/golang.org/x/net/http2/go111.go b/vendor/golang.org/x/net/http2/go111.go
new file mode 100644
index 00000000..9749dc0b
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/go111.go
@@ -0,0 +1,26 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build go1.11
+
+package http2
+
+import "net/textproto"
+
+func traceHasWroteHeaderField(trace *clientTrace) bool {
+	return trace != nil && trace.WroteHeaderField != nil
+}
+
+func traceWroteHeaderField(trace *clientTrace, k, v string) {
+	if trace != nil && trace.WroteHeaderField != nil {
+		trace.WroteHeaderField(k, []string{v})
+	}
+}
+
+func traceGot1xxResponseFunc(trace *clientTrace) func(int, textproto.MIMEHeader) error {
+	if trace != nil {
+		return trace.Got1xxResponse
+	}
+	return nil
+}
diff --git a/vendor/golang.org/x/net/http2/go17.go b/vendor/golang.org/x/net/http2/go17.go
index 47b7fae0..d957b7bc 100644
--- a/vendor/golang.org/x/net/http2/go17.go
+++ b/vendor/golang.org/x/net/http2/go17.go
@@ -18,6 +18,8 @@ type contextContext interface {
 	context.Context
 }
 
+var errCanceled = context.Canceled
+
 func serverConnBaseContext(c net.Conn, opts *ServeConnOpts) (ctx contextContext, cancel func()) {
 	ctx, cancel = context.WithCancel(context.Background())
 	ctx = context.WithValue(ctx, http.LocalAddrContextKey, c.LocalAddr())
@@ -48,6 +50,14 @@ func (t *Transport) idleConnTimeout() time.Duration {
 
 func setResponseUncompressed(res *http.Response) { res.Uncompressed = true }
 
+func traceGetConn(req *http.Request, hostPort string) {
+	trace := httptrace.ContextClientTrace(req.Context())
+	if trace == nil || trace.GetConn == nil {
+		return
+	}
+	trace.GetConn(hostPort)
+}
+
 func traceGotConn(req *http.Request, cc *ClientConn) {
 	trace := httptrace.ContextClientTrace(req.Context())
 	if trace == nil || trace.GotConn == nil {
@@ -104,3 +114,8 @@ func requestTrace(req *http.Request) *clientTrace {
 func (cc *ClientConn) Ping(ctx context.Context) error {
 	return cc.ping(ctx)
 }
+
+// Shutdown gracefully closes the client connection, waiting for running streams to complete.
+func (cc *ClientConn) Shutdown(ctx context.Context) error {
+	return cc.shutdown(ctx)
+}
diff --git a/vendor/golang.org/x/net/http2/go18_test.go b/vendor/golang.org/x/net/http2/go18_test.go
deleted file mode 100644
index 30e3b038..00000000
--- a/vendor/golang.org/x/net/http2/go18_test.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.8
-
-package http2
-
-import (
-	"crypto/tls"
-	"net/http"
-	"testing"
-	"time"
-)
-
-// Tests that http2.Server.IdleTimeout is initialized from
-// http.Server.{Idle,Read}Timeout. http.Server.IdleTimeout was
-// added in Go 1.8.
-func TestConfigureServerIdleTimeout_Go18(t *testing.T) {
-	const timeout = 5 * time.Second
-	const notThisOne = 1 * time.Second
-
-	// With a zero http2.Server, verify that it copies IdleTimeout:
-	{
-		s1 := &http.Server{
-			IdleTimeout: timeout,
-			ReadTimeout: notThisOne,
-		}
-		s2 := &Server{}
-		if err := ConfigureServer(s1, s2); err != nil {
-			t.Fatal(err)
-		}
-		if s2.IdleTimeout != timeout {
-			t.Errorf("s2.IdleTimeout = %v; want %v", s2.IdleTimeout, timeout)
-		}
-	}
-
-	// And that it falls back to ReadTimeout:
-	{
-		s1 := &http.Server{
-			ReadTimeout: timeout,
-		}
-		s2 := &Server{}
-		if err := ConfigureServer(s1, s2); err != nil {
-			t.Fatal(err)
-		}
-		if s2.IdleTimeout != timeout {
-			t.Errorf("s2.IdleTimeout = %v; want %v", s2.IdleTimeout, timeout)
-		}
-	}
-
-	// Verify that s1's IdleTimeout doesn't overwrite an existing setting:
-	{
-		s1 := &http.Server{
-			IdleTimeout: notThisOne,
-		}
-		s2 := &Server{
-			IdleTimeout: timeout,
-		}
-		if err := ConfigureServer(s1, s2); err != nil {
-			t.Fatal(err)
-		}
-		if s2.IdleTimeout != timeout {
-			t.Errorf("s2.IdleTimeout = %v; want %v", s2.IdleTimeout, timeout)
-		}
-	}
-}
-
-func TestCertClone(t *testing.T) {
-	c := &tls.Config{
-		GetClientCertificate: func(*tls.CertificateRequestInfo) (*tls.Certificate, error) {
-			panic("shouldn't be called")
-		},
-	}
-	c2 := cloneTLSConfig(c)
-	if c2.GetClientCertificate == nil {
-		t.Error("GetClientCertificate is nil")
-	}
-}
diff --git a/vendor/golang.org/x/net/http2/go19_test.go b/vendor/golang.org/x/net/http2/go19_test.go
deleted file mode 100644
index 22b00066..00000000
--- a/vendor/golang.org/x/net/http2/go19_test.go
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.9
-
-package http2
-
-import (
-	"context"
-	"net/http"
-	"reflect"
-	"testing"
-	"time"
-)
-
-func TestServerGracefulShutdown(t *testing.T) {
-	var st *serverTester
-	handlerDone := make(chan struct{})
-	st = newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		defer close(handlerDone)
-		go st.ts.Config.Shutdown(context.Background())
-
-		ga := st.wantGoAway()
-		if ga.ErrCode != ErrCodeNo {
-			t.Errorf("GOAWAY error = %v; want ErrCodeNo", ga.ErrCode)
-		}
-		if ga.LastStreamID != 1 {
-			t.Errorf("GOAWAY LastStreamID = %v; want 1", ga.LastStreamID)
-		}
-
-		w.Header().Set("x-foo", "bar")
-	})
-	defer st.Close()
-
-	st.greet()
-	st.bodylessReq1()
-
-	select {
-	case <-handlerDone:
-	case <-time.After(5 * time.Second):
-		t.Fatalf("server did not shutdown?")
-	}
-	hf := st.wantHeaders()
-	goth := st.decodeHeader(hf.HeaderBlockFragment())
-	wanth := [][2]string{
-		{":status", "200"},
-		{"x-foo", "bar"},
-		{"content-length", "0"},
-	}
-	if !reflect.DeepEqual(goth, wanth) {
-		t.Errorf("Got headers %v; want %v", goth, wanth)
-	}
-
-	n, err := st.cc.Read([]byte{0})
-	if n != 0 || err == nil {
-		t.Errorf("Read = %v, %v; want 0, non-nil", n, err)
-	}
-}
diff --git a/vendor/golang.org/x/net/http2/gotrack_test.go b/vendor/golang.org/x/net/http2/gotrack_test.go
deleted file mode 100644
index 06db6123..00000000
--- a/vendor/golang.org/x/net/http2/gotrack_test.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import (
-	"fmt"
-	"strings"
-	"testing"
-)
-
-func TestGoroutineLock(t *testing.T) {
-	oldDebug := DebugGoroutines
-	DebugGoroutines = true
-	defer func() { DebugGoroutines = oldDebug }()
-
-	g := newGoroutineLock()
-	g.check()
-
-	sawPanic := make(chan interface{})
-	go func() {
-		defer func() { sawPanic <- recover() }()
-		g.check() // should panic
-	}()
-	e := <-sawPanic
-	if e == nil {
-		t.Fatal("did not see panic from check in other goroutine")
-	}
-	if !strings.Contains(fmt.Sprint(e), "wrong goroutine") {
-		t.Errorf("expected on see panic about running on the wrong goroutine; got %v", e)
-	}
-}
diff --git a/vendor/golang.org/x/net/http2/hpack/encode_test.go b/vendor/golang.org/x/net/http2/hpack/encode_test.go
deleted file mode 100644
index 05f12db9..00000000
--- a/vendor/golang.org/x/net/http2/hpack/encode_test.go
+++ /dev/null
@@ -1,386 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package hpack
-
-import (
-	"bytes"
-	"encoding/hex"
-	"fmt"
-	"math/rand"
-	"reflect"
-	"strings"
-	"testing"
-)
-
-func TestEncoderTableSizeUpdate(t *testing.T) {
-	tests := []struct {
-		size1, size2 uint32
-		wantHex      string
-	}{
-		// Should emit 2 table size updates (2048 and 4096)
-		{2048, 4096, "3fe10f 3fe11f 82"},
-
-		// Should emit 1 table size update (2048)
-		{16384, 2048, "3fe10f 82"},
-	}
-	for _, tt := range tests {
-		var buf bytes.Buffer
-		e := NewEncoder(&buf)
-		e.SetMaxDynamicTableSize(tt.size1)
-		e.SetMaxDynamicTableSize(tt.size2)
-		if err := e.WriteField(pair(":method", "GET")); err != nil {
-			t.Fatal(err)
-		}
-		want := removeSpace(tt.wantHex)
-		if got := hex.EncodeToString(buf.Bytes()); got != want {
-			t.Errorf("e.SetDynamicTableSize %v, %v = %q; want %q", tt.size1, tt.size2, got, want)
-		}
-	}
-}
-
-func TestEncoderWriteField(t *testing.T) {
-	var buf bytes.Buffer
-	e := NewEncoder(&buf)
-	var got []HeaderField
-	d := NewDecoder(4<<10, func(f HeaderField) {
-		got = append(got, f)
-	})
-
-	tests := []struct {
-		hdrs []HeaderField
-	}{
-		{[]HeaderField{
-			pair(":method", "GET"),
-			pair(":scheme", "http"),
-			pair(":path", "/"),
-			pair(":authority", "www.example.com"),
-		}},
-		{[]HeaderField{
-			pair(":method", "GET"),
-			pair(":scheme", "http"),
-			pair(":path", "/"),
-			pair(":authority", "www.example.com"),
-			pair("cache-control", "no-cache"),
-		}},
-		{[]HeaderField{
-			pair(":method", "GET"),
-			pair(":scheme", "https"),
-			pair(":path", "/index.html"),
-			pair(":authority", "www.example.com"),
-			pair("custom-key", "custom-value"),
-		}},
-	}
-	for i, tt := range tests {
-		buf.Reset()
-		got = got[:0]
-		for _, hf := range tt.hdrs {
-			if err := e.WriteField(hf); err != nil {
-				t.Fatal(err)
-			}
-		}
-		_, err := d.Write(buf.Bytes())
-		if err != nil {
-			t.Errorf("%d. Decoder Write = %v", i, err)
-		}
-		if !reflect.DeepEqual(got, tt.hdrs) {
-			t.Errorf("%d. Decoded %+v; want %+v", i, got, tt.hdrs)
-		}
-	}
-}
-
-func TestEncoderSearchTable(t *testing.T) {
-	e := NewEncoder(nil)
-
-	e.dynTab.add(pair("foo", "bar"))
-	e.dynTab.add(pair("blake", "miz"))
-	e.dynTab.add(pair(":method", "GET"))
-
-	tests := []struct {
-		hf        HeaderField
-		wantI     uint64
-		wantMatch bool
-	}{
-		// Name and Value match
-		{pair("foo", "bar"), uint64(staticTable.len()) + 3, true},
-		{pair("blake", "miz"), uint64(staticTable.len()) + 2, true},
-		{pair(":method", "GET"), 2, true},
-
-		// Only name match because Sensitive == true. This is allowed to match
-		// any ":method" entry. The current implementation uses the last entry
-		// added in newStaticTable.
-		{HeaderField{":method", "GET", true}, 3, false},
-
-		// Only Name matches
-		{pair("foo", "..."), uint64(staticTable.len()) + 3, false},
-		{pair("blake", "..."), uint64(staticTable.len()) + 2, false},
-		// As before, this is allowed to match any ":method" entry.
-		{pair(":method", "..."), 3, false},
-
-		// None match
-		{pair("foo-", "bar"), 0, false},
-	}
-	for _, tt := range tests {
-		if gotI, gotMatch := e.searchTable(tt.hf); gotI != tt.wantI || gotMatch != tt.wantMatch {
-			t.Errorf("d.search(%+v) = %v, %v; want %v, %v", tt.hf, gotI, gotMatch, tt.wantI, tt.wantMatch)
-		}
-	}
-}
-
-func TestAppendVarInt(t *testing.T) {
-	tests := []struct {
-		n    byte
-		i    uint64
-		want []byte
-	}{
-		// Fits in a byte:
-		{1, 0, []byte{0}},
-		{2, 2, []byte{2}},
-		{3, 6, []byte{6}},
-		{4, 14, []byte{14}},
-		{5, 30, []byte{30}},
-		{6, 62, []byte{62}},
-		{7, 126, []byte{126}},
-		{8, 254, []byte{254}},
-
-		// Multiple bytes:
-		{5, 1337, []byte{31, 154, 10}},
-	}
-	for _, tt := range tests {
-		got := appendVarInt(nil, tt.n, tt.i)
-		if !bytes.Equal(got, tt.want) {
-			t.Errorf("appendVarInt(nil, %v, %v) = %v; want %v", tt.n, tt.i, got, tt.want)
-		}
-	}
-}
-
-func TestAppendHpackString(t *testing.T) {
-	tests := []struct {
-		s, wantHex string
-	}{
-		// Huffman encoded
-		{"www.example.com", "8c f1e3 c2e5 f23a 6ba0 ab90 f4ff"},
-
-		// Not Huffman encoded
-		{"a", "01 61"},
-
-		// zero length
-		{"", "00"},
-	}
-	for _, tt := range tests {
-		want := removeSpace(tt.wantHex)
-		buf := appendHpackString(nil, tt.s)
-		if got := hex.EncodeToString(buf); want != got {
-			t.Errorf("appendHpackString(nil, %q) = %q; want %q", tt.s, got, want)
-		}
-	}
-}
-
-func TestAppendIndexed(t *testing.T) {
-	tests := []struct {
-		i       uint64
-		wantHex string
-	}{
-		// 1 byte
-		{1, "81"},
-		{126, "fe"},
-
-		// 2 bytes
-		{127, "ff00"},
-		{128, "ff01"},
-	}
-	for _, tt := range tests {
-		want := removeSpace(tt.wantHex)
-		buf := appendIndexed(nil, tt.i)
-		if got := hex.EncodeToString(buf); want != got {
-			t.Errorf("appendIndex(nil, %v) = %q; want %q", tt.i, got, want)
-		}
-	}
-}
-
-func TestAppendNewName(t *testing.T) {
-	tests := []struct {
-		f        HeaderField
-		indexing bool
-		wantHex  string
-	}{
-		// Incremental indexing
-		{HeaderField{"custom-key", "custom-value", false}, true, "40 88 25a8 49e9 5ba9 7d7f 89 25a8 49e9 5bb8 e8b4 bf"},
-
-		// Without indexing
-		{HeaderField{"custom-key", "custom-value", false}, false, "00 88 25a8 49e9 5ba9 7d7f 89 25a8 49e9 5bb8 e8b4 bf"},
-
-		// Never indexed
-		{HeaderField{"custom-key", "custom-value", true}, true, "10 88 25a8 49e9 5ba9 7d7f 89 25a8 49e9 5bb8 e8b4 bf"},
-		{HeaderField{"custom-key", "custom-value", true}, false, "10 88 25a8 49e9 5ba9 7d7f 89 25a8 49e9 5bb8 e8b4 bf"},
-	}
-	for _, tt := range tests {
-		want := removeSpace(tt.wantHex)
-		buf := appendNewName(nil, tt.f, tt.indexing)
-		if got := hex.EncodeToString(buf); want != got {
-			t.Errorf("appendNewName(nil, %+v, %v) = %q; want %q", tt.f, tt.indexing, got, want)
-		}
-	}
-}
-
-func TestAppendIndexedName(t *testing.T) {
-	tests := []struct {
-		f        HeaderField
-		i        uint64
-		indexing bool
-		wantHex  string
-	}{
-		// Incremental indexing
-		{HeaderField{":status", "302", false}, 8, true, "48 82 6402"},
-
-		// Without indexing
-		{HeaderField{":status", "302", false}, 8, false, "08 82 6402"},
-
-		// Never indexed
-		{HeaderField{":status", "302", true}, 8, true, "18 82 6402"},
-		{HeaderField{":status", "302", true}, 8, false, "18 82 6402"},
-	}
-	for _, tt := range tests {
-		want := removeSpace(tt.wantHex)
-		buf := appendIndexedName(nil, tt.f, tt.i, tt.indexing)
-		if got := hex.EncodeToString(buf); want != got {
-			t.Errorf("appendIndexedName(nil, %+v, %v) = %q; want %q", tt.f, tt.indexing, got, want)
-		}
-	}
-}
-
-func TestAppendTableSize(t *testing.T) {
-	tests := []struct {
-		i       uint32
-		wantHex string
-	}{
-		// Fits into 1 byte
-		{30, "3e"},
-
-		// Extra byte
-		{31, "3f00"},
-		{32, "3f01"},
-	}
-	for _, tt := range tests {
-		want := removeSpace(tt.wantHex)
-		buf := appendTableSize(nil, tt.i)
-		if got := hex.EncodeToString(buf); want != got {
-			t.Errorf("appendTableSize(nil, %v) = %q; want %q", tt.i, got, want)
-		}
-	}
-}
-
-func TestEncoderSetMaxDynamicTableSize(t *testing.T) {
-	var buf bytes.Buffer
-	e := NewEncoder(&buf)
-	tests := []struct {
-		v           uint32
-		wantUpdate  bool
-		wantMinSize uint32
-		wantMaxSize uint32
-	}{
-		// Set new table size to 2048
-		{2048, true, 2048, 2048},
-
-		// Set new table size to 16384, but still limited to
-		// 4096
-		{16384, true, 2048, 4096},
-	}
-	for _, tt := range tests {
-		e.SetMaxDynamicTableSize(tt.v)
-		if got := e.tableSizeUpdate; tt.wantUpdate != got {
-			t.Errorf("e.tableSizeUpdate = %v; want %v", got, tt.wantUpdate)
-		}
-		if got := e.minSize; tt.wantMinSize != got {
-			t.Errorf("e.minSize = %v; want %v", got, tt.wantMinSize)
-		}
-		if got := e.dynTab.maxSize; tt.wantMaxSize != got {
-			t.Errorf("e.maxSize = %v; want %v", got, tt.wantMaxSize)
-		}
-	}
-}
-
-func TestEncoderSetMaxDynamicTableSizeLimit(t *testing.T) {
-	e := NewEncoder(nil)
-	// 4095 < initialHeaderTableSize means maxSize is truncated to
-	// 4095.
-	e.SetMaxDynamicTableSizeLimit(4095)
-	if got, want := e.dynTab.maxSize, uint32(4095); got != want {
-		t.Errorf("e.dynTab.maxSize = %v; want %v", got, want)
-	}
-	if got, want := e.maxSizeLimit, uint32(4095); got != want {
-		t.Errorf("e.maxSizeLimit = %v; want %v", got, want)
-	}
-	if got, want := e.tableSizeUpdate, true; got != want {
-		t.Errorf("e.tableSizeUpdate = %v; want %v", got, want)
-	}
-	// maxSize will be truncated to maxSizeLimit
-	e.SetMaxDynamicTableSize(16384)
-	if got, want := e.dynTab.maxSize, uint32(4095); got != want {
-		t.Errorf("e.dynTab.maxSize = %v; want %v", got, want)
-	}
-	// 8192 > current maxSizeLimit, so maxSize does not change.
-	e.SetMaxDynamicTableSizeLimit(8192)
-	if got, want := e.dynTab.maxSize, uint32(4095); got != want {
-		t.Errorf("e.dynTab.maxSize = %v; want %v", got, want)
-	}
-	if got, want := e.maxSizeLimit, uint32(8192); got != want {
-		t.Errorf("e.maxSizeLimit = %v; want %v", got, want)
-	}
-}
-
-func removeSpace(s string) string {
-	return strings.Replace(s, " ", "", -1)
-}
-
-func BenchmarkEncoderSearchTable(b *testing.B) {
-	e := NewEncoder(nil)
-
-	// A sample of possible header fields.
-	// This is not based on any actual data from HTTP/2 traces.
-	var possible []HeaderField
-	for _, f := range staticTable.ents {
-		if f.Value == "" {
-			possible = append(possible, f)
-			continue
-		}
-		// Generate 5 random values, except for cookie and set-cookie,
-		// which we know can have many values in practice.
-		num := 5
-		if f.Name == "cookie" || f.Name == "set-cookie" {
-			num = 25
-		}
-		for i := 0; i < num; i++ {
-			f.Value = fmt.Sprintf("%s-%d", f.Name, i)
-			possible = append(possible, f)
-		}
-	}
-	for k := 0; k < 10; k++ {
-		f := HeaderField{
-			Name:      fmt.Sprintf("x-header-%d", k),
-			Sensitive: rand.Int()%2 == 0,
-		}
-		for i := 0; i < 5; i++ {
-			f.Value = fmt.Sprintf("%s-%d", f.Name, i)
-			possible = append(possible, f)
-		}
-	}
-
-	// Add a random sample to the dynamic table. This very loosely simulates
-	// a history of 100 requests with 20 header fields per request.
-	for r := 0; r < 100*20; r++ {
-		f := possible[rand.Int31n(int32(len(possible)))]
-		// Skip if this is in the staticTable verbatim.
-		if _, has := staticTable.search(f); !has {
-			e.dynTab.add(f)
-		}
-	}
-
-	b.ResetTimer()
-	for n := 0; n < b.N; n++ {
-		for _, f := range possible {
-			e.searchTable(f)
-		}
-	}
-}
diff --git a/vendor/golang.org/x/net/http2/hpack/hpack_test.go b/vendor/golang.org/x/net/http2/hpack/hpack_test.go
deleted file mode 100644
index 974c35f0..00000000
--- a/vendor/golang.org/x/net/http2/hpack/hpack_test.go
+++ /dev/null
@@ -1,741 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package hpack
-
-import (
-	"bytes"
-	"encoding/hex"
-	"fmt"
-	"math/rand"
-	"reflect"
-	"strings"
-	"testing"
-	"time"
-)
-
-func (d *Decoder) mustAt(idx int) HeaderField {
-	if hf, ok := d.at(uint64(idx)); !ok {
-		panic(fmt.Sprintf("bogus index %d", idx))
-	} else {
-		return hf
-	}
-}
-
-func TestDynamicTableAt(t *testing.T) {
-	d := NewDecoder(4096, nil)
-	at := d.mustAt
-	if got, want := at(2), (pair(":method", "GET")); got != want {
-		t.Errorf("at(2) = %v; want %v", got, want)
-	}
-	d.dynTab.add(pair("foo", "bar"))
-	d.dynTab.add(pair("blake", "miz"))
-	if got, want := at(staticTable.len()+1), (pair("blake", "miz")); got != want {
-		t.Errorf("at(dyn 1) = %v; want %v", got, want)
-	}
-	if got, want := at(staticTable.len()+2), (pair("foo", "bar")); got != want {
-		t.Errorf("at(dyn 2) = %v; want %v", got, want)
-	}
-	if got, want := at(3), (pair(":method", "POST")); got != want {
-		t.Errorf("at(3) = %v; want %v", got, want)
-	}
-}
-
-func TestDynamicTableSizeEvict(t *testing.T) {
-	d := NewDecoder(4096, nil)
-	if want := uint32(0); d.dynTab.size != want {
-		t.Fatalf("size = %d; want %d", d.dynTab.size, want)
-	}
-	add := d.dynTab.add
-	add(pair("blake", "eats pizza"))
-	if want := uint32(15 + 32); d.dynTab.size != want {
-		t.Fatalf("after pizza, size = %d; want %d", d.dynTab.size, want)
-	}
-	add(pair("foo", "bar"))
-	if want := uint32(15 + 32 + 6 + 32); d.dynTab.size != want {
-		t.Fatalf("after foo bar, size = %d; want %d", d.dynTab.size, want)
-	}
-	d.dynTab.setMaxSize(15 + 32 + 1 /* slop */)
-	if want := uint32(6 + 32); d.dynTab.size != want {
-		t.Fatalf("after setMaxSize, size = %d; want %d", d.dynTab.size, want)
-	}
-	if got, want := d.mustAt(staticTable.len()+1), (pair("foo", "bar")); got != want {
-		t.Errorf("at(dyn 1) = %v; want %v", got, want)
-	}
-	add(pair("long", strings.Repeat("x", 500)))
-	if want := uint32(0); d.dynTab.size != want {
-		t.Fatalf("after big one, size = %d; want %d", d.dynTab.size, want)
-	}
-}
-
-func TestDecoderDecode(t *testing.T) {
-	tests := []struct {
-		name       string
-		in         []byte
-		want       []HeaderField
-		wantDynTab []HeaderField // newest entry first
-	}{
-		// C.2.1 Literal Header Field with Indexing
-		// http://http2.github.io/http2-spec/compression.html#rfc.section.C.2.1
-		{"C.2.1", dehex("400a 6375 7374 6f6d 2d6b 6579 0d63 7573 746f 6d2d 6865 6164 6572"),
-			[]HeaderField{pair("custom-key", "custom-header")},
-			[]HeaderField{pair("custom-key", "custom-header")},
-		},
-
-		// C.2.2 Literal Header Field without Indexing
-		// http://http2.github.io/http2-spec/compression.html#rfc.section.C.2.2
-		{"C.2.2", dehex("040c 2f73 616d 706c 652f 7061 7468"),
-			[]HeaderField{pair(":path", "/sample/path")},
-			[]HeaderField{}},
-
-		// C.2.3 Literal Header Field never Indexed
-		// http://http2.github.io/http2-spec/compression.html#rfc.section.C.2.3
-		{"C.2.3", dehex("1008 7061 7373 776f 7264 0673 6563 7265 74"),
-			[]HeaderField{{"password", "secret", true}},
-			[]HeaderField{}},
-
-		// C.2.4 Indexed Header Field
-		// http://http2.github.io/http2-spec/compression.html#rfc.section.C.2.4
-		{"C.2.4", []byte("\x82"),
-			[]HeaderField{pair(":method", "GET")},
-			[]HeaderField{}},
-	}
-	for _, tt := range tests {
-		d := NewDecoder(4096, nil)
-		hf, err := d.DecodeFull(tt.in)
-		if err != nil {
-			t.Errorf("%s: %v", tt.name, err)
-			continue
-		}
-		if !reflect.DeepEqual(hf, tt.want) {
-			t.Errorf("%s: Got %v; want %v", tt.name, hf, tt.want)
-		}
-		gotDynTab := d.dynTab.reverseCopy()
-		if !reflect.DeepEqual(gotDynTab, tt.wantDynTab) {
-			t.Errorf("%s: dynamic table after = %v; want %v", tt.name, gotDynTab, tt.wantDynTab)
-		}
-	}
-}
-
-func (dt *dynamicTable) reverseCopy() (hf []HeaderField) {
-	hf = make([]HeaderField, len(dt.table.ents))
-	for i := range hf {
-		hf[i] = dt.table.ents[len(dt.table.ents)-1-i]
-	}
-	return
-}
-
-type encAndWant struct {
-	enc         []byte
-	want        []HeaderField
-	wantDynTab  []HeaderField
-	wantDynSize uint32
-}
-
-// C.3 Request Examples without Huffman Coding
-// http://http2.github.io/http2-spec/compression.html#rfc.section.C.3
-func TestDecodeC3_NoHuffman(t *testing.T) {
-	testDecodeSeries(t, 4096, []encAndWant{
-		{dehex("8286 8441 0f77 7777 2e65 7861 6d70 6c65 2e63 6f6d"),
-			[]HeaderField{
-				pair(":method", "GET"),
-				pair(":scheme", "http"),
-				pair(":path", "/"),
-				pair(":authority", "www.example.com"),
-			},
-			[]HeaderField{
-				pair(":authority", "www.example.com"),
-			},
-			57,
-		},
-		{dehex("8286 84be 5808 6e6f 2d63 6163 6865"),
-			[]HeaderField{
-				pair(":method", "GET"),
-				pair(":scheme", "http"),
-				pair(":path", "/"),
-				pair(":authority", "www.example.com"),
-				pair("cache-control", "no-cache"),
-			},
-			[]HeaderField{
-				pair("cache-control", "no-cache"),
-				pair(":authority", "www.example.com"),
-			},
-			110,
-		},
-		{dehex("8287 85bf 400a 6375 7374 6f6d 2d6b 6579 0c63 7573 746f 6d2d 7661 6c75 65"),
-			[]HeaderField{
-				pair(":method", "GET"),
-				pair(":scheme", "https"),
-				pair(":path", "/index.html"),
-				pair(":authority", "www.example.com"),
-				pair("custom-key", "custom-value"),
-			},
-			[]HeaderField{
-				pair("custom-key", "custom-value"),
-				pair("cache-control", "no-cache"),
-				pair(":authority", "www.example.com"),
-			},
-			164,
-		},
-	})
-}
-
-// C.4 Request Examples with Huffman Coding
-// http://http2.github.io/http2-spec/compression.html#rfc.section.C.4
-func TestDecodeC4_Huffman(t *testing.T) {
-	testDecodeSeries(t, 4096, []encAndWant{
-		{dehex("8286 8441 8cf1 e3c2 e5f2 3a6b a0ab 90f4 ff"),
-			[]HeaderField{
-				pair(":method", "GET"),
-				pair(":scheme", "http"),
-				pair(":path", "/"),
-				pair(":authority", "www.example.com"),
-			},
-			[]HeaderField{
-				pair(":authority", "www.example.com"),
-			},
-			57,
-		},
-		{dehex("8286 84be 5886 a8eb 1064 9cbf"),
-			[]HeaderField{
-				pair(":method", "GET"),
-				pair(":scheme", "http"),
-				pair(":path", "/"),
-				pair(":authority", "www.example.com"),
-				pair("cache-control", "no-cache"),
-			},
-			[]HeaderField{
-				pair("cache-control", "no-cache"),
-				pair(":authority", "www.example.com"),
-			},
-			110,
-		},
-		{dehex("8287 85bf 4088 25a8 49e9 5ba9 7d7f 8925 a849 e95b b8e8 b4bf"),
-			[]HeaderField{
-				pair(":method", "GET"),
-				pair(":scheme", "https"),
-				pair(":path", "/index.html"),
-				pair(":authority", "www.example.com"),
-				pair("custom-key", "custom-value"),
-			},
-			[]HeaderField{
-				pair("custom-key", "custom-value"),
-				pair("cache-control", "no-cache"),
-				pair(":authority", "www.example.com"),
-			},
-			164,
-		},
-	})
-}
-
-// http://http2.github.io/http2-spec/compression.html#rfc.section.C.5
-// "This section shows several consecutive header lists, corresponding
-// to HTTP responses, on the same connection. The HTTP/2 setting
-// parameter SETTINGS_HEADER_TABLE_SIZE is set to the value of 256
-// octets, causing some evictions to occur."
-func TestDecodeC5_ResponsesNoHuff(t *testing.T) {
-	testDecodeSeries(t, 256, []encAndWant{
-		{dehex(`
-4803 3330 3258 0770 7269 7661 7465 611d
-4d6f 6e2c 2032 3120 4f63 7420 3230 3133
-2032 303a 3133 3a32 3120 474d 546e 1768
-7474 7073 3a2f 2f77 7777 2e65 7861 6d70
-6c65 2e63 6f6d
-`),
-			[]HeaderField{
-				pair(":status", "302"),
-				pair("cache-control", "private"),
-				pair("date", "Mon, 21 Oct 2013 20:13:21 GMT"),
-				pair("location", "https://www.example.com"),
-			},
-			[]HeaderField{
-				pair("location", "https://www.example.com"),
-				pair("date", "Mon, 21 Oct 2013 20:13:21 GMT"),
-				pair("cache-control", "private"),
-				pair(":status", "302"),
-			},
-			222,
-		},
-		{dehex("4803 3330 37c1 c0bf"),
-			[]HeaderField{
-				pair(":status", "307"),
-				pair("cache-control", "private"),
-				pair("date", "Mon, 21 Oct 2013 20:13:21 GMT"),
-				pair("location", "https://www.example.com"),
-			},
-			[]HeaderField{
-				pair(":status", "307"),
-				pair("location", "https://www.example.com"),
-				pair("date", "Mon, 21 Oct 2013 20:13:21 GMT"),
-				pair("cache-control", "private"),
-			},
-			222,
-		},
-		{dehex(`
-88c1 611d 4d6f 6e2c 2032 3120 4f63 7420
-3230 3133 2032 303a 3133 3a32 3220 474d
-54c0 5a04 677a 6970 7738 666f 6f3d 4153
-444a 4b48 514b 425a 584f 5157 454f 5049
-5541 5851 5745 4f49 553b 206d 6178 2d61
-6765 3d33 3630 303b 2076 6572 7369 6f6e
-3d31
-`),
-			[]HeaderField{
-				pair(":status", "200"),
-				pair("cache-control", "private"),
-				pair("date", "Mon, 21 Oct 2013 20:13:22 GMT"),
-				pair("location", "https://www.example.com"),
-				pair("content-encoding", "gzip"),
-				pair("set-cookie", "foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1"),
-			},
-			[]HeaderField{
-				pair("set-cookie", "foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1"),
-				pair("content-encoding", "gzip"),
-				pair("date", "Mon, 21 Oct 2013 20:13:22 GMT"),
-			},
-			215,
-		},
-	})
-}
-
-// http://http2.github.io/http2-spec/compression.html#rfc.section.C.6
-// "This section shows the same examples as the previous section, but
-// using Huffman encoding for the literal values. The HTTP/2 setting
-// parameter SETTINGS_HEADER_TABLE_SIZE is set to the value of 256
-// octets, causing some evictions to occur. The eviction mechanism
-// uses the length of the decoded literal values, so the same
-// evictions occurs as in the previous section."
-func TestDecodeC6_ResponsesHuffman(t *testing.T) {
-	testDecodeSeries(t, 256, []encAndWant{
-		{dehex(`
-4882 6402 5885 aec3 771a 4b61 96d0 7abe
-9410 54d4 44a8 2005 9504 0b81 66e0 82a6
-2d1b ff6e 919d 29ad 1718 63c7 8f0b 97c8
-e9ae 82ae 43d3
-`),
-			[]HeaderField{
-				pair(":status", "302"),
-				pair("cache-control", "private"),
-				pair("date", "Mon, 21 Oct 2013 20:13:21 GMT"),
-				pair("location", "https://www.example.com"),
-			},
-			[]HeaderField{
-				pair("location", "https://www.example.com"),
-				pair("date", "Mon, 21 Oct 2013 20:13:21 GMT"),
-				pair("cache-control", "private"),
-				pair(":status", "302"),
-			},
-			222,
-		},
-		{dehex("4883 640e ffc1 c0bf"),
-			[]HeaderField{
-				pair(":status", "307"),
-				pair("cache-control", "private"),
-				pair("date", "Mon, 21 Oct 2013 20:13:21 GMT"),
-				pair("location", "https://www.example.com"),
-			},
-			[]HeaderField{
-				pair(":status", "307"),
-				pair("location", "https://www.example.com"),
-				pair("date", "Mon, 21 Oct 2013 20:13:21 GMT"),
-				pair("cache-control", "private"),
-			},
-			222,
-		},
-		{dehex(`
-88c1 6196 d07a be94 1054 d444 a820 0595
-040b 8166 e084 a62d 1bff c05a 839b d9ab
-77ad 94e7 821d d7f2 e6c7 b335 dfdf cd5b
-3960 d5af 2708 7f36 72c1 ab27 0fb5 291f
-9587 3160 65c0 03ed 4ee5 b106 3d50 07
-`),
-			[]HeaderField{
-				pair(":status", "200"),
-				pair("cache-control", "private"),
-				pair("date", "Mon, 21 Oct 2013 20:13:22 GMT"),
-				pair("location", "https://www.example.com"),
-				pair("content-encoding", "gzip"),
-				pair("set-cookie", "foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1"),
-			},
-			[]HeaderField{
-				pair("set-cookie", "foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1"),
-				pair("content-encoding", "gzip"),
-				pair("date", "Mon, 21 Oct 2013 20:13:22 GMT"),
-			},
-			215,
-		},
-	})
-}
-
-func testDecodeSeries(t *testing.T, size uint32, steps []encAndWant) {
-	d := NewDecoder(size, nil)
-	for i, step := range steps {
-		hf, err := d.DecodeFull(step.enc)
-		if err != nil {
-			t.Fatalf("Error at step index %d: %v", i, err)
-		}
-		if !reflect.DeepEqual(hf, step.want) {
-			t.Fatalf("At step index %d: Got headers %v; want %v", i, hf, step.want)
-		}
-		gotDynTab := d.dynTab.reverseCopy()
-		if !reflect.DeepEqual(gotDynTab, step.wantDynTab) {
-			t.Errorf("After step index %d, dynamic table = %v; want %v", i, gotDynTab, step.wantDynTab)
-		}
-		if d.dynTab.size != step.wantDynSize {
-			t.Errorf("After step index %d, dynamic table size = %v; want %v", i, d.dynTab.size, step.wantDynSize)
-		}
-	}
-}
-
-func TestHuffmanDecodeExcessPadding(t *testing.T) {
-	tests := [][]byte{
-		{0xff},                                   // Padding Exceeds 7 bits
-		{0x1f, 0xff},                             // {"a", 1 byte excess padding}
-		{0x1f, 0xff, 0xff},                       // {"a", 2 byte excess padding}
-		{0x1f, 0xff, 0xff, 0xff},                 // {"a", 3 byte excess padding}
-		{0xff, 0x9f, 0xff, 0xff, 0xff},           // {"a", 29 bit excess padding}
-		{'R', 0xbc, '0', 0xff, 0xff, 0xff, 0xff}, // Padding ends on partial symbol.
-	}
-	for i, in := range tests {
-		var buf bytes.Buffer
-		if _, err := HuffmanDecode(&buf, in); err != ErrInvalidHuffman {
-			t.Errorf("test-%d: decode(%q) = %v; want ErrInvalidHuffman", i, in, err)
-		}
-	}
-}
-
-func TestHuffmanDecodeEOS(t *testing.T) {
-	in := []byte{0xff, 0xff, 0xff, 0xff, 0xfc} // {EOS, "?"}
-	var buf bytes.Buffer
-	if _, err := HuffmanDecode(&buf, in); err != ErrInvalidHuffman {
-		t.Errorf("error = %v; want ErrInvalidHuffman", err)
-	}
-}
-
-func TestHuffmanDecodeMaxLengthOnTrailingByte(t *testing.T) {
-	in := []byte{0x00, 0x01} // {"0", "0", "0"}
-	var buf bytes.Buffer
-	if err := huffmanDecode(&buf, 2, in); err != ErrStringLength {
-		t.Errorf("error = %v; want ErrStringLength", err)
-	}
-}
-
-func TestHuffmanDecodeCorruptPadding(t *testing.T) {
-	in := []byte{0x00}
-	var buf bytes.Buffer
-	if _, err := HuffmanDecode(&buf, in); err != ErrInvalidHuffman {
-		t.Errorf("error = %v; want ErrInvalidHuffman", err)
-	}
-}
-
-func TestHuffmanDecode(t *testing.T) {
-	tests := []struct {
-		inHex, want string
-	}{
-		{"f1e3 c2e5 f23a 6ba0 ab90 f4ff", "www.example.com"},
-		{"a8eb 1064 9cbf", "no-cache"},
-		{"25a8 49e9 5ba9 7d7f", "custom-key"},
-		{"25a8 49e9 5bb8 e8b4 bf", "custom-value"},
-		{"6402", "302"},
-		{"aec3 771a 4b", "private"},
-		{"d07a be94 1054 d444 a820 0595 040b 8166 e082 a62d 1bff", "Mon, 21 Oct 2013 20:13:21 GMT"},
-		{"9d29 ad17 1863 c78f 0b97 c8e9 ae82 ae43 d3", "https://www.example.com"},
-		{"9bd9 ab", "gzip"},
-		{"94e7 821d d7f2 e6c7 b335 dfdf cd5b 3960 d5af 2708 7f36 72c1 ab27 0fb5 291f 9587 3160 65c0 03ed 4ee5 b106 3d50 07",
-			"foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1"},
-	}
-	for i, tt := range tests {
-		var buf bytes.Buffer
-		in, err := hex.DecodeString(strings.Replace(tt.inHex, " ", "", -1))
-		if err != nil {
-			t.Errorf("%d. hex input error: %v", i, err)
-			continue
-		}
-		if _, err := HuffmanDecode(&buf, in); err != nil {
-			t.Errorf("%d. decode error: %v", i, err)
-			continue
-		}
-		if got := buf.String(); tt.want != got {
-			t.Errorf("%d. decode = %q; want %q", i, got, tt.want)
-		}
-	}
-}
-
-func TestAppendHuffmanString(t *testing.T) {
-	tests := []struct {
-		in, want string
-	}{
-		{"www.example.com", "f1e3 c2e5 f23a 6ba0 ab90 f4ff"},
-		{"no-cache", "a8eb 1064 9cbf"},
-		{"custom-key", "25a8 49e9 5ba9 7d7f"},
-		{"custom-value", "25a8 49e9 5bb8 e8b4 bf"},
-		{"302", "6402"},
-		{"private", "aec3 771a 4b"},
-		{"Mon, 21 Oct 2013 20:13:21 GMT", "d07a be94 1054 d444 a820 0595 040b 8166 e082 a62d 1bff"},
-		{"https://www.example.com", "9d29 ad17 1863 c78f 0b97 c8e9 ae82 ae43 d3"},
-		{"gzip", "9bd9 ab"},
-		{"foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1",
-			"94e7 821d d7f2 e6c7 b335 dfdf cd5b 3960 d5af 2708 7f36 72c1 ab27 0fb5 291f 9587 3160 65c0 03ed 4ee5 b106 3d50 07"},
-	}
-	for i, tt := range tests {
-		buf := []byte{}
-		want := strings.Replace(tt.want, " ", "", -1)
-		buf = AppendHuffmanString(buf, tt.in)
-		if got := hex.EncodeToString(buf); want != got {
-			t.Errorf("%d. encode = %q; want %q", i, got, want)
-		}
-	}
-}
-
-func TestHuffmanMaxStrLen(t *testing.T) {
-	const msg = "Some string"
-	huff := AppendHuffmanString(nil, msg)
-
-	testGood := func(max int) {
-		var out bytes.Buffer
-		if err := huffmanDecode(&out, max, huff); err != nil {
-			t.Errorf("For maxLen=%d, unexpected error: %v", max, err)
-		}
-		if out.String() != msg {
-			t.Errorf("For maxLen=%d, out = %q; want %q", max, out.String(), msg)
-		}
-	}
-	testGood(0)
-	testGood(len(msg))
-	testGood(len(msg) + 1)
-
-	var out bytes.Buffer
-	if err := huffmanDecode(&out, len(msg)-1, huff); err != ErrStringLength {
-		t.Errorf("err = %v; want ErrStringLength", err)
-	}
-}
-
-func TestHuffmanRoundtripStress(t *testing.T) {
-	const Len = 50 // of uncompressed string
-	input := make([]byte, Len)
-	var output bytes.Buffer
-	var huff []byte
-
-	n := 5000
-	if testing.Short() {
-		n = 100
-	}
-	seed := time.Now().UnixNano()
-	t.Logf("Seed = %v", seed)
-	src := rand.New(rand.NewSource(seed))
-	var encSize int64
-	for i := 0; i < n; i++ {
-		for l := range input {
-			input[l] = byte(src.Intn(256))
-		}
-		huff = AppendHuffmanString(huff[:0], string(input))
-		encSize += int64(len(huff))
-		output.Reset()
-		if err := huffmanDecode(&output, 0, huff); err != nil {
-			t.Errorf("Failed to decode %q -> %q -> error %v", input, huff, err)
-			continue
-		}
-		if !bytes.Equal(output.Bytes(), input) {
-			t.Errorf("Roundtrip failure on %q -> %q -> %q", input, huff, output.Bytes())
-		}
-	}
-	t.Logf("Compressed size of original: %0.02f%% (%v -> %v)", 100*(float64(encSize)/(Len*float64(n))), Len*n, encSize)
-}
-
-func TestHuffmanDecodeFuzz(t *testing.T) {
-	const Len = 50 // of compressed
-	var buf, zbuf bytes.Buffer
-
-	n := 5000
-	if testing.Short() {
-		n = 100
-	}
-	seed := time.Now().UnixNano()
-	t.Logf("Seed = %v", seed)
-	src := rand.New(rand.NewSource(seed))
-	numFail := 0
-	for i := 0; i < n; i++ {
-		zbuf.Reset()
-		if i == 0 {
-			// Start with at least one invalid one.
-			zbuf.WriteString("00\x91\xff\xff\xff\xff\xc8")
-		} else {
-			for l := 0; l < Len; l++ {
-				zbuf.WriteByte(byte(src.Intn(256)))
-			}
-		}
-
-		buf.Reset()
-		if err := huffmanDecode(&buf, 0, zbuf.Bytes()); err != nil {
-			if err == ErrInvalidHuffman {
-				numFail++
-				continue
-			}
-			t.Errorf("Failed to decode %q: %v", zbuf.Bytes(), err)
-			continue
-		}
-	}
-	t.Logf("%0.02f%% are invalid (%d / %d)", 100*float64(numFail)/float64(n), numFail, n)
-	if numFail < 1 {
-		t.Error("expected at least one invalid huffman encoding (test starts with one)")
-	}
-}
-
-func TestReadVarInt(t *testing.T) {
-	type res struct {
-		i        uint64
-		consumed int
-		err      error
-	}
-	tests := []struct {
-		n    byte
-		p    []byte
-		want res
-	}{
-		// Fits in a byte:
-		{1, []byte{0}, res{0, 1, nil}},
-		{2, []byte{2}, res{2, 1, nil}},
-		{3, []byte{6}, res{6, 1, nil}},
-		{4, []byte{14}, res{14, 1, nil}},
-		{5, []byte{30}, res{30, 1, nil}},
-		{6, []byte{62}, res{62, 1, nil}},
-		{7, []byte{126}, res{126, 1, nil}},
-		{8, []byte{254}, res{254, 1, nil}},
-
-		// Doesn't fit in a byte:
-		{1, []byte{1}, res{0, 0, errNeedMore}},
-		{2, []byte{3}, res{0, 0, errNeedMore}},
-		{3, []byte{7}, res{0, 0, errNeedMore}},
-		{4, []byte{15}, res{0, 0, errNeedMore}},
-		{5, []byte{31}, res{0, 0, errNeedMore}},
-		{6, []byte{63}, res{0, 0, errNeedMore}},
-		{7, []byte{127}, res{0, 0, errNeedMore}},
-		{8, []byte{255}, res{0, 0, errNeedMore}},
-
-		// Ignoring top bits:
-		{5, []byte{255, 154, 10}, res{1337, 3, nil}}, // high dummy three bits: 111
-		{5, []byte{159, 154, 10}, res{1337, 3, nil}}, // high dummy three bits: 100
-		{5, []byte{191, 154, 10}, res{1337, 3, nil}}, // high dummy three bits: 101
-
-		// Extra byte:
-		{5, []byte{191, 154, 10, 2}, res{1337, 3, nil}}, // extra byte
-
-		// Short a byte:
-		{5, []byte{191, 154}, res{0, 0, errNeedMore}},
-
-		// integer overflow:
-		{1, []byte{255, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128}, res{0, 0, errVarintOverflow}},
-	}
-	for _, tt := range tests {
-		i, remain, err := readVarInt(tt.n, tt.p)
-		consumed := len(tt.p) - len(remain)
-		got := res{i, consumed, err}
-		if got != tt.want {
-			t.Errorf("readVarInt(%d, %v ~ %x) = %+v; want %+v", tt.n, tt.p, tt.p, got, tt.want)
-		}
-	}
-}
-
-// Fuzz crash, originally reported at https://github.com/bradfitz/http2/issues/56
-func TestHuffmanFuzzCrash(t *testing.T) {
-	got, err := HuffmanDecodeToString([]byte("00\x91\xff\xff\xff\xff\xc8"))
-	if got != "" {
-		t.Errorf("Got %q; want empty string", got)
-	}
-	if err != ErrInvalidHuffman {
-		t.Errorf("Err = %v; want ErrInvalidHuffman", err)
-	}
-}
-
-func pair(name, value string) HeaderField {
-	return HeaderField{Name: name, Value: value}
-}
-
-func dehex(s string) []byte {
-	s = strings.Replace(s, " ", "", -1)
-	s = strings.Replace(s, "\n", "", -1)
-	b, err := hex.DecodeString(s)
-	if err != nil {
-		panic(err)
-	}
-	return b
-}
-
-func TestEmitEnabled(t *testing.T) {
-	var buf bytes.Buffer
-	enc := NewEncoder(&buf)
-	enc.WriteField(HeaderField{Name: "foo", Value: "bar"})
-	enc.WriteField(HeaderField{Name: "foo", Value: "bar"})
-
-	numCallback := 0
-	var dec *Decoder
-	dec = NewDecoder(8<<20, func(HeaderField) {
-		numCallback++
-		dec.SetEmitEnabled(false)
-	})
-	if !dec.EmitEnabled() {
-		t.Errorf("initial emit enabled = false; want true")
-	}
-	if _, err := dec.Write(buf.Bytes()); err != nil {
-		t.Error(err)
-	}
-	if numCallback != 1 {
-		t.Errorf("num callbacks = %d; want 1", numCallback)
-	}
-	if dec.EmitEnabled() {
-		t.Errorf("emit enabled = true; want false")
-	}
-}
-
-func TestSaveBufLimit(t *testing.T) {
-	const maxStr = 1 << 10
-	var got []HeaderField
-	dec := NewDecoder(initialHeaderTableSize, func(hf HeaderField) {
-		got = append(got, hf)
-	})
-	dec.SetMaxStringLength(maxStr)
-	var frag []byte
-	frag = append(frag[:0], encodeTypeByte(false, false))
-	frag = appendVarInt(frag, 7, 3)
-	frag = append(frag, "foo"...)
-	frag = appendVarInt(frag, 7, 3)
-	frag = append(frag, "bar"...)
-
-	if _, err := dec.Write(frag); err != nil {
-		t.Fatal(err)
-	}
-
-	want := []HeaderField{{Name: "foo", Value: "bar"}}
-	if !reflect.DeepEqual(got, want) {
-		t.Errorf("After small writes, got %v; want %v", got, want)
-	}
-
-	frag = append(frag[:0], encodeTypeByte(false, false))
-	frag = appendVarInt(frag, 7, maxStr*3)
-	frag = append(frag, make([]byte, maxStr*3)...)
-
-	_, err := dec.Write(frag)
-	if err != ErrStringLength {
-		t.Fatalf("Write error = %v; want ErrStringLength", err)
-	}
-}
-
-func TestDynamicSizeUpdate(t *testing.T) {
-	var buf bytes.Buffer
-	enc := NewEncoder(&buf)
-	enc.SetMaxDynamicTableSize(255)
-	enc.WriteField(HeaderField{Name: "foo", Value: "bar"})
-
-	d := NewDecoder(4096, nil)
-	_, err := d.DecodeFull(buf.Bytes())
-	if err != nil {
-		t.Fatalf("unexpected error: got = %v", err)
-	}
-
-	// must fail since the dynamic table update must be at the beginning
-	_, err = d.DecodeFull(buf.Bytes())
-	if err == nil {
-		t.Fatalf("dynamic table size update not at the beginning of a header block")
-	}
-}
diff --git a/vendor/golang.org/x/net/http2/hpack/huffman.go b/vendor/golang.org/x/net/http2/hpack/huffman.go
index 8850e394..b412a96c 100644
--- a/vendor/golang.org/x/net/http2/hpack/huffman.go
+++ b/vendor/golang.org/x/net/http2/hpack/huffman.go
@@ -47,6 +47,7 @@ var ErrInvalidHuffman = errors.New("hpack: invalid Huffman-encoded data")
 // If maxLen is greater than 0, attempts to write more to buf than
 // maxLen bytes will return ErrStringLength.
 func huffmanDecode(buf *bytes.Buffer, maxLen int, v []byte) error {
+	rootHuffmanNode := getRootHuffmanNode()
 	n := rootHuffmanNode
 	// cur is the bit buffer that has not been fed into n.
 	// cbits is the number of low order bits in cur that are valid.
@@ -106,7 +107,7 @@ func huffmanDecode(buf *bytes.Buffer, maxLen int, v []byte) error {
 
 type node struct {
 	// children is non-nil for internal nodes
-	children []*node
+	children *[256]*node
 
 	// The following are only valid if children is nil:
 	codeLen uint8 // number of bits that led to the output of sym
@@ -114,22 +115,31 @@ type node struct {
 }
 
 func newInternalNode() *node {
-	return &node{children: make([]*node, 256)}
+	return &node{children: new([256]*node)}
 }
 
-var rootHuffmanNode = newInternalNode()
+var (
+	buildRootOnce       sync.Once
+	lazyRootHuffmanNode *node
+)
 
-func init() {
+func getRootHuffmanNode() *node {
+	buildRootOnce.Do(buildRootHuffmanNode)
+	return lazyRootHuffmanNode
+}
+
+func buildRootHuffmanNode() {
 	if len(huffmanCodes) != 256 {
 		panic("unexpected size")
 	}
+	lazyRootHuffmanNode = newInternalNode()
 	for i, code := range huffmanCodes {
 		addDecoderNode(byte(i), code, huffmanCodeLen[i])
 	}
 }
 
 func addDecoderNode(sym byte, code uint32, codeLen uint8) {
-	cur := rootHuffmanNode
+	cur := lazyRootHuffmanNode
 	for codeLen > 8 {
 		codeLen -= 8
 		i := uint8(code >> codeLen)
diff --git a/vendor/golang.org/x/net/http2/hpack/tables_test.go b/vendor/golang.org/x/net/http2/hpack/tables_test.go
deleted file mode 100644
index d963f363..00000000
--- a/vendor/golang.org/x/net/http2/hpack/tables_test.go
+++ /dev/null
@@ -1,214 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package hpack
-
-import (
-	"bufio"
-	"regexp"
-	"strconv"
-	"strings"
-	"testing"
-)
-
-func TestHeaderFieldTable(t *testing.T) {
-	table := &headerFieldTable{}
-	table.init()
-	table.addEntry(pair("key1", "value1-1"))
-	table.addEntry(pair("key2", "value2-1"))
-	table.addEntry(pair("key1", "value1-2"))
-	table.addEntry(pair("key3", "value3-1"))
-	table.addEntry(pair("key4", "value4-1"))
-	table.addEntry(pair("key2", "value2-2"))
-
-	// Tests will be run twice: once before evicting anything, and
-	// again after evicting the three oldest entries.
-	tests := []struct {
-		f                 HeaderField
-		beforeWantStaticI uint64
-		beforeWantMatch   bool
-		afterWantStaticI  uint64
-		afterWantMatch    bool
-	}{
-		{HeaderField{"key1", "value1-1", false}, 1, true, 0, false},
-		{HeaderField{"key1", "value1-2", false}, 3, true, 0, false},
-		{HeaderField{"key1", "value1-3", false}, 3, false, 0, false},
-		{HeaderField{"key2", "value2-1", false}, 2, true, 3, false},
-		{HeaderField{"key2", "value2-2", false}, 6, true, 3, true},
-		{HeaderField{"key2", "value2-3", false}, 6, false, 3, false},
-		{HeaderField{"key4", "value4-1", false}, 5, true, 2, true},
-		// Name match only, because sensitive.
-		{HeaderField{"key4", "value4-1", true}, 5, false, 2, false},
-		// Key not found.
-		{HeaderField{"key5", "value5-x", false}, 0, false, 0, false},
-	}
-
-	staticToDynamic := func(i uint64) uint64 {
-		if i == 0 {
-			return 0
-		}
-		return uint64(table.len()) - i + 1 // dynamic is the reversed table
-	}
-
-	searchStatic := func(f HeaderField) (uint64, bool) {
-		old := staticTable
-		staticTable = table
-		defer func() { staticTable = old }()
-		return staticTable.search(f)
-	}
-
-	searchDynamic := func(f HeaderField) (uint64, bool) {
-		return table.search(f)
-	}
-
-	for _, test := range tests {
-		gotI, gotMatch := searchStatic(test.f)
-		if wantI, wantMatch := test.beforeWantStaticI, test.beforeWantMatch; gotI != wantI || gotMatch != wantMatch {
-			t.Errorf("before evictions: searchStatic(%+v)=%v,%v want %v,%v", test.f, gotI, gotMatch, wantI, wantMatch)
-		}
-		gotI, gotMatch = searchDynamic(test.f)
-		wantDynamicI := staticToDynamic(test.beforeWantStaticI)
-		if wantI, wantMatch := wantDynamicI, test.beforeWantMatch; gotI != wantI || gotMatch != wantMatch {
-			t.Errorf("before evictions: searchDynamic(%+v)=%v,%v want %v,%v", test.f, gotI, gotMatch, wantI, wantMatch)
-		}
-	}
-
-	table.evictOldest(3)
-
-	for _, test := range tests {
-		gotI, gotMatch := searchStatic(test.f)
-		if wantI, wantMatch := test.afterWantStaticI, test.afterWantMatch; gotI != wantI || gotMatch != wantMatch {
-			t.Errorf("after evictions: searchStatic(%+v)=%v,%v want %v,%v", test.f, gotI, gotMatch, wantI, wantMatch)
-		}
-		gotI, gotMatch = searchDynamic(test.f)
-		wantDynamicI := staticToDynamic(test.afterWantStaticI)
-		if wantI, wantMatch := wantDynamicI, test.afterWantMatch; gotI != wantI || gotMatch != wantMatch {
-			t.Errorf("after evictions: searchDynamic(%+v)=%v,%v want %v,%v", test.f, gotI, gotMatch, wantI, wantMatch)
-		}
-	}
-}
-
-func TestHeaderFieldTable_LookupMapEviction(t *testing.T) {
-	table := &headerFieldTable{}
-	table.init()
-	table.addEntry(pair("key1", "value1-1"))
-	table.addEntry(pair("key2", "value2-1"))
-	table.addEntry(pair("key1", "value1-2"))
-	table.addEntry(pair("key3", "value3-1"))
-	table.addEntry(pair("key4", "value4-1"))
-	table.addEntry(pair("key2", "value2-2"))
-
-	// evict all pairs
-	table.evictOldest(table.len())
-
-	if l := table.len(); l > 0 {
-		t.Errorf("table.len() = %d, want 0", l)
-	}
-
-	if l := len(table.byName); l > 0 {
-		t.Errorf("len(table.byName) = %d, want 0", l)
-	}
-
-	if l := len(table.byNameValue); l > 0 {
-		t.Errorf("len(table.byNameValue) = %d, want 0", l)
-	}
-}
-
-func TestStaticTable(t *testing.T) {
-	fromSpec := `
-          +-------+-----------------------------+---------------+
-          | 1     | :authority                  |               |
-          | 2     | :method                     | GET           |
-          | 3     | :method                     | POST          |
-          | 4     | :path                       | /             |
-          | 5     | :path                       | /index.html   |
-          | 6     | :scheme                     | http          |
-          | 7     | :scheme                     | https         |
-          | 8     | :status                     | 200           |
-          | 9     | :status                     | 204           |
-          | 10    | :status                     | 206           |
-          | 11    | :status                     | 304           |
-          | 12    | :status                     | 400           |
-          | 13    | :status                     | 404           |
-          | 14    | :status                     | 500           |
-          | 15    | accept-charset              |               |
-          | 16    | accept-encoding             | gzip, deflate |
-          | 17    | accept-language             |               |
-          | 18    | accept-ranges               |               |
-          | 19    | accept                      |               |
-          | 20    | access-control-allow-origin |               |
-          | 21    | age                         |               |
-          | 22    | allow                       |               |
-          | 23    | authorization               |               |
-          | 24    | cache-control               |               |
-          | 25    | content-disposition         |               |
-          | 26    | content-encoding            |               |
-          | 27    | content-language            |               |
-          | 28    | content-length              |               |
-          | 29    | content-location            |               |
-          | 30    | content-range               |               |
-          | 31    | content-type                |               |
-          | 32    | cookie                      |               |
-          | 33    | date                        |               |
-          | 34    | etag                        |               |
-          | 35    | expect                      |               |
-          | 36    | expires                     |               |
-          | 37    | from                        |               |
-          | 38    | host                        |               |
-          | 39    | if-match                    |               |
-          | 40    | if-modified-since           |               |
-          | 41    | if-none-match               |               |
-          | 42    | if-range                    |               |
-          | 43    | if-unmodified-since         |               |
-          | 44    | last-modified               |               |
-          | 45    | link                        |               |
-          | 46    | location                    |               |
-          | 47    | max-forwards                |               |
-          | 48    | proxy-authenticate          |               |
-          | 49    | proxy-authorization         |               |
-          | 50    | range                       |               |
-          | 51    | referer                     |               |
-          | 52    | refresh                     |               |
-          | 53    | retry-after                 |               |
-          | 54    | server                      |               |
-          | 55    | set-cookie                  |               |
-          | 56    | strict-transport-security   |               |
-          | 57    | transfer-encoding           |               |
-          | 58    | user-agent                  |               |
-          | 59    | vary                        |               |
-          | 60    | via                         |               |
-          | 61    | www-authenticate            |               |
-          +-------+-----------------------------+---------------+
-`
-	bs := bufio.NewScanner(strings.NewReader(fromSpec))
-	re := regexp.MustCompile(`\| (\d+)\s+\| (\S+)\s*\| (\S(.*\S)?)?\s+\|`)
-	for bs.Scan() {
-		l := bs.Text()
-		if !strings.Contains(l, "|") {
-			continue
-		}
-		m := re.FindStringSubmatch(l)
-		if m == nil {
-			continue
-		}
-		i, err := strconv.Atoi(m[1])
-		if err != nil {
-			t.Errorf("Bogus integer on line %q", l)
-			continue
-		}
-		if i < 1 || i > staticTable.len() {
-			t.Errorf("Bogus index %d on line %q", i, l)
-			continue
-		}
-		if got, want := staticTable.ents[i-1].Name, m[2]; got != want {
-			t.Errorf("header index %d name = %q; want %q", i, got, want)
-		}
-		if got, want := staticTable.ents[i-1].Value, m[3]; got != want {
-			t.Errorf("header index %d value = %q; want %q", i, got, want)
-		}
-	}
-	if err := bs.Err(); err != nil {
-		t.Error(err)
-	}
-}
diff --git a/vendor/golang.org/x/net/http2/http2_test.go b/vendor/golang.org/x/net/http2/http2_test.go
deleted file mode 100644
index 667db488..00000000
--- a/vendor/golang.org/x/net/http2/http2_test.go
+++ /dev/null
@@ -1,227 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import (
-	"bytes"
-	"errors"
-	"flag"
-	"fmt"
-	"net/http"
-	"os/exec"
-	"strconv"
-	"strings"
-	"testing"
-	"time"
-
-	"golang.org/x/net/http2/hpack"
-)
-
-var knownFailing = flag.Bool("known_failing", false, "Run known-failing tests.")
-
-func condSkipFailingTest(t *testing.T) {
-	if !*knownFailing {
-		t.Skip("Skipping known-failing test without --known_failing")
-	}
-}
-
-func init() {
-	inTests = true
-	DebugGoroutines = true
-	flag.BoolVar(&VerboseLogs, "verboseh2", VerboseLogs, "Verbose HTTP/2 debug logging")
-}
-
-func TestSettingString(t *testing.T) {
-	tests := []struct {
-		s    Setting
-		want string
-	}{
-		{Setting{SettingMaxFrameSize, 123}, "[MAX_FRAME_SIZE = 123]"},
-		{Setting{1<<16 - 1, 123}, "[UNKNOWN_SETTING_65535 = 123]"},
-	}
-	for i, tt := range tests {
-		got := fmt.Sprint(tt.s)
-		if got != tt.want {
-			t.Errorf("%d. for %#v, string = %q; want %q", i, tt.s, got, tt.want)
-		}
-	}
-}
-
-type twriter struct {
-	t  testing.TB
-	st *serverTester // optional
-}
-
-func (w twriter) Write(p []byte) (n int, err error) {
-	if w.st != nil {
-		ps := string(p)
-		for _, phrase := range w.st.logFilter {
-			if strings.Contains(ps, phrase) {
-				return len(p), nil // no logging
-			}
-		}
-	}
-	w.t.Logf("%s", p)
-	return len(p), nil
-}
-
-// like encodeHeader, but don't add implicit pseudo headers.
-func encodeHeaderNoImplicit(t *testing.T, headers ...string) []byte {
-	var buf bytes.Buffer
-	enc := hpack.NewEncoder(&buf)
-	for len(headers) > 0 {
-		k, v := headers[0], headers[1]
-		headers = headers[2:]
-		if err := enc.WriteField(hpack.HeaderField{Name: k, Value: v}); err != nil {
-			t.Fatalf("HPACK encoding error for %q/%q: %v", k, v, err)
-		}
-	}
-	return buf.Bytes()
-}
-
-// Verify that curl has http2.
-func requireCurl(t *testing.T) {
-	out, err := dockerLogs(curl(t, "--version"))
-	if err != nil {
-		t.Skipf("failed to determine curl features; skipping test")
-	}
-	if !strings.Contains(string(out), "HTTP2") {
-		t.Skip("curl doesn't support HTTP2; skipping test")
-	}
-}
-
-func curl(t *testing.T, args ...string) (container string) {
-	out, err := exec.Command("docker", append([]string{"run", "-d", "--net=host", "gohttp2/curl"}, args...)...).Output()
-	if err != nil {
-		t.Skipf("Failed to run curl in docker: %v, %s", err, out)
-	}
-	return strings.TrimSpace(string(out))
-}
-
-// Verify that h2load exists.
-func requireH2load(t *testing.T) {
-	out, err := dockerLogs(h2load(t, "--version"))
-	if err != nil {
-		t.Skipf("failed to probe h2load; skipping test: %s", out)
-	}
-	if !strings.Contains(string(out), "h2load nghttp2/") {
-		t.Skipf("h2load not present; skipping test. (Output=%q)", out)
-	}
-}
-
-func h2load(t *testing.T, args ...string) (container string) {
-	out, err := exec.Command("docker", append([]string{"run", "-d", "--net=host", "--entrypoint=/usr/local/bin/h2load", "gohttp2/curl"}, args...)...).Output()
-	if err != nil {
-		t.Skipf("Failed to run h2load in docker: %v, %s", err, out)
-	}
-	return strings.TrimSpace(string(out))
-}
-
-type puppetCommand struct {
-	fn   func(w http.ResponseWriter, r *http.Request)
-	done chan<- bool
-}
-
-type handlerPuppet struct {
-	ch chan puppetCommand
-}
-
-func newHandlerPuppet() *handlerPuppet {
-	return &handlerPuppet{
-		ch: make(chan puppetCommand),
-	}
-}
-
-func (p *handlerPuppet) act(w http.ResponseWriter, r *http.Request) {
-	for cmd := range p.ch {
-		cmd.fn(w, r)
-		cmd.done <- true
-	}
-}
-
-func (p *handlerPuppet) done() { close(p.ch) }
-func (p *handlerPuppet) do(fn func(http.ResponseWriter, *http.Request)) {
-	done := make(chan bool)
-	p.ch <- puppetCommand{fn, done}
-	<-done
-}
-func dockerLogs(container string) ([]byte, error) {
-	out, err := exec.Command("docker", "wait", container).CombinedOutput()
-	if err != nil {
-		return out, err
-	}
-	exitStatus, err := strconv.Atoi(strings.TrimSpace(string(out)))
-	if err != nil {
-		return out, errors.New("unexpected exit status from docker wait")
-	}
-	out, err = exec.Command("docker", "logs", container).CombinedOutput()
-	exec.Command("docker", "rm", container).Run()
-	if err == nil && exitStatus != 0 {
-		err = fmt.Errorf("exit status %d: %s", exitStatus, out)
-	}
-	return out, err
-}
-
-func kill(container string) {
-	exec.Command("docker", "kill", container).Run()
-	exec.Command("docker", "rm", container).Run()
-}
-
-func cleanDate(res *http.Response) {
-	if d := res.Header["Date"]; len(d) == 1 {
-		d[0] = "XXX"
-	}
-}
-
-func TestSorterPoolAllocs(t *testing.T) {
-	ss := []string{"a", "b", "c"}
-	h := http.Header{
-		"a": nil,
-		"b": nil,
-		"c": nil,
-	}
-	sorter := new(sorter)
-
-	if allocs := testing.AllocsPerRun(100, func() {
-		sorter.SortStrings(ss)
-	}); allocs >= 1 {
-		t.Logf("SortStrings allocs = %v; want <1", allocs)
-	}
-
-	if allocs := testing.AllocsPerRun(5, func() {
-		if len(sorter.Keys(h)) != 3 {
-			t.Fatal("wrong result")
-		}
-	}); allocs > 0 {
-		t.Logf("Keys allocs = %v; want <1", allocs)
-	}
-}
-
-// waitCondition reports whether fn eventually returned true,
-// checking immediately and then every checkEvery amount,
-// until waitFor has elapsed, at which point it returns false.
-func waitCondition(waitFor, checkEvery time.Duration, fn func() bool) bool {
-	deadline := time.Now().Add(waitFor)
-	for time.Now().Before(deadline) {
-		if fn() {
-			return true
-		}
-		time.Sleep(checkEvery)
-	}
-	return false
-}
-
-// waitErrCondition is like waitCondition but with errors instead of bools.
-func waitErrCondition(waitFor, checkEvery time.Duration, fn func() error) error {
-	deadline := time.Now().Add(waitFor)
-	var err error
-	for time.Now().Before(deadline) {
-		if err = fn(); err == nil {
-			return nil
-		}
-		time.Sleep(checkEvery)
-	}
-	return err
-}
diff --git a/vendor/golang.org/x/net/http2/not_go111.go b/vendor/golang.org/x/net/http2/not_go111.go
new file mode 100644
index 00000000..0df34e6d
--- /dev/null
+++ b/vendor/golang.org/x/net/http2/not_go111.go
@@ -0,0 +1,17 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !go1.11
+
+package http2
+
+import "net/textproto"
+
+func traceHasWroteHeaderField(trace *clientTrace) bool { return false }
+
+func traceWroteHeaderField(trace *clientTrace, k, v string) {}
+
+func traceGot1xxResponseFunc(trace *clientTrace) func(int, textproto.MIMEHeader) error {
+	return nil
+}
diff --git a/vendor/golang.org/x/net/http2/not_go17.go b/vendor/golang.org/x/net/http2/not_go17.go
index 140434a7..7ffb2504 100644
--- a/vendor/golang.org/x/net/http2/not_go17.go
+++ b/vendor/golang.org/x/net/http2/not_go17.go
@@ -8,6 +8,7 @@ package http2
 
 import (
 	"crypto/tls"
+	"errors"
 	"net"
 	"net/http"
 	"time"
@@ -18,6 +19,8 @@ type contextContext interface {
 	Err() error
 }
 
+var errCanceled = errors.New("canceled")
+
 type fakeContext struct{}
 
 func (fakeContext) Done() <-chan struct{} { return nil }
@@ -34,6 +37,7 @@ func setResponseUncompressed(res *http.Response) {
 type clientTrace struct{}
 
 func requestTrace(*http.Request) *clientTrace { return nil }
+func traceGetConn(*http.Request, string)      {}
 func traceGotConn(*http.Request, *ClientConn) {}
 func traceFirstResponseByte(*clientTrace)     {}
 func traceWroteHeaders(*clientTrace)          {}
@@ -84,4 +88,8 @@ func (cc *ClientConn) Ping(ctx contextContext) error {
 	return cc.ping(ctx)
 }
 
+func (cc *ClientConn) Shutdown(ctx contextContext) error {
+	return cc.shutdown(ctx)
+}
+
 func (t *Transport) idleConnTimeout() time.Duration { return 0 }
diff --git a/vendor/golang.org/x/net/http2/pipe_test.go b/vendor/golang.org/x/net/http2/pipe_test.go
deleted file mode 100644
index 1bf351ff..00000000
--- a/vendor/golang.org/x/net/http2/pipe_test.go
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import (
-	"bytes"
-	"errors"
-	"io"
-	"io/ioutil"
-	"testing"
-)
-
-func TestPipeClose(t *testing.T) {
-	var p pipe
-	p.b = new(bytes.Buffer)
-	a := errors.New("a")
-	b := errors.New("b")
-	p.CloseWithError(a)
-	p.CloseWithError(b)
-	_, err := p.Read(make([]byte, 1))
-	if err != a {
-		t.Errorf("err = %v want %v", err, a)
-	}
-}
-
-func TestPipeDoneChan(t *testing.T) {
-	var p pipe
-	done := p.Done()
-	select {
-	case <-done:
-		t.Fatal("done too soon")
-	default:
-	}
-	p.CloseWithError(io.EOF)
-	select {
-	case <-done:
-	default:
-		t.Fatal("should be done")
-	}
-}
-
-func TestPipeDoneChan_ErrFirst(t *testing.T) {
-	var p pipe
-	p.CloseWithError(io.EOF)
-	done := p.Done()
-	select {
-	case <-done:
-	default:
-		t.Fatal("should be done")
-	}
-}
-
-func TestPipeDoneChan_Break(t *testing.T) {
-	var p pipe
-	done := p.Done()
-	select {
-	case <-done:
-		t.Fatal("done too soon")
-	default:
-	}
-	p.BreakWithError(io.EOF)
-	select {
-	case <-done:
-	default:
-		t.Fatal("should be done")
-	}
-}
-
-func TestPipeDoneChan_Break_ErrFirst(t *testing.T) {
-	var p pipe
-	p.BreakWithError(io.EOF)
-	done := p.Done()
-	select {
-	case <-done:
-	default:
-		t.Fatal("should be done")
-	}
-}
-
-func TestPipeCloseWithError(t *testing.T) {
-	p := &pipe{b: new(bytes.Buffer)}
-	const body = "foo"
-	io.WriteString(p, body)
-	a := errors.New("test error")
-	p.CloseWithError(a)
-	all, err := ioutil.ReadAll(p)
-	if string(all) != body {
-		t.Errorf("read bytes = %q; want %q", all, body)
-	}
-	if err != a {
-		t.Logf("read error = %v, %v", err, a)
-	}
-	// Read and Write should fail.
-	if n, err := p.Write([]byte("abc")); err != errClosedPipeWrite || n != 0 {
-		t.Errorf("Write(abc) after close\ngot %v, %v\nwant 0, %v", n, err, errClosedPipeWrite)
-	}
-	if n, err := p.Read(make([]byte, 1)); err == nil || n != 0 {
-		t.Errorf("Read() after close\ngot %v, nil\nwant 0, %v", n, errClosedPipeWrite)
-	}
-}
-
-func TestPipeBreakWithError(t *testing.T) {
-	p := &pipe{b: new(bytes.Buffer)}
-	io.WriteString(p, "foo")
-	a := errors.New("test err")
-	p.BreakWithError(a)
-	all, err := ioutil.ReadAll(p)
-	if string(all) != "" {
-		t.Errorf("read bytes = %q; want empty string", all)
-	}
-	if err != a {
-		t.Logf("read error = %v, %v", err, a)
-	}
-	if p.b != nil {
-		t.Errorf("buffer should be nil after BreakWithError")
-	}
-	// Write should succeed silently.
-	if n, err := p.Write([]byte("abc")); err != nil || n != 3 {
-		t.Errorf("Write(abc) after break\ngot %v, %v\nwant 0, nil", n, err)
-	}
-	if p.b != nil {
-		t.Errorf("buffer should be nil after Write")
-	}
-	// Read should fail.
-	if n, err := p.Read(make([]byte, 1)); err == nil || n != 0 {
-		t.Errorf("Read() after close\ngot %v, nil\nwant 0, not nil", n)
-	}
-}
diff --git a/vendor/golang.org/x/net/http2/server.go b/vendor/golang.org/x/net/http2/server.go
index 79389916..9862dad0 100644
--- a/vendor/golang.org/x/net/http2/server.go
+++ b/vendor/golang.org/x/net/http2/server.go
@@ -1487,6 +1487,12 @@ func (sc *serverConn) processSettings(f *SettingsFrame) error {
 		}
 		return nil
 	}
+	if f.NumSettings() > 100 || f.HasDuplicates() {
+		// This isn't actually in the spec, but hang up on
+		// suspiciously large settings frames or those with
+		// duplicate entries.
+		return ConnectionError(ErrCodeProtocol)
+	}
 	if err := f.ForeachSetting(sc.processSetting); err != nil {
 		return err
 	}
@@ -1575,6 +1581,12 @@ func (sc *serverConn) processData(f *DataFrame) error {
 		// type PROTOCOL_ERROR."
 		return ConnectionError(ErrCodeProtocol)
 	}
+	// RFC 7540, sec 6.1: If a DATA frame is received whose stream is not in
+	// "open" or "half-closed (local)" state, the recipient MUST respond with a
+	// stream error (Section 5.4.2) of type STREAM_CLOSED.
+	if state == stateClosed {
+		return streamError(id, ErrCodeStreamClosed)
+	}
 	if st == nil || state != stateOpen || st.gotTrailerHeader || st.resetQueued {
 		// This includes sending a RST_STREAM if the stream is
 		// in stateHalfClosedLocal (which currently means that
@@ -1721,6 +1733,13 @@ func (sc *serverConn) processHeaders(f *MetaHeadersFrame) error {
 			// processing this frame.
 			return nil
 		}
+		// RFC 7540, sec 5.1: If an endpoint receives additional frames, other than
+		// WINDOW_UPDATE, PRIORITY, or RST_STREAM, for a stream that is in
+		// this state, it MUST respond with a stream error (Section 5.4.2) of
+		// type STREAM_CLOSED.
+		if st.state == stateHalfClosedRemote {
+			return streamError(id, ErrCodeStreamClosed)
+		}
 		return st.processTrailerHeaders(f)
 	}
 
@@ -2327,15 +2346,7 @@ func (rws *responseWriterState) writeChunk(p []byte) (n int, err error) {
 		}
 		_, hasContentType := rws.snapHeader["Content-Type"]
 		if !hasContentType && bodyAllowedForStatus(rws.status) && len(p) > 0 {
-			if cto := rws.snapHeader.Get("X-Content-Type-Options"); strings.EqualFold("nosniff", cto) {
-				// nosniff is an explicit directive not to guess a content-type.
-				// Content-sniffing is no less susceptible to polyglot attacks via
-				// hosted content when done on the server.
-				ctype = "application/octet-stream"
-				rws.conn.logf("http2: WriteHeader called with X-Content-Type-Options:nosniff but no Content-Type")
-			} else {
-				ctype = http.DetectContentType(p)
-			}
+			ctype = http.DetectContentType(p)
 		}
 		var date string
 		if _, ok := rws.snapHeader["Date"]; !ok {
diff --git a/vendor/golang.org/x/net/http2/server_push_test.go b/vendor/golang.org/x/net/http2/server_push_test.go
deleted file mode 100644
index 918fd30d..00000000
--- a/vendor/golang.org/x/net/http2/server_push_test.go
+++ /dev/null
@@ -1,521 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.8
-
-package http2
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"reflect"
-	"strconv"
-	"sync"
-	"testing"
-	"time"
-)
-
-func TestServer_Push_Success(t *testing.T) {
-	const (
-		mainBody   = "<html>index page</html>"
-		pushedBody = "<html>pushed page</html>"
-		userAgent  = "testagent"
-		cookie     = "testcookie"
-	)
-
-	var stURL string
-	checkPromisedReq := func(r *http.Request, wantMethod string, wantH http.Header) error {
-		if got, want := r.Method, wantMethod; got != want {
-			return fmt.Errorf("promised Req.Method=%q, want %q", got, want)
-		}
-		if got, want := r.Header, wantH; !reflect.DeepEqual(got, want) {
-			return fmt.Errorf("promised Req.Header=%q, want %q", got, want)
-		}
-		if got, want := "https://"+r.Host, stURL; got != want {
-			return fmt.Errorf("promised Req.Host=%q, want %q", got, want)
-		}
-		if r.Body == nil {
-			return fmt.Errorf("nil Body")
-		}
-		if buf, err := ioutil.ReadAll(r.Body); err != nil || len(buf) != 0 {
-			return fmt.Errorf("ReadAll(Body)=%q,%v, want '',nil", buf, err)
-		}
-		return nil
-	}
-
-	errc := make(chan error, 3)
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		switch r.URL.RequestURI() {
-		case "/":
-			// Push "/pushed?get" as a GET request, using an absolute URL.
-			opt := &http.PushOptions{
-				Header: http.Header{
-					"User-Agent": {userAgent},
-				},
-			}
-			if err := w.(http.Pusher).Push(stURL+"/pushed?get", opt); err != nil {
-				errc <- fmt.Errorf("error pushing /pushed?get: %v", err)
-				return
-			}
-			// Push "/pushed?head" as a HEAD request, using a path.
-			opt = &http.PushOptions{
-				Method: "HEAD",
-				Header: http.Header{
-					"User-Agent": {userAgent},
-					"Cookie":     {cookie},
-				},
-			}
-			if err := w.(http.Pusher).Push("/pushed?head", opt); err != nil {
-				errc <- fmt.Errorf("error pushing /pushed?head: %v", err)
-				return
-			}
-			w.Header().Set("Content-Type", "text/html")
-			w.Header().Set("Content-Length", strconv.Itoa(len(mainBody)))
-			w.WriteHeader(200)
-			io.WriteString(w, mainBody)
-			errc <- nil
-
-		case "/pushed?get":
-			wantH := http.Header{}
-			wantH.Set("User-Agent", userAgent)
-			if err := checkPromisedReq(r, "GET", wantH); err != nil {
-				errc <- fmt.Errorf("/pushed?get: %v", err)
-				return
-			}
-			w.Header().Set("Content-Type", "text/html")
-			w.Header().Set("Content-Length", strconv.Itoa(len(pushedBody)))
-			w.WriteHeader(200)
-			io.WriteString(w, pushedBody)
-			errc <- nil
-
-		case "/pushed?head":
-			wantH := http.Header{}
-			wantH.Set("User-Agent", userAgent)
-			wantH.Set("Cookie", cookie)
-			if err := checkPromisedReq(r, "HEAD", wantH); err != nil {
-				errc <- fmt.Errorf("/pushed?head: %v", err)
-				return
-			}
-			w.WriteHeader(204)
-			errc <- nil
-
-		default:
-			errc <- fmt.Errorf("unknown RequestURL %q", r.URL.RequestURI())
-		}
-	})
-	stURL = st.ts.URL
-
-	// Send one request, which should push two responses.
-	st.greet()
-	getSlash(st)
-	for k := 0; k < 3; k++ {
-		select {
-		case <-time.After(2 * time.Second):
-			t.Errorf("timeout waiting for handler %d to finish", k)
-		case err := <-errc:
-			if err != nil {
-				t.Fatal(err)
-			}
-		}
-	}
-
-	checkPushPromise := func(f Frame, promiseID uint32, wantH [][2]string) error {
-		pp, ok := f.(*PushPromiseFrame)
-		if !ok {
-			return fmt.Errorf("got a %T; want *PushPromiseFrame", f)
-		}
-		if !pp.HeadersEnded() {
-			return fmt.Errorf("want END_HEADERS flag in PushPromiseFrame")
-		}
-		if got, want := pp.PromiseID, promiseID; got != want {
-			return fmt.Errorf("got PromiseID %v; want %v", got, want)
-		}
-		gotH := st.decodeHeader(pp.HeaderBlockFragment())
-		if !reflect.DeepEqual(gotH, wantH) {
-			return fmt.Errorf("got promised headers %v; want %v", gotH, wantH)
-		}
-		return nil
-	}
-	checkHeaders := func(f Frame, wantH [][2]string) error {
-		hf, ok := f.(*HeadersFrame)
-		if !ok {
-			return fmt.Errorf("got a %T; want *HeadersFrame", f)
-		}
-		gotH := st.decodeHeader(hf.HeaderBlockFragment())
-		if !reflect.DeepEqual(gotH, wantH) {
-			return fmt.Errorf("got response headers %v; want %v", gotH, wantH)
-		}
-		return nil
-	}
-	checkData := func(f Frame, wantData string) error {
-		df, ok := f.(*DataFrame)
-		if !ok {
-			return fmt.Errorf("got a %T; want *DataFrame", f)
-		}
-		if gotData := string(df.Data()); gotData != wantData {
-			return fmt.Errorf("got response data %q; want %q", gotData, wantData)
-		}
-		return nil
-	}
-
-	// Stream 1 has 2 PUSH_PROMISE + HEADERS + DATA
-	// Stream 2 has HEADERS + DATA
-	// Stream 4 has HEADERS
-	expected := map[uint32][]func(Frame) error{
-		1: {
-			func(f Frame) error {
-				return checkPushPromise(f, 2, [][2]string{
-					{":method", "GET"},
-					{":scheme", "https"},
-					{":authority", st.ts.Listener.Addr().String()},
-					{":path", "/pushed?get"},
-					{"user-agent", userAgent},
-				})
-			},
-			func(f Frame) error {
-				return checkPushPromise(f, 4, [][2]string{
-					{":method", "HEAD"},
-					{":scheme", "https"},
-					{":authority", st.ts.Listener.Addr().String()},
-					{":path", "/pushed?head"},
-					{"cookie", cookie},
-					{"user-agent", userAgent},
-				})
-			},
-			func(f Frame) error {
-				return checkHeaders(f, [][2]string{
-					{":status", "200"},
-					{"content-type", "text/html"},
-					{"content-length", strconv.Itoa(len(mainBody))},
-				})
-			},
-			func(f Frame) error {
-				return checkData(f, mainBody)
-			},
-		},
-		2: {
-			func(f Frame) error {
-				return checkHeaders(f, [][2]string{
-					{":status", "200"},
-					{"content-type", "text/html"},
-					{"content-length", strconv.Itoa(len(pushedBody))},
-				})
-			},
-			func(f Frame) error {
-				return checkData(f, pushedBody)
-			},
-		},
-		4: {
-			func(f Frame) error {
-				return checkHeaders(f, [][2]string{
-					{":status", "204"},
-				})
-			},
-		},
-	}
-
-	consumed := map[uint32]int{}
-	for k := 0; len(expected) > 0; k++ {
-		f, err := st.readFrame()
-		if err != nil {
-			for id, left := range expected {
-				t.Errorf("stream %d: missing %d frames", id, len(left))
-			}
-			t.Fatalf("readFrame %d: %v", k, err)
-		}
-		id := f.Header().StreamID
-		label := fmt.Sprintf("stream %d, frame %d", id, consumed[id])
-		if len(expected[id]) == 0 {
-			t.Fatalf("%s: unexpected frame %#+v", label, f)
-		}
-		check := expected[id][0]
-		expected[id] = expected[id][1:]
-		if len(expected[id]) == 0 {
-			delete(expected, id)
-		}
-		if err := check(f); err != nil {
-			t.Fatalf("%s: %v", label, err)
-		}
-		consumed[id]++
-	}
-}
-
-func TestServer_Push_SuccessNoRace(t *testing.T) {
-	// Regression test for issue #18326. Ensure the request handler can mutate
-	// pushed request headers without racing with the PUSH_PROMISE write.
-	errc := make(chan error, 2)
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		switch r.URL.RequestURI() {
-		case "/":
-			opt := &http.PushOptions{
-				Header: http.Header{"User-Agent": {"testagent"}},
-			}
-			if err := w.(http.Pusher).Push("/pushed", opt); err != nil {
-				errc <- fmt.Errorf("error pushing: %v", err)
-				return
-			}
-			w.WriteHeader(200)
-			errc <- nil
-
-		case "/pushed":
-			// Update request header, ensure there is no race.
-			r.Header.Set("User-Agent", "newagent")
-			r.Header.Set("Cookie", "cookie")
-			w.WriteHeader(200)
-			errc <- nil
-
-		default:
-			errc <- fmt.Errorf("unknown RequestURL %q", r.URL.RequestURI())
-		}
-	})
-
-	// Send one request, which should push one response.
-	st.greet()
-	getSlash(st)
-	for k := 0; k < 2; k++ {
-		select {
-		case <-time.After(2 * time.Second):
-			t.Errorf("timeout waiting for handler %d to finish", k)
-		case err := <-errc:
-			if err != nil {
-				t.Fatal(err)
-			}
-		}
-	}
-}
-
-func TestServer_Push_RejectRecursivePush(t *testing.T) {
-	// Expect two requests, but might get three if there's a bug and the second push succeeds.
-	errc := make(chan error, 3)
-	handler := func(w http.ResponseWriter, r *http.Request) error {
-		baseURL := "https://" + r.Host
-		switch r.URL.Path {
-		case "/":
-			if err := w.(http.Pusher).Push(baseURL+"/push1", nil); err != nil {
-				return fmt.Errorf("first Push()=%v, want nil", err)
-			}
-			return nil
-
-		case "/push1":
-			if got, want := w.(http.Pusher).Push(baseURL+"/push2", nil), ErrRecursivePush; got != want {
-				return fmt.Errorf("Push()=%v, want %v", got, want)
-			}
-			return nil
-
-		default:
-			return fmt.Errorf("unexpected path: %q", r.URL.Path)
-		}
-	}
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		errc <- handler(w, r)
-	})
-	defer st.Close()
-	st.greet()
-	getSlash(st)
-	if err := <-errc; err != nil {
-		t.Errorf("First request failed: %v", err)
-	}
-	if err := <-errc; err != nil {
-		t.Errorf("Second request failed: %v", err)
-	}
-}
-
-func testServer_Push_RejectSingleRequest(t *testing.T, doPush func(http.Pusher, *http.Request) error, settings ...Setting) {
-	// Expect one request, but might get two if there's a bug and the push succeeds.
-	errc := make(chan error, 2)
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		errc <- doPush(w.(http.Pusher), r)
-	})
-	defer st.Close()
-	st.greet()
-	if err := st.fr.WriteSettings(settings...); err != nil {
-		st.t.Fatalf("WriteSettings: %v", err)
-	}
-	st.wantSettingsAck()
-	getSlash(st)
-	if err := <-errc; err != nil {
-		t.Error(err)
-	}
-	// Should not get a PUSH_PROMISE frame.
-	hf := st.wantHeaders()
-	if !hf.StreamEnded() {
-		t.Error("stream should end after headers")
-	}
-}
-
-func TestServer_Push_RejectIfDisabled(t *testing.T) {
-	testServer_Push_RejectSingleRequest(t,
-		func(p http.Pusher, r *http.Request) error {
-			if got, want := p.Push("https://"+r.Host+"/pushed", nil), http.ErrNotSupported; got != want {
-				return fmt.Errorf("Push()=%v, want %v", got, want)
-			}
-			return nil
-		},
-		Setting{SettingEnablePush, 0})
-}
-
-func TestServer_Push_RejectWhenNoConcurrentStreams(t *testing.T) {
-	testServer_Push_RejectSingleRequest(t,
-		func(p http.Pusher, r *http.Request) error {
-			if got, want := p.Push("https://"+r.Host+"/pushed", nil), ErrPushLimitReached; got != want {
-				return fmt.Errorf("Push()=%v, want %v", got, want)
-			}
-			return nil
-		},
-		Setting{SettingMaxConcurrentStreams, 0})
-}
-
-func TestServer_Push_RejectWrongScheme(t *testing.T) {
-	testServer_Push_RejectSingleRequest(t,
-		func(p http.Pusher, r *http.Request) error {
-			if err := p.Push("http://"+r.Host+"/pushed", nil); err == nil {
-				return errors.New("Push() should have failed (push target URL is http)")
-			}
-			return nil
-		})
-}
-
-func TestServer_Push_RejectMissingHost(t *testing.T) {
-	testServer_Push_RejectSingleRequest(t,
-		func(p http.Pusher, r *http.Request) error {
-			if err := p.Push("https:pushed", nil); err == nil {
-				return errors.New("Push() should have failed (push target URL missing host)")
-			}
-			return nil
-		})
-}
-
-func TestServer_Push_RejectRelativePath(t *testing.T) {
-	testServer_Push_RejectSingleRequest(t,
-		func(p http.Pusher, r *http.Request) error {
-			if err := p.Push("../test", nil); err == nil {
-				return errors.New("Push() should have failed (push target is a relative path)")
-			}
-			return nil
-		})
-}
-
-func TestServer_Push_RejectForbiddenMethod(t *testing.T) {
-	testServer_Push_RejectSingleRequest(t,
-		func(p http.Pusher, r *http.Request) error {
-			if err := p.Push("https://"+r.Host+"/pushed", &http.PushOptions{Method: "POST"}); err == nil {
-				return errors.New("Push() should have failed (cannot promise a POST)")
-			}
-			return nil
-		})
-}
-
-func TestServer_Push_RejectForbiddenHeader(t *testing.T) {
-	testServer_Push_RejectSingleRequest(t,
-		func(p http.Pusher, r *http.Request) error {
-			header := http.Header{
-				"Content-Length":   {"10"},
-				"Content-Encoding": {"gzip"},
-				"Trailer":          {"Foo"},
-				"Te":               {"trailers"},
-				"Host":             {"test.com"},
-				":authority":       {"test.com"},
-			}
-			if err := p.Push("https://"+r.Host+"/pushed", &http.PushOptions{Header: header}); err == nil {
-				return errors.New("Push() should have failed (forbidden headers)")
-			}
-			return nil
-		})
-}
-
-func TestServer_Push_StateTransitions(t *testing.T) {
-	const body = "foo"
-
-	gotPromise := make(chan bool)
-	finishedPush := make(chan bool)
-
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		switch r.URL.RequestURI() {
-		case "/":
-			if err := w.(http.Pusher).Push("/pushed", nil); err != nil {
-				t.Errorf("Push error: %v", err)
-			}
-			// Don't finish this request until the push finishes so we don't
-			// nondeterministically interleave output frames with the push.
-			<-finishedPush
-		case "/pushed":
-			<-gotPromise
-		}
-		w.Header().Set("Content-Type", "text/html")
-		w.Header().Set("Content-Length", strconv.Itoa(len(body)))
-		w.WriteHeader(200)
-		io.WriteString(w, body)
-	})
-	defer st.Close()
-
-	st.greet()
-	if st.stream(2) != nil {
-		t.Fatal("stream 2 should be empty")
-	}
-	if got, want := st.streamState(2), stateIdle; got != want {
-		t.Fatalf("streamState(2)=%v, want %v", got, want)
-	}
-	getSlash(st)
-	// After the PUSH_PROMISE is sent, the stream should be stateHalfClosedRemote.
-	st.wantPushPromise()
-	if got, want := st.streamState(2), stateHalfClosedRemote; got != want {
-		t.Fatalf("streamState(2)=%v, want %v", got, want)
-	}
-	// We stall the HTTP handler for "/pushed" until the above check. If we don't
-	// stall the handler, then the handler might write HEADERS and DATA and finish
-	// the stream before we check st.streamState(2) -- should that happen, we'll
-	// see stateClosed and fail the above check.
-	close(gotPromise)
-	st.wantHeaders()
-	if df := st.wantData(); !df.StreamEnded() {
-		t.Fatal("expected END_STREAM flag on DATA")
-	}
-	if got, want := st.streamState(2), stateClosed; got != want {
-		t.Fatalf("streamState(2)=%v, want %v", got, want)
-	}
-	close(finishedPush)
-}
-
-func TestServer_Push_RejectAfterGoAway(t *testing.T) {
-	var readyOnce sync.Once
-	ready := make(chan struct{})
-	errc := make(chan error, 2)
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		select {
-		case <-ready:
-		case <-time.After(5 * time.Second):
-			errc <- fmt.Errorf("timeout waiting for GOAWAY to be processed")
-		}
-		if got, want := w.(http.Pusher).Push("https://"+r.Host+"/pushed", nil), http.ErrNotSupported; got != want {
-			errc <- fmt.Errorf("Push()=%v, want %v", got, want)
-		}
-		errc <- nil
-	})
-	defer st.Close()
-	st.greet()
-	getSlash(st)
-
-	// Send GOAWAY and wait for it to be processed.
-	st.fr.WriteGoAway(1, ErrCodeNo, nil)
-	go func() {
-		for {
-			select {
-			case <-ready:
-				return
-			default:
-			}
-			st.sc.serveMsgCh <- func(loopNum int) {
-				if !st.sc.pushEnabled {
-					readyOnce.Do(func() { close(ready) })
-				}
-			}
-		}
-	}()
-	if err := <-errc; err != nil {
-		t.Error(err)
-	}
-}
diff --git a/vendor/golang.org/x/net/http2/server_test.go b/vendor/golang.org/x/net/http2/server_test.go
deleted file mode 100644
index 9c3e549d..00000000
--- a/vendor/golang.org/x/net/http2/server_test.go
+++ /dev/null
@@ -1,3843 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import (
-	"bytes"
-	"crypto/tls"
-	"errors"
-	"flag"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"log"
-	"net"
-	"net/http"
-	"net/http/httptest"
-	"os"
-	"os/exec"
-	"reflect"
-	"runtime"
-	"strconv"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	"golang.org/x/net/http2/hpack"
-)
-
-var stderrVerbose = flag.Bool("stderr_verbose", false, "Mirror verbosity to stderr, unbuffered")
-
-func stderrv() io.Writer {
-	if *stderrVerbose {
-		return os.Stderr
-	}
-
-	return ioutil.Discard
-}
-
-type serverTester struct {
-	cc             net.Conn // client conn
-	t              testing.TB
-	ts             *httptest.Server
-	fr             *Framer
-	serverLogBuf   bytes.Buffer // logger for httptest.Server
-	logFilter      []string     // substrings to filter out
-	scMu           sync.Mutex   // guards sc
-	sc             *serverConn
-	hpackDec       *hpack.Decoder
-	decodedHeaders [][2]string
-
-	// If http2debug!=2, then we capture Frame debug logs that will be written
-	// to t.Log after a test fails. The read and write logs use separate locks
-	// and buffers so we don't accidentally introduce synchronization between
-	// the read and write goroutines, which may hide data races.
-	frameReadLogMu   sync.Mutex
-	frameReadLogBuf  bytes.Buffer
-	frameWriteLogMu  sync.Mutex
-	frameWriteLogBuf bytes.Buffer
-
-	// writing headers:
-	headerBuf bytes.Buffer
-	hpackEnc  *hpack.Encoder
-}
-
-func init() {
-	testHookOnPanicMu = new(sync.Mutex)
-	goAwayTimeout = 25 * time.Millisecond
-}
-
-func resetHooks() {
-	testHookOnPanicMu.Lock()
-	testHookOnPanic = nil
-	testHookOnPanicMu.Unlock()
-}
-
-type serverTesterOpt string
-
-var optOnlyServer = serverTesterOpt("only_server")
-var optQuiet = serverTesterOpt("quiet_logging")
-var optFramerReuseFrames = serverTesterOpt("frame_reuse_frames")
-
-func newServerTester(t testing.TB, handler http.HandlerFunc, opts ...interface{}) *serverTester {
-	resetHooks()
-
-	ts := httptest.NewUnstartedServer(handler)
-
-	tlsConfig := &tls.Config{
-		InsecureSkipVerify: true,
-		NextProtos:         []string{NextProtoTLS},
-	}
-
-	var onlyServer, quiet, framerReuseFrames bool
-	h2server := new(Server)
-	for _, opt := range opts {
-		switch v := opt.(type) {
-		case func(*tls.Config):
-			v(tlsConfig)
-		case func(*httptest.Server):
-			v(ts)
-		case func(*Server):
-			v(h2server)
-		case serverTesterOpt:
-			switch v {
-			case optOnlyServer:
-				onlyServer = true
-			case optQuiet:
-				quiet = true
-			case optFramerReuseFrames:
-				framerReuseFrames = true
-			}
-		case func(net.Conn, http.ConnState):
-			ts.Config.ConnState = v
-		default:
-			t.Fatalf("unknown newServerTester option type %T", v)
-		}
-	}
-
-	ConfigureServer(ts.Config, h2server)
-
-	st := &serverTester{
-		t:  t,
-		ts: ts,
-	}
-	st.hpackEnc = hpack.NewEncoder(&st.headerBuf)
-	st.hpackDec = hpack.NewDecoder(initialHeaderTableSize, st.onHeaderField)
-
-	ts.TLS = ts.Config.TLSConfig // the httptest.Server has its own copy of this TLS config
-	if quiet {
-		ts.Config.ErrorLog = log.New(ioutil.Discard, "", 0)
-	} else {
-		ts.Config.ErrorLog = log.New(io.MultiWriter(stderrv(), twriter{t: t, st: st}, &st.serverLogBuf), "", log.LstdFlags)
-	}
-	ts.StartTLS()
-
-	if VerboseLogs {
-		t.Logf("Running test server at: %s", ts.URL)
-	}
-	testHookGetServerConn = func(v *serverConn) {
-		st.scMu.Lock()
-		defer st.scMu.Unlock()
-		st.sc = v
-	}
-	log.SetOutput(io.MultiWriter(stderrv(), twriter{t: t, st: st}))
-	if !onlyServer {
-		cc, err := tls.Dial("tcp", ts.Listener.Addr().String(), tlsConfig)
-		if err != nil {
-			t.Fatal(err)
-		}
-		st.cc = cc
-		st.fr = NewFramer(cc, cc)
-		if framerReuseFrames {
-			st.fr.SetReuseFrames()
-		}
-		if !logFrameReads && !logFrameWrites {
-			st.fr.debugReadLoggerf = func(m string, v ...interface{}) {
-				m = time.Now().Format("2006-01-02 15:04:05.999999999 ") + strings.TrimPrefix(m, "http2: ") + "\n"
-				st.frameReadLogMu.Lock()
-				fmt.Fprintf(&st.frameReadLogBuf, m, v...)
-				st.frameReadLogMu.Unlock()
-			}
-			st.fr.debugWriteLoggerf = func(m string, v ...interface{}) {
-				m = time.Now().Format("2006-01-02 15:04:05.999999999 ") + strings.TrimPrefix(m, "http2: ") + "\n"
-				st.frameWriteLogMu.Lock()
-				fmt.Fprintf(&st.frameWriteLogBuf, m, v...)
-				st.frameWriteLogMu.Unlock()
-			}
-			st.fr.logReads = true
-			st.fr.logWrites = true
-		}
-	}
-	return st
-}
-
-func (st *serverTester) closeConn() {
-	st.scMu.Lock()
-	defer st.scMu.Unlock()
-	st.sc.conn.Close()
-}
-
-func (st *serverTester) addLogFilter(phrase string) {
-	st.logFilter = append(st.logFilter, phrase)
-}
-
-func (st *serverTester) stream(id uint32) *stream {
-	ch := make(chan *stream, 1)
-	st.sc.serveMsgCh <- func(int) {
-		ch <- st.sc.streams[id]
-	}
-	return <-ch
-}
-
-func (st *serverTester) streamState(id uint32) streamState {
-	ch := make(chan streamState, 1)
-	st.sc.serveMsgCh <- func(int) {
-		state, _ := st.sc.state(id)
-		ch <- state
-	}
-	return <-ch
-}
-
-// loopNum reports how many times this conn's select loop has gone around.
-func (st *serverTester) loopNum() int {
-	lastc := make(chan int, 1)
-	st.sc.serveMsgCh <- func(loopNum int) {
-		lastc <- loopNum
-	}
-	return <-lastc
-}
-
-// awaitIdle heuristically awaits for the server conn's select loop to be idle.
-// The heuristic is that the server connection's serve loop must schedule
-// 50 times in a row without any channel sends or receives occurring.
-func (st *serverTester) awaitIdle() {
-	remain := 50
-	last := st.loopNum()
-	for remain > 0 {
-		n := st.loopNum()
-		if n == last+1 {
-			remain--
-		} else {
-			remain = 50
-		}
-		last = n
-	}
-}
-
-func (st *serverTester) Close() {
-	if st.t.Failed() {
-		st.frameReadLogMu.Lock()
-		if st.frameReadLogBuf.Len() > 0 {
-			st.t.Logf("Framer read log:\n%s", st.frameReadLogBuf.String())
-		}
-		st.frameReadLogMu.Unlock()
-
-		st.frameWriteLogMu.Lock()
-		if st.frameWriteLogBuf.Len() > 0 {
-			st.t.Logf("Framer write log:\n%s", st.frameWriteLogBuf.String())
-		}
-		st.frameWriteLogMu.Unlock()
-
-		// If we failed already (and are likely in a Fatal,
-		// unwindowing), force close the connection, so the
-		// httptest.Server doesn't wait forever for the conn
-		// to close.
-		if st.cc != nil {
-			st.cc.Close()
-		}
-	}
-	st.ts.Close()
-	if st.cc != nil {
-		st.cc.Close()
-	}
-	log.SetOutput(os.Stderr)
-}
-
-// greet initiates the client's HTTP/2 connection into a state where
-// frames may be sent.
-func (st *serverTester) greet() {
-	st.greetAndCheckSettings(func(Setting) error { return nil })
-}
-
-func (st *serverTester) greetAndCheckSettings(checkSetting func(s Setting) error) {
-	st.writePreface()
-	st.writeInitialSettings()
-	st.wantSettings().ForeachSetting(checkSetting)
-	st.writeSettingsAck()
-
-	// The initial WINDOW_UPDATE and SETTINGS ACK can come in any order.
-	var gotSettingsAck bool
-	var gotWindowUpdate bool
-
-	for i := 0; i < 2; i++ {
-		f, err := st.readFrame()
-		if err != nil {
-			st.t.Fatal(err)
-		}
-		switch f := f.(type) {
-		case *SettingsFrame:
-			if !f.Header().Flags.Has(FlagSettingsAck) {
-				st.t.Fatal("Settings Frame didn't have ACK set")
-			}
-			gotSettingsAck = true
-
-		case *WindowUpdateFrame:
-			if f.FrameHeader.StreamID != 0 {
-				st.t.Fatalf("WindowUpdate StreamID = %d; want 0", f.FrameHeader.StreamID)
-			}
-			incr := uint32((&Server{}).initialConnRecvWindowSize() - initialWindowSize)
-			if f.Increment != incr {
-				st.t.Fatalf("WindowUpdate increment = %d; want %d", f.Increment, incr)
-			}
-			gotWindowUpdate = true
-
-		default:
-			st.t.Fatalf("Wanting a settings ACK or window update, received a %T", f)
-		}
-	}
-
-	if !gotSettingsAck {
-		st.t.Fatalf("Didn't get a settings ACK")
-	}
-	if !gotWindowUpdate {
-		st.t.Fatalf("Didn't get a window update")
-	}
-}
-
-func (st *serverTester) writePreface() {
-	n, err := st.cc.Write(clientPreface)
-	if err != nil {
-		st.t.Fatalf("Error writing client preface: %v", err)
-	}
-	if n != len(clientPreface) {
-		st.t.Fatalf("Writing client preface, wrote %d bytes; want %d", n, len(clientPreface))
-	}
-}
-
-func (st *serverTester) writeInitialSettings() {
-	if err := st.fr.WriteSettings(); err != nil {
-		st.t.Fatalf("Error writing initial SETTINGS frame from client to server: %v", err)
-	}
-}
-
-func (st *serverTester) writeSettingsAck() {
-	if err := st.fr.WriteSettingsAck(); err != nil {
-		st.t.Fatalf("Error writing ACK of server's SETTINGS: %v", err)
-	}
-}
-
-func (st *serverTester) writeHeaders(p HeadersFrameParam) {
-	if err := st.fr.WriteHeaders(p); err != nil {
-		st.t.Fatalf("Error writing HEADERS: %v", err)
-	}
-}
-
-func (st *serverTester) writePriority(id uint32, p PriorityParam) {
-	if err := st.fr.WritePriority(id, p); err != nil {
-		st.t.Fatalf("Error writing PRIORITY: %v", err)
-	}
-}
-
-func (st *serverTester) encodeHeaderField(k, v string) {
-	err := st.hpackEnc.WriteField(hpack.HeaderField{Name: k, Value: v})
-	if err != nil {
-		st.t.Fatalf("HPACK encoding error for %q/%q: %v", k, v, err)
-	}
-}
-
-// encodeHeaderRaw is the magic-free version of encodeHeader.
-// It takes 0 or more (k, v) pairs and encodes them.
-func (st *serverTester) encodeHeaderRaw(headers ...string) []byte {
-	if len(headers)%2 == 1 {
-		panic("odd number of kv args")
-	}
-	st.headerBuf.Reset()
-	for len(headers) > 0 {
-		k, v := headers[0], headers[1]
-		st.encodeHeaderField(k, v)
-		headers = headers[2:]
-	}
-	return st.headerBuf.Bytes()
-}
-
-// encodeHeader encodes headers and returns their HPACK bytes. headers
-// must contain an even number of key/value pairs. There may be
-// multiple pairs for keys (e.g. "cookie").  The :method, :path, and
-// :scheme headers default to GET, / and https. The :authority header
-// defaults to st.ts.Listener.Addr().
-func (st *serverTester) encodeHeader(headers ...string) []byte {
-	if len(headers)%2 == 1 {
-		panic("odd number of kv args")
-	}
-
-	st.headerBuf.Reset()
-	defaultAuthority := st.ts.Listener.Addr().String()
-
-	if len(headers) == 0 {
-		// Fast path, mostly for benchmarks, so test code doesn't pollute
-		// profiles when we're looking to improve server allocations.
-		st.encodeHeaderField(":method", "GET")
-		st.encodeHeaderField(":scheme", "https")
-		st.encodeHeaderField(":authority", defaultAuthority)
-		st.encodeHeaderField(":path", "/")
-		return st.headerBuf.Bytes()
-	}
-
-	if len(headers) == 2 && headers[0] == ":method" {
-		// Another fast path for benchmarks.
-		st.encodeHeaderField(":method", headers[1])
-		st.encodeHeaderField(":scheme", "https")
-		st.encodeHeaderField(":authority", defaultAuthority)
-		st.encodeHeaderField(":path", "/")
-		return st.headerBuf.Bytes()
-	}
-
-	pseudoCount := map[string]int{}
-	keys := []string{":method", ":scheme", ":authority", ":path"}
-	vals := map[string][]string{
-		":method":    {"GET"},
-		":scheme":    {"https"},
-		":authority": {defaultAuthority},
-		":path":      {"/"},
-	}
-	for len(headers) > 0 {
-		k, v := headers[0], headers[1]
-		headers = headers[2:]
-		if _, ok := vals[k]; !ok {
-			keys = append(keys, k)
-		}
-		if strings.HasPrefix(k, ":") {
-			pseudoCount[k]++
-			if pseudoCount[k] == 1 {
-				vals[k] = []string{v}
-			} else {
-				// Allows testing of invalid headers w/ dup pseudo fields.
-				vals[k] = append(vals[k], v)
-			}
-		} else {
-			vals[k] = append(vals[k], v)
-		}
-	}
-	for _, k := range keys {
-		for _, v := range vals[k] {
-			st.encodeHeaderField(k, v)
-		}
-	}
-	return st.headerBuf.Bytes()
-}
-
-// bodylessReq1 writes a HEADERS frames with StreamID 1 and EndStream and EndHeaders set.
-func (st *serverTester) bodylessReq1(headers ...string) {
-	st.writeHeaders(HeadersFrameParam{
-		StreamID:      1, // clients send odd numbers
-		BlockFragment: st.encodeHeader(headers...),
-		EndStream:     true,
-		EndHeaders:    true,
-	})
-}
-
-func (st *serverTester) writeData(streamID uint32, endStream bool, data []byte) {
-	if err := st.fr.WriteData(streamID, endStream, data); err != nil {
-		st.t.Fatalf("Error writing DATA: %v", err)
-	}
-}
-
-func (st *serverTester) writeDataPadded(streamID uint32, endStream bool, data, pad []byte) {
-	if err := st.fr.WriteDataPadded(streamID, endStream, data, pad); err != nil {
-		st.t.Fatalf("Error writing DATA: %v", err)
-	}
-}
-
-func readFrameTimeout(fr *Framer, wait time.Duration) (Frame, error) {
-	ch := make(chan interface{}, 1)
-	go func() {
-		fr, err := fr.ReadFrame()
-		if err != nil {
-			ch <- err
-		} else {
-			ch <- fr
-		}
-	}()
-	t := time.NewTimer(wait)
-	select {
-	case v := <-ch:
-		t.Stop()
-		if fr, ok := v.(Frame); ok {
-			return fr, nil
-		}
-		return nil, v.(error)
-	case <-t.C:
-		return nil, errors.New("timeout waiting for frame")
-	}
-}
-
-func (st *serverTester) readFrame() (Frame, error) {
-	return readFrameTimeout(st.fr, 2*time.Second)
-}
-
-func (st *serverTester) wantHeaders() *HeadersFrame {
-	f, err := st.readFrame()
-	if err != nil {
-		st.t.Fatalf("Error while expecting a HEADERS frame: %v", err)
-	}
-	hf, ok := f.(*HeadersFrame)
-	if !ok {
-		st.t.Fatalf("got a %T; want *HeadersFrame", f)
-	}
-	return hf
-}
-
-func (st *serverTester) wantContinuation() *ContinuationFrame {
-	f, err := st.readFrame()
-	if err != nil {
-		st.t.Fatalf("Error while expecting a CONTINUATION frame: %v", err)
-	}
-	cf, ok := f.(*ContinuationFrame)
-	if !ok {
-		st.t.Fatalf("got a %T; want *ContinuationFrame", f)
-	}
-	return cf
-}
-
-func (st *serverTester) wantData() *DataFrame {
-	f, err := st.readFrame()
-	if err != nil {
-		st.t.Fatalf("Error while expecting a DATA frame: %v", err)
-	}
-	df, ok := f.(*DataFrame)
-	if !ok {
-		st.t.Fatalf("got a %T; want *DataFrame", f)
-	}
-	return df
-}
-
-func (st *serverTester) wantSettings() *SettingsFrame {
-	f, err := st.readFrame()
-	if err != nil {
-		st.t.Fatalf("Error while expecting a SETTINGS frame: %v", err)
-	}
-	sf, ok := f.(*SettingsFrame)
-	if !ok {
-		st.t.Fatalf("got a %T; want *SettingsFrame", f)
-	}
-	return sf
-}
-
-func (st *serverTester) wantPing() *PingFrame {
-	f, err := st.readFrame()
-	if err != nil {
-		st.t.Fatalf("Error while expecting a PING frame: %v", err)
-	}
-	pf, ok := f.(*PingFrame)
-	if !ok {
-		st.t.Fatalf("got a %T; want *PingFrame", f)
-	}
-	return pf
-}
-
-func (st *serverTester) wantGoAway() *GoAwayFrame {
-	f, err := st.readFrame()
-	if err != nil {
-		st.t.Fatalf("Error while expecting a GOAWAY frame: %v", err)
-	}
-	gf, ok := f.(*GoAwayFrame)
-	if !ok {
-		st.t.Fatalf("got a %T; want *GoAwayFrame", f)
-	}
-	return gf
-}
-
-func (st *serverTester) wantRSTStream(streamID uint32, errCode ErrCode) {
-	f, err := st.readFrame()
-	if err != nil {
-		st.t.Fatalf("Error while expecting an RSTStream frame: %v", err)
-	}
-	rs, ok := f.(*RSTStreamFrame)
-	if !ok {
-		st.t.Fatalf("got a %T; want *RSTStreamFrame", f)
-	}
-	if rs.FrameHeader.StreamID != streamID {
-		st.t.Fatalf("RSTStream StreamID = %d; want %d", rs.FrameHeader.StreamID, streamID)
-	}
-	if rs.ErrCode != errCode {
-		st.t.Fatalf("RSTStream ErrCode = %d (%s); want %d (%s)", rs.ErrCode, rs.ErrCode, errCode, errCode)
-	}
-}
-
-func (st *serverTester) wantWindowUpdate(streamID, incr uint32) {
-	f, err := st.readFrame()
-	if err != nil {
-		st.t.Fatalf("Error while expecting a WINDOW_UPDATE frame: %v", err)
-	}
-	wu, ok := f.(*WindowUpdateFrame)
-	if !ok {
-		st.t.Fatalf("got a %T; want *WindowUpdateFrame", f)
-	}
-	if wu.FrameHeader.StreamID != streamID {
-		st.t.Fatalf("WindowUpdate StreamID = %d; want %d", wu.FrameHeader.StreamID, streamID)
-	}
-	if wu.Increment != incr {
-		st.t.Fatalf("WindowUpdate increment = %d; want %d", wu.Increment, incr)
-	}
-}
-
-func (st *serverTester) wantSettingsAck() {
-	f, err := st.readFrame()
-	if err != nil {
-		st.t.Fatal(err)
-	}
-	sf, ok := f.(*SettingsFrame)
-	if !ok {
-		st.t.Fatalf("Wanting a settings ACK, received a %T", f)
-	}
-	if !sf.Header().Flags.Has(FlagSettingsAck) {
-		st.t.Fatal("Settings Frame didn't have ACK set")
-	}
-}
-
-func (st *serverTester) wantPushPromise() *PushPromiseFrame {
-	f, err := st.readFrame()
-	if err != nil {
-		st.t.Fatal(err)
-	}
-	ppf, ok := f.(*PushPromiseFrame)
-	if !ok {
-		st.t.Fatalf("Wanted PushPromise, received %T", ppf)
-	}
-	return ppf
-}
-
-func TestServer(t *testing.T) {
-	gotReq := make(chan bool, 1)
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Foo", "Bar")
-		gotReq <- true
-	})
-	defer st.Close()
-
-	covers("3.5", `
-		The server connection preface consists of a potentially empty
-		SETTINGS frame ([SETTINGS]) that MUST be the first frame the
-		server sends in the HTTP/2 connection.
-	`)
-
-	st.greet()
-	st.writeHeaders(HeadersFrameParam{
-		StreamID:      1, // clients send odd numbers
-		BlockFragment: st.encodeHeader(),
-		EndStream:     true, // no DATA frames
-		EndHeaders:    true,
-	})
-
-	select {
-	case <-gotReq:
-	case <-time.After(2 * time.Second):
-		t.Error("timeout waiting for request")
-	}
-}
-
-func TestServer_Request_Get(t *testing.T) {
-	testServerRequest(t, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1, // clients send odd numbers
-			BlockFragment: st.encodeHeader("foo-bar", "some-value"),
-			EndStream:     true, // no DATA frames
-			EndHeaders:    true,
-		})
-	}, func(r *http.Request) {
-		if r.Method != "GET" {
-			t.Errorf("Method = %q; want GET", r.Method)
-		}
-		if r.URL.Path != "/" {
-			t.Errorf("URL.Path = %q; want /", r.URL.Path)
-		}
-		if r.ContentLength != 0 {
-			t.Errorf("ContentLength = %v; want 0", r.ContentLength)
-		}
-		if r.Close {
-			t.Error("Close = true; want false")
-		}
-		if !strings.Contains(r.RemoteAddr, ":") {
-			t.Errorf("RemoteAddr = %q; want something with a colon", r.RemoteAddr)
-		}
-		if r.Proto != "HTTP/2.0" || r.ProtoMajor != 2 || r.ProtoMinor != 0 {
-			t.Errorf("Proto = %q Major=%v,Minor=%v; want HTTP/2.0", r.Proto, r.ProtoMajor, r.ProtoMinor)
-		}
-		wantHeader := http.Header{
-			"Foo-Bar": []string{"some-value"},
-		}
-		if !reflect.DeepEqual(r.Header, wantHeader) {
-			t.Errorf("Header = %#v; want %#v", r.Header, wantHeader)
-		}
-		if n, err := r.Body.Read([]byte(" ")); err != io.EOF || n != 0 {
-			t.Errorf("Read = %d, %v; want 0, EOF", n, err)
-		}
-	})
-}
-
-func TestServer_Request_Get_PathSlashes(t *testing.T) {
-	testServerRequest(t, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1, // clients send odd numbers
-			BlockFragment: st.encodeHeader(":path", "/%2f/"),
-			EndStream:     true, // no DATA frames
-			EndHeaders:    true,
-		})
-	}, func(r *http.Request) {
-		if r.RequestURI != "/%2f/" {
-			t.Errorf("RequestURI = %q; want /%%2f/", r.RequestURI)
-		}
-		if r.URL.Path != "///" {
-			t.Errorf("URL.Path = %q; want ///", r.URL.Path)
-		}
-	})
-}
-
-// TODO: add a test with EndStream=true on the HEADERS but setting a
-// Content-Length anyway. Should we just omit it and force it to
-// zero?
-
-func TestServer_Request_Post_NoContentLength_EndStream(t *testing.T) {
-	testServerRequest(t, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1, // clients send odd numbers
-			BlockFragment: st.encodeHeader(":method", "POST"),
-			EndStream:     true,
-			EndHeaders:    true,
-		})
-	}, func(r *http.Request) {
-		if r.Method != "POST" {
-			t.Errorf("Method = %q; want POST", r.Method)
-		}
-		if r.ContentLength != 0 {
-			t.Errorf("ContentLength = %v; want 0", r.ContentLength)
-		}
-		if n, err := r.Body.Read([]byte(" ")); err != io.EOF || n != 0 {
-			t.Errorf("Read = %d, %v; want 0, EOF", n, err)
-		}
-	})
-}
-
-func TestServer_Request_Post_Body_ImmediateEOF(t *testing.T) {
-	testBodyContents(t, -1, "", func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1, // clients send odd numbers
-			BlockFragment: st.encodeHeader(":method", "POST"),
-			EndStream:     false, // to say DATA frames are coming
-			EndHeaders:    true,
-		})
-		st.writeData(1, true, nil) // just kidding. empty body.
-	})
-}
-
-func TestServer_Request_Post_Body_OneData(t *testing.T) {
-	const content = "Some content"
-	testBodyContents(t, -1, content, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1, // clients send odd numbers
-			BlockFragment: st.encodeHeader(":method", "POST"),
-			EndStream:     false, // to say DATA frames are coming
-			EndHeaders:    true,
-		})
-		st.writeData(1, true, []byte(content))
-	})
-}
-
-func TestServer_Request_Post_Body_TwoData(t *testing.T) {
-	const content = "Some content"
-	testBodyContents(t, -1, content, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1, // clients send odd numbers
-			BlockFragment: st.encodeHeader(":method", "POST"),
-			EndStream:     false, // to say DATA frames are coming
-			EndHeaders:    true,
-		})
-		st.writeData(1, false, []byte(content[:5]))
-		st.writeData(1, true, []byte(content[5:]))
-	})
-}
-
-func TestServer_Request_Post_Body_ContentLength_Correct(t *testing.T) {
-	const content = "Some content"
-	testBodyContents(t, int64(len(content)), content, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID: 1, // clients send odd numbers
-			BlockFragment: st.encodeHeader(
-				":method", "POST",
-				"content-length", strconv.Itoa(len(content)),
-			),
-			EndStream:  false, // to say DATA frames are coming
-			EndHeaders: true,
-		})
-		st.writeData(1, true, []byte(content))
-	})
-}
-
-func TestServer_Request_Post_Body_ContentLength_TooLarge(t *testing.T) {
-	testBodyContentsFail(t, 3, "request declared a Content-Length of 3 but only wrote 2 bytes",
-		func(st *serverTester) {
-			st.writeHeaders(HeadersFrameParam{
-				StreamID: 1, // clients send odd numbers
-				BlockFragment: st.encodeHeader(
-					":method", "POST",
-					"content-length", "3",
-				),
-				EndStream:  false, // to say DATA frames are coming
-				EndHeaders: true,
-			})
-			st.writeData(1, true, []byte("12"))
-		})
-}
-
-func TestServer_Request_Post_Body_ContentLength_TooSmall(t *testing.T) {
-	testBodyContentsFail(t, 4, "sender tried to send more than declared Content-Length of 4 bytes",
-		func(st *serverTester) {
-			st.writeHeaders(HeadersFrameParam{
-				StreamID: 1, // clients send odd numbers
-				BlockFragment: st.encodeHeader(
-					":method", "POST",
-					"content-length", "4",
-				),
-				EndStream:  false, // to say DATA frames are coming
-				EndHeaders: true,
-			})
-			st.writeData(1, true, []byte("12345"))
-		})
-}
-
-func testBodyContents(t *testing.T, wantContentLength int64, wantBody string, write func(st *serverTester)) {
-	testServerRequest(t, write, func(r *http.Request) {
-		if r.Method != "POST" {
-			t.Errorf("Method = %q; want POST", r.Method)
-		}
-		if r.ContentLength != wantContentLength {
-			t.Errorf("ContentLength = %v; want %d", r.ContentLength, wantContentLength)
-		}
-		all, err := ioutil.ReadAll(r.Body)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if string(all) != wantBody {
-			t.Errorf("Read = %q; want %q", all, wantBody)
-		}
-		if err := r.Body.Close(); err != nil {
-			t.Fatalf("Close: %v", err)
-		}
-	})
-}
-
-func testBodyContentsFail(t *testing.T, wantContentLength int64, wantReadError string, write func(st *serverTester)) {
-	testServerRequest(t, write, func(r *http.Request) {
-		if r.Method != "POST" {
-			t.Errorf("Method = %q; want POST", r.Method)
-		}
-		if r.ContentLength != wantContentLength {
-			t.Errorf("ContentLength = %v; want %d", r.ContentLength, wantContentLength)
-		}
-		all, err := ioutil.ReadAll(r.Body)
-		if err == nil {
-			t.Fatalf("expected an error (%q) reading from the body. Successfully read %q instead.",
-				wantReadError, all)
-		}
-		if !strings.Contains(err.Error(), wantReadError) {
-			t.Fatalf("Body.Read = %v; want substring %q", err, wantReadError)
-		}
-		if err := r.Body.Close(); err != nil {
-			t.Fatalf("Close: %v", err)
-		}
-	})
-}
-
-// Using a Host header, instead of :authority
-func TestServer_Request_Get_Host(t *testing.T) {
-	const host = "example.com"
-	testServerRequest(t, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1, // clients send odd numbers
-			BlockFragment: st.encodeHeader(":authority", "", "host", host),
-			EndStream:     true,
-			EndHeaders:    true,
-		})
-	}, func(r *http.Request) {
-		if r.Host != host {
-			t.Errorf("Host = %q; want %q", r.Host, host)
-		}
-	})
-}
-
-// Using an :authority pseudo-header, instead of Host
-func TestServer_Request_Get_Authority(t *testing.T) {
-	const host = "example.com"
-	testServerRequest(t, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1, // clients send odd numbers
-			BlockFragment: st.encodeHeader(":authority", host),
-			EndStream:     true,
-			EndHeaders:    true,
-		})
-	}, func(r *http.Request) {
-		if r.Host != host {
-			t.Errorf("Host = %q; want %q", r.Host, host)
-		}
-	})
-}
-
-func TestServer_Request_WithContinuation(t *testing.T) {
-	wantHeader := http.Header{
-		"Foo-One":   []string{"value-one"},
-		"Foo-Two":   []string{"value-two"},
-		"Foo-Three": []string{"value-three"},
-	}
-	testServerRequest(t, func(st *serverTester) {
-		fullHeaders := st.encodeHeader(
-			"foo-one", "value-one",
-			"foo-two", "value-two",
-			"foo-three", "value-three",
-		)
-		remain := fullHeaders
-		chunks := 0
-		for len(remain) > 0 {
-			const maxChunkSize = 5
-			chunk := remain
-			if len(chunk) > maxChunkSize {
-				chunk = chunk[:maxChunkSize]
-			}
-			remain = remain[len(chunk):]
-
-			if chunks == 0 {
-				st.writeHeaders(HeadersFrameParam{
-					StreamID:      1, // clients send odd numbers
-					BlockFragment: chunk,
-					EndStream:     true,  // no DATA frames
-					EndHeaders:    false, // we'll have continuation frames
-				})
-			} else {
-				err := st.fr.WriteContinuation(1, len(remain) == 0, chunk)
-				if err != nil {
-					t.Fatal(err)
-				}
-			}
-			chunks++
-		}
-		if chunks < 2 {
-			t.Fatal("too few chunks")
-		}
-	}, func(r *http.Request) {
-		if !reflect.DeepEqual(r.Header, wantHeader) {
-			t.Errorf("Header = %#v; want %#v", r.Header, wantHeader)
-		}
-	})
-}
-
-// Concatenated cookie headers. ("8.1.2.5 Compressing the Cookie Header Field")
-func TestServer_Request_CookieConcat(t *testing.T) {
-	const host = "example.com"
-	testServerRequest(t, func(st *serverTester) {
-		st.bodylessReq1(
-			":authority", host,
-			"cookie", "a=b",
-			"cookie", "c=d",
-			"cookie", "e=f",
-		)
-	}, func(r *http.Request) {
-		const want = "a=b; c=d; e=f"
-		if got := r.Header.Get("Cookie"); got != want {
-			t.Errorf("Cookie = %q; want %q", got, want)
-		}
-	})
-}
-
-func TestServer_Request_Reject_CapitalHeader(t *testing.T) {
-	testRejectRequest(t, func(st *serverTester) { st.bodylessReq1("UPPER", "v") })
-}
-
-func TestServer_Request_Reject_HeaderFieldNameColon(t *testing.T) {
-	testRejectRequest(t, func(st *serverTester) { st.bodylessReq1("has:colon", "v") })
-}
-
-func TestServer_Request_Reject_HeaderFieldNameNULL(t *testing.T) {
-	testRejectRequest(t, func(st *serverTester) { st.bodylessReq1("has\x00null", "v") })
-}
-
-func TestServer_Request_Reject_HeaderFieldNameEmpty(t *testing.T) {
-	testRejectRequest(t, func(st *serverTester) { st.bodylessReq1("", "v") })
-}
-
-func TestServer_Request_Reject_HeaderFieldValueNewline(t *testing.T) {
-	testRejectRequest(t, func(st *serverTester) { st.bodylessReq1("foo", "has\nnewline") })
-}
-
-func TestServer_Request_Reject_HeaderFieldValueCR(t *testing.T) {
-	testRejectRequest(t, func(st *serverTester) { st.bodylessReq1("foo", "has\rcarriage") })
-}
-
-func TestServer_Request_Reject_HeaderFieldValueDEL(t *testing.T) {
-	testRejectRequest(t, func(st *serverTester) { st.bodylessReq1("foo", "has\x7fdel") })
-}
-
-func TestServer_Request_Reject_Pseudo_Missing_method(t *testing.T) {
-	testRejectRequest(t, func(st *serverTester) { st.bodylessReq1(":method", "") })
-}
-
-func TestServer_Request_Reject_Pseudo_ExactlyOne(t *testing.T) {
-	// 8.1.2.3 Request Pseudo-Header Fields
-	// "All HTTP/2 requests MUST include exactly one valid value" ...
-	testRejectRequest(t, func(st *serverTester) {
-		st.addLogFilter("duplicate pseudo-header")
-		st.bodylessReq1(":method", "GET", ":method", "POST")
-	})
-}
-
-func TestServer_Request_Reject_Pseudo_AfterRegular(t *testing.T) {
-	// 8.1.2.3 Request Pseudo-Header Fields
-	// "All pseudo-header fields MUST appear in the header block
-	// before regular header fields. Any request or response that
-	// contains a pseudo-header field that appears in a header
-	// block after a regular header field MUST be treated as
-	// malformed (Section 8.1.2.6)."
-	testRejectRequest(t, func(st *serverTester) {
-		st.addLogFilter("pseudo-header after regular header")
-		var buf bytes.Buffer
-		enc := hpack.NewEncoder(&buf)
-		enc.WriteField(hpack.HeaderField{Name: ":method", Value: "GET"})
-		enc.WriteField(hpack.HeaderField{Name: "regular", Value: "foobar"})
-		enc.WriteField(hpack.HeaderField{Name: ":path", Value: "/"})
-		enc.WriteField(hpack.HeaderField{Name: ":scheme", Value: "https"})
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1, // clients send odd numbers
-			BlockFragment: buf.Bytes(),
-			EndStream:     true,
-			EndHeaders:    true,
-		})
-	})
-}
-
-func TestServer_Request_Reject_Pseudo_Missing_path(t *testing.T) {
-	testRejectRequest(t, func(st *serverTester) { st.bodylessReq1(":path", "") })
-}
-
-func TestServer_Request_Reject_Pseudo_Missing_scheme(t *testing.T) {
-	testRejectRequest(t, func(st *serverTester) { st.bodylessReq1(":scheme", "") })
-}
-
-func TestServer_Request_Reject_Pseudo_scheme_invalid(t *testing.T) {
-	testRejectRequest(t, func(st *serverTester) { st.bodylessReq1(":scheme", "bogus") })
-}
-
-func TestServer_Request_Reject_Pseudo_Unknown(t *testing.T) {
-	testRejectRequest(t, func(st *serverTester) {
-		st.addLogFilter(`invalid pseudo-header ":unknown_thing"`)
-		st.bodylessReq1(":unknown_thing", "")
-	})
-}
-
-func testRejectRequest(t *testing.T, send func(*serverTester)) {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		t.Error("server request made it to handler; should've been rejected")
-	})
-	defer st.Close()
-
-	st.greet()
-	send(st)
-	st.wantRSTStream(1, ErrCodeProtocol)
-}
-
-func testRejectRequestWithProtocolError(t *testing.T, send func(*serverTester)) {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		t.Error("server request made it to handler; should've been rejected")
-	}, optQuiet)
-	defer st.Close()
-
-	st.greet()
-	send(st)
-	gf := st.wantGoAway()
-	if gf.ErrCode != ErrCodeProtocol {
-		t.Errorf("err code = %v; want %v", gf.ErrCode, ErrCodeProtocol)
-	}
-}
-
-// Section 5.1, on idle connections: "Receiving any frame other than
-// HEADERS or PRIORITY on a stream in this state MUST be treated as a
-// connection error (Section 5.4.1) of type PROTOCOL_ERROR."
-func TestRejectFrameOnIdle_WindowUpdate(t *testing.T) {
-	testRejectRequestWithProtocolError(t, func(st *serverTester) {
-		st.fr.WriteWindowUpdate(123, 456)
-	})
-}
-func TestRejectFrameOnIdle_Data(t *testing.T) {
-	testRejectRequestWithProtocolError(t, func(st *serverTester) {
-		st.fr.WriteData(123, true, nil)
-	})
-}
-func TestRejectFrameOnIdle_RSTStream(t *testing.T) {
-	testRejectRequestWithProtocolError(t, func(st *serverTester) {
-		st.fr.WriteRSTStream(123, ErrCodeCancel)
-	})
-}
-
-func TestServer_Request_Connect(t *testing.T) {
-	testServerRequest(t, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID: 1,
-			BlockFragment: st.encodeHeaderRaw(
-				":method", "CONNECT",
-				":authority", "example.com:123",
-			),
-			EndStream:  true,
-			EndHeaders: true,
-		})
-	}, func(r *http.Request) {
-		if g, w := r.Method, "CONNECT"; g != w {
-			t.Errorf("Method = %q; want %q", g, w)
-		}
-		if g, w := r.RequestURI, "example.com:123"; g != w {
-			t.Errorf("RequestURI = %q; want %q", g, w)
-		}
-		if g, w := r.URL.Host, "example.com:123"; g != w {
-			t.Errorf("URL.Host = %q; want %q", g, w)
-		}
-	})
-}
-
-func TestServer_Request_Connect_InvalidPath(t *testing.T) {
-	testServerRejectsStream(t, ErrCodeProtocol, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID: 1,
-			BlockFragment: st.encodeHeaderRaw(
-				":method", "CONNECT",
-				":authority", "example.com:123",
-				":path", "/bogus",
-			),
-			EndStream:  true,
-			EndHeaders: true,
-		})
-	})
-}
-
-func TestServer_Request_Connect_InvalidScheme(t *testing.T) {
-	testServerRejectsStream(t, ErrCodeProtocol, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID: 1,
-			BlockFragment: st.encodeHeaderRaw(
-				":method", "CONNECT",
-				":authority", "example.com:123",
-				":scheme", "https",
-			),
-			EndStream:  true,
-			EndHeaders: true,
-		})
-	})
-}
-
-func TestServer_Ping(t *testing.T) {
-	st := newServerTester(t, nil)
-	defer st.Close()
-	st.greet()
-
-	// Server should ignore this one, since it has ACK set.
-	ackPingData := [8]byte{1, 2, 4, 8, 16, 32, 64, 128}
-	if err := st.fr.WritePing(true, ackPingData); err != nil {
-		t.Fatal(err)
-	}
-
-	// But the server should reply to this one, since ACK is false.
-	pingData := [8]byte{1, 2, 3, 4, 5, 6, 7, 8}
-	if err := st.fr.WritePing(false, pingData); err != nil {
-		t.Fatal(err)
-	}
-
-	pf := st.wantPing()
-	if !pf.Flags.Has(FlagPingAck) {
-		t.Error("response ping doesn't have ACK set")
-	}
-	if pf.Data != pingData {
-		t.Errorf("response ping has data %q; want %q", pf.Data, pingData)
-	}
-}
-
-func TestServer_RejectsLargeFrames(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("see golang.org/issue/13434")
-	}
-
-	st := newServerTester(t, nil)
-	defer st.Close()
-	st.greet()
-
-	// Write too large of a frame (too large by one byte)
-	// We ignore the return value because it's expected that the server
-	// will only read the first 9 bytes (the headre) and then disconnect.
-	st.fr.WriteRawFrame(0xff, 0, 0, make([]byte, defaultMaxReadFrameSize+1))
-
-	gf := st.wantGoAway()
-	if gf.ErrCode != ErrCodeFrameSize {
-		t.Errorf("GOAWAY err = %v; want %v", gf.ErrCode, ErrCodeFrameSize)
-	}
-	if st.serverLogBuf.Len() != 0 {
-		// Previously we spun here for a bit until the GOAWAY disconnect
-		// timer fired, logging while we fired.
-		t.Errorf("unexpected server output: %.500s\n", st.serverLogBuf.Bytes())
-	}
-}
-
-func TestServer_Handler_Sends_WindowUpdate(t *testing.T) {
-	puppet := newHandlerPuppet()
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		puppet.act(w, r)
-	})
-	defer st.Close()
-	defer puppet.done()
-
-	st.greet()
-
-	st.writeHeaders(HeadersFrameParam{
-		StreamID:      1, // clients send odd numbers
-		BlockFragment: st.encodeHeader(":method", "POST"),
-		EndStream:     false, // data coming
-		EndHeaders:    true,
-	})
-	st.writeData(1, false, []byte("abcdef"))
-	puppet.do(readBodyHandler(t, "abc"))
-	st.wantWindowUpdate(0, 3)
-	st.wantWindowUpdate(1, 3)
-
-	puppet.do(readBodyHandler(t, "def"))
-	st.wantWindowUpdate(0, 3)
-	st.wantWindowUpdate(1, 3)
-
-	st.writeData(1, true, []byte("ghijkl")) // END_STREAM here
-	puppet.do(readBodyHandler(t, "ghi"))
-	puppet.do(readBodyHandler(t, "jkl"))
-	st.wantWindowUpdate(0, 3)
-	st.wantWindowUpdate(0, 3) // no more stream-level, since END_STREAM
-}
-
-// the version of the TestServer_Handler_Sends_WindowUpdate with padding.
-// See golang.org/issue/16556
-func TestServer_Handler_Sends_WindowUpdate_Padding(t *testing.T) {
-	puppet := newHandlerPuppet()
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		puppet.act(w, r)
-	})
-	defer st.Close()
-	defer puppet.done()
-
-	st.greet()
-
-	st.writeHeaders(HeadersFrameParam{
-		StreamID:      1,
-		BlockFragment: st.encodeHeader(":method", "POST"),
-		EndStream:     false,
-		EndHeaders:    true,
-	})
-	st.writeDataPadded(1, false, []byte("abcdef"), []byte{0, 0, 0, 0})
-
-	// Expect to immediately get our 5 bytes of padding back for
-	// both the connection and stream (4 bytes of padding + 1 byte of length)
-	st.wantWindowUpdate(0, 5)
-	st.wantWindowUpdate(1, 5)
-
-	puppet.do(readBodyHandler(t, "abc"))
-	st.wantWindowUpdate(0, 3)
-	st.wantWindowUpdate(1, 3)
-
-	puppet.do(readBodyHandler(t, "def"))
-	st.wantWindowUpdate(0, 3)
-	st.wantWindowUpdate(1, 3)
-}
-
-func TestServer_Send_GoAway_After_Bogus_WindowUpdate(t *testing.T) {
-	st := newServerTester(t, nil)
-	defer st.Close()
-	st.greet()
-	if err := st.fr.WriteWindowUpdate(0, 1<<31-1); err != nil {
-		t.Fatal(err)
-	}
-	gf := st.wantGoAway()
-	if gf.ErrCode != ErrCodeFlowControl {
-		t.Errorf("GOAWAY err = %v; want %v", gf.ErrCode, ErrCodeFlowControl)
-	}
-	if gf.LastStreamID != 0 {
-		t.Errorf("GOAWAY last stream ID = %v; want %v", gf.LastStreamID, 0)
-	}
-}
-
-func TestServer_Send_RstStream_After_Bogus_WindowUpdate(t *testing.T) {
-	inHandler := make(chan bool)
-	blockHandler := make(chan bool)
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		inHandler <- true
-		<-blockHandler
-	})
-	defer st.Close()
-	defer close(blockHandler)
-	st.greet()
-	st.writeHeaders(HeadersFrameParam{
-		StreamID:      1,
-		BlockFragment: st.encodeHeader(":method", "POST"),
-		EndStream:     false, // keep it open
-		EndHeaders:    true,
-	})
-	<-inHandler
-	// Send a bogus window update:
-	if err := st.fr.WriteWindowUpdate(1, 1<<31-1); err != nil {
-		t.Fatal(err)
-	}
-	st.wantRSTStream(1, ErrCodeFlowControl)
-}
-
-// testServerPostUnblock sends a hanging POST with unsent data to handler,
-// then runs fn once in the handler, and verifies that the error returned from
-// handler is acceptable. It fails if takes over 5 seconds for handler to exit.
-func testServerPostUnblock(t *testing.T,
-	handler func(http.ResponseWriter, *http.Request) error,
-	fn func(*serverTester),
-	checkErr func(error),
-	otherHeaders ...string) {
-	inHandler := make(chan bool)
-	errc := make(chan error, 1)
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		inHandler <- true
-		errc <- handler(w, r)
-	})
-	defer st.Close()
-	st.greet()
-	st.writeHeaders(HeadersFrameParam{
-		StreamID:      1,
-		BlockFragment: st.encodeHeader(append([]string{":method", "POST"}, otherHeaders...)...),
-		EndStream:     false, // keep it open
-		EndHeaders:    true,
-	})
-	<-inHandler
-	fn(st)
-	select {
-	case err := <-errc:
-		if checkErr != nil {
-			checkErr(err)
-		}
-	case <-time.After(5 * time.Second):
-		t.Fatal("timeout waiting for Handler to return")
-	}
-}
-
-func TestServer_RSTStream_Unblocks_Read(t *testing.T) {
-	testServerPostUnblock(t,
-		func(w http.ResponseWriter, r *http.Request) (err error) {
-			_, err = r.Body.Read(make([]byte, 1))
-			return
-		},
-		func(st *serverTester) {
-			if err := st.fr.WriteRSTStream(1, ErrCodeCancel); err != nil {
-				t.Fatal(err)
-			}
-		},
-		func(err error) {
-			want := StreamError{StreamID: 0x1, Code: 0x8}
-			if !reflect.DeepEqual(err, want) {
-				t.Errorf("Read error = %v; want %v", err, want)
-			}
-		},
-	)
-}
-
-func TestServer_RSTStream_Unblocks_Header_Write(t *testing.T) {
-	// Run this test a bunch, because it doesn't always
-	// deadlock. But with a bunch, it did.
-	n := 50
-	if testing.Short() {
-		n = 5
-	}
-	for i := 0; i < n; i++ {
-		testServer_RSTStream_Unblocks_Header_Write(t)
-	}
-}
-
-func testServer_RSTStream_Unblocks_Header_Write(t *testing.T) {
-	inHandler := make(chan bool, 1)
-	unblockHandler := make(chan bool, 1)
-	headerWritten := make(chan bool, 1)
-	wroteRST := make(chan bool, 1)
-
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		inHandler <- true
-		<-wroteRST
-		w.Header().Set("foo", "bar")
-		w.WriteHeader(200)
-		w.(http.Flusher).Flush()
-		headerWritten <- true
-		<-unblockHandler
-	})
-	defer st.Close()
-
-	st.greet()
-	st.writeHeaders(HeadersFrameParam{
-		StreamID:      1,
-		BlockFragment: st.encodeHeader(":method", "POST"),
-		EndStream:     false, // keep it open
-		EndHeaders:    true,
-	})
-	<-inHandler
-	if err := st.fr.WriteRSTStream(1, ErrCodeCancel); err != nil {
-		t.Fatal(err)
-	}
-	wroteRST <- true
-	st.awaitIdle()
-	select {
-	case <-headerWritten:
-	case <-time.After(2 * time.Second):
-		t.Error("timeout waiting for header write")
-	}
-	unblockHandler <- true
-}
-
-func TestServer_DeadConn_Unblocks_Read(t *testing.T) {
-	testServerPostUnblock(t,
-		func(w http.ResponseWriter, r *http.Request) (err error) {
-			_, err = r.Body.Read(make([]byte, 1))
-			return
-		},
-		func(st *serverTester) { st.cc.Close() },
-		func(err error) {
-			if err == nil {
-				t.Error("unexpected nil error from Request.Body.Read")
-			}
-		},
-	)
-}
-
-var blockUntilClosed = func(w http.ResponseWriter, r *http.Request) error {
-	<-w.(http.CloseNotifier).CloseNotify()
-	return nil
-}
-
-func TestServer_CloseNotify_After_RSTStream(t *testing.T) {
-	testServerPostUnblock(t, blockUntilClosed, func(st *serverTester) {
-		if err := st.fr.WriteRSTStream(1, ErrCodeCancel); err != nil {
-			t.Fatal(err)
-		}
-	}, nil)
-}
-
-func TestServer_CloseNotify_After_ConnClose(t *testing.T) {
-	testServerPostUnblock(t, blockUntilClosed, func(st *serverTester) { st.cc.Close() }, nil)
-}
-
-// that CloseNotify unblocks after a stream error due to the client's
-// problem that's unrelated to them explicitly canceling it (which is
-// TestServer_CloseNotify_After_RSTStream above)
-func TestServer_CloseNotify_After_StreamError(t *testing.T) {
-	testServerPostUnblock(t, blockUntilClosed, func(st *serverTester) {
-		// data longer than declared Content-Length => stream error
-		st.writeData(1, true, []byte("1234"))
-	}, nil, "content-length", "3")
-}
-
-func TestServer_StateTransitions(t *testing.T) {
-	var st *serverTester
-	inHandler := make(chan bool)
-	writeData := make(chan bool)
-	leaveHandler := make(chan bool)
-	st = newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		inHandler <- true
-		if st.stream(1) == nil {
-			t.Errorf("nil stream 1 in handler")
-		}
-		if got, want := st.streamState(1), stateOpen; got != want {
-			t.Errorf("in handler, state is %v; want %v", got, want)
-		}
-		writeData <- true
-		if n, err := r.Body.Read(make([]byte, 1)); n != 0 || err != io.EOF {
-			t.Errorf("body read = %d, %v; want 0, EOF", n, err)
-		}
-		if got, want := st.streamState(1), stateHalfClosedRemote; got != want {
-			t.Errorf("in handler, state is %v; want %v", got, want)
-		}
-
-		<-leaveHandler
-	})
-	st.greet()
-	if st.stream(1) != nil {
-		t.Fatal("stream 1 should be empty")
-	}
-	if got := st.streamState(1); got != stateIdle {
-		t.Fatalf("stream 1 should be idle; got %v", got)
-	}
-
-	st.writeHeaders(HeadersFrameParam{
-		StreamID:      1,
-		BlockFragment: st.encodeHeader(":method", "POST"),
-		EndStream:     false, // keep it open
-		EndHeaders:    true,
-	})
-	<-inHandler
-	<-writeData
-	st.writeData(1, true, nil)
-
-	leaveHandler <- true
-	hf := st.wantHeaders()
-	if !hf.StreamEnded() {
-		t.Fatal("expected END_STREAM flag")
-	}
-
-	if got, want := st.streamState(1), stateClosed; got != want {
-		t.Errorf("at end, state is %v; want %v", got, want)
-	}
-	if st.stream(1) != nil {
-		t.Fatal("at end, stream 1 should be gone")
-	}
-}
-
-// test HEADERS w/o EndHeaders + another HEADERS (should get rejected)
-func TestServer_Rejects_HeadersNoEnd_Then_Headers(t *testing.T) {
-	testServerRejectsConn(t, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1,
-			BlockFragment: st.encodeHeader(),
-			EndStream:     true,
-			EndHeaders:    false,
-		})
-		st.writeHeaders(HeadersFrameParam{ // Not a continuation.
-			StreamID:      3, // different stream.
-			BlockFragment: st.encodeHeader(),
-			EndStream:     true,
-			EndHeaders:    true,
-		})
-	})
-}
-
-// test HEADERS w/o EndHeaders + PING (should get rejected)
-func TestServer_Rejects_HeadersNoEnd_Then_Ping(t *testing.T) {
-	testServerRejectsConn(t, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1,
-			BlockFragment: st.encodeHeader(),
-			EndStream:     true,
-			EndHeaders:    false,
-		})
-		if err := st.fr.WritePing(false, [8]byte{}); err != nil {
-			t.Fatal(err)
-		}
-	})
-}
-
-// test HEADERS w/ EndHeaders + a continuation HEADERS (should get rejected)
-func TestServer_Rejects_HeadersEnd_Then_Continuation(t *testing.T) {
-	testServerRejectsConn(t, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1,
-			BlockFragment: st.encodeHeader(),
-			EndStream:     true,
-			EndHeaders:    true,
-		})
-		st.wantHeaders()
-		if err := st.fr.WriteContinuation(1, true, encodeHeaderNoImplicit(t, "foo", "bar")); err != nil {
-			t.Fatal(err)
-		}
-	})
-}
-
-// test HEADERS w/o EndHeaders + a continuation HEADERS on wrong stream ID
-func TestServer_Rejects_HeadersNoEnd_Then_ContinuationWrongStream(t *testing.T) {
-	testServerRejectsConn(t, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1,
-			BlockFragment: st.encodeHeader(),
-			EndStream:     true,
-			EndHeaders:    false,
-		})
-		if err := st.fr.WriteContinuation(3, true, encodeHeaderNoImplicit(t, "foo", "bar")); err != nil {
-			t.Fatal(err)
-		}
-	})
-}
-
-// No HEADERS on stream 0.
-func TestServer_Rejects_Headers0(t *testing.T) {
-	testServerRejectsConn(t, func(st *serverTester) {
-		st.fr.AllowIllegalWrites = true
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      0,
-			BlockFragment: st.encodeHeader(),
-			EndStream:     true,
-			EndHeaders:    true,
-		})
-	})
-}
-
-// No CONTINUATION on stream 0.
-func TestServer_Rejects_Continuation0(t *testing.T) {
-	testServerRejectsConn(t, func(st *serverTester) {
-		st.fr.AllowIllegalWrites = true
-		if err := st.fr.WriteContinuation(0, true, st.encodeHeader()); err != nil {
-			t.Fatal(err)
-		}
-	})
-}
-
-// No PRIORITY on stream 0.
-func TestServer_Rejects_Priority0(t *testing.T) {
-	testServerRejectsConn(t, func(st *serverTester) {
-		st.fr.AllowIllegalWrites = true
-		st.writePriority(0, PriorityParam{StreamDep: 1})
-	})
-}
-
-// No HEADERS frame with a self-dependence.
-func TestServer_Rejects_HeadersSelfDependence(t *testing.T) {
-	testServerRejectsStream(t, ErrCodeProtocol, func(st *serverTester) {
-		st.fr.AllowIllegalWrites = true
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1,
-			BlockFragment: st.encodeHeader(),
-			EndStream:     true,
-			EndHeaders:    true,
-			Priority:      PriorityParam{StreamDep: 1},
-		})
-	})
-}
-
-// No PRIORTY frame with a self-dependence.
-func TestServer_Rejects_PrioritySelfDependence(t *testing.T) {
-	testServerRejectsStream(t, ErrCodeProtocol, func(st *serverTester) {
-		st.fr.AllowIllegalWrites = true
-		st.writePriority(1, PriorityParam{StreamDep: 1})
-	})
-}
-
-func TestServer_Rejects_PushPromise(t *testing.T) {
-	testServerRejectsConn(t, func(st *serverTester) {
-		pp := PushPromiseParam{
-			StreamID:  1,
-			PromiseID: 3,
-		}
-		if err := st.fr.WritePushPromise(pp); err != nil {
-			t.Fatal(err)
-		}
-	})
-}
-
-// testServerRejectsConn tests that the server hangs up with a GOAWAY
-// frame and a server close after the client does something
-// deserving a CONNECTION_ERROR.
-func testServerRejectsConn(t *testing.T, writeReq func(*serverTester)) {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {})
-	st.addLogFilter("connection error: PROTOCOL_ERROR")
-	defer st.Close()
-	st.greet()
-	writeReq(st)
-
-	st.wantGoAway()
-	errc := make(chan error, 1)
-	go func() {
-		fr, err := st.fr.ReadFrame()
-		if err == nil {
-			err = fmt.Errorf("got frame of type %T", fr)
-		}
-		errc <- err
-	}()
-	select {
-	case err := <-errc:
-		if err != io.EOF {
-			t.Errorf("ReadFrame = %v; want io.EOF", err)
-		}
-	case <-time.After(2 * time.Second):
-		t.Error("timeout waiting for disconnect")
-	}
-}
-
-// testServerRejectsStream tests that the server sends a RST_STREAM with the provided
-// error code after a client sends a bogus request.
-func testServerRejectsStream(t *testing.T, code ErrCode, writeReq func(*serverTester)) {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {})
-	defer st.Close()
-	st.greet()
-	writeReq(st)
-	st.wantRSTStream(1, code)
-}
-
-// testServerRequest sets up an idle HTTP/2 connection and lets you
-// write a single request with writeReq, and then verify that the
-// *http.Request is built correctly in checkReq.
-func testServerRequest(t *testing.T, writeReq func(*serverTester), checkReq func(*http.Request)) {
-	gotReq := make(chan bool, 1)
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		if r.Body == nil {
-			t.Fatal("nil Body")
-		}
-		checkReq(r)
-		gotReq <- true
-	})
-	defer st.Close()
-
-	st.greet()
-	writeReq(st)
-
-	select {
-	case <-gotReq:
-	case <-time.After(2 * time.Second):
-		t.Error("timeout waiting for request")
-	}
-}
-
-func getSlash(st *serverTester) { st.bodylessReq1() }
-
-func TestServer_Response_NoData(t *testing.T) {
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		// Nothing.
-		return nil
-	}, func(st *serverTester) {
-		getSlash(st)
-		hf := st.wantHeaders()
-		if !hf.StreamEnded() {
-			t.Fatal("want END_STREAM flag")
-		}
-		if !hf.HeadersEnded() {
-			t.Fatal("want END_HEADERS flag")
-		}
-	})
-}
-
-func TestServer_Response_NoData_Header_FooBar(t *testing.T) {
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		w.Header().Set("Foo-Bar", "some-value")
-		return nil
-	}, func(st *serverTester) {
-		getSlash(st)
-		hf := st.wantHeaders()
-		if !hf.StreamEnded() {
-			t.Fatal("want END_STREAM flag")
-		}
-		if !hf.HeadersEnded() {
-			t.Fatal("want END_HEADERS flag")
-		}
-		goth := st.decodeHeader(hf.HeaderBlockFragment())
-		wanth := [][2]string{
-			{":status", "200"},
-			{"foo-bar", "some-value"},
-			{"content-length", "0"},
-		}
-		if !reflect.DeepEqual(goth, wanth) {
-			t.Errorf("Got headers %v; want %v", goth, wanth)
-		}
-	})
-}
-
-func TestServer_Response_Data_Sniff_DoesntOverride(t *testing.T) {
-	const msg = "<html>this is HTML."
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		w.Header().Set("Content-Type", "foo/bar")
-		io.WriteString(w, msg)
-		return nil
-	}, func(st *serverTester) {
-		getSlash(st)
-		hf := st.wantHeaders()
-		if hf.StreamEnded() {
-			t.Fatal("don't want END_STREAM, expecting data")
-		}
-		if !hf.HeadersEnded() {
-			t.Fatal("want END_HEADERS flag")
-		}
-		goth := st.decodeHeader(hf.HeaderBlockFragment())
-		wanth := [][2]string{
-			{":status", "200"},
-			{"content-type", "foo/bar"},
-			{"content-length", strconv.Itoa(len(msg))},
-		}
-		if !reflect.DeepEqual(goth, wanth) {
-			t.Errorf("Got headers %v; want %v", goth, wanth)
-		}
-		df := st.wantData()
-		if !df.StreamEnded() {
-			t.Error("expected DATA to have END_STREAM flag")
-		}
-		if got := string(df.Data()); got != msg {
-			t.Errorf("got DATA %q; want %q", got, msg)
-		}
-	})
-}
-
-func TestServer_Response_Nosniff_WithoutContentType(t *testing.T) {
-	const msg = "<html>this is HTML."
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		w.Header().Set("X-Content-Type-Options", "nosniff")
-		w.WriteHeader(200)
-		io.WriteString(w, msg)
-		return nil
-	}, func(st *serverTester) {
-		getSlash(st)
-		hf := st.wantHeaders()
-		if hf.StreamEnded() {
-			t.Fatal("don't want END_STREAM, expecting data")
-		}
-		if !hf.HeadersEnded() {
-			t.Fatal("want END_HEADERS flag")
-		}
-		goth := st.decodeHeader(hf.HeaderBlockFragment())
-		wanth := [][2]string{
-			{":status", "200"},
-			{"x-content-type-options", "nosniff"},
-			{"content-type", "application/octet-stream"},
-			{"content-length", strconv.Itoa(len(msg))},
-		}
-		if !reflect.DeepEqual(goth, wanth) {
-			t.Errorf("Got headers %v; want %v", goth, wanth)
-		}
-		df := st.wantData()
-		if !df.StreamEnded() {
-			t.Error("expected DATA to have END_STREAM flag")
-		}
-		if got := string(df.Data()); got != msg {
-			t.Errorf("got DATA %q; want %q", got, msg)
-		}
-	})
-}
-
-func TestServer_Response_TransferEncoding_chunked(t *testing.T) {
-	const msg = "hi"
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		w.Header().Set("Transfer-Encoding", "chunked") // should be stripped
-		io.WriteString(w, msg)
-		return nil
-	}, func(st *serverTester) {
-		getSlash(st)
-		hf := st.wantHeaders()
-		goth := st.decodeHeader(hf.HeaderBlockFragment())
-		wanth := [][2]string{
-			{":status", "200"},
-			{"content-type", "text/plain; charset=utf-8"},
-			{"content-length", strconv.Itoa(len(msg))},
-		}
-		if !reflect.DeepEqual(goth, wanth) {
-			t.Errorf("Got headers %v; want %v", goth, wanth)
-		}
-	})
-}
-
-// Header accessed only after the initial write.
-func TestServer_Response_Data_IgnoreHeaderAfterWrite_After(t *testing.T) {
-	const msg = "<html>this is HTML."
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		io.WriteString(w, msg)
-		w.Header().Set("foo", "should be ignored")
-		return nil
-	}, func(st *serverTester) {
-		getSlash(st)
-		hf := st.wantHeaders()
-		if hf.StreamEnded() {
-			t.Fatal("unexpected END_STREAM")
-		}
-		if !hf.HeadersEnded() {
-			t.Fatal("want END_HEADERS flag")
-		}
-		goth := st.decodeHeader(hf.HeaderBlockFragment())
-		wanth := [][2]string{
-			{":status", "200"},
-			{"content-type", "text/html; charset=utf-8"},
-			{"content-length", strconv.Itoa(len(msg))},
-		}
-		if !reflect.DeepEqual(goth, wanth) {
-			t.Errorf("Got headers %v; want %v", goth, wanth)
-		}
-	})
-}
-
-// Header accessed before the initial write and later mutated.
-func TestServer_Response_Data_IgnoreHeaderAfterWrite_Overwrite(t *testing.T) {
-	const msg = "<html>this is HTML."
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		w.Header().Set("foo", "proper value")
-		io.WriteString(w, msg)
-		w.Header().Set("foo", "should be ignored")
-		return nil
-	}, func(st *serverTester) {
-		getSlash(st)
-		hf := st.wantHeaders()
-		if hf.StreamEnded() {
-			t.Fatal("unexpected END_STREAM")
-		}
-		if !hf.HeadersEnded() {
-			t.Fatal("want END_HEADERS flag")
-		}
-		goth := st.decodeHeader(hf.HeaderBlockFragment())
-		wanth := [][2]string{
-			{":status", "200"},
-			{"foo", "proper value"},
-			{"content-type", "text/html; charset=utf-8"},
-			{"content-length", strconv.Itoa(len(msg))},
-		}
-		if !reflect.DeepEqual(goth, wanth) {
-			t.Errorf("Got headers %v; want %v", goth, wanth)
-		}
-	})
-}
-
-func TestServer_Response_Data_SniffLenType(t *testing.T) {
-	const msg = "<html>this is HTML."
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		io.WriteString(w, msg)
-		return nil
-	}, func(st *serverTester) {
-		getSlash(st)
-		hf := st.wantHeaders()
-		if hf.StreamEnded() {
-			t.Fatal("don't want END_STREAM, expecting data")
-		}
-		if !hf.HeadersEnded() {
-			t.Fatal("want END_HEADERS flag")
-		}
-		goth := st.decodeHeader(hf.HeaderBlockFragment())
-		wanth := [][2]string{
-			{":status", "200"},
-			{"content-type", "text/html; charset=utf-8"},
-			{"content-length", strconv.Itoa(len(msg))},
-		}
-		if !reflect.DeepEqual(goth, wanth) {
-			t.Errorf("Got headers %v; want %v", goth, wanth)
-		}
-		df := st.wantData()
-		if !df.StreamEnded() {
-			t.Error("expected DATA to have END_STREAM flag")
-		}
-		if got := string(df.Data()); got != msg {
-			t.Errorf("got DATA %q; want %q", got, msg)
-		}
-	})
-}
-
-func TestServer_Response_Header_Flush_MidWrite(t *testing.T) {
-	const msg = "<html>this is HTML"
-	const msg2 = ", and this is the next chunk"
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		io.WriteString(w, msg)
-		w.(http.Flusher).Flush()
-		io.WriteString(w, msg2)
-		return nil
-	}, func(st *serverTester) {
-		getSlash(st)
-		hf := st.wantHeaders()
-		if hf.StreamEnded() {
-			t.Fatal("unexpected END_STREAM flag")
-		}
-		if !hf.HeadersEnded() {
-			t.Fatal("want END_HEADERS flag")
-		}
-		goth := st.decodeHeader(hf.HeaderBlockFragment())
-		wanth := [][2]string{
-			{":status", "200"},
-			{"content-type", "text/html; charset=utf-8"}, // sniffed
-			// and no content-length
-		}
-		if !reflect.DeepEqual(goth, wanth) {
-			t.Errorf("Got headers %v; want %v", goth, wanth)
-		}
-		{
-			df := st.wantData()
-			if df.StreamEnded() {
-				t.Error("unexpected END_STREAM flag")
-			}
-			if got := string(df.Data()); got != msg {
-				t.Errorf("got DATA %q; want %q", got, msg)
-			}
-		}
-		{
-			df := st.wantData()
-			if !df.StreamEnded() {
-				t.Error("wanted END_STREAM flag on last data chunk")
-			}
-			if got := string(df.Data()); got != msg2 {
-				t.Errorf("got DATA %q; want %q", got, msg2)
-			}
-		}
-	})
-}
-
-func TestServer_Response_LargeWrite(t *testing.T) {
-	const size = 1 << 20
-	const maxFrameSize = 16 << 10
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		n, err := w.Write(bytes.Repeat([]byte("a"), size))
-		if err != nil {
-			return fmt.Errorf("Write error: %v", err)
-		}
-		if n != size {
-			return fmt.Errorf("wrong size %d from Write", n)
-		}
-		return nil
-	}, func(st *serverTester) {
-		if err := st.fr.WriteSettings(
-			Setting{SettingInitialWindowSize, 0},
-			Setting{SettingMaxFrameSize, maxFrameSize},
-		); err != nil {
-			t.Fatal(err)
-		}
-		st.wantSettingsAck()
-
-		getSlash(st) // make the single request
-
-		// Give the handler quota to write:
-		if err := st.fr.WriteWindowUpdate(1, size); err != nil {
-			t.Fatal(err)
-		}
-		// Give the handler quota to write to connection-level
-		// window as well
-		if err := st.fr.WriteWindowUpdate(0, size); err != nil {
-			t.Fatal(err)
-		}
-		hf := st.wantHeaders()
-		if hf.StreamEnded() {
-			t.Fatal("unexpected END_STREAM flag")
-		}
-		if !hf.HeadersEnded() {
-			t.Fatal("want END_HEADERS flag")
-		}
-		goth := st.decodeHeader(hf.HeaderBlockFragment())
-		wanth := [][2]string{
-			{":status", "200"},
-			{"content-type", "text/plain; charset=utf-8"}, // sniffed
-			// and no content-length
-		}
-		if !reflect.DeepEqual(goth, wanth) {
-			t.Errorf("Got headers %v; want %v", goth, wanth)
-		}
-		var bytes, frames int
-		for {
-			df := st.wantData()
-			bytes += len(df.Data())
-			frames++
-			for _, b := range df.Data() {
-				if b != 'a' {
-					t.Fatal("non-'a' byte seen in DATA")
-				}
-			}
-			if df.StreamEnded() {
-				break
-			}
-		}
-		if bytes != size {
-			t.Errorf("Got %d bytes; want %d", bytes, size)
-		}
-		if want := int(size / maxFrameSize); frames < want || frames > want*2 {
-			t.Errorf("Got %d frames; want %d", frames, size)
-		}
-	})
-}
-
-// Test that the handler can't write more than the client allows
-func TestServer_Response_LargeWrite_FlowControlled(t *testing.T) {
-	// Make these reads. Before each read, the client adds exactly enough
-	// flow-control to satisfy the read. Numbers chosen arbitrarily.
-	reads := []int{123, 1, 13, 127}
-	size := 0
-	for _, n := range reads {
-		size += n
-	}
-
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		w.(http.Flusher).Flush()
-		n, err := w.Write(bytes.Repeat([]byte("a"), size))
-		if err != nil {
-			return fmt.Errorf("Write error: %v", err)
-		}
-		if n != size {
-			return fmt.Errorf("wrong size %d from Write", n)
-		}
-		return nil
-	}, func(st *serverTester) {
-		// Set the window size to something explicit for this test.
-		// It's also how much initial data we expect.
-		if err := st.fr.WriteSettings(Setting{SettingInitialWindowSize, uint32(reads[0])}); err != nil {
-			t.Fatal(err)
-		}
-		st.wantSettingsAck()
-
-		getSlash(st) // make the single request
-
-		hf := st.wantHeaders()
-		if hf.StreamEnded() {
-			t.Fatal("unexpected END_STREAM flag")
-		}
-		if !hf.HeadersEnded() {
-			t.Fatal("want END_HEADERS flag")
-		}
-
-		df := st.wantData()
-		if got := len(df.Data()); got != reads[0] {
-			t.Fatalf("Initial window size = %d but got DATA with %d bytes", reads[0], got)
-		}
-
-		for _, quota := range reads[1:] {
-			if err := st.fr.WriteWindowUpdate(1, uint32(quota)); err != nil {
-				t.Fatal(err)
-			}
-			df := st.wantData()
-			if int(quota) != len(df.Data()) {
-				t.Fatalf("read %d bytes after giving %d quota", len(df.Data()), quota)
-			}
-		}
-	})
-}
-
-// Test that the handler blocked in a Write is unblocked if the server sends a RST_STREAM.
-func TestServer_Response_RST_Unblocks_LargeWrite(t *testing.T) {
-	const size = 1 << 20
-	const maxFrameSize = 16 << 10
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		w.(http.Flusher).Flush()
-		errc := make(chan error, 1)
-		go func() {
-			_, err := w.Write(bytes.Repeat([]byte("a"), size))
-			errc <- err
-		}()
-		select {
-		case err := <-errc:
-			if err == nil {
-				return errors.New("unexpected nil error from Write in handler")
-			}
-			return nil
-		case <-time.After(2 * time.Second):
-			return errors.New("timeout waiting for Write in handler")
-		}
-	}, func(st *serverTester) {
-		if err := st.fr.WriteSettings(
-			Setting{SettingInitialWindowSize, 0},
-			Setting{SettingMaxFrameSize, maxFrameSize},
-		); err != nil {
-			t.Fatal(err)
-		}
-		st.wantSettingsAck()
-
-		getSlash(st) // make the single request
-
-		hf := st.wantHeaders()
-		if hf.StreamEnded() {
-			t.Fatal("unexpected END_STREAM flag")
-		}
-		if !hf.HeadersEnded() {
-			t.Fatal("want END_HEADERS flag")
-		}
-
-		if err := st.fr.WriteRSTStream(1, ErrCodeCancel); err != nil {
-			t.Fatal(err)
-		}
-	})
-}
-
-func TestServer_Response_Empty_Data_Not_FlowControlled(t *testing.T) {
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		w.(http.Flusher).Flush()
-		// Nothing; send empty DATA
-		return nil
-	}, func(st *serverTester) {
-		// Handler gets no data quota:
-		if err := st.fr.WriteSettings(Setting{SettingInitialWindowSize, 0}); err != nil {
-			t.Fatal(err)
-		}
-		st.wantSettingsAck()
-
-		getSlash(st) // make the single request
-
-		hf := st.wantHeaders()
-		if hf.StreamEnded() {
-			t.Fatal("unexpected END_STREAM flag")
-		}
-		if !hf.HeadersEnded() {
-			t.Fatal("want END_HEADERS flag")
-		}
-
-		df := st.wantData()
-		if got := len(df.Data()); got != 0 {
-			t.Fatalf("unexpected %d DATA bytes; want 0", got)
-		}
-		if !df.StreamEnded() {
-			t.Fatal("DATA didn't have END_STREAM")
-		}
-	})
-}
-
-func TestServer_Response_Automatic100Continue(t *testing.T) {
-	const msg = "foo"
-	const reply = "bar"
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		if v := r.Header.Get("Expect"); v != "" {
-			t.Errorf("Expect header = %q; want empty", v)
-		}
-		buf := make([]byte, len(msg))
-		// This read should trigger the 100-continue being sent.
-		if n, err := io.ReadFull(r.Body, buf); err != nil || n != len(msg) || string(buf) != msg {
-			return fmt.Errorf("ReadFull = %q, %v; want %q, nil", buf[:n], err, msg)
-		}
-		_, err := io.WriteString(w, reply)
-		return err
-	}, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1, // clients send odd numbers
-			BlockFragment: st.encodeHeader(":method", "POST", "expect", "100-continue"),
-			EndStream:     false,
-			EndHeaders:    true,
-		})
-		hf := st.wantHeaders()
-		if hf.StreamEnded() {
-			t.Fatal("unexpected END_STREAM flag")
-		}
-		if !hf.HeadersEnded() {
-			t.Fatal("want END_HEADERS flag")
-		}
-		goth := st.decodeHeader(hf.HeaderBlockFragment())
-		wanth := [][2]string{
-			{":status", "100"},
-		}
-		if !reflect.DeepEqual(goth, wanth) {
-			t.Fatalf("Got headers %v; want %v", goth, wanth)
-		}
-
-		// Okay, they sent status 100, so we can send our
-		// gigantic and/or sensitive "foo" payload now.
-		st.writeData(1, true, []byte(msg))
-
-		st.wantWindowUpdate(0, uint32(len(msg)))
-
-		hf = st.wantHeaders()
-		if hf.StreamEnded() {
-			t.Fatal("expected data to follow")
-		}
-		if !hf.HeadersEnded() {
-			t.Fatal("want END_HEADERS flag")
-		}
-		goth = st.decodeHeader(hf.HeaderBlockFragment())
-		wanth = [][2]string{
-			{":status", "200"},
-			{"content-type", "text/plain; charset=utf-8"},
-			{"content-length", strconv.Itoa(len(reply))},
-		}
-		if !reflect.DeepEqual(goth, wanth) {
-			t.Errorf("Got headers %v; want %v", goth, wanth)
-		}
-
-		df := st.wantData()
-		if string(df.Data()) != reply {
-			t.Errorf("Client read %q; want %q", df.Data(), reply)
-		}
-		if !df.StreamEnded() {
-			t.Errorf("expect data stream end")
-		}
-	})
-}
-
-func TestServer_HandlerWriteErrorOnDisconnect(t *testing.T) {
-	errc := make(chan error, 1)
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		p := []byte("some data.\n")
-		for {
-			_, err := w.Write(p)
-			if err != nil {
-				errc <- err
-				return nil
-			}
-		}
-	}, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1,
-			BlockFragment: st.encodeHeader(),
-			EndStream:     false,
-			EndHeaders:    true,
-		})
-		hf := st.wantHeaders()
-		if hf.StreamEnded() {
-			t.Fatal("unexpected END_STREAM flag")
-		}
-		if !hf.HeadersEnded() {
-			t.Fatal("want END_HEADERS flag")
-		}
-		// Close the connection and wait for the handler to (hopefully) notice.
-		st.cc.Close()
-		select {
-		case <-errc:
-		case <-time.After(5 * time.Second):
-			t.Error("timeout")
-		}
-	})
-}
-
-func TestServer_Rejects_Too_Many_Streams(t *testing.T) {
-	const testPath = "/some/path"
-
-	inHandler := make(chan uint32)
-	leaveHandler := make(chan bool)
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		id := w.(*responseWriter).rws.stream.id
-		inHandler <- id
-		if id == 1+(defaultMaxStreams+1)*2 && r.URL.Path != testPath {
-			t.Errorf("decoded final path as %q; want %q", r.URL.Path, testPath)
-		}
-		<-leaveHandler
-	})
-	defer st.Close()
-	st.greet()
-	nextStreamID := uint32(1)
-	streamID := func() uint32 {
-		defer func() { nextStreamID += 2 }()
-		return nextStreamID
-	}
-	sendReq := func(id uint32, headers ...string) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      id,
-			BlockFragment: st.encodeHeader(headers...),
-			EndStream:     true,
-			EndHeaders:    true,
-		})
-	}
-	for i := 0; i < defaultMaxStreams; i++ {
-		sendReq(streamID())
-		<-inHandler
-	}
-	defer func() {
-		for i := 0; i < defaultMaxStreams; i++ {
-			leaveHandler <- true
-		}
-	}()
-
-	// And this one should cross the limit:
-	// (It's also sent as a CONTINUATION, to verify we still track the decoder context,
-	// even if we're rejecting it)
-	rejectID := streamID()
-	headerBlock := st.encodeHeader(":path", testPath)
-	frag1, frag2 := headerBlock[:3], headerBlock[3:]
-	st.writeHeaders(HeadersFrameParam{
-		StreamID:      rejectID,
-		BlockFragment: frag1,
-		EndStream:     true,
-		EndHeaders:    false, // CONTINUATION coming
-	})
-	if err := st.fr.WriteContinuation(rejectID, true, frag2); err != nil {
-		t.Fatal(err)
-	}
-	st.wantRSTStream(rejectID, ErrCodeProtocol)
-
-	// But let a handler finish:
-	leaveHandler <- true
-	st.wantHeaders()
-
-	// And now another stream should be able to start:
-	goodID := streamID()
-	sendReq(goodID, ":path", testPath)
-	select {
-	case got := <-inHandler:
-		if got != goodID {
-			t.Errorf("Got stream %d; want %d", got, goodID)
-		}
-	case <-time.After(3 * time.Second):
-		t.Error("timeout waiting for handler")
-	}
-}
-
-// So many response headers that the server needs to use CONTINUATION frames:
-func TestServer_Response_ManyHeaders_With_Continuation(t *testing.T) {
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		h := w.Header()
-		for i := 0; i < 5000; i++ {
-			h.Set(fmt.Sprintf("x-header-%d", i), fmt.Sprintf("x-value-%d", i))
-		}
-		return nil
-	}, func(st *serverTester) {
-		getSlash(st)
-		hf := st.wantHeaders()
-		if hf.HeadersEnded() {
-			t.Fatal("got unwanted END_HEADERS flag")
-		}
-		n := 0
-		for {
-			n++
-			cf := st.wantContinuation()
-			if cf.HeadersEnded() {
-				break
-			}
-		}
-		if n < 5 {
-			t.Errorf("Only got %d CONTINUATION frames; expected 5+ (currently 6)", n)
-		}
-	})
-}
-
-// This previously crashed (reported by Mathieu Lonjaret as observed
-// while using Camlistore) because we got a DATA frame from the client
-// after the handler exited and our logic at the time was wrong,
-// keeping a stream in the map in stateClosed, which tickled an
-// invariant check later when we tried to remove that stream (via
-// defer sc.closeAllStreamsOnConnClose) when the serverConn serve loop
-// ended.
-func TestServer_NoCrash_HandlerClose_Then_ClientClose(t *testing.T) {
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		// nothing
-		return nil
-	}, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1,
-			BlockFragment: st.encodeHeader(),
-			EndStream:     false, // DATA is coming
-			EndHeaders:    true,
-		})
-		hf := st.wantHeaders()
-		if !hf.HeadersEnded() || !hf.StreamEnded() {
-			t.Fatalf("want END_HEADERS+END_STREAM, got %v", hf)
-		}
-
-		// Sent when the a Handler closes while a client has
-		// indicated it's still sending DATA:
-		st.wantRSTStream(1, ErrCodeNo)
-
-		// Now the handler has ended, so it's ended its
-		// stream, but the client hasn't closed its side
-		// (stateClosedLocal).  So send more data and verify
-		// it doesn't crash with an internal invariant panic, like
-		// it did before.
-		st.writeData(1, true, []byte("foo"))
-
-		// Get our flow control bytes back, since the handler didn't get them.
-		st.wantWindowUpdate(0, uint32(len("foo")))
-
-		// Sent after a peer sends data anyway (admittedly the
-		// previous RST_STREAM might've still been in-flight),
-		// but they'll get the more friendly 'cancel' code
-		// first.
-		st.wantRSTStream(1, ErrCodeStreamClosed)
-
-		// Set up a bunch of machinery to record the panic we saw
-		// previously.
-		var (
-			panMu    sync.Mutex
-			panicVal interface{}
-		)
-
-		testHookOnPanicMu.Lock()
-		testHookOnPanic = func(sc *serverConn, pv interface{}) bool {
-			panMu.Lock()
-			panicVal = pv
-			panMu.Unlock()
-			return true
-		}
-		testHookOnPanicMu.Unlock()
-
-		// Now force the serve loop to end, via closing the connection.
-		st.cc.Close()
-		select {
-		case <-st.sc.doneServing:
-			// Loop has exited.
-			panMu.Lock()
-			got := panicVal
-			panMu.Unlock()
-			if got != nil {
-				t.Errorf("Got panic: %v", got)
-			}
-		case <-time.After(5 * time.Second):
-			t.Error("timeout")
-		}
-	})
-}
-
-func TestServer_Rejects_TLS10(t *testing.T) { testRejectTLS(t, tls.VersionTLS10) }
-func TestServer_Rejects_TLS11(t *testing.T) { testRejectTLS(t, tls.VersionTLS11) }
-
-func testRejectTLS(t *testing.T, max uint16) {
-	st := newServerTester(t, nil, func(c *tls.Config) {
-		c.MaxVersion = max
-	})
-	defer st.Close()
-	gf := st.wantGoAway()
-	if got, want := gf.ErrCode, ErrCodeInadequateSecurity; got != want {
-		t.Errorf("Got error code %v; want %v", got, want)
-	}
-}
-
-func TestServer_Rejects_TLSBadCipher(t *testing.T) {
-	st := newServerTester(t, nil, func(c *tls.Config) {
-		// Only list bad ones:
-		c.CipherSuites = []uint16{
-			tls.TLS_RSA_WITH_RC4_128_SHA,
-			tls.TLS_RSA_WITH_3DES_EDE_CBC_SHA,
-			tls.TLS_RSA_WITH_AES_128_CBC_SHA,
-			tls.TLS_RSA_WITH_AES_256_CBC_SHA,
-			tls.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA,
-			tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
-			tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
-			tls.TLS_ECDHE_RSA_WITH_RC4_128_SHA,
-			tls.TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,
-			tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
-			tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
-			cipher_TLS_RSA_WITH_AES_128_CBC_SHA256,
-		}
-	})
-	defer st.Close()
-	gf := st.wantGoAway()
-	if got, want := gf.ErrCode, ErrCodeInadequateSecurity; got != want {
-		t.Errorf("Got error code %v; want %v", got, want)
-	}
-}
-
-func TestServer_Advertises_Common_Cipher(t *testing.T) {
-	const requiredSuite = tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
-	st := newServerTester(t, nil, func(c *tls.Config) {
-		// Have the client only support the one required by the spec.
-		c.CipherSuites = []uint16{requiredSuite}
-	}, func(ts *httptest.Server) {
-		var srv *http.Server = ts.Config
-		// Have the server configured with no specific cipher suites.
-		// This tests that Go's defaults include the required one.
-		srv.TLSConfig = nil
-	})
-	defer st.Close()
-	st.greet()
-}
-
-func (st *serverTester) onHeaderField(f hpack.HeaderField) {
-	if f.Name == "date" {
-		return
-	}
-	st.decodedHeaders = append(st.decodedHeaders, [2]string{f.Name, f.Value})
-}
-
-func (st *serverTester) decodeHeader(headerBlock []byte) (pairs [][2]string) {
-	st.decodedHeaders = nil
-	if _, err := st.hpackDec.Write(headerBlock); err != nil {
-		st.t.Fatalf("hpack decoding error: %v", err)
-	}
-	if err := st.hpackDec.Close(); err != nil {
-		st.t.Fatalf("hpack decoding error: %v", err)
-	}
-	return st.decodedHeaders
-}
-
-// testServerResponse sets up an idle HTTP/2 connection. The client function should
-// write a single request that must be handled by the handler. This waits up to 5s
-// for client to return, then up to an additional 2s for the handler to return.
-func testServerResponse(t testing.TB,
-	handler func(http.ResponseWriter, *http.Request) error,
-	client func(*serverTester),
-) {
-	errc := make(chan error, 1)
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		if r.Body == nil {
-			t.Fatal("nil Body")
-		}
-		errc <- handler(w, r)
-	})
-	defer st.Close()
-
-	donec := make(chan bool)
-	go func() {
-		defer close(donec)
-		st.greet()
-		client(st)
-	}()
-
-	select {
-	case <-donec:
-	case <-time.After(5 * time.Second):
-		t.Fatal("timeout in client")
-	}
-
-	select {
-	case err := <-errc:
-		if err != nil {
-			t.Fatalf("Error in handler: %v", err)
-		}
-	case <-time.After(2 * time.Second):
-		t.Fatal("timeout in handler")
-	}
-}
-
-// readBodyHandler returns an http Handler func that reads len(want)
-// bytes from r.Body and fails t if the contents read were not
-// the value of want.
-func readBodyHandler(t *testing.T, want string) func(w http.ResponseWriter, r *http.Request) {
-	return func(w http.ResponseWriter, r *http.Request) {
-		buf := make([]byte, len(want))
-		_, err := io.ReadFull(r.Body, buf)
-		if err != nil {
-			t.Error(err)
-			return
-		}
-		if string(buf) != want {
-			t.Errorf("read %q; want %q", buf, want)
-		}
-	}
-}
-
-// TestServerWithCurl currently fails, hence the LenientCipherSuites test. See:
-//   https://github.com/tatsuhiro-t/nghttp2/issues/140 &
-//   http://sourceforge.net/p/curl/bugs/1472/
-func TestServerWithCurl(t *testing.T)                     { testServerWithCurl(t, false) }
-func TestServerWithCurl_LenientCipherSuites(t *testing.T) { testServerWithCurl(t, true) }
-
-func testServerWithCurl(t *testing.T, permitProhibitedCipherSuites bool) {
-	if runtime.GOOS != "linux" {
-		t.Skip("skipping Docker test when not on Linux; requires --net which won't work with boot2docker anyway")
-	}
-	if testing.Short() {
-		t.Skip("skipping curl test in short mode")
-	}
-	requireCurl(t)
-	var gotConn int32
-	testHookOnConn = func() { atomic.StoreInt32(&gotConn, 1) }
-
-	const msg = "Hello from curl!\n"
-	ts := httptest.NewUnstartedServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Foo", "Bar")
-		w.Header().Set("Client-Proto", r.Proto)
-		io.WriteString(w, msg)
-	}))
-	ConfigureServer(ts.Config, &Server{
-		PermitProhibitedCipherSuites: permitProhibitedCipherSuites,
-	})
-	ts.TLS = ts.Config.TLSConfig // the httptest.Server has its own copy of this TLS config
-	ts.StartTLS()
-	defer ts.Close()
-
-	t.Logf("Running test server for curl to hit at: %s", ts.URL)
-	container := curl(t, "--silent", "--http2", "--insecure", "-v", ts.URL)
-	defer kill(container)
-	resc := make(chan interface{}, 1)
-	go func() {
-		res, err := dockerLogs(container)
-		if err != nil {
-			resc <- err
-		} else {
-			resc <- res
-		}
-	}()
-	select {
-	case res := <-resc:
-		if err, ok := res.(error); ok {
-			t.Fatal(err)
-		}
-		body := string(res.([]byte))
-		// Search for both "key: value" and "key:value", since curl changed their format
-		// Our Dockerfile contains the latest version (no space), but just in case people
-		// didn't rebuild, check both.
-		if !strings.Contains(body, "foo: Bar") && !strings.Contains(body, "foo:Bar") {
-			t.Errorf("didn't see foo: Bar header")
-			t.Logf("Got: %s", body)
-		}
-		if !strings.Contains(body, "client-proto: HTTP/2") && !strings.Contains(body, "client-proto:HTTP/2") {
-			t.Errorf("didn't see client-proto: HTTP/2 header")
-			t.Logf("Got: %s", res)
-		}
-		if !strings.Contains(string(res.([]byte)), msg) {
-			t.Errorf("didn't see %q content", msg)
-			t.Logf("Got: %s", res)
-		}
-	case <-time.After(3 * time.Second):
-		t.Errorf("timeout waiting for curl")
-	}
-
-	if atomic.LoadInt32(&gotConn) == 0 {
-		t.Error("never saw an http2 connection")
-	}
-}
-
-var doh2load = flag.Bool("h2load", false, "Run h2load test")
-
-func TestServerWithH2Load(t *testing.T) {
-	if !*doh2load {
-		t.Skip("Skipping without --h2load flag.")
-	}
-	if runtime.GOOS != "linux" {
-		t.Skip("skipping Docker test when not on Linux; requires --net which won't work with boot2docker anyway")
-	}
-	requireH2load(t)
-
-	msg := strings.Repeat("Hello, h2load!\n", 5000)
-	ts := httptest.NewUnstartedServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		io.WriteString(w, msg)
-		w.(http.Flusher).Flush()
-		io.WriteString(w, msg)
-	}))
-	ts.StartTLS()
-	defer ts.Close()
-
-	cmd := exec.Command("docker", "run", "--net=host", "--entrypoint=/usr/local/bin/h2load", "gohttp2/curl",
-		"-n100000", "-c100", "-m100", ts.URL)
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	if err := cmd.Run(); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Issue 12843
-func TestServerDoS_MaxHeaderListSize(t *testing.T) {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {})
-	defer st.Close()
-
-	// shake hands
-	frameSize := defaultMaxReadFrameSize
-	var advHeaderListSize *uint32
-	st.greetAndCheckSettings(func(s Setting) error {
-		switch s.ID {
-		case SettingMaxFrameSize:
-			if s.Val < minMaxFrameSize {
-				frameSize = minMaxFrameSize
-			} else if s.Val > maxFrameSize {
-				frameSize = maxFrameSize
-			} else {
-				frameSize = int(s.Val)
-			}
-		case SettingMaxHeaderListSize:
-			advHeaderListSize = &s.Val
-		}
-		return nil
-	})
-
-	if advHeaderListSize == nil {
-		t.Errorf("server didn't advertise a max header list size")
-	} else if *advHeaderListSize == 0 {
-		t.Errorf("server advertised a max header list size of 0")
-	}
-
-	st.encodeHeaderField(":method", "GET")
-	st.encodeHeaderField(":path", "/")
-	st.encodeHeaderField(":scheme", "https")
-	cookie := strings.Repeat("*", 4058)
-	st.encodeHeaderField("cookie", cookie)
-	st.writeHeaders(HeadersFrameParam{
-		StreamID:      1,
-		BlockFragment: st.headerBuf.Bytes(),
-		EndStream:     true,
-		EndHeaders:    false,
-	})
-
-	// Capture the short encoding of a duplicate ~4K cookie, now
-	// that we've already sent it once.
-	st.headerBuf.Reset()
-	st.encodeHeaderField("cookie", cookie)
-
-	// Now send 1MB of it.
-	const size = 1 << 20
-	b := bytes.Repeat(st.headerBuf.Bytes(), size/st.headerBuf.Len())
-	for len(b) > 0 {
-		chunk := b
-		if len(chunk) > frameSize {
-			chunk = chunk[:frameSize]
-		}
-		b = b[len(chunk):]
-		st.fr.WriteContinuation(1, len(b) == 0, chunk)
-	}
-
-	h := st.wantHeaders()
-	if !h.HeadersEnded() {
-		t.Fatalf("Got HEADERS without END_HEADERS set: %v", h)
-	}
-	headers := st.decodeHeader(h.HeaderBlockFragment())
-	want := [][2]string{
-		{":status", "431"},
-		{"content-type", "text/html; charset=utf-8"},
-		{"content-length", "63"},
-	}
-	if !reflect.DeepEqual(headers, want) {
-		t.Errorf("Headers mismatch.\n got: %q\nwant: %q\n", headers, want)
-	}
-}
-
-func TestCompressionErrorOnWrite(t *testing.T) {
-	const maxStrLen = 8 << 10
-	var serverConfig *http.Server
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		// No response body.
-	}, func(ts *httptest.Server) {
-		serverConfig = ts.Config
-		serverConfig.MaxHeaderBytes = maxStrLen
-	})
-	st.addLogFilter("connection error: COMPRESSION_ERROR")
-	defer st.Close()
-	st.greet()
-
-	maxAllowed := st.sc.framer.maxHeaderStringLen()
-
-	// Crank this up, now that we have a conn connected with the
-	// hpack.Decoder's max string length set has been initialized
-	// from the earlier low ~8K value. We want this higher so don't
-	// hit the max header list size. We only want to test hitting
-	// the max string size.
-	serverConfig.MaxHeaderBytes = 1 << 20
-
-	// First a request with a header that's exactly the max allowed size
-	// for the hpack compression. It's still too long for the header list
-	// size, so we'll get the 431 error, but that keeps the compression
-	// context still valid.
-	hbf := st.encodeHeader("foo", strings.Repeat("a", maxAllowed))
-
-	st.writeHeaders(HeadersFrameParam{
-		StreamID:      1,
-		BlockFragment: hbf,
-		EndStream:     true,
-		EndHeaders:    true,
-	})
-	h := st.wantHeaders()
-	if !h.HeadersEnded() {
-		t.Fatalf("Got HEADERS without END_HEADERS set: %v", h)
-	}
-	headers := st.decodeHeader(h.HeaderBlockFragment())
-	want := [][2]string{
-		{":status", "431"},
-		{"content-type", "text/html; charset=utf-8"},
-		{"content-length", "63"},
-	}
-	if !reflect.DeepEqual(headers, want) {
-		t.Errorf("Headers mismatch.\n got: %q\nwant: %q\n", headers, want)
-	}
-	df := st.wantData()
-	if !strings.Contains(string(df.Data()), "HTTP Error 431") {
-		t.Errorf("Unexpected data body: %q", df.Data())
-	}
-	if !df.StreamEnded() {
-		t.Fatalf("expect data stream end")
-	}
-
-	// And now send one that's just one byte too big.
-	hbf = st.encodeHeader("bar", strings.Repeat("b", maxAllowed+1))
-	st.writeHeaders(HeadersFrameParam{
-		StreamID:      3,
-		BlockFragment: hbf,
-		EndStream:     true,
-		EndHeaders:    true,
-	})
-	ga := st.wantGoAway()
-	if ga.ErrCode != ErrCodeCompression {
-		t.Errorf("GOAWAY err = %v; want ErrCodeCompression", ga.ErrCode)
-	}
-}
-
-func TestCompressionErrorOnClose(t *testing.T) {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		// No response body.
-	})
-	st.addLogFilter("connection error: COMPRESSION_ERROR")
-	defer st.Close()
-	st.greet()
-
-	hbf := st.encodeHeader("foo", "bar")
-	hbf = hbf[:len(hbf)-1] // truncate one byte from the end, so hpack.Decoder.Close fails.
-	st.writeHeaders(HeadersFrameParam{
-		StreamID:      1,
-		BlockFragment: hbf,
-		EndStream:     true,
-		EndHeaders:    true,
-	})
-	ga := st.wantGoAway()
-	if ga.ErrCode != ErrCodeCompression {
-		t.Errorf("GOAWAY err = %v; want ErrCodeCompression", ga.ErrCode)
-	}
-}
-
-// test that a server handler can read trailers from a client
-func TestServerReadsTrailers(t *testing.T) {
-	const testBody = "some test body"
-	writeReq := func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1, // clients send odd numbers
-			BlockFragment: st.encodeHeader("trailer", "Foo, Bar", "trailer", "Baz"),
-			EndStream:     false,
-			EndHeaders:    true,
-		})
-		st.writeData(1, false, []byte(testBody))
-		st.writeHeaders(HeadersFrameParam{
-			StreamID: 1, // clients send odd numbers
-			BlockFragment: st.encodeHeaderRaw(
-				"foo", "foov",
-				"bar", "barv",
-				"baz", "bazv",
-				"surprise", "wasn't declared; shouldn't show up",
-			),
-			EndStream:  true,
-			EndHeaders: true,
-		})
-	}
-	checkReq := func(r *http.Request) {
-		wantTrailer := http.Header{
-			"Foo": nil,
-			"Bar": nil,
-			"Baz": nil,
-		}
-		if !reflect.DeepEqual(r.Trailer, wantTrailer) {
-			t.Errorf("initial Trailer = %v; want %v", r.Trailer, wantTrailer)
-		}
-		slurp, err := ioutil.ReadAll(r.Body)
-		if string(slurp) != testBody {
-			t.Errorf("read body %q; want %q", slurp, testBody)
-		}
-		if err != nil {
-			t.Fatalf("Body slurp: %v", err)
-		}
-		wantTrailerAfter := http.Header{
-			"Foo": {"foov"},
-			"Bar": {"barv"},
-			"Baz": {"bazv"},
-		}
-		if !reflect.DeepEqual(r.Trailer, wantTrailerAfter) {
-			t.Errorf("final Trailer = %v; want %v", r.Trailer, wantTrailerAfter)
-		}
-	}
-	testServerRequest(t, writeReq, checkReq)
-}
-
-// test that a server handler can send trailers
-func TestServerWritesTrailers_WithFlush(t *testing.T)    { testServerWritesTrailers(t, true) }
-func TestServerWritesTrailers_WithoutFlush(t *testing.T) { testServerWritesTrailers(t, false) }
-
-func testServerWritesTrailers(t *testing.T, withFlush bool) {
-	// See https://httpwg.github.io/specs/rfc7540.html#rfc.section.8.1.3
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		w.Header().Set("Trailer", "Server-Trailer-A, Server-Trailer-B")
-		w.Header().Add("Trailer", "Server-Trailer-C")
-		w.Header().Add("Trailer", "Transfer-Encoding, Content-Length, Trailer") // filtered
-
-		// Regular headers:
-		w.Header().Set("Foo", "Bar")
-		w.Header().Set("Content-Length", "5") // len("Hello")
-
-		io.WriteString(w, "Hello")
-		if withFlush {
-			w.(http.Flusher).Flush()
-		}
-		w.Header().Set("Server-Trailer-A", "valuea")
-		w.Header().Set("Server-Trailer-C", "valuec") // skipping B
-		// After a flush, random keys like Server-Surprise shouldn't show up:
-		w.Header().Set("Server-Surpise", "surprise! this isn't predeclared!")
-		// But we do permit promoting keys to trailers after a
-		// flush if they start with the magic
-		// otherwise-invalid "Trailer:" prefix:
-		w.Header().Set("Trailer:Post-Header-Trailer", "hi1")
-		w.Header().Set("Trailer:post-header-trailer2", "hi2")
-		w.Header().Set("Trailer:Range", "invalid")
-		w.Header().Set("Trailer:Foo\x01Bogus", "invalid")
-		w.Header().Set("Transfer-Encoding", "should not be included; Forbidden by RFC 7230 4.1.2")
-		w.Header().Set("Content-Length", "should not be included; Forbidden by RFC 7230 4.1.2")
-		w.Header().Set("Trailer", "should not be included; Forbidden by RFC 7230 4.1.2")
-		return nil
-	}, func(st *serverTester) {
-		getSlash(st)
-		hf := st.wantHeaders()
-		if hf.StreamEnded() {
-			t.Fatal("response HEADERS had END_STREAM")
-		}
-		if !hf.HeadersEnded() {
-			t.Fatal("response HEADERS didn't have END_HEADERS")
-		}
-		goth := st.decodeHeader(hf.HeaderBlockFragment())
-		wanth := [][2]string{
-			{":status", "200"},
-			{"foo", "Bar"},
-			{"trailer", "Server-Trailer-A, Server-Trailer-B"},
-			{"trailer", "Server-Trailer-C"},
-			{"trailer", "Transfer-Encoding, Content-Length, Trailer"},
-			{"content-type", "text/plain; charset=utf-8"},
-			{"content-length", "5"},
-		}
-		if !reflect.DeepEqual(goth, wanth) {
-			t.Errorf("Header mismatch.\n got: %v\nwant: %v", goth, wanth)
-		}
-		df := st.wantData()
-		if string(df.Data()) != "Hello" {
-			t.Fatalf("Client read %q; want Hello", df.Data())
-		}
-		if df.StreamEnded() {
-			t.Fatalf("data frame had STREAM_ENDED")
-		}
-		tf := st.wantHeaders() // for the trailers
-		if !tf.StreamEnded() {
-			t.Fatalf("trailers HEADERS lacked END_STREAM")
-		}
-		if !tf.HeadersEnded() {
-			t.Fatalf("trailers HEADERS lacked END_HEADERS")
-		}
-		wanth = [][2]string{
-			{"post-header-trailer", "hi1"},
-			{"post-header-trailer2", "hi2"},
-			{"server-trailer-a", "valuea"},
-			{"server-trailer-c", "valuec"},
-		}
-		goth = st.decodeHeader(tf.HeaderBlockFragment())
-		if !reflect.DeepEqual(goth, wanth) {
-			t.Errorf("Header mismatch.\n got: %v\nwant: %v", goth, wanth)
-		}
-	})
-}
-
-// validate transmitted header field names & values
-// golang.org/issue/14048
-func TestServerDoesntWriteInvalidHeaders(t *testing.T) {
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		w.Header().Add("OK1", "x")
-		w.Header().Add("Bad:Colon", "x") // colon (non-token byte) in key
-		w.Header().Add("Bad1\x00", "x")  // null in key
-		w.Header().Add("Bad2", "x\x00y") // null in value
-		return nil
-	}, func(st *serverTester) {
-		getSlash(st)
-		hf := st.wantHeaders()
-		if !hf.StreamEnded() {
-			t.Error("response HEADERS lacked END_STREAM")
-		}
-		if !hf.HeadersEnded() {
-			t.Fatal("response HEADERS didn't have END_HEADERS")
-		}
-		goth := st.decodeHeader(hf.HeaderBlockFragment())
-		wanth := [][2]string{
-			{":status", "200"},
-			{"ok1", "x"},
-			{"content-length", "0"},
-		}
-		if !reflect.DeepEqual(goth, wanth) {
-			t.Errorf("Header mismatch.\n got: %v\nwant: %v", goth, wanth)
-		}
-	})
-}
-
-func BenchmarkServerGets(b *testing.B) {
-	defer disableGoroutineTracking()()
-	b.ReportAllocs()
-
-	const msg = "Hello, world"
-	st := newServerTester(b, func(w http.ResponseWriter, r *http.Request) {
-		io.WriteString(w, msg)
-	})
-	defer st.Close()
-	st.greet()
-
-	// Give the server quota to reply. (plus it has the 64KB)
-	if err := st.fr.WriteWindowUpdate(0, uint32(b.N*len(msg))); err != nil {
-		b.Fatal(err)
-	}
-
-	for i := 0; i < b.N; i++ {
-		id := 1 + uint32(i)*2
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      id,
-			BlockFragment: st.encodeHeader(),
-			EndStream:     true,
-			EndHeaders:    true,
-		})
-		st.wantHeaders()
-		df := st.wantData()
-		if !df.StreamEnded() {
-			b.Fatalf("DATA didn't have END_STREAM; got %v", df)
-		}
-	}
-}
-
-func BenchmarkServerPosts(b *testing.B) {
-	defer disableGoroutineTracking()()
-	b.ReportAllocs()
-
-	const msg = "Hello, world"
-	st := newServerTester(b, func(w http.ResponseWriter, r *http.Request) {
-		// Consume the (empty) body from th peer before replying, otherwise
-		// the server will sometimes (depending on scheduling) send the peer a
-		// a RST_STREAM with the CANCEL error code.
-		if n, err := io.Copy(ioutil.Discard, r.Body); n != 0 || err != nil {
-			b.Errorf("Copy error; got %v, %v; want 0, nil", n, err)
-		}
-		io.WriteString(w, msg)
-	})
-	defer st.Close()
-	st.greet()
-
-	// Give the server quota to reply. (plus it has the 64KB)
-	if err := st.fr.WriteWindowUpdate(0, uint32(b.N*len(msg))); err != nil {
-		b.Fatal(err)
-	}
-
-	for i := 0; i < b.N; i++ {
-		id := 1 + uint32(i)*2
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      id,
-			BlockFragment: st.encodeHeader(":method", "POST"),
-			EndStream:     false,
-			EndHeaders:    true,
-		})
-		st.writeData(id, true, nil)
-		st.wantHeaders()
-		df := st.wantData()
-		if !df.StreamEnded() {
-			b.Fatalf("DATA didn't have END_STREAM; got %v", df)
-		}
-	}
-}
-
-// Send a stream of messages from server to client in separate data frames.
-// Brings up performance issues seen in long streams.
-// Created to show problem in go issue #18502
-func BenchmarkServerToClientStreamDefaultOptions(b *testing.B) {
-	benchmarkServerToClientStream(b)
-}
-
-// Justification for Change-Id: Iad93420ef6c3918f54249d867098f1dadfa324d8
-// Expect to see memory/alloc reduction by opting in to Frame reuse with the Framer.
-func BenchmarkServerToClientStreamReuseFrames(b *testing.B) {
-	benchmarkServerToClientStream(b, optFramerReuseFrames)
-}
-
-func benchmarkServerToClientStream(b *testing.B, newServerOpts ...interface{}) {
-	defer disableGoroutineTracking()()
-	b.ReportAllocs()
-	const msgLen = 1
-	// default window size
-	const windowSize = 1<<16 - 1
-
-	// next message to send from the server and for the client to expect
-	nextMsg := func(i int) []byte {
-		msg := make([]byte, msgLen)
-		msg[0] = byte(i)
-		if len(msg) != msgLen {
-			panic("invalid test setup msg length")
-		}
-		return msg
-	}
-
-	st := newServerTester(b, func(w http.ResponseWriter, r *http.Request) {
-		// Consume the (empty) body from th peer before replying, otherwise
-		// the server will sometimes (depending on scheduling) send the peer a
-		// a RST_STREAM with the CANCEL error code.
-		if n, err := io.Copy(ioutil.Discard, r.Body); n != 0 || err != nil {
-			b.Errorf("Copy error; got %v, %v; want 0, nil", n, err)
-		}
-		for i := 0; i < b.N; i += 1 {
-			w.Write(nextMsg(i))
-			w.(http.Flusher).Flush()
-		}
-	}, newServerOpts...)
-	defer st.Close()
-	st.greet()
-
-	const id = uint32(1)
-
-	st.writeHeaders(HeadersFrameParam{
-		StreamID:      id,
-		BlockFragment: st.encodeHeader(":method", "POST"),
-		EndStream:     false,
-		EndHeaders:    true,
-	})
-
-	st.writeData(id, true, nil)
-	st.wantHeaders()
-
-	var pendingWindowUpdate = uint32(0)
-
-	for i := 0; i < b.N; i += 1 {
-		expected := nextMsg(i)
-		df := st.wantData()
-		if bytes.Compare(expected, df.data) != 0 {
-			b.Fatalf("Bad message received; want %v; got %v", expected, df.data)
-		}
-		// try to send infrequent but large window updates so they don't overwhelm the test
-		pendingWindowUpdate += uint32(len(df.data))
-		if pendingWindowUpdate >= windowSize/2 {
-			if err := st.fr.WriteWindowUpdate(0, pendingWindowUpdate); err != nil {
-				b.Fatal(err)
-			}
-			if err := st.fr.WriteWindowUpdate(id, pendingWindowUpdate); err != nil {
-				b.Fatal(err)
-			}
-			pendingWindowUpdate = 0
-		}
-	}
-	df := st.wantData()
-	if !df.StreamEnded() {
-		b.Fatalf("DATA didn't have END_STREAM; got %v", df)
-	}
-}
-
-// go-fuzz bug, originally reported at https://github.com/bradfitz/http2/issues/53
-// Verify we don't hang.
-func TestIssue53(t *testing.T) {
-	const data = "PRI * HTTP/2.0\r\n\r\nSM" +
-		"\r\n\r\n\x00\x00\x00\x01\ainfinfin\ad"
-	s := &http.Server{
-		ErrorLog: log.New(io.MultiWriter(stderrv(), twriter{t: t}), "", log.LstdFlags),
-		Handler: http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-			w.Write([]byte("hello"))
-		}),
-	}
-	s2 := &Server{
-		MaxReadFrameSize:             1 << 16,
-		PermitProhibitedCipherSuites: true,
-	}
-	c := &issue53Conn{[]byte(data), false, false}
-	s2.ServeConn(c, &ServeConnOpts{BaseConfig: s})
-	if !c.closed {
-		t.Fatal("connection is not closed")
-	}
-}
-
-type issue53Conn struct {
-	data    []byte
-	closed  bool
-	written bool
-}
-
-func (c *issue53Conn) Read(b []byte) (n int, err error) {
-	if len(c.data) == 0 {
-		return 0, io.EOF
-	}
-	n = copy(b, c.data)
-	c.data = c.data[n:]
-	return
-}
-
-func (c *issue53Conn) Write(b []byte) (n int, err error) {
-	c.written = true
-	return len(b), nil
-}
-
-func (c *issue53Conn) Close() error {
-	c.closed = true
-	return nil
-}
-
-func (c *issue53Conn) LocalAddr() net.Addr {
-	return &net.TCPAddr{IP: net.IPv4(127, 0, 0, 1), Port: 49706}
-}
-func (c *issue53Conn) RemoteAddr() net.Addr {
-	return &net.TCPAddr{IP: net.IPv4(127, 0, 0, 1), Port: 49706}
-}
-func (c *issue53Conn) SetDeadline(t time.Time) error      { return nil }
-func (c *issue53Conn) SetReadDeadline(t time.Time) error  { return nil }
-func (c *issue53Conn) SetWriteDeadline(t time.Time) error { return nil }
-
-// golang.org/issue/12895
-func TestConfigureServer(t *testing.T) {
-	tests := []struct {
-		name      string
-		tlsConfig *tls.Config
-		wantErr   string
-	}{
-		{
-			name: "empty server",
-		},
-		{
-			name: "just the required cipher suite",
-			tlsConfig: &tls.Config{
-				CipherSuites: []uint16{tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256},
-			},
-		},
-		{
-			name: "just the alternative required cipher suite",
-			tlsConfig: &tls.Config{
-				CipherSuites: []uint16{tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256},
-			},
-		},
-		{
-			name: "missing required cipher suite",
-			tlsConfig: &tls.Config{
-				CipherSuites: []uint16{tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384},
-			},
-			wantErr: "is missing an HTTP/2-required AES_128_GCM_SHA256 cipher.",
-		},
-		{
-			name: "required after bad",
-			tlsConfig: &tls.Config{
-				CipherSuites: []uint16{tls.TLS_RSA_WITH_RC4_128_SHA, tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256},
-			},
-			wantErr: "contains an HTTP/2-approved cipher suite (0xc02f), but it comes after",
-		},
-		{
-			name: "bad after required",
-			tlsConfig: &tls.Config{
-				CipherSuites: []uint16{tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, tls.TLS_RSA_WITH_RC4_128_SHA},
-			},
-		},
-	}
-	for _, tt := range tests {
-		srv := &http.Server{TLSConfig: tt.tlsConfig}
-		err := ConfigureServer(srv, nil)
-		if (err != nil) != (tt.wantErr != "") {
-			if tt.wantErr != "" {
-				t.Errorf("%s: success, but want error", tt.name)
-			} else {
-				t.Errorf("%s: unexpected error: %v", tt.name, err)
-			}
-		}
-		if err != nil && tt.wantErr != "" && !strings.Contains(err.Error(), tt.wantErr) {
-			t.Errorf("%s: err = %v; want substring %q", tt.name, err, tt.wantErr)
-		}
-		if err == nil && !srv.TLSConfig.PreferServerCipherSuites {
-			t.Errorf("%s: PreferServerCipherSuite is false; want true", tt.name)
-		}
-	}
-}
-
-func TestServerRejectHeadWithBody(t *testing.T) {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		// No response body.
-	})
-	defer st.Close()
-	st.greet()
-	st.writeHeaders(HeadersFrameParam{
-		StreamID:      1, // clients send odd numbers
-		BlockFragment: st.encodeHeader(":method", "HEAD"),
-		EndStream:     false, // what we're testing, a bogus HEAD request with body
-		EndHeaders:    true,
-	})
-	st.wantRSTStream(1, ErrCodeProtocol)
-}
-
-func TestServerNoAutoContentLengthOnHead(t *testing.T) {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		// No response body. (or smaller than one frame)
-	})
-	defer st.Close()
-	st.greet()
-	st.writeHeaders(HeadersFrameParam{
-		StreamID:      1, // clients send odd numbers
-		BlockFragment: st.encodeHeader(":method", "HEAD"),
-		EndStream:     true,
-		EndHeaders:    true,
-	})
-	h := st.wantHeaders()
-	headers := st.decodeHeader(h.HeaderBlockFragment())
-	want := [][2]string{
-		{":status", "200"},
-	}
-	if !reflect.DeepEqual(headers, want) {
-		t.Errorf("Headers mismatch.\n got: %q\nwant: %q\n", headers, want)
-	}
-}
-
-// golang.org/issue/13495
-func TestServerNoDuplicateContentType(t *testing.T) {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		w.Header()["Content-Type"] = []string{""}
-		fmt.Fprintf(w, "<html><head></head><body>hi</body></html>")
-	})
-	defer st.Close()
-	st.greet()
-	st.writeHeaders(HeadersFrameParam{
-		StreamID:      1,
-		BlockFragment: st.encodeHeader(),
-		EndStream:     true,
-		EndHeaders:    true,
-	})
-	h := st.wantHeaders()
-	headers := st.decodeHeader(h.HeaderBlockFragment())
-	want := [][2]string{
-		{":status", "200"},
-		{"content-type", ""},
-		{"content-length", "41"},
-	}
-	if !reflect.DeepEqual(headers, want) {
-		t.Errorf("Headers mismatch.\n got: %q\nwant: %q\n", headers, want)
-	}
-}
-
-func disableGoroutineTracking() (restore func()) {
-	old := DebugGoroutines
-	DebugGoroutines = false
-	return func() { DebugGoroutines = old }
-}
-
-func BenchmarkServer_GetRequest(b *testing.B) {
-	defer disableGoroutineTracking()()
-	b.ReportAllocs()
-	const msg = "Hello, world."
-	st := newServerTester(b, func(w http.ResponseWriter, r *http.Request) {
-		n, err := io.Copy(ioutil.Discard, r.Body)
-		if err != nil || n > 0 {
-			b.Errorf("Read %d bytes, error %v; want 0 bytes.", n, err)
-		}
-		io.WriteString(w, msg)
-	})
-	defer st.Close()
-
-	st.greet()
-	// Give the server quota to reply. (plus it has the 64KB)
-	if err := st.fr.WriteWindowUpdate(0, uint32(b.N*len(msg))); err != nil {
-		b.Fatal(err)
-	}
-	hbf := st.encodeHeader(":method", "GET")
-	for i := 0; i < b.N; i++ {
-		streamID := uint32(1 + 2*i)
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      streamID,
-			BlockFragment: hbf,
-			EndStream:     true,
-			EndHeaders:    true,
-		})
-		st.wantHeaders()
-		st.wantData()
-	}
-}
-
-func BenchmarkServer_PostRequest(b *testing.B) {
-	defer disableGoroutineTracking()()
-	b.ReportAllocs()
-	const msg = "Hello, world."
-	st := newServerTester(b, func(w http.ResponseWriter, r *http.Request) {
-		n, err := io.Copy(ioutil.Discard, r.Body)
-		if err != nil || n > 0 {
-			b.Errorf("Read %d bytes, error %v; want 0 bytes.", n, err)
-		}
-		io.WriteString(w, msg)
-	})
-	defer st.Close()
-	st.greet()
-	// Give the server quota to reply. (plus it has the 64KB)
-	if err := st.fr.WriteWindowUpdate(0, uint32(b.N*len(msg))); err != nil {
-		b.Fatal(err)
-	}
-	hbf := st.encodeHeader(":method", "POST")
-	for i := 0; i < b.N; i++ {
-		streamID := uint32(1 + 2*i)
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      streamID,
-			BlockFragment: hbf,
-			EndStream:     false,
-			EndHeaders:    true,
-		})
-		st.writeData(streamID, true, nil)
-		st.wantHeaders()
-		st.wantData()
-	}
-}
-
-type connStateConn struct {
-	net.Conn
-	cs tls.ConnectionState
-}
-
-func (c connStateConn) ConnectionState() tls.ConnectionState { return c.cs }
-
-// golang.org/issue/12737 -- handle any net.Conn, not just
-// *tls.Conn.
-func TestServerHandleCustomConn(t *testing.T) {
-	var s Server
-	c1, c2 := net.Pipe()
-	clientDone := make(chan struct{})
-	handlerDone := make(chan struct{})
-	var req *http.Request
-	go func() {
-		defer close(clientDone)
-		defer c2.Close()
-		fr := NewFramer(c2, c2)
-		io.WriteString(c2, ClientPreface)
-		fr.WriteSettings()
-		fr.WriteSettingsAck()
-		f, err := fr.ReadFrame()
-		if err != nil {
-			t.Error(err)
-			return
-		}
-		if sf, ok := f.(*SettingsFrame); !ok || sf.IsAck() {
-			t.Errorf("Got %v; want non-ACK SettingsFrame", summarizeFrame(f))
-			return
-		}
-		f, err = fr.ReadFrame()
-		if err != nil {
-			t.Error(err)
-			return
-		}
-		if sf, ok := f.(*SettingsFrame); !ok || !sf.IsAck() {
-			t.Errorf("Got %v; want ACK SettingsFrame", summarizeFrame(f))
-			return
-		}
-		var henc hpackEncoder
-		fr.WriteHeaders(HeadersFrameParam{
-			StreamID:      1,
-			BlockFragment: henc.encodeHeaderRaw(t, ":method", "GET", ":path", "/", ":scheme", "https", ":authority", "foo.com"),
-			EndStream:     true,
-			EndHeaders:    true,
-		})
-		go io.Copy(ioutil.Discard, c2)
-		<-handlerDone
-	}()
-	const testString = "my custom ConnectionState"
-	fakeConnState := tls.ConnectionState{
-		ServerName:  testString,
-		Version:     tls.VersionTLS12,
-		CipherSuite: cipher_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
-	}
-	go s.ServeConn(connStateConn{c1, fakeConnState}, &ServeConnOpts{
-		BaseConfig: &http.Server{
-			Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-				defer close(handlerDone)
-				req = r
-			}),
-		}})
-	select {
-	case <-clientDone:
-	case <-time.After(5 * time.Second):
-		t.Fatal("timeout waiting for handler")
-	}
-	if req.TLS == nil {
-		t.Fatalf("Request.TLS is nil. Got: %#v", req)
-	}
-	if req.TLS.ServerName != testString {
-		t.Fatalf("Request.TLS = %+v; want ServerName of %q", req.TLS, testString)
-	}
-}
-
-// golang.org/issue/14214
-func TestServer_Rejects_ConnHeaders(t *testing.T) {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		t.Error("should not get to Handler")
-	})
-	defer st.Close()
-	st.greet()
-	st.bodylessReq1("connection", "foo")
-	hf := st.wantHeaders()
-	goth := st.decodeHeader(hf.HeaderBlockFragment())
-	wanth := [][2]string{
-		{":status", "400"},
-		{"content-type", "text/plain; charset=utf-8"},
-		{"x-content-type-options", "nosniff"},
-		{"content-length", "51"},
-	}
-	if !reflect.DeepEqual(goth, wanth) {
-		t.Errorf("Got headers %v; want %v", goth, wanth)
-	}
-}
-
-type hpackEncoder struct {
-	enc *hpack.Encoder
-	buf bytes.Buffer
-}
-
-func (he *hpackEncoder) encodeHeaderRaw(t *testing.T, headers ...string) []byte {
-	if len(headers)%2 == 1 {
-		panic("odd number of kv args")
-	}
-	he.buf.Reset()
-	if he.enc == nil {
-		he.enc = hpack.NewEncoder(&he.buf)
-	}
-	for len(headers) > 0 {
-		k, v := headers[0], headers[1]
-		err := he.enc.WriteField(hpack.HeaderField{Name: k, Value: v})
-		if err != nil {
-			t.Fatalf("HPACK encoding error for %q/%q: %v", k, v, err)
-		}
-		headers = headers[2:]
-	}
-	return he.buf.Bytes()
-}
-
-func TestCheckValidHTTP2Request(t *testing.T) {
-	tests := []struct {
-		h    http.Header
-		want error
-	}{
-		{
-			h:    http.Header{"Te": {"trailers"}},
-			want: nil,
-		},
-		{
-			h:    http.Header{"Te": {"trailers", "bogus"}},
-			want: errors.New(`request header "TE" may only be "trailers" in HTTP/2`),
-		},
-		{
-			h:    http.Header{"Foo": {""}},
-			want: nil,
-		},
-		{
-			h:    http.Header{"Connection": {""}},
-			want: errors.New(`request header "Connection" is not valid in HTTP/2`),
-		},
-		{
-			h:    http.Header{"Proxy-Connection": {""}},
-			want: errors.New(`request header "Proxy-Connection" is not valid in HTTP/2`),
-		},
-		{
-			h:    http.Header{"Keep-Alive": {""}},
-			want: errors.New(`request header "Keep-Alive" is not valid in HTTP/2`),
-		},
-		{
-			h:    http.Header{"Upgrade": {""}},
-			want: errors.New(`request header "Upgrade" is not valid in HTTP/2`),
-		},
-	}
-	for i, tt := range tests {
-		got := checkValidHTTP2RequestHeaders(tt.h)
-		if !reflect.DeepEqual(got, tt.want) {
-			t.Errorf("%d. checkValidHTTP2Request = %v; want %v", i, got, tt.want)
-		}
-	}
-}
-
-// golang.org/issue/14030
-func TestExpect100ContinueAfterHandlerWrites(t *testing.T) {
-	const msg = "Hello"
-	const msg2 = "World"
-
-	doRead := make(chan bool, 1)
-	defer close(doRead) // fallback cleanup
-
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		io.WriteString(w, msg)
-		w.(http.Flusher).Flush()
-
-		// Do a read, which might force a 100-continue status to be sent.
-		<-doRead
-		r.Body.Read(make([]byte, 10))
-
-		io.WriteString(w, msg2)
-
-	}, optOnlyServer)
-	defer st.Close()
-
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-
-	req, _ := http.NewRequest("POST", st.ts.URL, io.LimitReader(neverEnding('A'), 2<<20))
-	req.Header.Set("Expect", "100-continue")
-
-	res, err := tr.RoundTrip(req)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer res.Body.Close()
-
-	buf := make([]byte, len(msg))
-	if _, err := io.ReadFull(res.Body, buf); err != nil {
-		t.Fatal(err)
-	}
-	if string(buf) != msg {
-		t.Fatalf("msg = %q; want %q", buf, msg)
-	}
-
-	doRead <- true
-
-	if _, err := io.ReadFull(res.Body, buf); err != nil {
-		t.Fatal(err)
-	}
-	if string(buf) != msg2 {
-		t.Fatalf("second msg = %q; want %q", buf, msg2)
-	}
-}
-
-type funcReader func([]byte) (n int, err error)
-
-func (f funcReader) Read(p []byte) (n int, err error) { return f(p) }
-
-// golang.org/issue/16481 -- return flow control when streams close with unread data.
-// (The Server version of the bug. See also TestUnreadFlowControlReturned_Transport)
-func TestUnreadFlowControlReturned_Server(t *testing.T) {
-	unblock := make(chan bool, 1)
-	defer close(unblock)
-
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		// Don't read the 16KB request body. Wait until the client's
-		// done sending it and then return. This should cause the Server
-		// to then return those 16KB of flow control to the client.
-		<-unblock
-	}, optOnlyServer)
-	defer st.Close()
-
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-
-	// This previously hung on the 4th iteration.
-	for i := 0; i < 6; i++ {
-		body := io.MultiReader(
-			io.LimitReader(neverEnding('A'), 16<<10),
-			funcReader(func([]byte) (n int, err error) {
-				unblock <- true
-				return 0, io.EOF
-			}),
-		)
-		req, _ := http.NewRequest("POST", st.ts.URL, body)
-		res, err := tr.RoundTrip(req)
-		if err != nil {
-			t.Fatal(err)
-		}
-		res.Body.Close()
-	}
-
-}
-
-func TestServerIdleTimeout(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping in short mode")
-	}
-
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-	}, func(h2s *Server) {
-		h2s.IdleTimeout = 500 * time.Millisecond
-	})
-	defer st.Close()
-
-	st.greet()
-	ga := st.wantGoAway()
-	if ga.ErrCode != ErrCodeNo {
-		t.Errorf("GOAWAY error = %v; want ErrCodeNo", ga.ErrCode)
-	}
-}
-
-func TestServerIdleTimeout_AfterRequest(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping in short mode")
-	}
-	const timeout = 250 * time.Millisecond
-
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		time.Sleep(timeout * 2)
-	}, func(h2s *Server) {
-		h2s.IdleTimeout = timeout
-	})
-	defer st.Close()
-
-	st.greet()
-
-	// Send a request which takes twice the timeout. Verifies the
-	// idle timeout doesn't fire while we're in a request:
-	st.bodylessReq1()
-	st.wantHeaders()
-
-	// But the idle timeout should be rearmed after the request
-	// is done:
-	ga := st.wantGoAway()
-	if ga.ErrCode != ErrCodeNo {
-		t.Errorf("GOAWAY error = %v; want ErrCodeNo", ga.ErrCode)
-	}
-}
-
-// grpc-go closes the Request.Body currently with a Read.
-// Verify that it doesn't race.
-// See https://github.com/grpc/grpc-go/pull/938
-func TestRequestBodyReadCloseRace(t *testing.T) {
-	for i := 0; i < 100; i++ {
-		body := &requestBody{
-			pipe: &pipe{
-				b: new(bytes.Buffer),
-			},
-		}
-		body.pipe.CloseWithError(io.EOF)
-
-		done := make(chan bool, 1)
-		buf := make([]byte, 10)
-		go func() {
-			time.Sleep(1 * time.Millisecond)
-			body.Close()
-			done <- true
-		}()
-		body.Read(buf)
-		<-done
-	}
-}
-
-func TestIssue20704Race(t *testing.T) {
-	if testing.Short() && os.Getenv("GO_BUILDER_NAME") == "" {
-		t.Skip("skipping in short mode")
-	}
-	const (
-		itemSize  = 1 << 10
-		itemCount = 100
-	)
-
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		for i := 0; i < itemCount; i++ {
-			_, err := w.Write(make([]byte, itemSize))
-			if err != nil {
-				return
-			}
-		}
-	}, optOnlyServer)
-	defer st.Close()
-
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-	cl := &http.Client{Transport: tr}
-
-	for i := 0; i < 1000; i++ {
-		resp, err := cl.Get(st.ts.URL)
-		if err != nil {
-			t.Fatal(err)
-		}
-		// Force a RST stream to the server by closing without
-		// reading the body:
-		resp.Body.Close()
-	}
-}
-
-func TestServer_Rejects_TooSmall(t *testing.T) {
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		ioutil.ReadAll(r.Body)
-		return nil
-	}, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID: 1, // clients send odd numbers
-			BlockFragment: st.encodeHeader(
-				":method", "POST",
-				"content-length", "4",
-			),
-			EndStream:  false, // to say DATA frames are coming
-			EndHeaders: true,
-		})
-		st.writeData(1, true, []byte("12345"))
-
-		st.wantRSTStream(1, ErrCodeProtocol)
-	})
-}
-
-// Tests that a handler setting "Connection: close" results in a GOAWAY being sent,
-// and the connection still completing.
-func TestServerHandlerConnectionClose(t *testing.T) {
-	unblockHandler := make(chan bool, 1)
-	defer close(unblockHandler) // backup; in case of errors
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		w.Header().Set("Connection", "close")
-		w.Header().Set("Foo", "bar")
-		w.(http.Flusher).Flush()
-		<-unblockHandler
-		return nil
-	}, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1,
-			BlockFragment: st.encodeHeader(),
-			EndStream:     true,
-			EndHeaders:    true,
-		})
-		var sawGoAway bool
-		var sawRes bool
-		for {
-			f, err := st.readFrame()
-			if err == io.EOF {
-				break
-			}
-			if err != nil {
-				t.Fatal(err)
-			}
-			switch f := f.(type) {
-			case *GoAwayFrame:
-				sawGoAway = true
-				unblockHandler <- true
-				if f.LastStreamID != 1 || f.ErrCode != ErrCodeNo {
-					t.Errorf("unexpected GOAWAY frame: %v", summarizeFrame(f))
-				}
-			case *HeadersFrame:
-				goth := st.decodeHeader(f.HeaderBlockFragment())
-				wanth := [][2]string{
-					{":status", "200"},
-					{"foo", "bar"},
-				}
-				if !reflect.DeepEqual(goth, wanth) {
-					t.Errorf("got headers %v; want %v", goth, wanth)
-				}
-				sawRes = true
-			case *DataFrame:
-				if f.StreamID != 1 || !f.StreamEnded() || len(f.Data()) != 0 {
-					t.Errorf("unexpected DATA frame: %v", summarizeFrame(f))
-				}
-			default:
-				t.Logf("unexpected frame: %v", summarizeFrame(f))
-			}
-		}
-		if !sawGoAway {
-			t.Errorf("didn't see GOAWAY")
-		}
-		if !sawRes {
-			t.Errorf("didn't see response")
-		}
-	})
-}
diff --git a/vendor/golang.org/x/net/http2/transport.go b/vendor/golang.org/x/net/http2/transport.go
index d23a2262..9d1f2fad 100644
--- a/vendor/golang.org/x/net/http2/transport.go
+++ b/vendor/golang.org/x/net/http2/transport.go
@@ -21,6 +21,7 @@ import (
 	mathrand "math/rand"
 	"net"
 	"net/http"
+	"net/textproto"
 	"sort"
 	"strconv"
 	"strings"
@@ -159,6 +160,7 @@ type ClientConn struct {
 	cond            *sync.Cond // hold mu; broadcast on flow/closed changes
 	flow            flow       // our conn-level flow control quota (cs.flow is per stream)
 	inflow          flow       // peer's conn-level flow control
+	closing         bool
 	closed          bool
 	wantSettingsAck bool                     // we sent a SETTINGS frame and haven't heard back
 	goAway          *GoAwayFrame             // if non-nil, the GoAwayFrame we received
@@ -211,9 +213,10 @@ type clientStream struct {
 	done chan struct{} // closed when stream remove from cc.streams map; close calls guarded by cc.mu
 
 	// owned by clientConnReadLoop:
-	firstByte    bool // got the first response byte
-	pastHeaders  bool // got first MetaHeadersFrame (actual headers)
-	pastTrailers bool // got optional second MetaHeadersFrame (trailers)
+	firstByte    bool  // got the first response byte
+	pastHeaders  bool  // got first MetaHeadersFrame (actual headers)
+	pastTrailers bool  // got optional second MetaHeadersFrame (trailers)
+	num1xx       uint8 // number of 1xx responses seen
 
 	trailer    http.Header  // accumulated trailers
 	resTrailer *http.Header // client's Response.Trailer
@@ -237,6 +240,17 @@ func awaitRequestCancel(req *http.Request, done <-chan struct{}) error {
 	}
 }
 
+var got1xxFuncForTests func(int, textproto.MIMEHeader) error
+
+// get1xxTraceFunc returns the value of request's httptrace.ClientTrace.Got1xxResponse func,
+// if any. It returns nil if not set or if the Go version is too old.
+func (cs *clientStream) get1xxTraceFunc() func(int, textproto.MIMEHeader) error {
+	if fn := got1xxFuncForTests; fn != nil {
+		return fn
+	}
+	return traceGot1xxResponseFunc(cs.trace)
+}
+
 // awaitRequestCancel waits for the user to cancel a request, its context to
 // expire, or for the request to be done (any way it might be removed from the
 // cc.streams map: peer reset, successful completion, TCP connection breakage,
@@ -423,27 +437,36 @@ func shouldRetryRequest(req *http.Request, err error, afterBodyWrite bool) (*htt
 	if !canRetryError(err) {
 		return nil, err
 	}
-	if !afterBodyWrite {
-		return req, nil
-	}
 	// If the Body is nil (or http.NoBody), it's safe to reuse
 	// this request and its Body.
 	if req.Body == nil || reqBodyIsNoBody(req.Body) {
 		return req, nil
 	}
-	// Otherwise we depend on the Request having its GetBody
-	// func defined.
+
+	// If the request body can be reset back to its original
+	// state via the optional req.GetBody, do that.
 	getBody := reqGetBody(req) // Go 1.8: getBody = req.GetBody
-	if getBody == nil {
-		return nil, fmt.Errorf("http2: Transport: cannot retry err [%v] after Request.Body was written; define Request.GetBody to avoid this error", err)
+	if getBody != nil {
+		// TODO: consider a req.Body.Close here? or audit that all caller paths do?
+		body, err := getBody()
+		if err != nil {
+			return nil, err
+		}
+		newReq := *req
+		newReq.Body = body
+		return &newReq, nil
 	}
-	body, err := getBody()
-	if err != nil {
-		return nil, err
+
+	// The Request.Body can't reset back to the beginning, but we
+	// don't seem to have started to read from it yet, so reuse
+	// the request directly. The "afterBodyWrite" means the
+	// bodyWrite process has started, which becomes true before
+	// the first Read.
+	if !afterBodyWrite {
+		return req, nil
 	}
-	newReq := *req
-	newReq.Body = body
-	return &newReq, nil
+
+	return nil, fmt.Errorf("http2: Transport: cannot retry err [%v] after Request.Body was written; define Request.GetBody to avoid this error", err)
 }
 
 func canRetryError(err error) bool {
@@ -630,12 +653,32 @@ func (cc *ClientConn) CanTakeNewRequest() bool {
 	return cc.canTakeNewRequestLocked()
 }
 
-func (cc *ClientConn) canTakeNewRequestLocked() bool {
+// clientConnIdleState describes the suitability of a client
+// connection to initiate a new RoundTrip request.
+type clientConnIdleState struct {
+	canTakeNewRequest bool
+	freshConn         bool // whether it's unused by any previous request
+}
+
+func (cc *ClientConn) idleState() clientConnIdleState {
+	cc.mu.Lock()
+	defer cc.mu.Unlock()
+	return cc.idleStateLocked()
+}
+
+func (cc *ClientConn) idleStateLocked() (st clientConnIdleState) {
 	if cc.singleUse && cc.nextStreamID > 1 {
-		return false
+		return
 	}
-	return cc.goAway == nil && !cc.closed &&
+	st.canTakeNewRequest = cc.goAway == nil && !cc.closed && !cc.closing &&
 		int64(cc.nextStreamID)+int64(cc.pendingRequests) < math.MaxInt32
+	st.freshConn = cc.nextStreamID == 1 && st.canTakeNewRequest
+	return
+}
+
+func (cc *ClientConn) canTakeNewRequestLocked() bool {
+	st := cc.idleStateLocked()
+	return st.canTakeNewRequest
 }
 
 // onIdleTimeout is called from a time.AfterFunc goroutine. It will
@@ -665,6 +708,88 @@ func (cc *ClientConn) closeIfIdle() {
 	cc.tconn.Close()
 }
 
+var shutdownEnterWaitStateHook = func() {}
+
+// Shutdown gracefully close the client connection, waiting for running streams to complete.
+// Public implementation is in go17.go and not_go17.go
+func (cc *ClientConn) shutdown(ctx contextContext) error {
+	if err := cc.sendGoAway(); err != nil {
+		return err
+	}
+	// Wait for all in-flight streams to complete or connection to close
+	done := make(chan error, 1)
+	cancelled := false // guarded by cc.mu
+	go func() {
+		cc.mu.Lock()
+		defer cc.mu.Unlock()
+		for {
+			if len(cc.streams) == 0 || cc.closed {
+				cc.closed = true
+				done <- cc.tconn.Close()
+				break
+			}
+			if cancelled {
+				break
+			}
+			cc.cond.Wait()
+		}
+	}()
+	shutdownEnterWaitStateHook()
+	select {
+	case err := <-done:
+		return err
+	case <-ctx.Done():
+		cc.mu.Lock()
+		// Free the goroutine above
+		cancelled = true
+		cc.cond.Broadcast()
+		cc.mu.Unlock()
+		return ctx.Err()
+	}
+}
+
+func (cc *ClientConn) sendGoAway() error {
+	cc.mu.Lock()
+	defer cc.mu.Unlock()
+	cc.wmu.Lock()
+	defer cc.wmu.Unlock()
+	if cc.closing {
+		// GOAWAY sent already
+		return nil
+	}
+	// Send a graceful shutdown frame to server
+	maxStreamID := cc.nextStreamID
+	if err := cc.fr.WriteGoAway(maxStreamID, ErrCodeNo, nil); err != nil {
+		return err
+	}
+	if err := cc.bw.Flush(); err != nil {
+		return err
+	}
+	// Prevent new requests
+	cc.closing = true
+	return nil
+}
+
+// Close closes the client connection immediately.
+//
+// In-flight requests are interrupted. For a graceful shutdown, use Shutdown instead.
+func (cc *ClientConn) Close() error {
+	cc.mu.Lock()
+	defer cc.cond.Broadcast()
+	defer cc.mu.Unlock()
+	err := errors.New("http2: client connection force closed via ClientConn.Close")
+	for id, cs := range cc.streams {
+		select {
+		case cs.resc <- resAndError{err: err}:
+		default:
+		}
+		cs.bufPipe.CloseWithError(err)
+		delete(cc.streams, id)
+	}
+	cc.closed = true
+	return cc.tconn.Close()
+}
+
 const maxAllocFrameSize = 512 << 10
 
 // frameBuffer returns a scratch buffer suitable for writing DATA frames.
@@ -747,7 +872,7 @@ func checkConnHeaders(req *http.Request) error {
 	if vv := req.Header["Transfer-Encoding"]; len(vv) > 0 && (len(vv) > 1 || vv[0] != "" && vv[0] != "chunked") {
 		return fmt.Errorf("http2: invalid Transfer-Encoding request header: %q", vv)
 	}
-	if vv := req.Header["Connection"]; len(vv) > 0 && (len(vv) > 1 || vv[0] != "" && vv[0] != "close" && vv[0] != "keep-alive") {
+	if vv := req.Header["Connection"]; len(vv) > 0 && (len(vv) > 1 || vv[0] != "" && !strings.EqualFold(vv[0], "close") && !strings.EqualFold(vv[0], "keep-alive")) {
 		return fmt.Errorf("http2: invalid Connection request header: %q", vv)
 	}
 	return nil
@@ -1291,9 +1416,16 @@ func (cc *ClientConn) encodeHeaders(req *http.Request, addGzipHeader bool, trail
 		return nil, errRequestHeaderListSize
 	}
 
+	trace := requestTrace(req)
+	traceHeaders := traceHasWroteHeaderField(trace)
+
 	// Header list size is ok. Write the headers.
 	enumerateHeaders(func(name, value string) {
-		cc.writeHeader(strings.ToLower(name), value)
+		name = strings.ToLower(name)
+		cc.writeHeader(name, value)
+		if traceHeaders {
+			traceWroteHeaderField(trace, name, value)
+		}
 	})
 
 	return cc.hbuf.Bytes(), nil
@@ -1615,8 +1747,7 @@ func (rl *clientConnReadLoop) processHeaders(f *MetaHeadersFrame) error {
 // is the detail.
 //
 // As a special case, handleResponse may return (nil, nil) to skip the
-// frame (currently only used for 100 expect continue). This special
-// case is going away after Issue 13851 is fixed.
+// frame (currently only used for 1xx responses).
 func (rl *clientConnReadLoop) handleResponse(cs *clientStream, f *MetaHeadersFrame) (*http.Response, error) {
 	if f.Truncated {
 		return nil, errResponseHeaderListSize
@@ -1631,15 +1762,6 @@ func (rl *clientConnReadLoop) handleResponse(cs *clientStream, f *MetaHeadersFra
 		return nil, errors.New("malformed response from server: malformed non-numeric status pseudo header")
 	}
 
-	if statusCode == 100 {
-		traceGot100Continue(cs.trace)
-		if cs.on100 != nil {
-			cs.on100() // forces any write delay timer to fire
-		}
-		cs.pastHeaders = false // do it all again
-		return nil, nil
-	}
-
 	header := make(http.Header)
 	res := &http.Response{
 		Proto:      "HTTP/2.0",
@@ -1664,6 +1786,27 @@ func (rl *clientConnReadLoop) handleResponse(cs *clientStream, f *MetaHeadersFra
 		}
 	}
 
+	if statusCode >= 100 && statusCode <= 199 {
+		cs.num1xx++
+		const max1xxResponses = 5 // arbitrary bound on number of informational responses, same as net/http
+		if cs.num1xx > max1xxResponses {
+			return nil, errors.New("http2: too many 1xx informational responses")
+		}
+		if fn := cs.get1xxTraceFunc(); fn != nil {
+			if err := fn(statusCode, textproto.MIMEHeader(header)); err != nil {
+				return nil, err
+			}
+		}
+		if statusCode == 100 {
+			traceGot100Continue(cs.trace)
+			if cs.on100 != nil {
+				cs.on100() // forces any write delay timer to fire
+			}
+		}
+		cs.pastHeaders = false // do it all again
+		return nil, nil
+	}
+
 	streamEnded := f.StreamEnded()
 	isHead := cs.req.Method == "HEAD"
 	if !streamEnded || isHead {
diff --git a/vendor/golang.org/x/net/http2/transport_test.go b/vendor/golang.org/x/net/http2/transport_test.go
deleted file mode 100644
index 17c09cab..00000000
--- a/vendor/golang.org/x/net/http2/transport_test.go
+++ /dev/null
@@ -1,3848 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import (
-	"bufio"
-	"bytes"
-	"crypto/tls"
-	"errors"
-	"flag"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"log"
-	"math/rand"
-	"net"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"os"
-	"reflect"
-	"runtime"
-	"sort"
-	"strconv"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	"golang.org/x/net/http2/hpack"
-)
-
-var (
-	extNet        = flag.Bool("extnet", false, "do external network tests")
-	transportHost = flag.String("transporthost", "http2.golang.org", "hostname to use for TestTransport")
-	insecure      = flag.Bool("insecure", false, "insecure TLS dials") // TODO: dead code. remove?
-)
-
-var tlsConfigInsecure = &tls.Config{InsecureSkipVerify: true}
-
-type testContext struct{}
-
-func (testContext) Done() <-chan struct{}                   { return make(chan struct{}) }
-func (testContext) Err() error                              { panic("should not be called") }
-func (testContext) Deadline() (deadline time.Time, ok bool) { return time.Time{}, false }
-func (testContext) Value(key interface{}) interface{}       { return nil }
-
-func TestTransportExternal(t *testing.T) {
-	if !*extNet {
-		t.Skip("skipping external network test")
-	}
-	req, _ := http.NewRequest("GET", "https://"+*transportHost+"/", nil)
-	rt := &Transport{TLSClientConfig: tlsConfigInsecure}
-	res, err := rt.RoundTrip(req)
-	if err != nil {
-		t.Fatalf("%v", err)
-	}
-	res.Write(os.Stdout)
-}
-
-type fakeTLSConn struct {
-	net.Conn
-}
-
-func (c *fakeTLSConn) ConnectionState() tls.ConnectionState {
-	return tls.ConnectionState{
-		Version:     tls.VersionTLS12,
-		CipherSuite: cipher_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
-	}
-}
-
-func startH2cServer(t *testing.T) net.Listener {
-	h2Server := &Server{}
-	l := newLocalListener(t)
-	go func() {
-		conn, err := l.Accept()
-		if err != nil {
-			t.Error(err)
-			return
-		}
-		h2Server.ServeConn(&fakeTLSConn{conn}, &ServeConnOpts{Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			fmt.Fprintf(w, "Hello, %v, http: %v", r.URL.Path, r.TLS == nil)
-		})})
-	}()
-	return l
-}
-
-func TestTransportH2c(t *testing.T) {
-	l := startH2cServer(t)
-	defer l.Close()
-	req, err := http.NewRequest("GET", "http://"+l.Addr().String()+"/foobar", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	tr := &Transport{
-		AllowHTTP: true,
-		DialTLS: func(network, addr string, cfg *tls.Config) (net.Conn, error) {
-			return net.Dial(network, addr)
-		},
-	}
-	res, err := tr.RoundTrip(req)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if res.ProtoMajor != 2 {
-		t.Fatal("proto not h2c")
-	}
-	body, err := ioutil.ReadAll(res.Body)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if got, want := string(body), "Hello, /foobar, http: true"; got != want {
-		t.Fatalf("response got %v, want %v", got, want)
-	}
-}
-
-func TestTransport(t *testing.T) {
-	const body = "sup"
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		io.WriteString(w, body)
-	}, optOnlyServer)
-	defer st.Close()
-
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-
-	req, err := http.NewRequest("GET", st.ts.URL, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	res, err := tr.RoundTrip(req)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer res.Body.Close()
-
-	t.Logf("Got res: %+v", res)
-	if g, w := res.StatusCode, 200; g != w {
-		t.Errorf("StatusCode = %v; want %v", g, w)
-	}
-	if g, w := res.Status, "200 OK"; g != w {
-		t.Errorf("Status = %q; want %q", g, w)
-	}
-	wantHeader := http.Header{
-		"Content-Length": []string{"3"},
-		"Content-Type":   []string{"text/plain; charset=utf-8"},
-		"Date":           []string{"XXX"}, // see cleanDate
-	}
-	cleanDate(res)
-	if !reflect.DeepEqual(res.Header, wantHeader) {
-		t.Errorf("res Header = %v; want %v", res.Header, wantHeader)
-	}
-	if res.Request != req {
-		t.Errorf("Response.Request = %p; want %p", res.Request, req)
-	}
-	if res.TLS == nil {
-		t.Error("Response.TLS = nil; want non-nil")
-	}
-	slurp, err := ioutil.ReadAll(res.Body)
-	if err != nil {
-		t.Errorf("Body read: %v", err)
-	} else if string(slurp) != body {
-		t.Errorf("Body = %q; want %q", slurp, body)
-	}
-}
-
-func onSameConn(t *testing.T, modReq func(*http.Request)) bool {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		io.WriteString(w, r.RemoteAddr)
-	}, optOnlyServer, func(c net.Conn, st http.ConnState) {
-		t.Logf("conn %v is now state %v", c.RemoteAddr(), st)
-	})
-	defer st.Close()
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-	get := func() string {
-		req, err := http.NewRequest("GET", st.ts.URL, nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-		modReq(req)
-		res, err := tr.RoundTrip(req)
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer res.Body.Close()
-		slurp, err := ioutil.ReadAll(res.Body)
-		if err != nil {
-			t.Fatalf("Body read: %v", err)
-		}
-		addr := strings.TrimSpace(string(slurp))
-		if addr == "" {
-			t.Fatalf("didn't get an addr in response")
-		}
-		return addr
-	}
-	first := get()
-	second := get()
-	return first == second
-}
-
-func TestTransportReusesConns(t *testing.T) {
-	if !onSameConn(t, func(*http.Request) {}) {
-		t.Errorf("first and second responses were on different connections")
-	}
-}
-
-func TestTransportReusesConn_RequestClose(t *testing.T) {
-	if onSameConn(t, func(r *http.Request) { r.Close = true }) {
-		t.Errorf("first and second responses were not on different connections")
-	}
-}
-
-func TestTransportReusesConn_ConnClose(t *testing.T) {
-	if onSameConn(t, func(r *http.Request) { r.Header.Set("Connection", "close") }) {
-		t.Errorf("first and second responses were not on different connections")
-	}
-}
-
-// Tests that the Transport only keeps one pending dial open per destination address.
-// https://golang.org/issue/13397
-func TestTransportGroupsPendingDials(t *testing.T) {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		io.WriteString(w, r.RemoteAddr)
-	}, optOnlyServer)
-	defer st.Close()
-	tr := &Transport{
-		TLSClientConfig: tlsConfigInsecure,
-	}
-	defer tr.CloseIdleConnections()
-	var (
-		mu    sync.Mutex
-		dials = map[string]int{}
-	)
-	var wg sync.WaitGroup
-	for i := 0; i < 10; i++ {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			req, err := http.NewRequest("GET", st.ts.URL, nil)
-			if err != nil {
-				t.Error(err)
-				return
-			}
-			res, err := tr.RoundTrip(req)
-			if err != nil {
-				t.Error(err)
-				return
-			}
-			defer res.Body.Close()
-			slurp, err := ioutil.ReadAll(res.Body)
-			if err != nil {
-				t.Errorf("Body read: %v", err)
-			}
-			addr := strings.TrimSpace(string(slurp))
-			if addr == "" {
-				t.Errorf("didn't get an addr in response")
-			}
-			mu.Lock()
-			dials[addr]++
-			mu.Unlock()
-		}()
-	}
-	wg.Wait()
-	if len(dials) != 1 {
-		t.Errorf("saw %d dials; want 1: %v", len(dials), dials)
-	}
-	tr.CloseIdleConnections()
-	if err := retry(50, 10*time.Millisecond, func() error {
-		cp, ok := tr.connPool().(*clientConnPool)
-		if !ok {
-			return fmt.Errorf("Conn pool is %T; want *clientConnPool", tr.connPool())
-		}
-		cp.mu.Lock()
-		defer cp.mu.Unlock()
-		if len(cp.dialing) != 0 {
-			return fmt.Errorf("dialing map = %v; want empty", cp.dialing)
-		}
-		if len(cp.conns) != 0 {
-			return fmt.Errorf("conns = %v; want empty", cp.conns)
-		}
-		if len(cp.keys) != 0 {
-			return fmt.Errorf("keys = %v; want empty", cp.keys)
-		}
-		return nil
-	}); err != nil {
-		t.Errorf("State of pool after CloseIdleConnections: %v", err)
-	}
-}
-
-func retry(tries int, delay time.Duration, fn func() error) error {
-	var err error
-	for i := 0; i < tries; i++ {
-		err = fn()
-		if err == nil {
-			return nil
-		}
-		time.Sleep(delay)
-	}
-	return err
-}
-
-func TestTransportAbortClosesPipes(t *testing.T) {
-	shutdown := make(chan struct{})
-	st := newServerTester(t,
-		func(w http.ResponseWriter, r *http.Request) {
-			w.(http.Flusher).Flush()
-			<-shutdown
-		},
-		optOnlyServer,
-	)
-	defer st.Close()
-	defer close(shutdown) // we must shutdown before st.Close() to avoid hanging
-
-	done := make(chan struct{})
-	requestMade := make(chan struct{})
-	go func() {
-		defer close(done)
-		tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-		req, err := http.NewRequest("GET", st.ts.URL, nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-		res, err := tr.RoundTrip(req)
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer res.Body.Close()
-		close(requestMade)
-		_, err = ioutil.ReadAll(res.Body)
-		if err == nil {
-			t.Error("expected error from res.Body.Read")
-		}
-	}()
-
-	<-requestMade
-	// Now force the serve loop to end, via closing the connection.
-	st.closeConn()
-	// deadlock? that's a bug.
-	select {
-	case <-done:
-	case <-time.After(3 * time.Second):
-		t.Fatal("timeout")
-	}
-}
-
-// TODO: merge this with TestTransportBody to make TestTransportRequest? This
-// could be a table-driven test with extra goodies.
-func TestTransportPath(t *testing.T) {
-	gotc := make(chan *url.URL, 1)
-	st := newServerTester(t,
-		func(w http.ResponseWriter, r *http.Request) {
-			gotc <- r.URL
-		},
-		optOnlyServer,
-	)
-	defer st.Close()
-
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-	const (
-		path  = "/testpath"
-		query = "q=1"
-	)
-	surl := st.ts.URL + path + "?" + query
-	req, err := http.NewRequest("POST", surl, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	c := &http.Client{Transport: tr}
-	res, err := c.Do(req)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer res.Body.Close()
-	got := <-gotc
-	if got.Path != path {
-		t.Errorf("Read Path = %q; want %q", got.Path, path)
-	}
-	if got.RawQuery != query {
-		t.Errorf("Read RawQuery = %q; want %q", got.RawQuery, query)
-	}
-}
-
-func randString(n int) string {
-	rnd := rand.New(rand.NewSource(int64(n)))
-	b := make([]byte, n)
-	for i := range b {
-		b[i] = byte(rnd.Intn(256))
-	}
-	return string(b)
-}
-
-type panicReader struct{}
-
-func (panicReader) Read([]byte) (int, error) { panic("unexpected Read") }
-func (panicReader) Close() error             { panic("unexpected Close") }
-
-func TestActualContentLength(t *testing.T) {
-	tests := []struct {
-		req  *http.Request
-		want int64
-	}{
-		// Verify we don't read from Body:
-		0: {
-			req:  &http.Request{Body: panicReader{}},
-			want: -1,
-		},
-		// nil Body means 0, regardless of ContentLength:
-		1: {
-			req:  &http.Request{Body: nil, ContentLength: 5},
-			want: 0,
-		},
-		// ContentLength is used if set.
-		2: {
-			req:  &http.Request{Body: panicReader{}, ContentLength: 5},
-			want: 5,
-		},
-		// http.NoBody means 0, not -1.
-		3: {
-			req:  &http.Request{Body: go18httpNoBody()},
-			want: 0,
-		},
-	}
-	for i, tt := range tests {
-		got := actualContentLength(tt.req)
-		if got != tt.want {
-			t.Errorf("test[%d]: got %d; want %d", i, got, tt.want)
-		}
-	}
-}
-
-func TestTransportBody(t *testing.T) {
-	bodyTests := []struct {
-		body         string
-		noContentLen bool
-	}{
-		{body: "some message"},
-		{body: "some message", noContentLen: true},
-		{body: strings.Repeat("a", 1<<20), noContentLen: true},
-		{body: strings.Repeat("a", 1<<20)},
-		{body: randString(16<<10 - 1)},
-		{body: randString(16 << 10)},
-		{body: randString(16<<10 + 1)},
-		{body: randString(512<<10 - 1)},
-		{body: randString(512 << 10)},
-		{body: randString(512<<10 + 1)},
-		{body: randString(1<<20 - 1)},
-		{body: randString(1 << 20)},
-		{body: randString(1<<20 + 2)},
-	}
-
-	type reqInfo struct {
-		req   *http.Request
-		slurp []byte
-		err   error
-	}
-	gotc := make(chan reqInfo, 1)
-	st := newServerTester(t,
-		func(w http.ResponseWriter, r *http.Request) {
-			slurp, err := ioutil.ReadAll(r.Body)
-			if err != nil {
-				gotc <- reqInfo{err: err}
-			} else {
-				gotc <- reqInfo{req: r, slurp: slurp}
-			}
-		},
-		optOnlyServer,
-	)
-	defer st.Close()
-
-	for i, tt := range bodyTests {
-		tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-		defer tr.CloseIdleConnections()
-
-		var body io.Reader = strings.NewReader(tt.body)
-		if tt.noContentLen {
-			body = struct{ io.Reader }{body} // just a Reader, hiding concrete type and other methods
-		}
-		req, err := http.NewRequest("POST", st.ts.URL, body)
-		if err != nil {
-			t.Fatalf("#%d: %v", i, err)
-		}
-		c := &http.Client{Transport: tr}
-		res, err := c.Do(req)
-		if err != nil {
-			t.Fatalf("#%d: %v", i, err)
-		}
-		defer res.Body.Close()
-		ri := <-gotc
-		if ri.err != nil {
-			t.Errorf("#%d: read error: %v", i, ri.err)
-			continue
-		}
-		if got := string(ri.slurp); got != tt.body {
-			t.Errorf("#%d: Read body mismatch.\n got: %q (len %d)\nwant: %q (len %d)", i, shortString(got), len(got), shortString(tt.body), len(tt.body))
-		}
-		wantLen := int64(len(tt.body))
-		if tt.noContentLen && tt.body != "" {
-			wantLen = -1
-		}
-		if ri.req.ContentLength != wantLen {
-			t.Errorf("#%d. handler got ContentLength = %v; want %v", i, ri.req.ContentLength, wantLen)
-		}
-	}
-}
-
-func shortString(v string) string {
-	const maxLen = 100
-	if len(v) <= maxLen {
-		return v
-	}
-	return fmt.Sprintf("%v[...%d bytes omitted...]%v", v[:maxLen/2], len(v)-maxLen, v[len(v)-maxLen/2:])
-}
-
-func TestTransportDialTLS(t *testing.T) {
-	var mu sync.Mutex // guards following
-	var gotReq, didDial bool
-
-	ts := newServerTester(t,
-		func(w http.ResponseWriter, r *http.Request) {
-			mu.Lock()
-			gotReq = true
-			mu.Unlock()
-		},
-		optOnlyServer,
-	)
-	defer ts.Close()
-	tr := &Transport{
-		DialTLS: func(netw, addr string, cfg *tls.Config) (net.Conn, error) {
-			mu.Lock()
-			didDial = true
-			mu.Unlock()
-			cfg.InsecureSkipVerify = true
-			c, err := tls.Dial(netw, addr, cfg)
-			if err != nil {
-				return nil, err
-			}
-			return c, c.Handshake()
-		},
-	}
-	defer tr.CloseIdleConnections()
-	client := &http.Client{Transport: tr}
-	res, err := client.Get(ts.ts.URL)
-	if err != nil {
-		t.Fatal(err)
-	}
-	res.Body.Close()
-	mu.Lock()
-	if !gotReq {
-		t.Error("didn't get request")
-	}
-	if !didDial {
-		t.Error("didn't use dial hook")
-	}
-}
-
-func TestConfigureTransport(t *testing.T) {
-	t1 := &http.Transport{}
-	err := ConfigureTransport(t1)
-	if err == errTransportVersion {
-		t.Skip(err)
-	}
-	if err != nil {
-		t.Fatal(err)
-	}
-	if got := fmt.Sprintf("%#v", t1); !strings.Contains(got, `"h2"`) {
-		// Laziness, to avoid buildtags.
-		t.Errorf("stringification of HTTP/1 transport didn't contain \"h2\": %v", got)
-	}
-	wantNextProtos := []string{"h2", "http/1.1"}
-	if t1.TLSClientConfig == nil {
-		t.Errorf("nil t1.TLSClientConfig")
-	} else if !reflect.DeepEqual(t1.TLSClientConfig.NextProtos, wantNextProtos) {
-		t.Errorf("TLSClientConfig.NextProtos = %q; want %q", t1.TLSClientConfig.NextProtos, wantNextProtos)
-	}
-	if err := ConfigureTransport(t1); err == nil {
-		t.Error("unexpected success on second call to ConfigureTransport")
-	}
-
-	// And does it work?
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		io.WriteString(w, r.Proto)
-	}, optOnlyServer)
-	defer st.Close()
-
-	t1.TLSClientConfig.InsecureSkipVerify = true
-	c := &http.Client{Transport: t1}
-	res, err := c.Get(st.ts.URL)
-	if err != nil {
-		t.Fatal(err)
-	}
-	slurp, err := ioutil.ReadAll(res.Body)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if got, want := string(slurp), "HTTP/2.0"; got != want {
-		t.Errorf("body = %q; want %q", got, want)
-	}
-}
-
-type capitalizeReader struct {
-	r io.Reader
-}
-
-func (cr capitalizeReader) Read(p []byte) (n int, err error) {
-	n, err = cr.r.Read(p)
-	for i, b := range p[:n] {
-		if b >= 'a' && b <= 'z' {
-			p[i] = b - ('a' - 'A')
-		}
-	}
-	return
-}
-
-type flushWriter struct {
-	w io.Writer
-}
-
-func (fw flushWriter) Write(p []byte) (n int, err error) {
-	n, err = fw.w.Write(p)
-	if f, ok := fw.w.(http.Flusher); ok {
-		f.Flush()
-	}
-	return
-}
-
-type clientTester struct {
-	t      *testing.T
-	tr     *Transport
-	sc, cc net.Conn // server and client conn
-	fr     *Framer  // server's framer
-	client func() error
-	server func() error
-}
-
-func newClientTester(t *testing.T) *clientTester {
-	var dialOnce struct {
-		sync.Mutex
-		dialed bool
-	}
-	ct := &clientTester{
-		t: t,
-	}
-	ct.tr = &Transport{
-		TLSClientConfig: tlsConfigInsecure,
-		DialTLS: func(network, addr string, cfg *tls.Config) (net.Conn, error) {
-			dialOnce.Lock()
-			defer dialOnce.Unlock()
-			if dialOnce.dialed {
-				return nil, errors.New("only one dial allowed in test mode")
-			}
-			dialOnce.dialed = true
-			return ct.cc, nil
-		},
-	}
-
-	ln := newLocalListener(t)
-	cc, err := net.Dial("tcp", ln.Addr().String())
-	if err != nil {
-		t.Fatal(err)
-
-	}
-	sc, err := ln.Accept()
-	if err != nil {
-		t.Fatal(err)
-	}
-	ln.Close()
-	ct.cc = cc
-	ct.sc = sc
-	ct.fr = NewFramer(sc, sc)
-	return ct
-}
-
-func newLocalListener(t *testing.T) net.Listener {
-	ln, err := net.Listen("tcp4", "127.0.0.1:0")
-	if err == nil {
-		return ln
-	}
-	ln, err = net.Listen("tcp6", "[::1]:0")
-	if err != nil {
-		t.Fatal(err)
-	}
-	return ln
-}
-
-func (ct *clientTester) greet(settings ...Setting) {
-	buf := make([]byte, len(ClientPreface))
-	_, err := io.ReadFull(ct.sc, buf)
-	if err != nil {
-		ct.t.Fatalf("reading client preface: %v", err)
-	}
-	f, err := ct.fr.ReadFrame()
-	if err != nil {
-		ct.t.Fatalf("Reading client settings frame: %v", err)
-	}
-	if sf, ok := f.(*SettingsFrame); !ok {
-		ct.t.Fatalf("Wanted client settings frame; got %v", f)
-		_ = sf // stash it away?
-	}
-	if err := ct.fr.WriteSettings(settings...); err != nil {
-		ct.t.Fatal(err)
-	}
-	if err := ct.fr.WriteSettingsAck(); err != nil {
-		ct.t.Fatal(err)
-	}
-}
-
-func (ct *clientTester) readNonSettingsFrame() (Frame, error) {
-	for {
-		f, err := ct.fr.ReadFrame()
-		if err != nil {
-			return nil, err
-		}
-		if _, ok := f.(*SettingsFrame); ok {
-			continue
-		}
-		return f, nil
-	}
-}
-
-func (ct *clientTester) cleanup() {
-	ct.tr.CloseIdleConnections()
-}
-
-func (ct *clientTester) run() {
-	errc := make(chan error, 2)
-	ct.start("client", errc, ct.client)
-	ct.start("server", errc, ct.server)
-	defer ct.cleanup()
-	for i := 0; i < 2; i++ {
-		if err := <-errc; err != nil {
-			ct.t.Error(err)
-			return
-		}
-	}
-}
-
-func (ct *clientTester) start(which string, errc chan<- error, fn func() error) {
-	go func() {
-		finished := false
-		var err error
-		defer func() {
-			if !finished {
-				err = fmt.Errorf("%s goroutine didn't finish.", which)
-			} else if err != nil {
-				err = fmt.Errorf("%s: %v", which, err)
-			}
-			errc <- err
-		}()
-		err = fn()
-		finished = true
-	}()
-}
-
-func (ct *clientTester) readFrame() (Frame, error) {
-	return readFrameTimeout(ct.fr, 2*time.Second)
-}
-
-func (ct *clientTester) firstHeaders() (*HeadersFrame, error) {
-	for {
-		f, err := ct.readFrame()
-		if err != nil {
-			return nil, fmt.Errorf("ReadFrame while waiting for Headers: %v", err)
-		}
-		switch f.(type) {
-		case *WindowUpdateFrame, *SettingsFrame:
-			continue
-		}
-		hf, ok := f.(*HeadersFrame)
-		if !ok {
-			return nil, fmt.Errorf("Got %T; want HeadersFrame", f)
-		}
-		return hf, nil
-	}
-}
-
-type countingReader struct {
-	n *int64
-}
-
-func (r countingReader) Read(p []byte) (n int, err error) {
-	for i := range p {
-		p[i] = byte(i)
-	}
-	atomic.AddInt64(r.n, int64(len(p)))
-	return len(p), err
-}
-
-func TestTransportReqBodyAfterResponse_200(t *testing.T) { testTransportReqBodyAfterResponse(t, 200) }
-func TestTransportReqBodyAfterResponse_403(t *testing.T) { testTransportReqBodyAfterResponse(t, 403) }
-
-func testTransportReqBodyAfterResponse(t *testing.T, status int) {
-	const bodySize = 10 << 20
-	clientDone := make(chan struct{})
-	ct := newClientTester(t)
-	ct.client = func() error {
-		defer ct.cc.(*net.TCPConn).CloseWrite()
-		defer close(clientDone)
-
-		var n int64 // atomic
-		req, err := http.NewRequest("PUT", "https://dummy.tld/", io.LimitReader(countingReader{&n}, bodySize))
-		if err != nil {
-			return err
-		}
-		res, err := ct.tr.RoundTrip(req)
-		if err != nil {
-			return fmt.Errorf("RoundTrip: %v", err)
-		}
-		defer res.Body.Close()
-		if res.StatusCode != status {
-			return fmt.Errorf("status code = %v; want %v", res.StatusCode, status)
-		}
-		slurp, err := ioutil.ReadAll(res.Body)
-		if err != nil {
-			return fmt.Errorf("Slurp: %v", err)
-		}
-		if len(slurp) > 0 {
-			return fmt.Errorf("unexpected body: %q", slurp)
-		}
-		if status == 200 {
-			if got := atomic.LoadInt64(&n); got != bodySize {
-				return fmt.Errorf("For 200 response, Transport wrote %d bytes; want %d", got, bodySize)
-			}
-		} else {
-			if got := atomic.LoadInt64(&n); got == 0 || got >= bodySize {
-				return fmt.Errorf("For %d response, Transport wrote %d bytes; want (0,%d) exclusive", status, got, bodySize)
-			}
-		}
-		return nil
-	}
-	ct.server = func() error {
-		ct.greet()
-		var buf bytes.Buffer
-		enc := hpack.NewEncoder(&buf)
-		var dataRecv int64
-		var closed bool
-		for {
-			f, err := ct.fr.ReadFrame()
-			if err != nil {
-				select {
-				case <-clientDone:
-					// If the client's done, it
-					// will have reported any
-					// errors on its side.
-					return nil
-				default:
-					return err
-				}
-			}
-			//println(fmt.Sprintf("server got frame: %v", f))
-			switch f := f.(type) {
-			case *WindowUpdateFrame, *SettingsFrame:
-			case *HeadersFrame:
-				if !f.HeadersEnded() {
-					return fmt.Errorf("headers should have END_HEADERS be ended: %v", f)
-				}
-				if f.StreamEnded() {
-					return fmt.Errorf("headers contains END_STREAM unexpectedly: %v", f)
-				}
-			case *DataFrame:
-				dataLen := len(f.Data())
-				if dataLen > 0 {
-					if dataRecv == 0 {
-						enc.WriteField(hpack.HeaderField{Name: ":status", Value: strconv.Itoa(status)})
-						ct.fr.WriteHeaders(HeadersFrameParam{
-							StreamID:      f.StreamID,
-							EndHeaders:    true,
-							EndStream:     false,
-							BlockFragment: buf.Bytes(),
-						})
-					}
-					if err := ct.fr.WriteWindowUpdate(0, uint32(dataLen)); err != nil {
-						return err
-					}
-					if err := ct.fr.WriteWindowUpdate(f.StreamID, uint32(dataLen)); err != nil {
-						return err
-					}
-				}
-				dataRecv += int64(dataLen)
-
-				if !closed && ((status != 200 && dataRecv > 0) ||
-					(status == 200 && dataRecv == bodySize)) {
-					closed = true
-					if err := ct.fr.WriteData(f.StreamID, true, nil); err != nil {
-						return err
-					}
-				}
-			default:
-				return fmt.Errorf("Unexpected client frame %v", f)
-			}
-		}
-	}
-	ct.run()
-}
-
-// See golang.org/issue/13444
-func TestTransportFullDuplex(t *testing.T) {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(200) // redundant but for clarity
-		w.(http.Flusher).Flush()
-		io.Copy(flushWriter{w}, capitalizeReader{r.Body})
-		fmt.Fprintf(w, "bye.\n")
-	}, optOnlyServer)
-	defer st.Close()
-
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-	c := &http.Client{Transport: tr}
-
-	pr, pw := io.Pipe()
-	req, err := http.NewRequest("PUT", st.ts.URL, ioutil.NopCloser(pr))
-	if err != nil {
-		t.Fatal(err)
-	}
-	req.ContentLength = -1
-	res, err := c.Do(req)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer res.Body.Close()
-	if res.StatusCode != 200 {
-		t.Fatalf("StatusCode = %v; want %v", res.StatusCode, 200)
-	}
-	bs := bufio.NewScanner(res.Body)
-	want := func(v string) {
-		if !bs.Scan() {
-			t.Fatalf("wanted to read %q but Scan() = false, err = %v", v, bs.Err())
-		}
-	}
-	write := func(v string) {
-		_, err := io.WriteString(pw, v)
-		if err != nil {
-			t.Fatalf("pipe write: %v", err)
-		}
-	}
-	write("foo\n")
-	want("FOO")
-	write("bar\n")
-	want("BAR")
-	pw.Close()
-	want("bye.")
-	if err := bs.Err(); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestTransportConnectRequest(t *testing.T) {
-	gotc := make(chan *http.Request, 1)
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		gotc <- r
-	}, optOnlyServer)
-	defer st.Close()
-
-	u, err := url.Parse(st.ts.URL)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-	c := &http.Client{Transport: tr}
-
-	tests := []struct {
-		req  *http.Request
-		want string
-	}{
-		{
-			req: &http.Request{
-				Method: "CONNECT",
-				Header: http.Header{},
-				URL:    u,
-			},
-			want: u.Host,
-		},
-		{
-			req: &http.Request{
-				Method: "CONNECT",
-				Header: http.Header{},
-				URL:    u,
-				Host:   "example.com:123",
-			},
-			want: "example.com:123",
-		},
-	}
-
-	for i, tt := range tests {
-		res, err := c.Do(tt.req)
-		if err != nil {
-			t.Errorf("%d. RoundTrip = %v", i, err)
-			continue
-		}
-		res.Body.Close()
-		req := <-gotc
-		if req.Method != "CONNECT" {
-			t.Errorf("method = %q; want CONNECT", req.Method)
-		}
-		if req.Host != tt.want {
-			t.Errorf("Host = %q; want %q", req.Host, tt.want)
-		}
-		if req.URL.Host != tt.want {
-			t.Errorf("URL.Host = %q; want %q", req.URL.Host, tt.want)
-		}
-	}
-}
-
-type headerType int
-
-const (
-	noHeader headerType = iota // omitted
-	oneHeader
-	splitHeader // broken into continuation on purpose
-)
-
-const (
-	f0 = noHeader
-	f1 = oneHeader
-	f2 = splitHeader
-	d0 = false
-	d1 = true
-)
-
-// Test all 36 combinations of response frame orders:
-//    (3 ways of 100-continue) * (2 ways of headers) * (2 ways of data) * (3 ways of trailers):func TestTransportResponsePattern_00f0(t *testing.T) { testTransportResponsePattern(h0, h1, false, h0) }
-// Generated by http://play.golang.org/p/SScqYKJYXd
-func TestTransportResPattern_c0h1d0t0(t *testing.T) { testTransportResPattern(t, f0, f1, d0, f0) }
-func TestTransportResPattern_c0h1d0t1(t *testing.T) { testTransportResPattern(t, f0, f1, d0, f1) }
-func TestTransportResPattern_c0h1d0t2(t *testing.T) { testTransportResPattern(t, f0, f1, d0, f2) }
-func TestTransportResPattern_c0h1d1t0(t *testing.T) { testTransportResPattern(t, f0, f1, d1, f0) }
-func TestTransportResPattern_c0h1d1t1(t *testing.T) { testTransportResPattern(t, f0, f1, d1, f1) }
-func TestTransportResPattern_c0h1d1t2(t *testing.T) { testTransportResPattern(t, f0, f1, d1, f2) }
-func TestTransportResPattern_c0h2d0t0(t *testing.T) { testTransportResPattern(t, f0, f2, d0, f0) }
-func TestTransportResPattern_c0h2d0t1(t *testing.T) { testTransportResPattern(t, f0, f2, d0, f1) }
-func TestTransportResPattern_c0h2d0t2(t *testing.T) { testTransportResPattern(t, f0, f2, d0, f2) }
-func TestTransportResPattern_c0h2d1t0(t *testing.T) { testTransportResPattern(t, f0, f2, d1, f0) }
-func TestTransportResPattern_c0h2d1t1(t *testing.T) { testTransportResPattern(t, f0, f2, d1, f1) }
-func TestTransportResPattern_c0h2d1t2(t *testing.T) { testTransportResPattern(t, f0, f2, d1, f2) }
-func TestTransportResPattern_c1h1d0t0(t *testing.T) { testTransportResPattern(t, f1, f1, d0, f0) }
-func TestTransportResPattern_c1h1d0t1(t *testing.T) { testTransportResPattern(t, f1, f1, d0, f1) }
-func TestTransportResPattern_c1h1d0t2(t *testing.T) { testTransportResPattern(t, f1, f1, d0, f2) }
-func TestTransportResPattern_c1h1d1t0(t *testing.T) { testTransportResPattern(t, f1, f1, d1, f0) }
-func TestTransportResPattern_c1h1d1t1(t *testing.T) { testTransportResPattern(t, f1, f1, d1, f1) }
-func TestTransportResPattern_c1h1d1t2(t *testing.T) { testTransportResPattern(t, f1, f1, d1, f2) }
-func TestTransportResPattern_c1h2d0t0(t *testing.T) { testTransportResPattern(t, f1, f2, d0, f0) }
-func TestTransportResPattern_c1h2d0t1(t *testing.T) { testTransportResPattern(t, f1, f2, d0, f1) }
-func TestTransportResPattern_c1h2d0t2(t *testing.T) { testTransportResPattern(t, f1, f2, d0, f2) }
-func TestTransportResPattern_c1h2d1t0(t *testing.T) { testTransportResPattern(t, f1, f2, d1, f0) }
-func TestTransportResPattern_c1h2d1t1(t *testing.T) { testTransportResPattern(t, f1, f2, d1, f1) }
-func TestTransportResPattern_c1h2d1t2(t *testing.T) { testTransportResPattern(t, f1, f2, d1, f2) }
-func TestTransportResPattern_c2h1d0t0(t *testing.T) { testTransportResPattern(t, f2, f1, d0, f0) }
-func TestTransportResPattern_c2h1d0t1(t *testing.T) { testTransportResPattern(t, f2, f1, d0, f1) }
-func TestTransportResPattern_c2h1d0t2(t *testing.T) { testTransportResPattern(t, f2, f1, d0, f2) }
-func TestTransportResPattern_c2h1d1t0(t *testing.T) { testTransportResPattern(t, f2, f1, d1, f0) }
-func TestTransportResPattern_c2h1d1t1(t *testing.T) { testTransportResPattern(t, f2, f1, d1, f1) }
-func TestTransportResPattern_c2h1d1t2(t *testing.T) { testTransportResPattern(t, f2, f1, d1, f2) }
-func TestTransportResPattern_c2h2d0t0(t *testing.T) { testTransportResPattern(t, f2, f2, d0, f0) }
-func TestTransportResPattern_c2h2d0t1(t *testing.T) { testTransportResPattern(t, f2, f2, d0, f1) }
-func TestTransportResPattern_c2h2d0t2(t *testing.T) { testTransportResPattern(t, f2, f2, d0, f2) }
-func TestTransportResPattern_c2h2d1t0(t *testing.T) { testTransportResPattern(t, f2, f2, d1, f0) }
-func TestTransportResPattern_c2h2d1t1(t *testing.T) { testTransportResPattern(t, f2, f2, d1, f1) }
-func TestTransportResPattern_c2h2d1t2(t *testing.T) { testTransportResPattern(t, f2, f2, d1, f2) }
-
-func testTransportResPattern(t *testing.T, expect100Continue, resHeader headerType, withData bool, trailers headerType) {
-	const reqBody = "some request body"
-	const resBody = "some response body"
-
-	if resHeader == noHeader {
-		// TODO: test 100-continue followed by immediate
-		// server stream reset, without headers in the middle?
-		panic("invalid combination")
-	}
-
-	ct := newClientTester(t)
-	ct.client = func() error {
-		req, _ := http.NewRequest("POST", "https://dummy.tld/", strings.NewReader(reqBody))
-		if expect100Continue != noHeader {
-			req.Header.Set("Expect", "100-continue")
-		}
-		res, err := ct.tr.RoundTrip(req)
-		if err != nil {
-			return fmt.Errorf("RoundTrip: %v", err)
-		}
-		defer res.Body.Close()
-		if res.StatusCode != 200 {
-			return fmt.Errorf("status code = %v; want 200", res.StatusCode)
-		}
-		slurp, err := ioutil.ReadAll(res.Body)
-		if err != nil {
-			return fmt.Errorf("Slurp: %v", err)
-		}
-		wantBody := resBody
-		if !withData {
-			wantBody = ""
-		}
-		if string(slurp) != wantBody {
-			return fmt.Errorf("body = %q; want %q", slurp, wantBody)
-		}
-		if trailers == noHeader {
-			if len(res.Trailer) > 0 {
-				t.Errorf("Trailer = %v; want none", res.Trailer)
-			}
-		} else {
-			want := http.Header{"Some-Trailer": {"some-value"}}
-			if !reflect.DeepEqual(res.Trailer, want) {
-				t.Errorf("Trailer = %v; want %v", res.Trailer, want)
-			}
-		}
-		return nil
-	}
-	ct.server = func() error {
-		ct.greet()
-		var buf bytes.Buffer
-		enc := hpack.NewEncoder(&buf)
-
-		for {
-			f, err := ct.fr.ReadFrame()
-			if err != nil {
-				return err
-			}
-			endStream := false
-			send := func(mode headerType) {
-				hbf := buf.Bytes()
-				switch mode {
-				case oneHeader:
-					ct.fr.WriteHeaders(HeadersFrameParam{
-						StreamID:      f.Header().StreamID,
-						EndHeaders:    true,
-						EndStream:     endStream,
-						BlockFragment: hbf,
-					})
-				case splitHeader:
-					if len(hbf) < 2 {
-						panic("too small")
-					}
-					ct.fr.WriteHeaders(HeadersFrameParam{
-						StreamID:      f.Header().StreamID,
-						EndHeaders:    false,
-						EndStream:     endStream,
-						BlockFragment: hbf[:1],
-					})
-					ct.fr.WriteContinuation(f.Header().StreamID, true, hbf[1:])
-				default:
-					panic("bogus mode")
-				}
-			}
-			switch f := f.(type) {
-			case *WindowUpdateFrame, *SettingsFrame:
-			case *DataFrame:
-				if !f.StreamEnded() {
-					// No need to send flow control tokens. The test request body is tiny.
-					continue
-				}
-				// Response headers (1+ frames; 1 or 2 in this test, but never 0)
-				{
-					buf.Reset()
-					enc.WriteField(hpack.HeaderField{Name: ":status", Value: "200"})
-					enc.WriteField(hpack.HeaderField{Name: "x-foo", Value: "blah"})
-					enc.WriteField(hpack.HeaderField{Name: "x-bar", Value: "more"})
-					if trailers != noHeader {
-						enc.WriteField(hpack.HeaderField{Name: "trailer", Value: "some-trailer"})
-					}
-					endStream = withData == false && trailers == noHeader
-					send(resHeader)
-				}
-				if withData {
-					endStream = trailers == noHeader
-					ct.fr.WriteData(f.StreamID, endStream, []byte(resBody))
-				}
-				if trailers != noHeader {
-					endStream = true
-					buf.Reset()
-					enc.WriteField(hpack.HeaderField{Name: "some-trailer", Value: "some-value"})
-					send(trailers)
-				}
-				if endStream {
-					return nil
-				}
-			case *HeadersFrame:
-				if expect100Continue != noHeader {
-					buf.Reset()
-					enc.WriteField(hpack.HeaderField{Name: ":status", Value: "100"})
-					send(expect100Continue)
-				}
-			}
-		}
-	}
-	ct.run()
-}
-
-func TestTransportReceiveUndeclaredTrailer(t *testing.T) {
-	ct := newClientTester(t)
-	ct.client = func() error {
-		req, _ := http.NewRequest("GET", "https://dummy.tld/", nil)
-		res, err := ct.tr.RoundTrip(req)
-		if err != nil {
-			return fmt.Errorf("RoundTrip: %v", err)
-		}
-		defer res.Body.Close()
-		if res.StatusCode != 200 {
-			return fmt.Errorf("status code = %v; want 200", res.StatusCode)
-		}
-		slurp, err := ioutil.ReadAll(res.Body)
-		if err != nil {
-			return fmt.Errorf("res.Body ReadAll error = %q, %v; want %v", slurp, err, nil)
-		}
-		if len(slurp) > 0 {
-			return fmt.Errorf("body = %q; want nothing", slurp)
-		}
-		if _, ok := res.Trailer["Some-Trailer"]; !ok {
-			return fmt.Errorf("expected Some-Trailer")
-		}
-		return nil
-	}
-	ct.server = func() error {
-		ct.greet()
-
-		var n int
-		var hf *HeadersFrame
-		for hf == nil && n < 10 {
-			f, err := ct.fr.ReadFrame()
-			if err != nil {
-				return err
-			}
-			hf, _ = f.(*HeadersFrame)
-			n++
-		}
-
-		var buf bytes.Buffer
-		enc := hpack.NewEncoder(&buf)
-
-		// send headers without Trailer header
-		enc.WriteField(hpack.HeaderField{Name: ":status", Value: "200"})
-		ct.fr.WriteHeaders(HeadersFrameParam{
-			StreamID:      hf.StreamID,
-			EndHeaders:    true,
-			EndStream:     false,
-			BlockFragment: buf.Bytes(),
-		})
-
-		// send trailers
-		buf.Reset()
-		enc.WriteField(hpack.HeaderField{Name: "some-trailer", Value: "I'm an undeclared Trailer!"})
-		ct.fr.WriteHeaders(HeadersFrameParam{
-			StreamID:      hf.StreamID,
-			EndHeaders:    true,
-			EndStream:     true,
-			BlockFragment: buf.Bytes(),
-		})
-		return nil
-	}
-	ct.run()
-}
-
-func TestTransportInvalidTrailer_Pseudo1(t *testing.T) {
-	testTransportInvalidTrailer_Pseudo(t, oneHeader)
-}
-func TestTransportInvalidTrailer_Pseudo2(t *testing.T) {
-	testTransportInvalidTrailer_Pseudo(t, splitHeader)
-}
-func testTransportInvalidTrailer_Pseudo(t *testing.T, trailers headerType) {
-	testInvalidTrailer(t, trailers, pseudoHeaderError(":colon"), func(enc *hpack.Encoder) {
-		enc.WriteField(hpack.HeaderField{Name: ":colon", Value: "foo"})
-		enc.WriteField(hpack.HeaderField{Name: "foo", Value: "bar"})
-	})
-}
-
-func TestTransportInvalidTrailer_Capital1(t *testing.T) {
-	testTransportInvalidTrailer_Capital(t, oneHeader)
-}
-func TestTransportInvalidTrailer_Capital2(t *testing.T) {
-	testTransportInvalidTrailer_Capital(t, splitHeader)
-}
-func testTransportInvalidTrailer_Capital(t *testing.T, trailers headerType) {
-	testInvalidTrailer(t, trailers, headerFieldNameError("Capital"), func(enc *hpack.Encoder) {
-		enc.WriteField(hpack.HeaderField{Name: "foo", Value: "bar"})
-		enc.WriteField(hpack.HeaderField{Name: "Capital", Value: "bad"})
-	})
-}
-func TestTransportInvalidTrailer_EmptyFieldName(t *testing.T) {
-	testInvalidTrailer(t, oneHeader, headerFieldNameError(""), func(enc *hpack.Encoder) {
-		enc.WriteField(hpack.HeaderField{Name: "", Value: "bad"})
-	})
-}
-func TestTransportInvalidTrailer_BinaryFieldValue(t *testing.T) {
-	testInvalidTrailer(t, oneHeader, headerFieldValueError("has\nnewline"), func(enc *hpack.Encoder) {
-		enc.WriteField(hpack.HeaderField{Name: "x", Value: "has\nnewline"})
-	})
-}
-
-func testInvalidTrailer(t *testing.T, trailers headerType, wantErr error, writeTrailer func(*hpack.Encoder)) {
-	ct := newClientTester(t)
-	ct.client = func() error {
-		req, _ := http.NewRequest("GET", "https://dummy.tld/", nil)
-		res, err := ct.tr.RoundTrip(req)
-		if err != nil {
-			return fmt.Errorf("RoundTrip: %v", err)
-		}
-		defer res.Body.Close()
-		if res.StatusCode != 200 {
-			return fmt.Errorf("status code = %v; want 200", res.StatusCode)
-		}
-		slurp, err := ioutil.ReadAll(res.Body)
-		se, ok := err.(StreamError)
-		if !ok || se.Cause != wantErr {
-			return fmt.Errorf("res.Body ReadAll error = %q, %#v; want StreamError with cause %T, %#v", slurp, err, wantErr, wantErr)
-		}
-		if len(slurp) > 0 {
-			return fmt.Errorf("body = %q; want nothing", slurp)
-		}
-		return nil
-	}
-	ct.server = func() error {
-		ct.greet()
-		var buf bytes.Buffer
-		enc := hpack.NewEncoder(&buf)
-
-		for {
-			f, err := ct.fr.ReadFrame()
-			if err != nil {
-				return err
-			}
-			switch f := f.(type) {
-			case *HeadersFrame:
-				var endStream bool
-				send := func(mode headerType) {
-					hbf := buf.Bytes()
-					switch mode {
-					case oneHeader:
-						ct.fr.WriteHeaders(HeadersFrameParam{
-							StreamID:      f.StreamID,
-							EndHeaders:    true,
-							EndStream:     endStream,
-							BlockFragment: hbf,
-						})
-					case splitHeader:
-						if len(hbf) < 2 {
-							panic("too small")
-						}
-						ct.fr.WriteHeaders(HeadersFrameParam{
-							StreamID:      f.StreamID,
-							EndHeaders:    false,
-							EndStream:     endStream,
-							BlockFragment: hbf[:1],
-						})
-						ct.fr.WriteContinuation(f.StreamID, true, hbf[1:])
-					default:
-						panic("bogus mode")
-					}
-				}
-				// Response headers (1+ frames; 1 or 2 in this test, but never 0)
-				{
-					buf.Reset()
-					enc.WriteField(hpack.HeaderField{Name: ":status", Value: "200"})
-					enc.WriteField(hpack.HeaderField{Name: "trailer", Value: "declared"})
-					endStream = false
-					send(oneHeader)
-				}
-				// Trailers:
-				{
-					endStream = true
-					buf.Reset()
-					writeTrailer(enc)
-					send(trailers)
-				}
-				return nil
-			}
-		}
-	}
-	ct.run()
-}
-
-// headerListSize returns the HTTP2 header list size of h.
-//   http://httpwg.org/specs/rfc7540.html#SETTINGS_MAX_HEADER_LIST_SIZE
-//   http://httpwg.org/specs/rfc7540.html#MaxHeaderBlock
-func headerListSize(h http.Header) (size uint32) {
-	for k, vv := range h {
-		for _, v := range vv {
-			hf := hpack.HeaderField{Name: k, Value: v}
-			size += hf.Size()
-		}
-	}
-	return size
-}
-
-// padHeaders adds data to an http.Header until headerListSize(h) ==
-// limit. Due to the way header list sizes are calculated, padHeaders
-// cannot add fewer than len("Pad-Headers") + 32 bytes to h, and will
-// call t.Fatal if asked to do so. PadHeaders first reserves enough
-// space for an empty "Pad-Headers" key, then adds as many copies of
-// filler as possible. Any remaining bytes necessary to push the
-// header list size up to limit are added to h["Pad-Headers"].
-func padHeaders(t *testing.T, h http.Header, limit uint64, filler string) {
-	if limit > 0xffffffff {
-		t.Fatalf("padHeaders: refusing to pad to more than 2^32-1 bytes. limit = %v", limit)
-	}
-	hf := hpack.HeaderField{Name: "Pad-Headers", Value: ""}
-	minPadding := uint64(hf.Size())
-	size := uint64(headerListSize(h))
-
-	minlimit := size + minPadding
-	if limit < minlimit {
-		t.Fatalf("padHeaders: limit %v < %v", limit, minlimit)
-	}
-
-	// Use a fixed-width format for name so that fieldSize
-	// remains constant.
-	nameFmt := "Pad-Headers-%06d"
-	hf = hpack.HeaderField{Name: fmt.Sprintf(nameFmt, 1), Value: filler}
-	fieldSize := uint64(hf.Size())
-
-	// Add as many complete filler values as possible, leaving
-	// room for at least one empty "Pad-Headers" key.
-	limit = limit - minPadding
-	for i := 0; size+fieldSize < limit; i++ {
-		name := fmt.Sprintf(nameFmt, i)
-		h.Add(name, filler)
-		size += fieldSize
-	}
-
-	// Add enough bytes to reach limit.
-	remain := limit - size
-	lastValue := strings.Repeat("*", int(remain))
-	h.Add("Pad-Headers", lastValue)
-}
-
-func TestPadHeaders(t *testing.T) {
-	check := func(h http.Header, limit uint32, fillerLen int) {
-		if h == nil {
-			h = make(http.Header)
-		}
-		filler := strings.Repeat("f", fillerLen)
-		padHeaders(t, h, uint64(limit), filler)
-		gotSize := headerListSize(h)
-		if gotSize != limit {
-			t.Errorf("Got size = %v; want %v", gotSize, limit)
-		}
-	}
-	// Try all possible combinations for small fillerLen and limit.
-	hf := hpack.HeaderField{Name: "Pad-Headers", Value: ""}
-	minLimit := hf.Size()
-	for limit := minLimit; limit <= 128; limit++ {
-		for fillerLen := 0; uint32(fillerLen) <= limit; fillerLen++ {
-			check(nil, limit, fillerLen)
-		}
-	}
-
-	// Try a few tests with larger limits, plus cumulative
-	// tests. Since these tests are cumulative, tests[i+1].limit
-	// must be >= tests[i].limit + minLimit. See the comment on
-	// padHeaders for more info on why the limit arg has this
-	// restriction.
-	tests := []struct {
-		fillerLen int
-		limit     uint32
-	}{
-		{
-			fillerLen: 64,
-			limit:     1024,
-		},
-		{
-			fillerLen: 1024,
-			limit:     1286,
-		},
-		{
-			fillerLen: 256,
-			limit:     2048,
-		},
-		{
-			fillerLen: 1024,
-			limit:     10 * 1024,
-		},
-		{
-			fillerLen: 1023,
-			limit:     11 * 1024,
-		},
-	}
-	h := make(http.Header)
-	for _, tc := range tests {
-		check(nil, tc.limit, tc.fillerLen)
-		check(h, tc.limit, tc.fillerLen)
-	}
-}
-
-func TestTransportChecksRequestHeaderListSize(t *testing.T) {
-	st := newServerTester(t,
-		func(w http.ResponseWriter, r *http.Request) {
-			// Consume body & force client to send
-			// trailers before writing response.
-			// ioutil.ReadAll returns non-nil err for
-			// requests that attempt to send greater than
-			// maxHeaderListSize bytes of trailers, since
-			// those requests generate a stream reset.
-			ioutil.ReadAll(r.Body)
-			r.Body.Close()
-		},
-		func(ts *httptest.Server) {
-			ts.Config.MaxHeaderBytes = 16 << 10
-		},
-		optOnlyServer,
-		optQuiet,
-	)
-	defer st.Close()
-
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-
-	checkRoundTrip := func(req *http.Request, wantErr error, desc string) {
-		res, err := tr.RoundTrip(req)
-		if err != wantErr {
-			if res != nil {
-				res.Body.Close()
-			}
-			t.Errorf("%v: RoundTrip err = %v; want %v", desc, err, wantErr)
-			return
-		}
-		if err == nil {
-			if res == nil {
-				t.Errorf("%v: response nil; want non-nil.", desc)
-				return
-			}
-			defer res.Body.Close()
-			if res.StatusCode != http.StatusOK {
-				t.Errorf("%v: response status = %v; want %v", desc, res.StatusCode, http.StatusOK)
-			}
-			return
-		}
-		if res != nil {
-			t.Errorf("%v: RoundTrip err = %v but response non-nil", desc, err)
-		}
-	}
-	headerListSizeForRequest := func(req *http.Request) (size uint64) {
-		contentLen := actualContentLength(req)
-		trailers, err := commaSeparatedTrailers(req)
-		if err != nil {
-			t.Fatalf("headerListSizeForRequest: %v", err)
-		}
-		cc := &ClientConn{peerMaxHeaderListSize: 0xffffffffffffffff}
-		cc.henc = hpack.NewEncoder(&cc.hbuf)
-		cc.mu.Lock()
-		hdrs, err := cc.encodeHeaders(req, true, trailers, contentLen)
-		cc.mu.Unlock()
-		if err != nil {
-			t.Fatalf("headerListSizeForRequest: %v", err)
-		}
-		hpackDec := hpack.NewDecoder(initialHeaderTableSize, func(hf hpack.HeaderField) {
-			size += uint64(hf.Size())
-		})
-		if len(hdrs) > 0 {
-			if _, err := hpackDec.Write(hdrs); err != nil {
-				t.Fatalf("headerListSizeForRequest: %v", err)
-			}
-		}
-		return size
-	}
-	// Create a new Request for each test, rather than reusing the
-	// same Request, to avoid a race when modifying req.Headers.
-	// See https://github.com/golang/go/issues/21316
-	newRequest := func() *http.Request {
-		// Body must be non-nil to enable writing trailers.
-		body := strings.NewReader("hello")
-		req, err := http.NewRequest("POST", st.ts.URL, body)
-		if err != nil {
-			t.Fatalf("newRequest: NewRequest: %v", err)
-		}
-		return req
-	}
-
-	// Make an arbitrary request to ensure we get the server's
-	// settings frame and initialize peerMaxHeaderListSize.
-	req := newRequest()
-	checkRoundTrip(req, nil, "Initial request")
-
-	// Get the ClientConn associated with the request and validate
-	// peerMaxHeaderListSize.
-	addr := authorityAddr(req.URL.Scheme, req.URL.Host)
-	cc, err := tr.connPool().GetClientConn(req, addr)
-	if err != nil {
-		t.Fatalf("GetClientConn: %v", err)
-	}
-	cc.mu.Lock()
-	peerSize := cc.peerMaxHeaderListSize
-	cc.mu.Unlock()
-	st.scMu.Lock()
-	wantSize := uint64(st.sc.maxHeaderListSize())
-	st.scMu.Unlock()
-	if peerSize != wantSize {
-		t.Errorf("peerMaxHeaderListSize = %v; want %v", peerSize, wantSize)
-	}
-
-	// Sanity check peerSize. (*serverConn) maxHeaderListSize adds
-	// 320 bytes of padding.
-	wantHeaderBytes := uint64(st.ts.Config.MaxHeaderBytes) + 320
-	if peerSize != wantHeaderBytes {
-		t.Errorf("peerMaxHeaderListSize = %v; want %v.", peerSize, wantHeaderBytes)
-	}
-
-	// Pad headers & trailers, but stay under peerSize.
-	req = newRequest()
-	req.Header = make(http.Header)
-	req.Trailer = make(http.Header)
-	filler := strings.Repeat("*", 1024)
-	padHeaders(t, req.Trailer, peerSize, filler)
-	// cc.encodeHeaders adds some default headers to the request,
-	// so we need to leave room for those.
-	defaultBytes := headerListSizeForRequest(req)
-	padHeaders(t, req.Header, peerSize-defaultBytes, filler)
-	checkRoundTrip(req, nil, "Headers & Trailers under limit")
-
-	// Add enough header bytes to push us over peerSize.
-	req = newRequest()
-	req.Header = make(http.Header)
-	padHeaders(t, req.Header, peerSize, filler)
-	checkRoundTrip(req, errRequestHeaderListSize, "Headers over limit")
-
-	// Push trailers over the limit.
-	req = newRequest()
-	req.Trailer = make(http.Header)
-	padHeaders(t, req.Trailer, peerSize+1, filler)
-	checkRoundTrip(req, errRequestHeaderListSize, "Trailers over limit")
-
-	// Send headers with a single large value.
-	req = newRequest()
-	filler = strings.Repeat("*", int(peerSize))
-	req.Header = make(http.Header)
-	req.Header.Set("Big", filler)
-	checkRoundTrip(req, errRequestHeaderListSize, "Single large header")
-
-	// Send trailers with a single large value.
-	req = newRequest()
-	req.Trailer = make(http.Header)
-	req.Trailer.Set("Big", filler)
-	checkRoundTrip(req, errRequestHeaderListSize, "Single large trailer")
-}
-
-func TestTransportChecksResponseHeaderListSize(t *testing.T) {
-	ct := newClientTester(t)
-	ct.client = func() error {
-		req, _ := http.NewRequest("GET", "https://dummy.tld/", nil)
-		res, err := ct.tr.RoundTrip(req)
-		if err != errResponseHeaderListSize {
-			if res != nil {
-				res.Body.Close()
-			}
-			size := int64(0)
-			for k, vv := range res.Header {
-				for _, v := range vv {
-					size += int64(len(k)) + int64(len(v)) + 32
-				}
-			}
-			return fmt.Errorf("RoundTrip Error = %v (and %d bytes of response headers); want errResponseHeaderListSize", err, size)
-		}
-		return nil
-	}
-	ct.server = func() error {
-		ct.greet()
-		var buf bytes.Buffer
-		enc := hpack.NewEncoder(&buf)
-
-		for {
-			f, err := ct.fr.ReadFrame()
-			if err != nil {
-				return err
-			}
-			switch f := f.(type) {
-			case *HeadersFrame:
-				enc.WriteField(hpack.HeaderField{Name: ":status", Value: "200"})
-				large := strings.Repeat("a", 1<<10)
-				for i := 0; i < 5042; i++ {
-					enc.WriteField(hpack.HeaderField{Name: large, Value: large})
-				}
-				if size, want := buf.Len(), 6329; size != want {
-					// Note: this number might change if
-					// our hpack implementation
-					// changes. That's fine. This is
-					// just a sanity check that our
-					// response can fit in a single
-					// header block fragment frame.
-					return fmt.Errorf("encoding over 10MB of duplicate keypairs took %d bytes; expected %d", size, want)
-				}
-				ct.fr.WriteHeaders(HeadersFrameParam{
-					StreamID:      f.StreamID,
-					EndHeaders:    true,
-					EndStream:     true,
-					BlockFragment: buf.Bytes(),
-				})
-				return nil
-			}
-		}
-	}
-	ct.run()
-}
-
-// Test that the Transport returns a typed error from Response.Body.Read calls
-// when the server sends an error. (here we use a panic, since that should generate
-// a stream error, but others like cancel should be similar)
-func TestTransportBodyReadErrorType(t *testing.T) {
-	doPanic := make(chan bool, 1)
-	st := newServerTester(t,
-		func(w http.ResponseWriter, r *http.Request) {
-			w.(http.Flusher).Flush() // force headers out
-			<-doPanic
-			panic("boom")
-		},
-		optOnlyServer,
-		optQuiet,
-	)
-	defer st.Close()
-
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-	c := &http.Client{Transport: tr}
-
-	res, err := c.Get(st.ts.URL)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer res.Body.Close()
-	doPanic <- true
-	buf := make([]byte, 100)
-	n, err := res.Body.Read(buf)
-	want := StreamError{StreamID: 0x1, Code: 0x2}
-	if !reflect.DeepEqual(want, err) {
-		t.Errorf("Read = %v, %#v; want error %#v", n, err, want)
-	}
-}
-
-// golang.org/issue/13924
-// This used to fail after many iterations, especially with -race:
-// go test -v -run=TestTransportDoubleCloseOnWriteError -count=500 -race
-func TestTransportDoubleCloseOnWriteError(t *testing.T) {
-	var (
-		mu   sync.Mutex
-		conn net.Conn // to close if set
-	)
-
-	st := newServerTester(t,
-		func(w http.ResponseWriter, r *http.Request) {
-			mu.Lock()
-			defer mu.Unlock()
-			if conn != nil {
-				conn.Close()
-			}
-		},
-		optOnlyServer,
-	)
-	defer st.Close()
-
-	tr := &Transport{
-		TLSClientConfig: tlsConfigInsecure,
-		DialTLS: func(network, addr string, cfg *tls.Config) (net.Conn, error) {
-			tc, err := tls.Dial(network, addr, cfg)
-			if err != nil {
-				return nil, err
-			}
-			mu.Lock()
-			defer mu.Unlock()
-			conn = tc
-			return tc, nil
-		},
-	}
-	defer tr.CloseIdleConnections()
-	c := &http.Client{Transport: tr}
-	c.Get(st.ts.URL)
-}
-
-// Test that the http1 Transport.DisableKeepAlives option is respected
-// and connections are closed as soon as idle.
-// See golang.org/issue/14008
-func TestTransportDisableKeepAlives(t *testing.T) {
-	st := newServerTester(t,
-		func(w http.ResponseWriter, r *http.Request) {
-			io.WriteString(w, "hi")
-		},
-		optOnlyServer,
-	)
-	defer st.Close()
-
-	connClosed := make(chan struct{}) // closed on tls.Conn.Close
-	tr := &Transport{
-		t1: &http.Transport{
-			DisableKeepAlives: true,
-		},
-		TLSClientConfig: tlsConfigInsecure,
-		DialTLS: func(network, addr string, cfg *tls.Config) (net.Conn, error) {
-			tc, err := tls.Dial(network, addr, cfg)
-			if err != nil {
-				return nil, err
-			}
-			return &noteCloseConn{Conn: tc, closefn: func() { close(connClosed) }}, nil
-		},
-	}
-	c := &http.Client{Transport: tr}
-	res, err := c.Get(st.ts.URL)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := ioutil.ReadAll(res.Body); err != nil {
-		t.Fatal(err)
-	}
-	defer res.Body.Close()
-
-	select {
-	case <-connClosed:
-	case <-time.After(1 * time.Second):
-		t.Errorf("timeout")
-	}
-
-}
-
-// Test concurrent requests with Transport.DisableKeepAlives. We can share connections,
-// but when things are totally idle, it still needs to close.
-func TestTransportDisableKeepAlives_Concurrency(t *testing.T) {
-	const D = 25 * time.Millisecond
-	st := newServerTester(t,
-		func(w http.ResponseWriter, r *http.Request) {
-			time.Sleep(D)
-			io.WriteString(w, "hi")
-		},
-		optOnlyServer,
-	)
-	defer st.Close()
-
-	var dials int32
-	var conns sync.WaitGroup
-	tr := &Transport{
-		t1: &http.Transport{
-			DisableKeepAlives: true,
-		},
-		TLSClientConfig: tlsConfigInsecure,
-		DialTLS: func(network, addr string, cfg *tls.Config) (net.Conn, error) {
-			tc, err := tls.Dial(network, addr, cfg)
-			if err != nil {
-				return nil, err
-			}
-			atomic.AddInt32(&dials, 1)
-			conns.Add(1)
-			return &noteCloseConn{Conn: tc, closefn: func() { conns.Done() }}, nil
-		},
-	}
-	c := &http.Client{Transport: tr}
-	var reqs sync.WaitGroup
-	const N = 20
-	for i := 0; i < N; i++ {
-		reqs.Add(1)
-		if i == N-1 {
-			// For the final request, try to make all the
-			// others close. This isn't verified in the
-			// count, other than the Log statement, since
-			// it's so timing dependent. This test is
-			// really to make sure we don't interrupt a
-			// valid request.
-			time.Sleep(D * 2)
-		}
-		go func() {
-			defer reqs.Done()
-			res, err := c.Get(st.ts.URL)
-			if err != nil {
-				t.Error(err)
-				return
-			}
-			if _, err := ioutil.ReadAll(res.Body); err != nil {
-				t.Error(err)
-				return
-			}
-			res.Body.Close()
-		}()
-	}
-	reqs.Wait()
-	conns.Wait()
-	t.Logf("did %d dials, %d requests", atomic.LoadInt32(&dials), N)
-}
-
-type noteCloseConn struct {
-	net.Conn
-	onceClose sync.Once
-	closefn   func()
-}
-
-func (c *noteCloseConn) Close() error {
-	c.onceClose.Do(c.closefn)
-	return c.Conn.Close()
-}
-
-func isTimeout(err error) bool {
-	switch err := err.(type) {
-	case nil:
-		return false
-	case *url.Error:
-		return isTimeout(err.Err)
-	case net.Error:
-		return err.Timeout()
-	}
-	return false
-}
-
-// Test that the http1 Transport.ResponseHeaderTimeout option and cancel is sent.
-func TestTransportResponseHeaderTimeout_NoBody(t *testing.T) {
-	testTransportResponseHeaderTimeout(t, false)
-}
-func TestTransportResponseHeaderTimeout_Body(t *testing.T) {
-	testTransportResponseHeaderTimeout(t, true)
-}
-
-func testTransportResponseHeaderTimeout(t *testing.T, body bool) {
-	ct := newClientTester(t)
-	ct.tr.t1 = &http.Transport{
-		ResponseHeaderTimeout: 5 * time.Millisecond,
-	}
-	ct.client = func() error {
-		c := &http.Client{Transport: ct.tr}
-		var err error
-		var n int64
-		const bodySize = 4 << 20
-		if body {
-			_, err = c.Post("https://dummy.tld/", "text/foo", io.LimitReader(countingReader{&n}, bodySize))
-		} else {
-			_, err = c.Get("https://dummy.tld/")
-		}
-		if !isTimeout(err) {
-			t.Errorf("client expected timeout error; got %#v", err)
-		}
-		if body && n != bodySize {
-			t.Errorf("only read %d bytes of body; want %d", n, bodySize)
-		}
-		return nil
-	}
-	ct.server = func() error {
-		ct.greet()
-		for {
-			f, err := ct.fr.ReadFrame()
-			if err != nil {
-				t.Logf("ReadFrame: %v", err)
-				return nil
-			}
-			switch f := f.(type) {
-			case *DataFrame:
-				dataLen := len(f.Data())
-				if dataLen > 0 {
-					if err := ct.fr.WriteWindowUpdate(0, uint32(dataLen)); err != nil {
-						return err
-					}
-					if err := ct.fr.WriteWindowUpdate(f.StreamID, uint32(dataLen)); err != nil {
-						return err
-					}
-				}
-			case *RSTStreamFrame:
-				if f.StreamID == 1 && f.ErrCode == ErrCodeCancel {
-					return nil
-				}
-			}
-		}
-	}
-	ct.run()
-}
-
-func TestTransportDisableCompression(t *testing.T) {
-	const body = "sup"
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		want := http.Header{
-			"User-Agent": []string{"Go-http-client/2.0"},
-		}
-		if !reflect.DeepEqual(r.Header, want) {
-			t.Errorf("request headers = %v; want %v", r.Header, want)
-		}
-	}, optOnlyServer)
-	defer st.Close()
-
-	tr := &Transport{
-		TLSClientConfig: tlsConfigInsecure,
-		t1: &http.Transport{
-			DisableCompression: true,
-		},
-	}
-	defer tr.CloseIdleConnections()
-
-	req, err := http.NewRequest("GET", st.ts.URL, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	res, err := tr.RoundTrip(req)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer res.Body.Close()
-}
-
-// RFC 7540 section 8.1.2.2
-func TestTransportRejectsConnHeaders(t *testing.T) {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		var got []string
-		for k := range r.Header {
-			got = append(got, k)
-		}
-		sort.Strings(got)
-		w.Header().Set("Got-Header", strings.Join(got, ","))
-	}, optOnlyServer)
-	defer st.Close()
-
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-
-	tests := []struct {
-		key   string
-		value []string
-		want  string
-	}{
-		{
-			key:   "Upgrade",
-			value: []string{"anything"},
-			want:  "ERROR: http2: invalid Upgrade request header: [\"anything\"]",
-		},
-		{
-			key:   "Connection",
-			value: []string{"foo"},
-			want:  "ERROR: http2: invalid Connection request header: [\"foo\"]",
-		},
-		{
-			key:   "Connection",
-			value: []string{"close"},
-			want:  "Accept-Encoding,User-Agent",
-		},
-		{
-			key:   "Connection",
-			value: []string{"close", "something-else"},
-			want:  "ERROR: http2: invalid Connection request header: [\"close\" \"something-else\"]",
-		},
-		{
-			key:   "Connection",
-			value: []string{"keep-alive"},
-			want:  "Accept-Encoding,User-Agent",
-		},
-		{
-			key:   "Proxy-Connection", // just deleted and ignored
-			value: []string{"keep-alive"},
-			want:  "Accept-Encoding,User-Agent",
-		},
-		{
-			key:   "Transfer-Encoding",
-			value: []string{""},
-			want:  "Accept-Encoding,User-Agent",
-		},
-		{
-			key:   "Transfer-Encoding",
-			value: []string{"foo"},
-			want:  "ERROR: http2: invalid Transfer-Encoding request header: [\"foo\"]",
-		},
-		{
-			key:   "Transfer-Encoding",
-			value: []string{"chunked"},
-			want:  "Accept-Encoding,User-Agent",
-		},
-		{
-			key:   "Transfer-Encoding",
-			value: []string{"chunked", "other"},
-			want:  "ERROR: http2: invalid Transfer-Encoding request header: [\"chunked\" \"other\"]",
-		},
-		{
-			key:   "Content-Length",
-			value: []string{"123"},
-			want:  "Accept-Encoding,User-Agent",
-		},
-		{
-			key:   "Keep-Alive",
-			value: []string{"doop"},
-			want:  "Accept-Encoding,User-Agent",
-		},
-	}
-
-	for _, tt := range tests {
-		req, _ := http.NewRequest("GET", st.ts.URL, nil)
-		req.Header[tt.key] = tt.value
-		res, err := tr.RoundTrip(req)
-		var got string
-		if err != nil {
-			got = fmt.Sprintf("ERROR: %v", err)
-		} else {
-			got = res.Header.Get("Got-Header")
-			res.Body.Close()
-		}
-		if got != tt.want {
-			t.Errorf("For key %q, value %q, got = %q; want %q", tt.key, tt.value, got, tt.want)
-		}
-	}
-}
-
-// golang.org/issue/14048
-func TestTransportFailsOnInvalidHeaders(t *testing.T) {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		var got []string
-		for k := range r.Header {
-			got = append(got, k)
-		}
-		sort.Strings(got)
-		w.Header().Set("Got-Header", strings.Join(got, ","))
-	}, optOnlyServer)
-	defer st.Close()
-
-	tests := [...]struct {
-		h       http.Header
-		wantErr string
-	}{
-		0: {
-			h:       http.Header{"with space": {"foo"}},
-			wantErr: `invalid HTTP header name "with space"`,
-		},
-		1: {
-			h:       http.Header{"name": {"Брэд"}},
-			wantErr: "", // okay
-		},
-		2: {
-			h:       http.Header{"имя": {"Brad"}},
-			wantErr: `invalid HTTP header name "имя"`,
-		},
-		3: {
-			h:       http.Header{"foo": {"foo\x01bar"}},
-			wantErr: `invalid HTTP header value "foo\x01bar" for header "foo"`,
-		},
-	}
-
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-
-	for i, tt := range tests {
-		req, _ := http.NewRequest("GET", st.ts.URL, nil)
-		req.Header = tt.h
-		res, err := tr.RoundTrip(req)
-		var bad bool
-		if tt.wantErr == "" {
-			if err != nil {
-				bad = true
-				t.Errorf("case %d: error = %v; want no error", i, err)
-			}
-		} else {
-			if !strings.Contains(fmt.Sprint(err), tt.wantErr) {
-				bad = true
-				t.Errorf("case %d: error = %v; want error %q", i, err, tt.wantErr)
-			}
-		}
-		if err == nil {
-			if bad {
-				t.Logf("case %d: server got headers %q", i, res.Header.Get("Got-Header"))
-			}
-			res.Body.Close()
-		}
-	}
-}
-
-// Tests that gzipReader doesn't crash on a second Read call following
-// the first Read call's gzip.NewReader returning an error.
-func TestGzipReader_DoubleReadCrash(t *testing.T) {
-	gz := &gzipReader{
-		body: ioutil.NopCloser(strings.NewReader("0123456789")),
-	}
-	var buf [1]byte
-	n, err1 := gz.Read(buf[:])
-	if n != 0 || !strings.Contains(fmt.Sprint(err1), "invalid header") {
-		t.Fatalf("Read = %v, %v; want 0, invalid header", n, err1)
-	}
-	n, err2 := gz.Read(buf[:])
-	if n != 0 || err2 != err1 {
-		t.Fatalf("second Read = %v, %v; want 0, %v", n, err2, err1)
-	}
-}
-
-func TestTransportNewTLSConfig(t *testing.T) {
-	tests := [...]struct {
-		conf *tls.Config
-		host string
-		want *tls.Config
-	}{
-		// Normal case.
-		0: {
-			conf: nil,
-			host: "foo.com",
-			want: &tls.Config{
-				ServerName: "foo.com",
-				NextProtos: []string{NextProtoTLS},
-			},
-		},
-
-		// User-provided name (bar.com) takes precedence:
-		1: {
-			conf: &tls.Config{
-				ServerName: "bar.com",
-			},
-			host: "foo.com",
-			want: &tls.Config{
-				ServerName: "bar.com",
-				NextProtos: []string{NextProtoTLS},
-			},
-		},
-
-		// NextProto is prepended:
-		2: {
-			conf: &tls.Config{
-				NextProtos: []string{"foo", "bar"},
-			},
-			host: "example.com",
-			want: &tls.Config{
-				ServerName: "example.com",
-				NextProtos: []string{NextProtoTLS, "foo", "bar"},
-			},
-		},
-
-		// NextProto is not duplicated:
-		3: {
-			conf: &tls.Config{
-				NextProtos: []string{"foo", "bar", NextProtoTLS},
-			},
-			host: "example.com",
-			want: &tls.Config{
-				ServerName: "example.com",
-				NextProtos: []string{"foo", "bar", NextProtoTLS},
-			},
-		},
-	}
-	for i, tt := range tests {
-		// Ignore the session ticket keys part, which ends up populating
-		// unexported fields in the Config:
-		if tt.conf != nil {
-			tt.conf.SessionTicketsDisabled = true
-		}
-
-		tr := &Transport{TLSClientConfig: tt.conf}
-		got := tr.newTLSConfig(tt.host)
-
-		got.SessionTicketsDisabled = false
-
-		if !reflect.DeepEqual(got, tt.want) {
-			t.Errorf("%d. got %#v; want %#v", i, got, tt.want)
-		}
-	}
-}
-
-// The Google GFE responds to HEAD requests with a HEADERS frame
-// without END_STREAM, followed by a 0-length DATA frame with
-// END_STREAM. Make sure we don't get confused by that. (We did.)
-func TestTransportReadHeadResponse(t *testing.T) {
-	ct := newClientTester(t)
-	clientDone := make(chan struct{})
-	ct.client = func() error {
-		defer close(clientDone)
-		req, _ := http.NewRequest("HEAD", "https://dummy.tld/", nil)
-		res, err := ct.tr.RoundTrip(req)
-		if err != nil {
-			return err
-		}
-		if res.ContentLength != 123 {
-			return fmt.Errorf("Content-Length = %d; want 123", res.ContentLength)
-		}
-		slurp, err := ioutil.ReadAll(res.Body)
-		if err != nil {
-			return fmt.Errorf("ReadAll: %v", err)
-		}
-		if len(slurp) > 0 {
-			return fmt.Errorf("Unexpected non-empty ReadAll body: %q", slurp)
-		}
-		return nil
-	}
-	ct.server = func() error {
-		ct.greet()
-		for {
-			f, err := ct.fr.ReadFrame()
-			if err != nil {
-				t.Logf("ReadFrame: %v", err)
-				return nil
-			}
-			hf, ok := f.(*HeadersFrame)
-			if !ok {
-				continue
-			}
-			var buf bytes.Buffer
-			enc := hpack.NewEncoder(&buf)
-			enc.WriteField(hpack.HeaderField{Name: ":status", Value: "200"})
-			enc.WriteField(hpack.HeaderField{Name: "content-length", Value: "123"})
-			ct.fr.WriteHeaders(HeadersFrameParam{
-				StreamID:      hf.StreamID,
-				EndHeaders:    true,
-				EndStream:     false, // as the GFE does
-				BlockFragment: buf.Bytes(),
-			})
-			ct.fr.WriteData(hf.StreamID, true, nil)
-
-			<-clientDone
-			return nil
-		}
-	}
-	ct.run()
-}
-
-func TestTransportReadHeadResponseWithBody(t *testing.T) {
-	// This test use not valid response format.
-	// Discarding logger output to not spam tests output.
-	log.SetOutput(ioutil.Discard)
-	defer log.SetOutput(os.Stderr)
-
-	response := "redirecting to /elsewhere"
-	ct := newClientTester(t)
-	clientDone := make(chan struct{})
-	ct.client = func() error {
-		defer close(clientDone)
-		req, _ := http.NewRequest("HEAD", "https://dummy.tld/", nil)
-		res, err := ct.tr.RoundTrip(req)
-		if err != nil {
-			return err
-		}
-		if res.ContentLength != int64(len(response)) {
-			return fmt.Errorf("Content-Length = %d; want %d", res.ContentLength, len(response))
-		}
-		slurp, err := ioutil.ReadAll(res.Body)
-		if err != nil {
-			return fmt.Errorf("ReadAll: %v", err)
-		}
-		if len(slurp) > 0 {
-			return fmt.Errorf("Unexpected non-empty ReadAll body: %q", slurp)
-		}
-		return nil
-	}
-	ct.server = func() error {
-		ct.greet()
-		for {
-			f, err := ct.fr.ReadFrame()
-			if err != nil {
-				t.Logf("ReadFrame: %v", err)
-				return nil
-			}
-			hf, ok := f.(*HeadersFrame)
-			if !ok {
-				continue
-			}
-			var buf bytes.Buffer
-			enc := hpack.NewEncoder(&buf)
-			enc.WriteField(hpack.HeaderField{Name: ":status", Value: "200"})
-			enc.WriteField(hpack.HeaderField{Name: "content-length", Value: strconv.Itoa(len(response))})
-			ct.fr.WriteHeaders(HeadersFrameParam{
-				StreamID:      hf.StreamID,
-				EndHeaders:    true,
-				EndStream:     false,
-				BlockFragment: buf.Bytes(),
-			})
-			ct.fr.WriteData(hf.StreamID, true, []byte(response))
-
-			<-clientDone
-			return nil
-		}
-	}
-	ct.run()
-}
-
-type neverEnding byte
-
-func (b neverEnding) Read(p []byte) (int, error) {
-	for i := range p {
-		p[i] = byte(b)
-	}
-	return len(p), nil
-}
-
-// golang.org/issue/15425: test that a handler closing the request
-// body doesn't terminate the stream to the peer. (It just stops
-// readability from the handler's side, and eventually the client
-// runs out of flow control tokens)
-func TestTransportHandlerBodyClose(t *testing.T) {
-	const bodySize = 10 << 20
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		r.Body.Close()
-		io.Copy(w, io.LimitReader(neverEnding('A'), bodySize))
-	}, optOnlyServer)
-	defer st.Close()
-
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-
-	g0 := runtime.NumGoroutine()
-
-	const numReq = 10
-	for i := 0; i < numReq; i++ {
-		req, err := http.NewRequest("POST", st.ts.URL, struct{ io.Reader }{io.LimitReader(neverEnding('A'), bodySize)})
-		if err != nil {
-			t.Fatal(err)
-		}
-		res, err := tr.RoundTrip(req)
-		if err != nil {
-			t.Fatal(err)
-		}
-		n, err := io.Copy(ioutil.Discard, res.Body)
-		res.Body.Close()
-		if n != bodySize || err != nil {
-			t.Fatalf("req#%d: Copy = %d, %v; want %d, nil", i, n, err, bodySize)
-		}
-	}
-	tr.CloseIdleConnections()
-
-	if !waitCondition(5*time.Second, 100*time.Millisecond, func() bool {
-		gd := runtime.NumGoroutine() - g0
-		return gd < numReq/2
-	}) {
-		t.Errorf("appeared to leak goroutines")
-	}
-}
-
-// https://golang.org/issue/15930
-func TestTransportFlowControl(t *testing.T) {
-	const bufLen = 64 << 10
-	var total int64 = 100 << 20 // 100MB
-	if testing.Short() {
-		total = 10 << 20
-	}
-
-	var wrote int64 // updated atomically
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		b := make([]byte, bufLen)
-		for wrote < total {
-			n, err := w.Write(b)
-			atomic.AddInt64(&wrote, int64(n))
-			if err != nil {
-				t.Errorf("ResponseWriter.Write error: %v", err)
-				break
-			}
-			w.(http.Flusher).Flush()
-		}
-	}, optOnlyServer)
-
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-	req, err := http.NewRequest("GET", st.ts.URL, nil)
-	if err != nil {
-		t.Fatal("NewRequest error:", err)
-	}
-	resp, err := tr.RoundTrip(req)
-	if err != nil {
-		t.Fatal("RoundTrip error:", err)
-	}
-	defer resp.Body.Close()
-
-	var read int64
-	b := make([]byte, bufLen)
-	for {
-		n, err := resp.Body.Read(b)
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			t.Fatal("Read error:", err)
-		}
-		read += int64(n)
-
-		const max = transportDefaultStreamFlow
-		if w := atomic.LoadInt64(&wrote); -max > read-w || read-w > max {
-			t.Fatalf("Too much data inflight: server wrote %v bytes but client only received %v", w, read)
-		}
-
-		// Let the server get ahead of the client.
-		time.Sleep(1 * time.Millisecond)
-	}
-}
-
-// golang.org/issue/14627 -- if the server sends a GOAWAY frame, make
-// the Transport remember it and return it back to users (via
-// RoundTrip or request body reads) if needed (e.g. if the server
-// proceeds to close the TCP connection before the client gets its
-// response)
-func TestTransportUsesGoAwayDebugError_RoundTrip(t *testing.T) {
-	testTransportUsesGoAwayDebugError(t, false)
-}
-
-func TestTransportUsesGoAwayDebugError_Body(t *testing.T) {
-	testTransportUsesGoAwayDebugError(t, true)
-}
-
-func testTransportUsesGoAwayDebugError(t *testing.T, failMidBody bool) {
-	ct := newClientTester(t)
-	clientDone := make(chan struct{})
-
-	const goAwayErrCode = ErrCodeHTTP11Required // arbitrary
-	const goAwayDebugData = "some debug data"
-
-	ct.client = func() error {
-		defer close(clientDone)
-		req, _ := http.NewRequest("GET", "https://dummy.tld/", nil)
-		res, err := ct.tr.RoundTrip(req)
-		if failMidBody {
-			if err != nil {
-				return fmt.Errorf("unexpected client RoundTrip error: %v", err)
-			}
-			_, err = io.Copy(ioutil.Discard, res.Body)
-			res.Body.Close()
-		}
-		want := GoAwayError{
-			LastStreamID: 5,
-			ErrCode:      goAwayErrCode,
-			DebugData:    goAwayDebugData,
-		}
-		if !reflect.DeepEqual(err, want) {
-			t.Errorf("RoundTrip error = %T: %#v, want %T (%#v)", err, err, want, want)
-		}
-		return nil
-	}
-	ct.server = func() error {
-		ct.greet()
-		for {
-			f, err := ct.fr.ReadFrame()
-			if err != nil {
-				t.Logf("ReadFrame: %v", err)
-				return nil
-			}
-			hf, ok := f.(*HeadersFrame)
-			if !ok {
-				continue
-			}
-			if failMidBody {
-				var buf bytes.Buffer
-				enc := hpack.NewEncoder(&buf)
-				enc.WriteField(hpack.HeaderField{Name: ":status", Value: "200"})
-				enc.WriteField(hpack.HeaderField{Name: "content-length", Value: "123"})
-				ct.fr.WriteHeaders(HeadersFrameParam{
-					StreamID:      hf.StreamID,
-					EndHeaders:    true,
-					EndStream:     false,
-					BlockFragment: buf.Bytes(),
-				})
-			}
-			// Write two GOAWAY frames, to test that the Transport takes
-			// the interesting parts of both.
-			ct.fr.WriteGoAway(5, ErrCodeNo, []byte(goAwayDebugData))
-			ct.fr.WriteGoAway(5, goAwayErrCode, nil)
-			ct.sc.(*net.TCPConn).CloseWrite()
-			<-clientDone
-			return nil
-		}
-	}
-	ct.run()
-}
-
-func testTransportReturnsUnusedFlowControl(t *testing.T, oneDataFrame bool) {
-	ct := newClientTester(t)
-
-	clientClosed := make(chan struct{})
-	serverWroteFirstByte := make(chan struct{})
-
-	ct.client = func() error {
-		req, _ := http.NewRequest("GET", "https://dummy.tld/", nil)
-		res, err := ct.tr.RoundTrip(req)
-		if err != nil {
-			return err
-		}
-		<-serverWroteFirstByte
-
-		if n, err := res.Body.Read(make([]byte, 1)); err != nil || n != 1 {
-			return fmt.Errorf("body read = %v, %v; want 1, nil", n, err)
-		}
-		res.Body.Close() // leaving 4999 bytes unread
-		close(clientClosed)
-
-		return nil
-	}
-	ct.server = func() error {
-		ct.greet()
-
-		var hf *HeadersFrame
-		for {
-			f, err := ct.fr.ReadFrame()
-			if err != nil {
-				return fmt.Errorf("ReadFrame while waiting for Headers: %v", err)
-			}
-			switch f.(type) {
-			case *WindowUpdateFrame, *SettingsFrame:
-				continue
-			}
-			var ok bool
-			hf, ok = f.(*HeadersFrame)
-			if !ok {
-				return fmt.Errorf("Got %T; want HeadersFrame", f)
-			}
-			break
-		}
-
-		var buf bytes.Buffer
-		enc := hpack.NewEncoder(&buf)
-		enc.WriteField(hpack.HeaderField{Name: ":status", Value: "200"})
-		enc.WriteField(hpack.HeaderField{Name: "content-length", Value: "5000"})
-		ct.fr.WriteHeaders(HeadersFrameParam{
-			StreamID:      hf.StreamID,
-			EndHeaders:    true,
-			EndStream:     false,
-			BlockFragment: buf.Bytes(),
-		})
-
-		// Two cases:
-		// - Send one DATA frame with 5000 bytes.
-		// - Send two DATA frames with 1 and 4999 bytes each.
-		//
-		// In both cases, the client should consume one byte of data,
-		// refund that byte, then refund the following 4999 bytes.
-		//
-		// In the second case, the server waits for the client connection to
-		// close before seconding the second DATA frame. This tests the case
-		// where the client receives a DATA frame after it has reset the stream.
-		if oneDataFrame {
-			ct.fr.WriteData(hf.StreamID, false /* don't end stream */, make([]byte, 5000))
-			close(serverWroteFirstByte)
-			<-clientClosed
-		} else {
-			ct.fr.WriteData(hf.StreamID, false /* don't end stream */, make([]byte, 1))
-			close(serverWroteFirstByte)
-			<-clientClosed
-			ct.fr.WriteData(hf.StreamID, false /* don't end stream */, make([]byte, 4999))
-		}
-
-		waitingFor := "RSTStreamFrame"
-		for {
-			f, err := ct.fr.ReadFrame()
-			if err != nil {
-				return fmt.Errorf("ReadFrame while waiting for %s: %v", waitingFor, err)
-			}
-			if _, ok := f.(*SettingsFrame); ok {
-				continue
-			}
-			switch waitingFor {
-			case "RSTStreamFrame":
-				if rf, ok := f.(*RSTStreamFrame); !ok || rf.ErrCode != ErrCodeCancel {
-					return fmt.Errorf("Expected a RSTStreamFrame with code cancel; got %v", summarizeFrame(f))
-				}
-				waitingFor = "WindowUpdateFrame"
-			case "WindowUpdateFrame":
-				if wuf, ok := f.(*WindowUpdateFrame); !ok || wuf.Increment != 4999 {
-					return fmt.Errorf("Expected WindowUpdateFrame for 4999 bytes; got %v", summarizeFrame(f))
-				}
-				return nil
-			}
-		}
-	}
-	ct.run()
-}
-
-// See golang.org/issue/16481
-func TestTransportReturnsUnusedFlowControlSingleWrite(t *testing.T) {
-	testTransportReturnsUnusedFlowControl(t, true)
-}
-
-// See golang.org/issue/20469
-func TestTransportReturnsUnusedFlowControlMultipleWrites(t *testing.T) {
-	testTransportReturnsUnusedFlowControl(t, false)
-}
-
-// Issue 16612: adjust flow control on open streams when transport
-// receives SETTINGS with INITIAL_WINDOW_SIZE from server.
-func TestTransportAdjustsFlowControl(t *testing.T) {
-	ct := newClientTester(t)
-	clientDone := make(chan struct{})
-
-	const bodySize = 1 << 20
-
-	ct.client = func() error {
-		defer ct.cc.(*net.TCPConn).CloseWrite()
-		defer close(clientDone)
-
-		req, _ := http.NewRequest("POST", "https://dummy.tld/", struct{ io.Reader }{io.LimitReader(neverEnding('A'), bodySize)})
-		res, err := ct.tr.RoundTrip(req)
-		if err != nil {
-			return err
-		}
-		res.Body.Close()
-		return nil
-	}
-	ct.server = func() error {
-		_, err := io.ReadFull(ct.sc, make([]byte, len(ClientPreface)))
-		if err != nil {
-			return fmt.Errorf("reading client preface: %v", err)
-		}
-
-		var gotBytes int64
-		var sentSettings bool
-		for {
-			f, err := ct.fr.ReadFrame()
-			if err != nil {
-				select {
-				case <-clientDone:
-					return nil
-				default:
-					return fmt.Errorf("ReadFrame while waiting for Headers: %v", err)
-				}
-			}
-			switch f := f.(type) {
-			case *DataFrame:
-				gotBytes += int64(len(f.Data()))
-				// After we've got half the client's
-				// initial flow control window's worth
-				// of request body data, give it just
-				// enough flow control to finish.
-				if gotBytes >= initialWindowSize/2 && !sentSettings {
-					sentSettings = true
-
-					ct.fr.WriteSettings(Setting{ID: SettingInitialWindowSize, Val: bodySize})
-					ct.fr.WriteWindowUpdate(0, bodySize)
-					ct.fr.WriteSettingsAck()
-				}
-
-				if f.StreamEnded() {
-					var buf bytes.Buffer
-					enc := hpack.NewEncoder(&buf)
-					enc.WriteField(hpack.HeaderField{Name: ":status", Value: "200"})
-					ct.fr.WriteHeaders(HeadersFrameParam{
-						StreamID:      f.StreamID,
-						EndHeaders:    true,
-						EndStream:     true,
-						BlockFragment: buf.Bytes(),
-					})
-				}
-			}
-		}
-	}
-	ct.run()
-}
-
-// See golang.org/issue/16556
-func TestTransportReturnsDataPaddingFlowControl(t *testing.T) {
-	ct := newClientTester(t)
-
-	unblockClient := make(chan bool, 1)
-
-	ct.client = func() error {
-		req, _ := http.NewRequest("GET", "https://dummy.tld/", nil)
-		res, err := ct.tr.RoundTrip(req)
-		if err != nil {
-			return err
-		}
-		defer res.Body.Close()
-		<-unblockClient
-		return nil
-	}
-	ct.server = func() error {
-		ct.greet()
-
-		var hf *HeadersFrame
-		for {
-			f, err := ct.fr.ReadFrame()
-			if err != nil {
-				return fmt.Errorf("ReadFrame while waiting for Headers: %v", err)
-			}
-			switch f.(type) {
-			case *WindowUpdateFrame, *SettingsFrame:
-				continue
-			}
-			var ok bool
-			hf, ok = f.(*HeadersFrame)
-			if !ok {
-				return fmt.Errorf("Got %T; want HeadersFrame", f)
-			}
-			break
-		}
-
-		var buf bytes.Buffer
-		enc := hpack.NewEncoder(&buf)
-		enc.WriteField(hpack.HeaderField{Name: ":status", Value: "200"})
-		enc.WriteField(hpack.HeaderField{Name: "content-length", Value: "5000"})
-		ct.fr.WriteHeaders(HeadersFrameParam{
-			StreamID:      hf.StreamID,
-			EndHeaders:    true,
-			EndStream:     false,
-			BlockFragment: buf.Bytes(),
-		})
-		pad := make([]byte, 5)
-		ct.fr.WriteDataPadded(hf.StreamID, false, make([]byte, 5000), pad) // without ending stream
-
-		f, err := ct.readNonSettingsFrame()
-		if err != nil {
-			return fmt.Errorf("ReadFrame while waiting for first WindowUpdateFrame: %v", err)
-		}
-		wantBack := uint32(len(pad)) + 1 // one byte for the length of the padding
-		if wuf, ok := f.(*WindowUpdateFrame); !ok || wuf.Increment != wantBack || wuf.StreamID != 0 {
-			return fmt.Errorf("Expected conn WindowUpdateFrame for %d bytes; got %v", wantBack, summarizeFrame(f))
-		}
-
-		f, err = ct.readNonSettingsFrame()
-		if err != nil {
-			return fmt.Errorf("ReadFrame while waiting for second WindowUpdateFrame: %v", err)
-		}
-		if wuf, ok := f.(*WindowUpdateFrame); !ok || wuf.Increment != wantBack || wuf.StreamID == 0 {
-			return fmt.Errorf("Expected stream WindowUpdateFrame for %d bytes; got %v", wantBack, summarizeFrame(f))
-		}
-		unblockClient <- true
-		return nil
-	}
-	ct.run()
-}
-
-// golang.org/issue/16572 -- RoundTrip shouldn't hang when it gets a
-// StreamError as a result of the response HEADERS
-func TestTransportReturnsErrorOnBadResponseHeaders(t *testing.T) {
-	ct := newClientTester(t)
-
-	ct.client = func() error {
-		req, _ := http.NewRequest("GET", "https://dummy.tld/", nil)
-		res, err := ct.tr.RoundTrip(req)
-		if err == nil {
-			res.Body.Close()
-			return errors.New("unexpected successful GET")
-		}
-		want := StreamError{1, ErrCodeProtocol, headerFieldNameError("  content-type")}
-		if !reflect.DeepEqual(want, err) {
-			t.Errorf("RoundTrip error = %#v; want %#v", err, want)
-		}
-		return nil
-	}
-	ct.server = func() error {
-		ct.greet()
-
-		hf, err := ct.firstHeaders()
-		if err != nil {
-			return err
-		}
-
-		var buf bytes.Buffer
-		enc := hpack.NewEncoder(&buf)
-		enc.WriteField(hpack.HeaderField{Name: ":status", Value: "200"})
-		enc.WriteField(hpack.HeaderField{Name: "  content-type", Value: "bogus"}) // bogus spaces
-		ct.fr.WriteHeaders(HeadersFrameParam{
-			StreamID:      hf.StreamID,
-			EndHeaders:    true,
-			EndStream:     false,
-			BlockFragment: buf.Bytes(),
-		})
-
-		for {
-			fr, err := ct.readFrame()
-			if err != nil {
-				return fmt.Errorf("error waiting for RST_STREAM from client: %v", err)
-			}
-			if _, ok := fr.(*SettingsFrame); ok {
-				continue
-			}
-			if rst, ok := fr.(*RSTStreamFrame); !ok || rst.StreamID != 1 || rst.ErrCode != ErrCodeProtocol {
-				t.Errorf("Frame = %v; want RST_STREAM for stream 1 with ErrCodeProtocol", summarizeFrame(fr))
-			}
-			break
-		}
-
-		return nil
-	}
-	ct.run()
-}
-
-// byteAndEOFReader returns is in an io.Reader which reads one byte
-// (the underlying byte) and io.EOF at once in its Read call.
-type byteAndEOFReader byte
-
-func (b byteAndEOFReader) Read(p []byte) (n int, err error) {
-	if len(p) == 0 {
-		panic("unexpected useless call")
-	}
-	p[0] = byte(b)
-	return 1, io.EOF
-}
-
-// Issue 16788: the Transport had a regression where it started
-// sending a spurious DATA frame with a duplicate END_STREAM bit after
-// the request body writer goroutine had already read an EOF from the
-// Request.Body and included the END_STREAM on a data-carrying DATA
-// frame.
-//
-// Notably, to trigger this, the requests need to use a Request.Body
-// which returns (non-0, io.EOF) and also needs to set the ContentLength
-// explicitly.
-func TestTransportBodyDoubleEndStream(t *testing.T) {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		// Nothing.
-	}, optOnlyServer)
-	defer st.Close()
-
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-
-	for i := 0; i < 2; i++ {
-		req, _ := http.NewRequest("POST", st.ts.URL, byteAndEOFReader('a'))
-		req.ContentLength = 1
-		res, err := tr.RoundTrip(req)
-		if err != nil {
-			t.Fatalf("failure on req %d: %v", i+1, err)
-		}
-		defer res.Body.Close()
-	}
-}
-
-// golang.org/issue/16847, golang.org/issue/19103
-func TestTransportRequestPathPseudo(t *testing.T) {
-	type result struct {
-		path string
-		err  string
-	}
-	tests := []struct {
-		req  *http.Request
-		want result
-	}{
-		0: {
-			req: &http.Request{
-				Method: "GET",
-				URL: &url.URL{
-					Host: "foo.com",
-					Path: "/foo",
-				},
-			},
-			want: result{path: "/foo"},
-		},
-		// In Go 1.7, we accepted paths of "//foo".
-		// In Go 1.8, we rejected it (issue 16847).
-		// In Go 1.9, we accepted it again (issue 19103).
-		1: {
-			req: &http.Request{
-				Method: "GET",
-				URL: &url.URL{
-					Host: "foo.com",
-					Path: "//foo",
-				},
-			},
-			want: result{path: "//foo"},
-		},
-
-		// Opaque with //$Matching_Hostname/path
-		2: {
-			req: &http.Request{
-				Method: "GET",
-				URL: &url.URL{
-					Scheme: "https",
-					Opaque: "//foo.com/path",
-					Host:   "foo.com",
-					Path:   "/ignored",
-				},
-			},
-			want: result{path: "/path"},
-		},
-
-		// Opaque with some other Request.Host instead:
-		3: {
-			req: &http.Request{
-				Method: "GET",
-				Host:   "bar.com",
-				URL: &url.URL{
-					Scheme: "https",
-					Opaque: "//bar.com/path",
-					Host:   "foo.com",
-					Path:   "/ignored",
-				},
-			},
-			want: result{path: "/path"},
-		},
-
-		// Opaque without the leading "//":
-		4: {
-			req: &http.Request{
-				Method: "GET",
-				URL: &url.URL{
-					Opaque: "/path",
-					Host:   "foo.com",
-					Path:   "/ignored",
-				},
-			},
-			want: result{path: "/path"},
-		},
-
-		// Opaque we can't handle:
-		5: {
-			req: &http.Request{
-				Method: "GET",
-				URL: &url.URL{
-					Scheme: "https",
-					Opaque: "//unknown_host/path",
-					Host:   "foo.com",
-					Path:   "/ignored",
-				},
-			},
-			want: result{err: `invalid request :path "https://unknown_host/path" from URL.Opaque = "//unknown_host/path"`},
-		},
-
-		// A CONNECT request:
-		6: {
-			req: &http.Request{
-				Method: "CONNECT",
-				URL: &url.URL{
-					Host: "foo.com",
-				},
-			},
-			want: result{},
-		},
-	}
-	for i, tt := range tests {
-		cc := &ClientConn{peerMaxHeaderListSize: 0xffffffffffffffff}
-		cc.henc = hpack.NewEncoder(&cc.hbuf)
-		cc.mu.Lock()
-		hdrs, err := cc.encodeHeaders(tt.req, false, "", -1)
-		cc.mu.Unlock()
-		var got result
-		hpackDec := hpack.NewDecoder(initialHeaderTableSize, func(f hpack.HeaderField) {
-			if f.Name == ":path" {
-				got.path = f.Value
-			}
-		})
-		if err != nil {
-			got.err = err.Error()
-		} else if len(hdrs) > 0 {
-			if _, err := hpackDec.Write(hdrs); err != nil {
-				t.Errorf("%d. bogus hpack: %v", i, err)
-				continue
-			}
-		}
-		if got != tt.want {
-			t.Errorf("%d. got %+v; want %+v", i, got, tt.want)
-		}
-
-	}
-
-}
-
-// golang.org/issue/17071 -- don't sniff the first byte of the request body
-// before we've determined that the ClientConn is usable.
-func TestRoundTripDoesntConsumeRequestBodyEarly(t *testing.T) {
-	const body = "foo"
-	req, _ := http.NewRequest("POST", "http://foo.com/", ioutil.NopCloser(strings.NewReader(body)))
-	cc := &ClientConn{
-		closed: true,
-	}
-	_, err := cc.RoundTrip(req)
-	if err != errClientConnUnusable {
-		t.Fatalf("RoundTrip = %v; want errClientConnUnusable", err)
-	}
-	slurp, err := ioutil.ReadAll(req.Body)
-	if err != nil {
-		t.Errorf("ReadAll = %v", err)
-	}
-	if string(slurp) != body {
-		t.Errorf("Body = %q; want %q", slurp, body)
-	}
-}
-
-func TestClientConnPing(t *testing.T) {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {}, optOnlyServer)
-	defer st.Close()
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-	cc, err := tr.dialClientConn(st.ts.Listener.Addr().String(), false)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err = cc.Ping(testContext{}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Issue 16974: if the server sent a DATA frame after the user
-// canceled the Transport's Request, the Transport previously wrote to a
-// closed pipe, got an error, and ended up closing the whole TCP
-// connection.
-func TestTransportCancelDataResponseRace(t *testing.T) {
-	cancel := make(chan struct{})
-	clientGotError := make(chan bool, 1)
-
-	const msg = "Hello."
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		if strings.Contains(r.URL.Path, "/hello") {
-			time.Sleep(50 * time.Millisecond)
-			io.WriteString(w, msg)
-			return
-		}
-		for i := 0; i < 50; i++ {
-			io.WriteString(w, "Some data.")
-			w.(http.Flusher).Flush()
-			if i == 2 {
-				close(cancel)
-				<-clientGotError
-			}
-			time.Sleep(10 * time.Millisecond)
-		}
-	}, optOnlyServer)
-	defer st.Close()
-
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-
-	c := &http.Client{Transport: tr}
-	req, _ := http.NewRequest("GET", st.ts.URL, nil)
-	req.Cancel = cancel
-	res, err := c.Do(req)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err = io.Copy(ioutil.Discard, res.Body); err == nil {
-		t.Fatal("unexpected success")
-	}
-	clientGotError <- true
-
-	res, err = c.Get(st.ts.URL + "/hello")
-	if err != nil {
-		t.Fatal(err)
-	}
-	slurp, err := ioutil.ReadAll(res.Body)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if string(slurp) != msg {
-		t.Errorf("Got = %q; want %q", slurp, msg)
-	}
-}
-
-// Issue 21316: It should be safe to reuse an http.Request after the
-// request has completed.
-func TestTransportNoRaceOnRequestObjectAfterRequestComplete(t *testing.T) {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(200)
-		io.WriteString(w, "body")
-	}, optOnlyServer)
-	defer st.Close()
-
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-
-	req, _ := http.NewRequest("GET", st.ts.URL, nil)
-	resp, err := tr.RoundTrip(req)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err = io.Copy(ioutil.Discard, resp.Body); err != nil {
-		t.Fatalf("error reading response body: %v", err)
-	}
-	if err := resp.Body.Close(); err != nil {
-		t.Fatalf("error closing response body: %v", err)
-	}
-
-	// This access of req.Header should not race with code in the transport.
-	req.Header = http.Header{}
-}
-
-func TestTransportRetryAfterGOAWAY(t *testing.T) {
-	var dialer struct {
-		sync.Mutex
-		count int
-	}
-	ct1 := make(chan *clientTester)
-	ct2 := make(chan *clientTester)
-
-	ln := newLocalListener(t)
-	defer ln.Close()
-
-	tr := &Transport{
-		TLSClientConfig: tlsConfigInsecure,
-	}
-	tr.DialTLS = func(network, addr string, cfg *tls.Config) (net.Conn, error) {
-		dialer.Lock()
-		defer dialer.Unlock()
-		dialer.count++
-		if dialer.count == 3 {
-			return nil, errors.New("unexpected number of dials")
-		}
-		cc, err := net.Dial("tcp", ln.Addr().String())
-		if err != nil {
-			return nil, fmt.Errorf("dial error: %v", err)
-		}
-		sc, err := ln.Accept()
-		if err != nil {
-			return nil, fmt.Errorf("accept error: %v", err)
-		}
-		ct := &clientTester{
-			t:  t,
-			tr: tr,
-			cc: cc,
-			sc: sc,
-			fr: NewFramer(sc, sc),
-		}
-		switch dialer.count {
-		case 1:
-			ct1 <- ct
-		case 2:
-			ct2 <- ct
-		}
-		return cc, nil
-	}
-
-	errs := make(chan error, 3)
-	done := make(chan struct{})
-	defer close(done)
-
-	// Client.
-	go func() {
-		req, _ := http.NewRequest("GET", "https://dummy.tld/", nil)
-		res, err := tr.RoundTrip(req)
-		if res != nil {
-			res.Body.Close()
-			if got := res.Header.Get("Foo"); got != "bar" {
-				err = fmt.Errorf("foo header = %q; want bar", got)
-			}
-		}
-		if err != nil {
-			err = fmt.Errorf("RoundTrip: %v", err)
-		}
-		errs <- err
-	}()
-
-	connToClose := make(chan io.Closer, 2)
-
-	// Server for the first request.
-	go func() {
-		var ct *clientTester
-		select {
-		case ct = <-ct1:
-		case <-done:
-			return
-		}
-
-		connToClose <- ct.cc
-		ct.greet()
-		hf, err := ct.firstHeaders()
-		if err != nil {
-			errs <- fmt.Errorf("server1 failed reading HEADERS: %v", err)
-			return
-		}
-		t.Logf("server1 got %v", hf)
-		if err := ct.fr.WriteGoAway(0 /*max id*/, ErrCodeNo, nil); err != nil {
-			errs <- fmt.Errorf("server1 failed writing GOAWAY: %v", err)
-			return
-		}
-		errs <- nil
-	}()
-
-	// Server for the second request.
-	go func() {
-		var ct *clientTester
-		select {
-		case ct = <-ct2:
-		case <-done:
-			return
-		}
-
-		connToClose <- ct.cc
-		ct.greet()
-		hf, err := ct.firstHeaders()
-		if err != nil {
-			errs <- fmt.Errorf("server2 failed reading HEADERS: %v", err)
-			return
-		}
-		t.Logf("server2 got %v", hf)
-
-		var buf bytes.Buffer
-		enc := hpack.NewEncoder(&buf)
-		enc.WriteField(hpack.HeaderField{Name: ":status", Value: "200"})
-		enc.WriteField(hpack.HeaderField{Name: "foo", Value: "bar"})
-		err = ct.fr.WriteHeaders(HeadersFrameParam{
-			StreamID:      hf.StreamID,
-			EndHeaders:    true,
-			EndStream:     false,
-			BlockFragment: buf.Bytes(),
-		})
-		if err != nil {
-			errs <- fmt.Errorf("server2 failed writing response HEADERS: %v", err)
-		} else {
-			errs <- nil
-		}
-	}()
-
-	for k := 0; k < 3; k++ {
-		select {
-		case err := <-errs:
-			if err != nil {
-				t.Error(err)
-			}
-		case <-time.After(1 * time.Second):
-			t.Errorf("timed out")
-		}
-	}
-
-	for {
-		select {
-		case c := <-connToClose:
-			c.Close()
-		default:
-			return
-		}
-	}
-}
-
-func TestTransportRetryAfterRefusedStream(t *testing.T) {
-	clientDone := make(chan struct{})
-	ct := newClientTester(t)
-	ct.client = func() error {
-		defer ct.cc.(*net.TCPConn).CloseWrite()
-		defer close(clientDone)
-		req, _ := http.NewRequest("GET", "https://dummy.tld/", nil)
-		resp, err := ct.tr.RoundTrip(req)
-		if err != nil {
-			return fmt.Errorf("RoundTrip: %v", err)
-		}
-		resp.Body.Close()
-		if resp.StatusCode != 204 {
-			return fmt.Errorf("Status = %v; want 204", resp.StatusCode)
-		}
-		return nil
-	}
-	ct.server = func() error {
-		ct.greet()
-		var buf bytes.Buffer
-		enc := hpack.NewEncoder(&buf)
-		nreq := 0
-
-		for {
-			f, err := ct.fr.ReadFrame()
-			if err != nil {
-				select {
-				case <-clientDone:
-					// If the client's done, it
-					// will have reported any
-					// errors on its side.
-					return nil
-				default:
-					return err
-				}
-			}
-			switch f := f.(type) {
-			case *WindowUpdateFrame, *SettingsFrame:
-			case *HeadersFrame:
-				if !f.HeadersEnded() {
-					return fmt.Errorf("headers should have END_HEADERS be ended: %v", f)
-				}
-				nreq++
-				if nreq == 1 {
-					ct.fr.WriteRSTStream(f.StreamID, ErrCodeRefusedStream)
-				} else {
-					enc.WriteField(hpack.HeaderField{Name: ":status", Value: "204"})
-					ct.fr.WriteHeaders(HeadersFrameParam{
-						StreamID:      f.StreamID,
-						EndHeaders:    true,
-						EndStream:     true,
-						BlockFragment: buf.Bytes(),
-					})
-				}
-			default:
-				return fmt.Errorf("Unexpected client frame %v", f)
-			}
-		}
-	}
-	ct.run()
-}
-
-func TestTransportRetryHasLimit(t *testing.T) {
-	// Skip in short mode because the total expected delay is 1s+2s+4s+8s+16s=29s.
-	if testing.Short() {
-		t.Skip("skipping long test in short mode")
-	}
-	clientDone := make(chan struct{})
-	ct := newClientTester(t)
-	ct.client = func() error {
-		defer ct.cc.(*net.TCPConn).CloseWrite()
-		defer close(clientDone)
-		req, _ := http.NewRequest("GET", "https://dummy.tld/", nil)
-		resp, err := ct.tr.RoundTrip(req)
-		if err == nil {
-			return fmt.Errorf("RoundTrip expected error, got response: %+v", resp)
-		}
-		t.Logf("expected error, got: %v", err)
-		return nil
-	}
-	ct.server = func() error {
-		ct.greet()
-		for {
-			f, err := ct.fr.ReadFrame()
-			if err != nil {
-				select {
-				case <-clientDone:
-					// If the client's done, it
-					// will have reported any
-					// errors on its side.
-					return nil
-				default:
-					return err
-				}
-			}
-			switch f := f.(type) {
-			case *WindowUpdateFrame, *SettingsFrame:
-			case *HeadersFrame:
-				if !f.HeadersEnded() {
-					return fmt.Errorf("headers should have END_HEADERS be ended: %v", f)
-				}
-				ct.fr.WriteRSTStream(f.StreamID, ErrCodeRefusedStream)
-			default:
-				return fmt.Errorf("Unexpected client frame %v", f)
-			}
-		}
-	}
-	ct.run()
-}
-
-func TestTransportResponseDataBeforeHeaders(t *testing.T) {
-	// This test use not valid response format.
-	// Discarding logger output to not spam tests output.
-	log.SetOutput(ioutil.Discard)
-	defer log.SetOutput(os.Stderr)
-
-	ct := newClientTester(t)
-	ct.client = func() error {
-		defer ct.cc.(*net.TCPConn).CloseWrite()
-		req := httptest.NewRequest("GET", "https://dummy.tld/", nil)
-		// First request is normal to ensure the check is per stream and not per connection.
-		_, err := ct.tr.RoundTrip(req)
-		if err != nil {
-			return fmt.Errorf("RoundTrip expected no error, got: %v", err)
-		}
-		// Second request returns a DATA frame with no HEADERS.
-		resp, err := ct.tr.RoundTrip(req)
-		if err == nil {
-			return fmt.Errorf("RoundTrip expected error, got response: %+v", resp)
-		}
-		if err, ok := err.(StreamError); !ok || err.Code != ErrCodeProtocol {
-			return fmt.Errorf("expected stream PROTOCOL_ERROR, got: %v", err)
-		}
-		return nil
-	}
-	ct.server = func() error {
-		ct.greet()
-		for {
-			f, err := ct.fr.ReadFrame()
-			if err == io.EOF {
-				return nil
-			} else if err != nil {
-				return err
-			}
-			switch f := f.(type) {
-			case *WindowUpdateFrame, *SettingsFrame:
-			case *HeadersFrame:
-				switch f.StreamID {
-				case 1:
-					// Send a valid response to first request.
-					var buf bytes.Buffer
-					enc := hpack.NewEncoder(&buf)
-					enc.WriteField(hpack.HeaderField{Name: ":status", Value: "200"})
-					ct.fr.WriteHeaders(HeadersFrameParam{
-						StreamID:      f.StreamID,
-						EndHeaders:    true,
-						EndStream:     true,
-						BlockFragment: buf.Bytes(),
-					})
-				case 3:
-					ct.fr.WriteData(f.StreamID, true, []byte("payload"))
-				}
-			default:
-				return fmt.Errorf("Unexpected client frame %v", f)
-			}
-		}
-	}
-	ct.run()
-}
-func TestTransportRequestsStallAtServerLimit(t *testing.T) {
-	const maxConcurrent = 2
-
-	greet := make(chan struct{})      // server sends initial SETTINGS frame
-	gotRequest := make(chan struct{}) // server received a request
-	clientDone := make(chan struct{})
-
-	// Collect errors from goroutines.
-	var wg sync.WaitGroup
-	errs := make(chan error, 100)
-	defer func() {
-		wg.Wait()
-		close(errs)
-		for err := range errs {
-			t.Error(err)
-		}
-	}()
-
-	// We will send maxConcurrent+2 requests. This checker goroutine waits for the
-	// following stages:
-	//   1. The first maxConcurrent requests are received by the server.
-	//   2. The client will cancel the next request
-	//   3. The server is unblocked so it can service the first maxConcurrent requests
-	//   4. The client will send the final request
-	wg.Add(1)
-	unblockClient := make(chan struct{})
-	clientRequestCancelled := make(chan struct{})
-	unblockServer := make(chan struct{})
-	go func() {
-		defer wg.Done()
-		// Stage 1.
-		for k := 0; k < maxConcurrent; k++ {
-			<-gotRequest
-		}
-		// Stage 2.
-		close(unblockClient)
-		<-clientRequestCancelled
-		// Stage 3: give some time for the final RoundTrip call to be scheduled and
-		// verify that the final request is not sent.
-		time.Sleep(50 * time.Millisecond)
-		select {
-		case <-gotRequest:
-			errs <- errors.New("last request did not stall")
-			close(unblockServer)
-			return
-		default:
-		}
-		close(unblockServer)
-		// Stage 4.
-		<-gotRequest
-	}()
-
-	ct := newClientTester(t)
-	ct.client = func() error {
-		var wg sync.WaitGroup
-		defer func() {
-			wg.Wait()
-			close(clientDone)
-			ct.cc.(*net.TCPConn).CloseWrite()
-		}()
-		for k := 0; k < maxConcurrent+2; k++ {
-			wg.Add(1)
-			go func(k int) {
-				defer wg.Done()
-				// Don't send the second request until after receiving SETTINGS from the server
-				// to avoid a race where we use the default SettingMaxConcurrentStreams, which
-				// is much larger than maxConcurrent. We have to send the first request before
-				// waiting because the first request triggers the dial and greet.
-				if k > 0 {
-					<-greet
-				}
-				// Block until maxConcurrent requests are sent before sending any more.
-				if k >= maxConcurrent {
-					<-unblockClient
-				}
-				req, _ := http.NewRequest("GET", fmt.Sprintf("https://dummy.tld/%d", k), nil)
-				if k == maxConcurrent {
-					// This request will be canceled.
-					cancel := make(chan struct{})
-					req.Cancel = cancel
-					close(cancel)
-					_, err := ct.tr.RoundTrip(req)
-					close(clientRequestCancelled)
-					if err == nil {
-						errs <- fmt.Errorf("RoundTrip(%d) should have failed due to cancel", k)
-						return
-					}
-				} else {
-					resp, err := ct.tr.RoundTrip(req)
-					if err != nil {
-						errs <- fmt.Errorf("RoundTrip(%d): %v", k, err)
-						return
-					}
-					ioutil.ReadAll(resp.Body)
-					resp.Body.Close()
-					if resp.StatusCode != 204 {
-						errs <- fmt.Errorf("Status = %v; want 204", resp.StatusCode)
-						return
-					}
-				}
-			}(k)
-		}
-		return nil
-	}
-
-	ct.server = func() error {
-		var wg sync.WaitGroup
-		defer wg.Wait()
-
-		ct.greet(Setting{SettingMaxConcurrentStreams, maxConcurrent})
-
-		// Server write loop.
-		var buf bytes.Buffer
-		enc := hpack.NewEncoder(&buf)
-		writeResp := make(chan uint32, maxConcurrent+1)
-
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			<-unblockServer
-			for id := range writeResp {
-				buf.Reset()
-				enc.WriteField(hpack.HeaderField{Name: ":status", Value: "204"})
-				ct.fr.WriteHeaders(HeadersFrameParam{
-					StreamID:      id,
-					EndHeaders:    true,
-					EndStream:     true,
-					BlockFragment: buf.Bytes(),
-				})
-			}
-		}()
-
-		// Server read loop.
-		var nreq int
-		for {
-			f, err := ct.fr.ReadFrame()
-			if err != nil {
-				select {
-				case <-clientDone:
-					// If the client's done, it will have reported any errors on its side.
-					return nil
-				default:
-					return err
-				}
-			}
-			switch f := f.(type) {
-			case *WindowUpdateFrame:
-			case *SettingsFrame:
-				// Wait for the client SETTINGS ack until ending the greet.
-				close(greet)
-			case *HeadersFrame:
-				if !f.HeadersEnded() {
-					return fmt.Errorf("headers should have END_HEADERS be ended: %v", f)
-				}
-				gotRequest <- struct{}{}
-				nreq++
-				writeResp <- f.StreamID
-				if nreq == maxConcurrent+1 {
-					close(writeResp)
-				}
-			default:
-				return fmt.Errorf("Unexpected client frame %v", f)
-			}
-		}
-	}
-
-	ct.run()
-}
-
-func TestAuthorityAddr(t *testing.T) {
-	tests := []struct {
-		scheme, authority string
-		want              string
-	}{
-		{"http", "foo.com", "foo.com:80"},
-		{"https", "foo.com", "foo.com:443"},
-		{"https", "foo.com:1234", "foo.com:1234"},
-		{"https", "1.2.3.4:1234", "1.2.3.4:1234"},
-		{"https", "1.2.3.4", "1.2.3.4:443"},
-		{"https", "[::1]:1234", "[::1]:1234"},
-		{"https", "[::1]", "[::1]:443"},
-	}
-	for _, tt := range tests {
-		got := authorityAddr(tt.scheme, tt.authority)
-		if got != tt.want {
-			t.Errorf("authorityAddr(%q, %q) = %q; want %q", tt.scheme, tt.authority, got, tt.want)
-		}
-	}
-}
-
-// Issue 20448: stop allocating for DATA frames' payload after
-// Response.Body.Close is called.
-func TestTransportAllocationsAfterResponseBodyClose(t *testing.T) {
-	megabyteZero := make([]byte, 1<<20)
-
-	writeErr := make(chan error, 1)
-
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		w.(http.Flusher).Flush()
-		var sum int64
-		for i := 0; i < 100; i++ {
-			n, err := w.Write(megabyteZero)
-			sum += int64(n)
-			if err != nil {
-				writeErr <- err
-				return
-			}
-		}
-		t.Logf("wrote all %d bytes", sum)
-		writeErr <- nil
-	}, optOnlyServer)
-	defer st.Close()
-
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-	c := &http.Client{Transport: tr}
-	res, err := c.Get(st.ts.URL)
-	if err != nil {
-		t.Fatal(err)
-	}
-	var buf [1]byte
-	if _, err := res.Body.Read(buf[:]); err != nil {
-		t.Error(err)
-	}
-	if err := res.Body.Close(); err != nil {
-		t.Error(err)
-	}
-
-	trb, ok := res.Body.(transportResponseBody)
-	if !ok {
-		t.Fatalf("res.Body = %T; want transportResponseBody", res.Body)
-	}
-	if trb.cs.bufPipe.b != nil {
-		t.Errorf("response body pipe is still open")
-	}
-
-	gotErr := <-writeErr
-	if gotErr == nil {
-		t.Errorf("Handler unexpectedly managed to write its entire response without getting an error")
-	} else if gotErr != errStreamClosed {
-		t.Errorf("Handler Write err = %v; want errStreamClosed", gotErr)
-	}
-}
-
-// Issue 18891: make sure Request.Body == NoBody means no DATA frame
-// is ever sent, even if empty.
-func TestTransportNoBodyMeansNoDATA(t *testing.T) {
-	ct := newClientTester(t)
-
-	unblockClient := make(chan bool)
-
-	ct.client = func() error {
-		req, _ := http.NewRequest("GET", "https://dummy.tld/", go18httpNoBody())
-		ct.tr.RoundTrip(req)
-		<-unblockClient
-		return nil
-	}
-	ct.server = func() error {
-		defer close(unblockClient)
-		defer ct.cc.(*net.TCPConn).Close()
-		ct.greet()
-
-		for {
-			f, err := ct.fr.ReadFrame()
-			if err != nil {
-				return fmt.Errorf("ReadFrame while waiting for Headers: %v", err)
-			}
-			switch f := f.(type) {
-			default:
-				return fmt.Errorf("Got %T; want HeadersFrame", f)
-			case *WindowUpdateFrame, *SettingsFrame:
-				continue
-			case *HeadersFrame:
-				if !f.StreamEnded() {
-					return fmt.Errorf("got headers frame without END_STREAM")
-				}
-				return nil
-			}
-		}
-	}
-	ct.run()
-}
-
-func benchSimpleRoundTrip(b *testing.B, nHeaders int) {
-	defer disableGoroutineTracking()()
-	b.ReportAllocs()
-	st := newServerTester(b,
-		func(w http.ResponseWriter, r *http.Request) {
-		},
-		optOnlyServer,
-		optQuiet,
-	)
-	defer st.Close()
-
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-
-	req, err := http.NewRequest("GET", st.ts.URL, nil)
-	if err != nil {
-		b.Fatal(err)
-	}
-
-	for i := 0; i < nHeaders; i++ {
-		name := fmt.Sprint("A-", i)
-		req.Header.Set(name, "*")
-	}
-
-	b.ResetTimer()
-
-	for i := 0; i < b.N; i++ {
-		res, err := tr.RoundTrip(req)
-		if err != nil {
-			if res != nil {
-				res.Body.Close()
-			}
-			b.Fatalf("RoundTrip err = %v; want nil", err)
-		}
-		res.Body.Close()
-		if res.StatusCode != http.StatusOK {
-			b.Fatalf("Response code = %v; want %v", res.StatusCode, http.StatusOK)
-		}
-	}
-}
-
-type infiniteReader struct{}
-
-func (r infiniteReader) Read(b []byte) (int, error) {
-	return len(b), nil
-}
-
-// Issue 20521: it is not an error to receive a response and end stream
-// from the server without the body being consumed.
-func TestTransportResponseAndResetWithoutConsumingBodyRace(t *testing.T) {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(http.StatusOK)
-	}, optOnlyServer)
-	defer st.Close()
-
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-
-	// The request body needs to be big enough to trigger flow control.
-	req, _ := http.NewRequest("PUT", st.ts.URL, infiniteReader{})
-	res, err := tr.RoundTrip(req)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if res.StatusCode != http.StatusOK {
-		t.Fatalf("Response code = %v; want %v", res.StatusCode, http.StatusOK)
-	}
-}
-
-// Verify transport doesn't crash when receiving bogus response lacking a :status header.
-// Issue 22880.
-func TestTransportHandlesInvalidStatuslessResponse(t *testing.T) {
-	ct := newClientTester(t)
-	ct.client = func() error {
-		req, _ := http.NewRequest("GET", "https://dummy.tld/", nil)
-		_, err := ct.tr.RoundTrip(req)
-		const substr = "malformed response from server: missing status pseudo header"
-		if !strings.Contains(fmt.Sprint(err), substr) {
-			return fmt.Errorf("RoundTrip error = %v; want substring %q", err, substr)
-		}
-		return nil
-	}
-	ct.server = func() error {
-		ct.greet()
-		var buf bytes.Buffer
-		enc := hpack.NewEncoder(&buf)
-
-		for {
-			f, err := ct.fr.ReadFrame()
-			if err != nil {
-				return err
-			}
-			switch f := f.(type) {
-			case *HeadersFrame:
-				enc.WriteField(hpack.HeaderField{Name: "content-type", Value: "text/html"}) // no :status header
-				ct.fr.WriteHeaders(HeadersFrameParam{
-					StreamID:      f.StreamID,
-					EndHeaders:    true,
-					EndStream:     false, // we'll send some DATA to try to crash the transport
-					BlockFragment: buf.Bytes(),
-				})
-				ct.fr.WriteData(f.StreamID, true, []byte("payload"))
-				return nil
-			}
-		}
-	}
-	ct.run()
-}
-
-func BenchmarkClientRequestHeaders(b *testing.B) {
-	b.Run("   0 Headers", func(b *testing.B) { benchSimpleRoundTrip(b, 0) })
-	b.Run("  10 Headers", func(b *testing.B) { benchSimpleRoundTrip(b, 10) })
-	b.Run(" 100 Headers", func(b *testing.B) { benchSimpleRoundTrip(b, 100) })
-	b.Run("1000 Headers", func(b *testing.B) { benchSimpleRoundTrip(b, 1000) })
-}
diff --git a/vendor/golang.org/x/net/http2/writesched_priority_test.go b/vendor/golang.org/x/net/http2/writesched_priority_test.go
deleted file mode 100644
index f2b535a2..00000000
--- a/vendor/golang.org/x/net/http2/writesched_priority_test.go
+++ /dev/null
@@ -1,541 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import (
-	"bytes"
-	"fmt"
-	"sort"
-	"testing"
-)
-
-func defaultPriorityWriteScheduler() *priorityWriteScheduler {
-	return NewPriorityWriteScheduler(nil).(*priorityWriteScheduler)
-}
-
-func checkPriorityWellFormed(ws *priorityWriteScheduler) error {
-	for id, n := range ws.nodes {
-		if id != n.id {
-			return fmt.Errorf("bad ws.nodes: ws.nodes[%d] = %d", id, n.id)
-		}
-		if n.parent == nil {
-			if n.next != nil || n.prev != nil {
-				return fmt.Errorf("bad node %d: nil parent but prev/next not nil", id)
-			}
-			continue
-		}
-		found := false
-		for k := n.parent.kids; k != nil; k = k.next {
-			if k.id == id {
-				found = true
-				break
-			}
-		}
-		if !found {
-			return fmt.Errorf("bad node %d: not found in parent %d kids list", id, n.parent.id)
-		}
-	}
-	return nil
-}
-
-func fmtTree(ws *priorityWriteScheduler, fmtNode func(*priorityNode) string) string {
-	var ids []int
-	for _, n := range ws.nodes {
-		ids = append(ids, int(n.id))
-	}
-	sort.Ints(ids)
-
-	var buf bytes.Buffer
-	for _, id := range ids {
-		if buf.Len() != 0 {
-			buf.WriteString(" ")
-		}
-		if id == 0 {
-			buf.WriteString(fmtNode(&ws.root))
-		} else {
-			buf.WriteString(fmtNode(ws.nodes[uint32(id)]))
-		}
-	}
-	return buf.String()
-}
-
-func fmtNodeParentSkipRoot(n *priorityNode) string {
-	switch {
-	case n.id == 0:
-		return ""
-	case n.parent == nil:
-		return fmt.Sprintf("%d{parent:nil}", n.id)
-	default:
-		return fmt.Sprintf("%d{parent:%d}", n.id, n.parent.id)
-	}
-}
-
-func fmtNodeWeightParentSkipRoot(n *priorityNode) string {
-	switch {
-	case n.id == 0:
-		return ""
-	case n.parent == nil:
-		return fmt.Sprintf("%d{weight:%d,parent:nil}", n.id, n.weight)
-	default:
-		return fmt.Sprintf("%d{weight:%d,parent:%d}", n.id, n.weight, n.parent.id)
-	}
-}
-
-func TestPriorityTwoStreams(t *testing.T) {
-	ws := defaultPriorityWriteScheduler()
-	ws.OpenStream(1, OpenStreamOptions{})
-	ws.OpenStream(2, OpenStreamOptions{})
-
-	want := "1{weight:15,parent:0} 2{weight:15,parent:0}"
-	if got := fmtTree(ws, fmtNodeWeightParentSkipRoot); got != want {
-		t.Errorf("After open\ngot  %q\nwant %q", got, want)
-	}
-
-	// Move 1's parent to 2.
-	ws.AdjustStream(1, PriorityParam{
-		StreamDep: 2,
-		Weight:    32,
-		Exclusive: false,
-	})
-	want = "1{weight:32,parent:2} 2{weight:15,parent:0}"
-	if got := fmtTree(ws, fmtNodeWeightParentSkipRoot); got != want {
-		t.Errorf("After adjust\ngot  %q\nwant %q", got, want)
-	}
-
-	if err := checkPriorityWellFormed(ws); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestPriorityAdjustExclusiveZero(t *testing.T) {
-	// 1, 2, and 3 are all children of the 0 stream.
-	// Exclusive reprioritization to any of the streams should bring
-	// the rest of the streams under the reprioritized stream.
-	ws := defaultPriorityWriteScheduler()
-	ws.OpenStream(1, OpenStreamOptions{})
-	ws.OpenStream(2, OpenStreamOptions{})
-	ws.OpenStream(3, OpenStreamOptions{})
-
-	want := "1{weight:15,parent:0} 2{weight:15,parent:0} 3{weight:15,parent:0}"
-	if got := fmtTree(ws, fmtNodeWeightParentSkipRoot); got != want {
-		t.Errorf("After open\ngot  %q\nwant %q", got, want)
-	}
-
-	ws.AdjustStream(2, PriorityParam{
-		StreamDep: 0,
-		Weight:    20,
-		Exclusive: true,
-	})
-	want = "1{weight:15,parent:2} 2{weight:20,parent:0} 3{weight:15,parent:2}"
-	if got := fmtTree(ws, fmtNodeWeightParentSkipRoot); got != want {
-		t.Errorf("After adjust\ngot  %q\nwant %q", got, want)
-	}
-
-	if err := checkPriorityWellFormed(ws); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestPriorityAdjustOwnParent(t *testing.T) {
-	// Assigning a node as its own parent should have no effect.
-	ws := defaultPriorityWriteScheduler()
-	ws.OpenStream(1, OpenStreamOptions{})
-	ws.OpenStream(2, OpenStreamOptions{})
-	ws.AdjustStream(2, PriorityParam{
-		StreamDep: 2,
-		Weight:    20,
-		Exclusive: true,
-	})
-	want := "1{weight:15,parent:0} 2{weight:15,parent:0}"
-	if got := fmtTree(ws, fmtNodeWeightParentSkipRoot); got != want {
-		t.Errorf("After adjust\ngot  %q\nwant %q", got, want)
-	}
-	if err := checkPriorityWellFormed(ws); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestPriorityClosedStreams(t *testing.T) {
-	ws := NewPriorityWriteScheduler(&PriorityWriteSchedulerConfig{MaxClosedNodesInTree: 2}).(*priorityWriteScheduler)
-	ws.OpenStream(1, OpenStreamOptions{})
-	ws.OpenStream(2, OpenStreamOptions{PusherID: 1})
-	ws.OpenStream(3, OpenStreamOptions{PusherID: 2})
-	ws.OpenStream(4, OpenStreamOptions{PusherID: 3})
-
-	// Close the first three streams. We lose 1, but keep 2 and 3.
-	ws.CloseStream(1)
-	ws.CloseStream(2)
-	ws.CloseStream(3)
-
-	want := "2{weight:15,parent:0} 3{weight:15,parent:2} 4{weight:15,parent:3}"
-	if got := fmtTree(ws, fmtNodeWeightParentSkipRoot); got != want {
-		t.Errorf("After close\ngot  %q\nwant %q", got, want)
-	}
-	if err := checkPriorityWellFormed(ws); err != nil {
-		t.Error(err)
-	}
-
-	// Adding a stream as an exclusive child of 1 gives it default
-	// priorities, since 1 is gone.
-	ws.OpenStream(5, OpenStreamOptions{})
-	ws.AdjustStream(5, PriorityParam{StreamDep: 1, Weight: 15, Exclusive: true})
-
-	// Adding a stream as an exclusive child of 2 should work, since 2 is not gone.
-	ws.OpenStream(6, OpenStreamOptions{})
-	ws.AdjustStream(6, PriorityParam{StreamDep: 2, Weight: 15, Exclusive: true})
-
-	want = "2{weight:15,parent:0} 3{weight:15,parent:6} 4{weight:15,parent:3} 5{weight:15,parent:0} 6{weight:15,parent:2}"
-	if got := fmtTree(ws, fmtNodeWeightParentSkipRoot); got != want {
-		t.Errorf("After add streams\ngot  %q\nwant %q", got, want)
-	}
-	if err := checkPriorityWellFormed(ws); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestPriorityClosedStreamsDisabled(t *testing.T) {
-	ws := NewPriorityWriteScheduler(&PriorityWriteSchedulerConfig{}).(*priorityWriteScheduler)
-	ws.OpenStream(1, OpenStreamOptions{})
-	ws.OpenStream(2, OpenStreamOptions{PusherID: 1})
-	ws.OpenStream(3, OpenStreamOptions{PusherID: 2})
-
-	// Close the first two streams. We keep only 3.
-	ws.CloseStream(1)
-	ws.CloseStream(2)
-
-	want := "3{weight:15,parent:0}"
-	if got := fmtTree(ws, fmtNodeWeightParentSkipRoot); got != want {
-		t.Errorf("After close\ngot  %q\nwant %q", got, want)
-	}
-	if err := checkPriorityWellFormed(ws); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestPriorityIdleStreams(t *testing.T) {
-	ws := NewPriorityWriteScheduler(&PriorityWriteSchedulerConfig{MaxIdleNodesInTree: 2}).(*priorityWriteScheduler)
-	ws.AdjustStream(1, PriorityParam{StreamDep: 0, Weight: 15}) // idle
-	ws.AdjustStream(2, PriorityParam{StreamDep: 0, Weight: 15}) // idle
-	ws.AdjustStream(3, PriorityParam{StreamDep: 2, Weight: 20}) // idle
-	ws.OpenStream(4, OpenStreamOptions{})
-	ws.OpenStream(5, OpenStreamOptions{})
-	ws.OpenStream(6, OpenStreamOptions{})
-	ws.AdjustStream(4, PriorityParam{StreamDep: 1, Weight: 15})
-	ws.AdjustStream(5, PriorityParam{StreamDep: 2, Weight: 15})
-	ws.AdjustStream(6, PriorityParam{StreamDep: 3, Weight: 15})
-
-	want := "2{weight:15,parent:0} 3{weight:20,parent:2} 4{weight:15,parent:0} 5{weight:15,parent:2} 6{weight:15,parent:3}"
-	if got := fmtTree(ws, fmtNodeWeightParentSkipRoot); got != want {
-		t.Errorf("After open\ngot  %q\nwant %q", got, want)
-	}
-	if err := checkPriorityWellFormed(ws); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestPriorityIdleStreamsDisabled(t *testing.T) {
-	ws := NewPriorityWriteScheduler(&PriorityWriteSchedulerConfig{}).(*priorityWriteScheduler)
-	ws.AdjustStream(1, PriorityParam{StreamDep: 0, Weight: 15}) // idle
-	ws.AdjustStream(2, PriorityParam{StreamDep: 0, Weight: 15}) // idle
-	ws.AdjustStream(3, PriorityParam{StreamDep: 2, Weight: 20}) // idle
-	ws.OpenStream(4, OpenStreamOptions{})
-
-	want := "4{weight:15,parent:0}"
-	if got := fmtTree(ws, fmtNodeWeightParentSkipRoot); got != want {
-		t.Errorf("After open\ngot  %q\nwant %q", got, want)
-	}
-	if err := checkPriorityWellFormed(ws); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestPrioritySection531NonExclusive(t *testing.T) {
-	// Example from RFC 7540 Section 5.3.1.
-	// A,B,C,D = 1,2,3,4
-	ws := defaultPriorityWriteScheduler()
-	ws.OpenStream(1, OpenStreamOptions{})
-	ws.OpenStream(2, OpenStreamOptions{PusherID: 1})
-	ws.OpenStream(3, OpenStreamOptions{PusherID: 1})
-	ws.OpenStream(4, OpenStreamOptions{})
-	ws.AdjustStream(4, PriorityParam{
-		StreamDep: 1,
-		Weight:    15,
-		Exclusive: false,
-	})
-	want := "1{parent:0} 2{parent:1} 3{parent:1} 4{parent:1}"
-	if got := fmtTree(ws, fmtNodeParentSkipRoot); got != want {
-		t.Errorf("After adjust\ngot  %q\nwant %q", got, want)
-	}
-	if err := checkPriorityWellFormed(ws); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestPrioritySection531Exclusive(t *testing.T) {
-	// Example from RFC 7540 Section 5.3.1.
-	// A,B,C,D = 1,2,3,4
-	ws := defaultPriorityWriteScheduler()
-	ws.OpenStream(1, OpenStreamOptions{})
-	ws.OpenStream(2, OpenStreamOptions{PusherID: 1})
-	ws.OpenStream(3, OpenStreamOptions{PusherID: 1})
-	ws.OpenStream(4, OpenStreamOptions{})
-	ws.AdjustStream(4, PriorityParam{
-		StreamDep: 1,
-		Weight:    15,
-		Exclusive: true,
-	})
-	want := "1{parent:0} 2{parent:4} 3{parent:4} 4{parent:1}"
-	if got := fmtTree(ws, fmtNodeParentSkipRoot); got != want {
-		t.Errorf("After adjust\ngot  %q\nwant %q", got, want)
-	}
-	if err := checkPriorityWellFormed(ws); err != nil {
-		t.Error(err)
-	}
-}
-
-func makeSection533Tree() *priorityWriteScheduler {
-	// Initial tree from RFC 7540 Section 5.3.3.
-	// A,B,C,D,E,F = 1,2,3,4,5,6
-	ws := defaultPriorityWriteScheduler()
-	ws.OpenStream(1, OpenStreamOptions{})
-	ws.OpenStream(2, OpenStreamOptions{PusherID: 1})
-	ws.OpenStream(3, OpenStreamOptions{PusherID: 1})
-	ws.OpenStream(4, OpenStreamOptions{PusherID: 3})
-	ws.OpenStream(5, OpenStreamOptions{PusherID: 3})
-	ws.OpenStream(6, OpenStreamOptions{PusherID: 4})
-	return ws
-}
-
-func TestPrioritySection533NonExclusive(t *testing.T) {
-	// Example from RFC 7540 Section 5.3.3.
-	// A,B,C,D,E,F = 1,2,3,4,5,6
-	ws := defaultPriorityWriteScheduler()
-	ws.OpenStream(1, OpenStreamOptions{})
-	ws.OpenStream(2, OpenStreamOptions{PusherID: 1})
-	ws.OpenStream(3, OpenStreamOptions{PusherID: 1})
-	ws.OpenStream(4, OpenStreamOptions{PusherID: 3})
-	ws.OpenStream(5, OpenStreamOptions{PusherID: 3})
-	ws.OpenStream(6, OpenStreamOptions{PusherID: 4})
-	ws.AdjustStream(1, PriorityParam{
-		StreamDep: 4,
-		Weight:    15,
-		Exclusive: false,
-	})
-	want := "1{parent:4} 2{parent:1} 3{parent:1} 4{parent:0} 5{parent:3} 6{parent:4}"
-	if got := fmtTree(ws, fmtNodeParentSkipRoot); got != want {
-		t.Errorf("After adjust\ngot  %q\nwant %q", got, want)
-	}
-	if err := checkPriorityWellFormed(ws); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestPrioritySection533Exclusive(t *testing.T) {
-	// Example from RFC 7540 Section 5.3.3.
-	// A,B,C,D,E,F = 1,2,3,4,5,6
-	ws := defaultPriorityWriteScheduler()
-	ws.OpenStream(1, OpenStreamOptions{})
-	ws.OpenStream(2, OpenStreamOptions{PusherID: 1})
-	ws.OpenStream(3, OpenStreamOptions{PusherID: 1})
-	ws.OpenStream(4, OpenStreamOptions{PusherID: 3})
-	ws.OpenStream(5, OpenStreamOptions{PusherID: 3})
-	ws.OpenStream(6, OpenStreamOptions{PusherID: 4})
-	ws.AdjustStream(1, PriorityParam{
-		StreamDep: 4,
-		Weight:    15,
-		Exclusive: true,
-	})
-	want := "1{parent:4} 2{parent:1} 3{parent:1} 4{parent:0} 5{parent:3} 6{parent:1}"
-	if got := fmtTree(ws, fmtNodeParentSkipRoot); got != want {
-		t.Errorf("After adjust\ngot  %q\nwant %q", got, want)
-	}
-	if err := checkPriorityWellFormed(ws); err != nil {
-		t.Error(err)
-	}
-}
-
-func checkPopAll(ws WriteScheduler, order []uint32) error {
-	for k, id := range order {
-		wr, ok := ws.Pop()
-		if !ok {
-			return fmt.Errorf("Pop[%d]: got ok=false, want %d (order=%v)", k, id, order)
-		}
-		if got := wr.StreamID(); got != id {
-			return fmt.Errorf("Pop[%d]: got %v, want %d (order=%v)", k, got, id, order)
-		}
-	}
-	wr, ok := ws.Pop()
-	if ok {
-		return fmt.Errorf("Pop[%d]: got %v, want ok=false (order=%v)", len(order), wr.StreamID(), order)
-	}
-	return nil
-}
-
-func TestPriorityPopFrom533Tree(t *testing.T) {
-	ws := makeSection533Tree()
-
-	ws.Push(makeWriteHeadersRequest(3 /*C*/))
-	ws.Push(makeWriteNonStreamRequest())
-	ws.Push(makeWriteHeadersRequest(5 /*E*/))
-	ws.Push(makeWriteHeadersRequest(1 /*A*/))
-	t.Log("tree:", fmtTree(ws, fmtNodeParentSkipRoot))
-
-	if err := checkPopAll(ws, []uint32{0 /*NonStream*/, 1, 3, 5}); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestPriorityPopFromLinearTree(t *testing.T) {
-	ws := defaultPriorityWriteScheduler()
-	ws.OpenStream(1, OpenStreamOptions{})
-	ws.OpenStream(2, OpenStreamOptions{PusherID: 1})
-	ws.OpenStream(3, OpenStreamOptions{PusherID: 2})
-	ws.OpenStream(4, OpenStreamOptions{PusherID: 3})
-
-	ws.Push(makeWriteHeadersRequest(3))
-	ws.Push(makeWriteHeadersRequest(4))
-	ws.Push(makeWriteHeadersRequest(1))
-	ws.Push(makeWriteHeadersRequest(2))
-	ws.Push(makeWriteNonStreamRequest())
-	ws.Push(makeWriteNonStreamRequest())
-	t.Log("tree:", fmtTree(ws, fmtNodeParentSkipRoot))
-
-	if err := checkPopAll(ws, []uint32{0, 0 /*NonStreams*/, 1, 2, 3, 4}); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestPriorityFlowControl(t *testing.T) {
-	ws := NewPriorityWriteScheduler(&PriorityWriteSchedulerConfig{ThrottleOutOfOrderWrites: false})
-	ws.OpenStream(1, OpenStreamOptions{})
-	ws.OpenStream(2, OpenStreamOptions{PusherID: 1})
-
-	sc := &serverConn{maxFrameSize: 16}
-	st1 := &stream{id: 1, sc: sc}
-	st2 := &stream{id: 2, sc: sc}
-
-	ws.Push(FrameWriteRequest{&writeData{1, make([]byte, 16), false}, st1, nil})
-	ws.Push(FrameWriteRequest{&writeData{2, make([]byte, 16), false}, st2, nil})
-	ws.AdjustStream(2, PriorityParam{StreamDep: 1})
-
-	// No flow-control bytes available.
-	if wr, ok := ws.Pop(); ok {
-		t.Fatalf("Pop(limited by flow control)=%v,true, want false", wr)
-	}
-
-	// Add enough flow-control bytes to write st2 in two Pop calls.
-	// Should write data from st2 even though it's lower priority than st1.
-	for i := 1; i <= 2; i++ {
-		st2.flow.add(8)
-		wr, ok := ws.Pop()
-		if !ok {
-			t.Fatalf("Pop(%d)=false, want true", i)
-		}
-		if got, want := wr.DataSize(), 8; got != want {
-			t.Fatalf("Pop(%d)=%d bytes, want %d bytes", i, got, want)
-		}
-	}
-}
-
-func TestPriorityThrottleOutOfOrderWrites(t *testing.T) {
-	ws := NewPriorityWriteScheduler(&PriorityWriteSchedulerConfig{ThrottleOutOfOrderWrites: true})
-	ws.OpenStream(1, OpenStreamOptions{})
-	ws.OpenStream(2, OpenStreamOptions{PusherID: 1})
-
-	sc := &serverConn{maxFrameSize: 4096}
-	st1 := &stream{id: 1, sc: sc}
-	st2 := &stream{id: 2, sc: sc}
-	st1.flow.add(4096)
-	st2.flow.add(4096)
-	ws.Push(FrameWriteRequest{&writeData{2, make([]byte, 4096), false}, st2, nil})
-	ws.AdjustStream(2, PriorityParam{StreamDep: 1})
-
-	// We have enough flow-control bytes to write st2 in a single Pop call.
-	// However, due to out-of-order write throttling, the first call should
-	// only write 1KB.
-	wr, ok := ws.Pop()
-	if !ok {
-		t.Fatalf("Pop(st2.first)=false, want true")
-	}
-	if got, want := wr.StreamID(), uint32(2); got != want {
-		t.Fatalf("Pop(st2.first)=stream %d, want stream %d", got, want)
-	}
-	if got, want := wr.DataSize(), 1024; got != want {
-		t.Fatalf("Pop(st2.first)=%d bytes, want %d bytes", got, want)
-	}
-
-	// Now add data on st1. This should take precedence.
-	ws.Push(FrameWriteRequest{&writeData{1, make([]byte, 4096), false}, st1, nil})
-	wr, ok = ws.Pop()
-	if !ok {
-		t.Fatalf("Pop(st1)=false, want true")
-	}
-	if got, want := wr.StreamID(), uint32(1); got != want {
-		t.Fatalf("Pop(st1)=stream %d, want stream %d", got, want)
-	}
-	if got, want := wr.DataSize(), 4096; got != want {
-		t.Fatalf("Pop(st1)=%d bytes, want %d bytes", got, want)
-	}
-
-	// Should go back to writing 1KB from st2.
-	wr, ok = ws.Pop()
-	if !ok {
-		t.Fatalf("Pop(st2.last)=false, want true")
-	}
-	if got, want := wr.StreamID(), uint32(2); got != want {
-		t.Fatalf("Pop(st2.last)=stream %d, want stream %d", got, want)
-	}
-	if got, want := wr.DataSize(), 1024; got != want {
-		t.Fatalf("Pop(st2.last)=%d bytes, want %d bytes", got, want)
-	}
-}
-
-func TestPriorityWeights(t *testing.T) {
-	ws := defaultPriorityWriteScheduler()
-	ws.OpenStream(1, OpenStreamOptions{})
-	ws.OpenStream(2, OpenStreamOptions{})
-
-	sc := &serverConn{maxFrameSize: 8}
-	st1 := &stream{id: 1, sc: sc}
-	st2 := &stream{id: 2, sc: sc}
-	st1.flow.add(40)
-	st2.flow.add(40)
-
-	ws.Push(FrameWriteRequest{&writeData{1, make([]byte, 40), false}, st1, nil})
-	ws.Push(FrameWriteRequest{&writeData{2, make([]byte, 40), false}, st2, nil})
-	ws.AdjustStream(1, PriorityParam{StreamDep: 0, Weight: 34})
-	ws.AdjustStream(2, PriorityParam{StreamDep: 0, Weight: 9})
-
-	// st1 gets 3.5x the bandwidth of st2 (3.5 = (34+1)/(9+1)).
-	// The maximum frame size is 8 bytes. The write sequence should be:
-	//   st1, total bytes so far is (st1=8,  st=0)
-	//   st2, total bytes so far is (st1=8,  st=8)
-	//   st1, total bytes so far is (st1=16, st=8)
-	//   st1, total bytes so far is (st1=24, st=8)   // 3x bandwidth
-	//   st1, total bytes so far is (st1=32, st=8)   // 4x bandwidth
-	//   st2, total bytes so far is (st1=32, st=16)  // 2x bandwidth
-	//   st1, total bytes so far is (st1=40, st=16)
-	//   st2, total bytes so far is (st1=40, st=24)
-	//   st2, total bytes so far is (st1=40, st=32)
-	//   st2, total bytes so far is (st1=40, st=40)
-	if err := checkPopAll(ws, []uint32{1, 2, 1, 1, 1, 2, 1, 2, 2, 2}); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestPriorityRstStreamOnNonOpenStreams(t *testing.T) {
-	ws := NewPriorityWriteScheduler(&PriorityWriteSchedulerConfig{
-		MaxClosedNodesInTree: 0,
-		MaxIdleNodesInTree:   0,
-	})
-	ws.OpenStream(1, OpenStreamOptions{})
-	ws.CloseStream(1)
-	ws.Push(FrameWriteRequest{write: streamError(1, ErrCodeProtocol)})
-	ws.Push(FrameWriteRequest{write: streamError(2, ErrCodeProtocol)})
-
-	if err := checkPopAll(ws, []uint32{1, 2}); err != nil {
-		t.Error(err)
-	}
-}
diff --git a/vendor/golang.org/x/net/http2/writesched_random_test.go b/vendor/golang.org/x/net/http2/writesched_random_test.go
deleted file mode 100644
index 3bf4aa36..00000000
--- a/vendor/golang.org/x/net/http2/writesched_random_test.go
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import "testing"
-
-func TestRandomScheduler(t *testing.T) {
-	ws := NewRandomWriteScheduler()
-	ws.Push(makeWriteHeadersRequest(3))
-	ws.Push(makeWriteHeadersRequest(4))
-	ws.Push(makeWriteHeadersRequest(1))
-	ws.Push(makeWriteHeadersRequest(2))
-	ws.Push(makeWriteNonStreamRequest())
-	ws.Push(makeWriteNonStreamRequest())
-
-	// Pop all frames. Should get the non-stream requests first,
-	// followed by the stream requests in any order.
-	var order []FrameWriteRequest
-	for {
-		wr, ok := ws.Pop()
-		if !ok {
-			break
-		}
-		order = append(order, wr)
-	}
-	t.Logf("got frames: %v", order)
-	if len(order) != 6 {
-		t.Fatalf("got %d frames, expected 6", len(order))
-	}
-	if order[0].StreamID() != 0 || order[1].StreamID() != 0 {
-		t.Fatal("expected non-stream frames first", order[0], order[1])
-	}
-	got := make(map[uint32]bool)
-	for _, wr := range order[2:] {
-		got[wr.StreamID()] = true
-	}
-	for id := uint32(1); id <= 4; id++ {
-		if !got[id] {
-			t.Errorf("frame not found for stream %d", id)
-		}
-	}
-}
diff --git a/vendor/golang.org/x/net/http2/writesched_test.go b/vendor/golang.org/x/net/http2/writesched_test.go
deleted file mode 100644
index 0807056b..00000000
--- a/vendor/golang.org/x/net/http2/writesched_test.go
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import (
-	"fmt"
-	"math"
-	"reflect"
-	"testing"
-)
-
-func makeWriteNonStreamRequest() FrameWriteRequest {
-	return FrameWriteRequest{writeSettingsAck{}, nil, nil}
-}
-
-func makeWriteHeadersRequest(streamID uint32) FrameWriteRequest {
-	st := &stream{id: streamID}
-	return FrameWriteRequest{&writeResHeaders{streamID: streamID, httpResCode: 200}, st, nil}
-}
-
-func checkConsume(wr FrameWriteRequest, nbytes int32, want []FrameWriteRequest) error {
-	consumed, rest, n := wr.Consume(nbytes)
-	var wantConsumed, wantRest FrameWriteRequest
-	switch len(want) {
-	case 0:
-	case 1:
-		wantConsumed = want[0]
-	case 2:
-		wantConsumed = want[0]
-		wantRest = want[1]
-	}
-	if !reflect.DeepEqual(consumed, wantConsumed) || !reflect.DeepEqual(rest, wantRest) || n != len(want) {
-		return fmt.Errorf("got %v, %v, %v\nwant %v, %v, %v", consumed, rest, n, wantConsumed, wantRest, len(want))
-	}
-	return nil
-}
-
-func TestFrameWriteRequestNonData(t *testing.T) {
-	wr := makeWriteNonStreamRequest()
-	if got, want := wr.DataSize(), 0; got != want {
-		t.Errorf("DataSize: got %v, want %v", got, want)
-	}
-
-	// Non-DATA frames are always consumed whole.
-	if err := checkConsume(wr, 0, []FrameWriteRequest{wr}); err != nil {
-		t.Errorf("Consume:\n%v", err)
-	}
-}
-
-func TestFrameWriteRequestData(t *testing.T) {
-	st := &stream{
-		id: 1,
-		sc: &serverConn{maxFrameSize: 16},
-	}
-	const size = 32
-	wr := FrameWriteRequest{&writeData{st.id, make([]byte, size), true}, st, make(chan error)}
-	if got, want := wr.DataSize(), size; got != want {
-		t.Errorf("DataSize: got %v, want %v", got, want)
-	}
-
-	// No flow-control bytes available: cannot consume anything.
-	if err := checkConsume(wr, math.MaxInt32, []FrameWriteRequest{}); err != nil {
-		t.Errorf("Consume(limited by flow control):\n%v", err)
-	}
-
-	// Add enough flow-control bytes to consume the entire frame,
-	// but we're now restricted by st.sc.maxFrameSize.
-	st.flow.add(size)
-	want := []FrameWriteRequest{
-		{
-			write:  &writeData{st.id, make([]byte, st.sc.maxFrameSize), false},
-			stream: st,
-			done:   nil,
-		},
-		{
-			write:  &writeData{st.id, make([]byte, size-st.sc.maxFrameSize), true},
-			stream: st,
-			done:   wr.done,
-		},
-	}
-	if err := checkConsume(wr, math.MaxInt32, want); err != nil {
-		t.Errorf("Consume(limited by maxFrameSize):\n%v", err)
-	}
-	rest := want[1]
-
-	// Consume 8 bytes from the remaining frame.
-	want = []FrameWriteRequest{
-		{
-			write:  &writeData{st.id, make([]byte, 8), false},
-			stream: st,
-			done:   nil,
-		},
-		{
-			write:  &writeData{st.id, make([]byte, size-st.sc.maxFrameSize-8), true},
-			stream: st,
-			done:   wr.done,
-		},
-	}
-	if err := checkConsume(rest, 8, want); err != nil {
-		t.Errorf("Consume(8):\n%v", err)
-	}
-	rest = want[1]
-
-	// Consume all remaining bytes.
-	want = []FrameWriteRequest{
-		{
-			write:  &writeData{st.id, make([]byte, size-st.sc.maxFrameSize-8), true},
-			stream: st,
-			done:   wr.done,
-		},
-	}
-	if err := checkConsume(rest, math.MaxInt32, want); err != nil {
-		t.Errorf("Consume(remainder):\n%v", err)
-	}
-}
-
-func TestFrameWriteRequest_StreamID(t *testing.T) {
-	const streamID = 123
-	wr := FrameWriteRequest{write: streamError(streamID, ErrCodeNo)}
-	if got := wr.StreamID(); got != streamID {
-		t.Errorf("FrameWriteRequest(StreamError) = %v; want %v", got, streamID)
-	}
-}
diff --git a/vendor/golang.org/x/net/http2/z_spec_test.go b/vendor/golang.org/x/net/http2/z_spec_test.go
deleted file mode 100644
index 610b2cdb..00000000
--- a/vendor/golang.org/x/net/http2/z_spec_test.go
+++ /dev/null
@@ -1,356 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import (
-	"bytes"
-	"encoding/xml"
-	"flag"
-	"fmt"
-	"io"
-	"os"
-	"reflect"
-	"regexp"
-	"sort"
-	"strconv"
-	"strings"
-	"sync"
-	"testing"
-)
-
-var coverSpec = flag.Bool("coverspec", false, "Run spec coverage tests")
-
-// The global map of sentence coverage for the http2 spec.
-var defaultSpecCoverage specCoverage
-
-var loadSpecOnce sync.Once
-
-func loadSpec() {
-	if f, err := os.Open("testdata/draft-ietf-httpbis-http2.xml"); err != nil {
-		panic(err)
-	} else {
-		defaultSpecCoverage = readSpecCov(f)
-		f.Close()
-	}
-}
-
-// covers marks all sentences for section sec in defaultSpecCoverage. Sentences not
-// "covered" will be included in report outputted by TestSpecCoverage.
-func covers(sec, sentences string) {
-	loadSpecOnce.Do(loadSpec)
-	defaultSpecCoverage.cover(sec, sentences)
-}
-
-type specPart struct {
-	section  string
-	sentence string
-}
-
-func (ss specPart) Less(oo specPart) bool {
-	atoi := func(s string) int {
-		n, err := strconv.Atoi(s)
-		if err != nil {
-			panic(err)
-		}
-		return n
-	}
-	a := strings.Split(ss.section, ".")
-	b := strings.Split(oo.section, ".")
-	for len(a) > 0 {
-		if len(b) == 0 {
-			return false
-		}
-		x, y := atoi(a[0]), atoi(b[0])
-		if x == y {
-			a, b = a[1:], b[1:]
-			continue
-		}
-		return x < y
-	}
-	if len(b) > 0 {
-		return true
-	}
-	return false
-}
-
-type bySpecSection []specPart
-
-func (a bySpecSection) Len() int           { return len(a) }
-func (a bySpecSection) Less(i, j int) bool { return a[i].Less(a[j]) }
-func (a bySpecSection) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-
-type specCoverage struct {
-	coverage map[specPart]bool
-	d        *xml.Decoder
-}
-
-func joinSection(sec []int) string {
-	s := fmt.Sprintf("%d", sec[0])
-	for _, n := range sec[1:] {
-		s = fmt.Sprintf("%s.%d", s, n)
-	}
-	return s
-}
-
-func (sc specCoverage) readSection(sec []int) {
-	var (
-		buf = new(bytes.Buffer)
-		sub = 0
-	)
-	for {
-		tk, err := sc.d.Token()
-		if err != nil {
-			if err == io.EOF {
-				return
-			}
-			panic(err)
-		}
-		switch v := tk.(type) {
-		case xml.StartElement:
-			if skipElement(v) {
-				if err := sc.d.Skip(); err != nil {
-					panic(err)
-				}
-				if v.Name.Local == "section" {
-					sub++
-				}
-				break
-			}
-			switch v.Name.Local {
-			case "section":
-				sub++
-				sc.readSection(append(sec, sub))
-			case "xref":
-				buf.Write(sc.readXRef(v))
-			}
-		case xml.CharData:
-			if len(sec) == 0 {
-				break
-			}
-			buf.Write(v)
-		case xml.EndElement:
-			if v.Name.Local == "section" {
-				sc.addSentences(joinSection(sec), buf.String())
-				return
-			}
-		}
-	}
-}
-
-func (sc specCoverage) readXRef(se xml.StartElement) []byte {
-	var b []byte
-	for {
-		tk, err := sc.d.Token()
-		if err != nil {
-			panic(err)
-		}
-		switch v := tk.(type) {
-		case xml.CharData:
-			if b != nil {
-				panic("unexpected CharData")
-			}
-			b = []byte(string(v))
-		case xml.EndElement:
-			if v.Name.Local != "xref" {
-				panic("expected </xref>")
-			}
-			if b != nil {
-				return b
-			}
-			sig := attrSig(se)
-			switch sig {
-			case "target":
-				return []byte(fmt.Sprintf("[%s]", attrValue(se, "target")))
-			case "fmt-of,rel,target", "fmt-,,rel,target":
-				return []byte(fmt.Sprintf("[%s, %s]", attrValue(se, "target"), attrValue(se, "rel")))
-			case "fmt-of,sec,target", "fmt-,,sec,target":
-				return []byte(fmt.Sprintf("[section %s of %s]", attrValue(se, "sec"), attrValue(se, "target")))
-			case "fmt-of,rel,sec,target":
-				return []byte(fmt.Sprintf("[section %s of %s, %s]", attrValue(se, "sec"), attrValue(se, "target"), attrValue(se, "rel")))
-			default:
-				panic(fmt.Sprintf("unknown attribute signature %q in %#v", sig, fmt.Sprintf("%#v", se)))
-			}
-		default:
-			panic(fmt.Sprintf("unexpected tag %q", v))
-		}
-	}
-}
-
-var skipAnchor = map[string]bool{
-	"intro":    true,
-	"Overview": true,
-}
-
-var skipTitle = map[string]bool{
-	"Acknowledgements":            true,
-	"Change Log":                  true,
-	"Document Organization":       true,
-	"Conventions and Terminology": true,
-}
-
-func skipElement(s xml.StartElement) bool {
-	switch s.Name.Local {
-	case "artwork":
-		return true
-	case "section":
-		for _, attr := range s.Attr {
-			switch attr.Name.Local {
-			case "anchor":
-				if skipAnchor[attr.Value] || strings.HasPrefix(attr.Value, "changes.since.") {
-					return true
-				}
-			case "title":
-				if skipTitle[attr.Value] {
-					return true
-				}
-			}
-		}
-	}
-	return false
-}
-
-func readSpecCov(r io.Reader) specCoverage {
-	sc := specCoverage{
-		coverage: map[specPart]bool{},
-		d:        xml.NewDecoder(r)}
-	sc.readSection(nil)
-	return sc
-}
-
-func (sc specCoverage) addSentences(sec string, sentence string) {
-	for _, s := range parseSentences(sentence) {
-		sc.coverage[specPart{sec, s}] = false
-	}
-}
-
-func (sc specCoverage) cover(sec string, sentence string) {
-	for _, s := range parseSentences(sentence) {
-		p := specPart{sec, s}
-		if _, ok := sc.coverage[p]; !ok {
-			panic(fmt.Sprintf("Not found in spec: %q, %q", sec, s))
-		}
-		sc.coverage[specPart{sec, s}] = true
-	}
-
-}
-
-var whitespaceRx = regexp.MustCompile(`\s+`)
-
-func parseSentences(sens string) []string {
-	sens = strings.TrimSpace(sens)
-	if sens == "" {
-		return nil
-	}
-	ss := strings.Split(whitespaceRx.ReplaceAllString(sens, " "), ". ")
-	for i, s := range ss {
-		s = strings.TrimSpace(s)
-		if !strings.HasSuffix(s, ".") {
-			s += "."
-		}
-		ss[i] = s
-	}
-	return ss
-}
-
-func TestSpecParseSentences(t *testing.T) {
-	tests := []struct {
-		ss   string
-		want []string
-	}{
-		{"Sentence 1. Sentence 2.",
-			[]string{
-				"Sentence 1.",
-				"Sentence 2.",
-			}},
-		{"Sentence 1.  \nSentence 2.\tSentence 3.",
-			[]string{
-				"Sentence 1.",
-				"Sentence 2.",
-				"Sentence 3.",
-			}},
-	}
-
-	for i, tt := range tests {
-		got := parseSentences(tt.ss)
-		if !reflect.DeepEqual(got, tt.want) {
-			t.Errorf("%d: got = %q, want %q", i, got, tt.want)
-		}
-	}
-}
-
-func TestSpecCoverage(t *testing.T) {
-	if !*coverSpec {
-		t.Skip()
-	}
-
-	loadSpecOnce.Do(loadSpec)
-
-	var (
-		list     []specPart
-		cv       = defaultSpecCoverage.coverage
-		total    = len(cv)
-		complete = 0
-	)
-
-	for sp, touched := range defaultSpecCoverage.coverage {
-		if touched {
-			complete++
-		} else {
-			list = append(list, sp)
-		}
-	}
-	sort.Stable(bySpecSection(list))
-
-	if testing.Short() && len(list) > 5 {
-		list = list[:5]
-	}
-
-	for _, p := range list {
-		t.Errorf("\tSECTION %s: %s", p.section, p.sentence)
-	}
-
-	t.Logf("%d/%d (%d%%) sentences covered", complete, total, (complete/total)*100)
-}
-
-func attrSig(se xml.StartElement) string {
-	var names []string
-	for _, attr := range se.Attr {
-		if attr.Name.Local == "fmt" {
-			names = append(names, "fmt-"+attr.Value)
-		} else {
-			names = append(names, attr.Name.Local)
-		}
-	}
-	sort.Strings(names)
-	return strings.Join(names, ",")
-}
-
-func attrValue(se xml.StartElement, attr string) string {
-	for _, a := range se.Attr {
-		if a.Name.Local == attr {
-			return a.Value
-		}
-	}
-	panic("unknown attribute " + attr)
-}
-
-func TestSpecPartLess(t *testing.T) {
-	tests := []struct {
-		sec1, sec2 string
-		want       bool
-	}{
-		{"6.2.1", "6.2", false},
-		{"6.2", "6.2.1", true},
-		{"6.10", "6.10.1", true},
-		{"6.10", "6.1.1", false}, // 10, not 1
-		{"6.1", "6.1", false},    // equal, so not less
-	}
-	for _, tt := range tests {
-		got := (specPart{tt.sec1, "foo"}).Less(specPart{tt.sec2, "foo"})
-		if got != tt.want {
-			t.Errorf("Less(%q, %q) = %v; want %v", tt.sec1, tt.sec2, got, tt.want)
-		}
-	}
-}
diff --git a/vendor/golang.org/x/net/idna/example_test.go b/vendor/golang.org/x/net/idna/example_test.go
deleted file mode 100644
index 948f6eb2..00000000
--- a/vendor/golang.org/x/net/idna/example_test.go
+++ /dev/null
@@ -1,70 +0,0 @@
-// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
-
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package idna_test
-
-import (
-	"fmt"
-
-	"golang.org/x/net/idna"
-)
-
-func ExampleProfile() {
-	// Raw Punycode has no restrictions and does no mappings.
-	fmt.Println(idna.ToASCII(""))
-	fmt.Println(idna.ToASCII("*.faß.com"))
-	fmt.Println(idna.Punycode.ToASCII("*.faß.com"))
-
-	// Rewrite IDN for lookup. This (currently) uses transitional mappings to
-	// find a balance between IDNA2003 and IDNA2008 compatibility.
-	fmt.Println(idna.Lookup.ToASCII(""))
-	fmt.Println(idna.Lookup.ToASCII("www.faß.com"))
-
-	// Convert an IDN to ASCII for registration purposes. This changes the
-	// encoding, but reports an error if the input was illformed.
-	fmt.Println(idna.Registration.ToASCII(""))
-	fmt.Println(idna.Registration.ToASCII("www.faß.com"))
-
-	// Output:
-	//  <nil>
-	// *.xn--fa-hia.com <nil>
-	// *.xn--fa-hia.com <nil>
-	//  <nil>
-	// www.fass.com <nil>
-	//  idna: invalid label ""
-	// www.xn--fa-hia.com <nil>
-}
-
-func ExampleNew() {
-	var p *idna.Profile
-
-	// Raw Punycode has no restrictions and does no mappings.
-	p = idna.New()
-	fmt.Println(p.ToASCII("*.faß.com"))
-
-	// Do mappings. Note that star is not allowed in a DNS lookup.
-	p = idna.New(
-		idna.MapForLookup(),
-		idna.Transitional(true)) // Map ß -> ss
-	fmt.Println(p.ToASCII("*.faß.com"))
-
-	// Lookup for registration. Also does not allow '*'.
-	p = idna.New(idna.ValidateForRegistration())
-	fmt.Println(p.ToUnicode("*.faß.com"))
-
-	// Set up a profile maps for lookup, but allows wild cards.
-	p = idna.New(
-		idna.MapForLookup(),
-		idna.Transitional(true),      // Map ß -> ss
-		idna.StrictDomainName(false)) // Set more permissive ASCII rules.
-	fmt.Println(p.ToASCII("*.faß.com"))
-
-	// Output:
-	// *.xn--fa-hia.com <nil>
-	// *.fass.com idna: disallowed rune U+002A
-	// *.faß.com idna: disallowed rune U+002A
-	// *.fass.com <nil>
-}
diff --git a/vendor/golang.org/x/net/idna/idna_test.go b/vendor/golang.org/x/net/idna/idna_test.go
deleted file mode 100644
index 0b067cac..00000000
--- a/vendor/golang.org/x/net/idna/idna_test.go
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package idna
-
-import (
-	"testing"
-)
-
-var idnaTestCases = [...]struct {
-	ascii, unicode string
-}{
-	// Labels.
-	{"books", "books"},
-	{"xn--bcher-kva", "bücher"},
-
-	// Domains.
-	{"foo--xn--bar.org", "foo--xn--bar.org"},
-	{"golang.org", "golang.org"},
-	{"example.xn--p1ai", "example.рф"},
-	{"xn--czrw28b.tw", "商業.tw"},
-	{"www.xn--mller-kva.de", "www.müller.de"},
-}
-
-func TestIDNA(t *testing.T) {
-	for _, tc := range idnaTestCases {
-		if a, err := ToASCII(tc.unicode); err != nil {
-			t.Errorf("ToASCII(%q): %v", tc.unicode, err)
-		} else if a != tc.ascii {
-			t.Errorf("ToASCII(%q): got %q, want %q", tc.unicode, a, tc.ascii)
-		}
-
-		if u, err := ToUnicode(tc.ascii); err != nil {
-			t.Errorf("ToUnicode(%q): %v", tc.ascii, err)
-		} else if u != tc.unicode {
-			t.Errorf("ToUnicode(%q): got %q, want %q", tc.ascii, u, tc.unicode)
-		}
-	}
-}
-
-func TestIDNASeparators(t *testing.T) {
-	type subCase struct {
-		unicode   string
-		wantASCII string
-		wantErr   bool
-	}
-
-	testCases := []struct {
-		name     string
-		profile  *Profile
-		subCases []subCase
-	}{
-		{
-			name: "Punycode", profile: Punycode,
-			subCases: []subCase{
-				{"example\u3002jp", "xn--examplejp-ck3h", false},
-				{"東京\uFF0Ejp", "xn--jp-l92cn98g071o", false},
-				{"大阪\uFF61jp", "xn--jp-ku9cz72u463f", false},
-			},
-		},
-		{
-			name: "Lookup", profile: Lookup,
-			subCases: []subCase{
-				{"example\u3002jp", "example.jp", false},
-				{"東京\uFF0Ejp", "xn--1lqs71d.jp", false},
-				{"大阪\uFF61jp", "xn--pssu33l.jp", false},
-			},
-		},
-		{
-			name: "Display", profile: Display,
-			subCases: []subCase{
-				{"example\u3002jp", "example.jp", false},
-				{"東京\uFF0Ejp", "xn--1lqs71d.jp", false},
-				{"大阪\uFF61jp", "xn--pssu33l.jp", false},
-			},
-		},
-		{
-			name: "Registration", profile: Registration,
-			subCases: []subCase{
-				{"example\u3002jp", "", true},
-				{"東京\uFF0Ejp", "", true},
-				{"大阪\uFF61jp", "", true},
-			},
-		},
-	}
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			for _, c := range tc.subCases {
-				gotA, err := tc.profile.ToASCII(c.unicode)
-				if c.wantErr {
-					if err == nil {
-						t.Errorf("ToASCII(%q): got no error, but an error expected", c.unicode)
-					}
-				} else {
-					if err != nil {
-						t.Errorf("ToASCII(%q): got err=%v, but no error expected", c.unicode, err)
-					} else if gotA != c.wantASCII {
-						t.Errorf("ToASCII(%q): got %q, want %q", c.unicode, gotA, c.wantASCII)
-					}
-				}
-			}
-		})
-	}
-}
-
-// TODO(nigeltao): test errors, once we've specified when ToASCII and ToUnicode
-// return errors.
diff --git a/vendor/golang.org/x/net/idna/punycode_test.go b/vendor/golang.org/x/net/idna/punycode_test.go
deleted file mode 100644
index bfec81de..00000000
--- a/vendor/golang.org/x/net/idna/punycode_test.go
+++ /dev/null
@@ -1,198 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package idna
-
-import (
-	"strings"
-	"testing"
-)
-
-var punycodeTestCases = [...]struct {
-	s, encoded string
-}{
-	{"", ""},
-	{"-", "--"},
-	{"-a", "-a-"},
-	{"-a-", "-a--"},
-	{"a", "a-"},
-	{"a-", "a--"},
-	{"a-b", "a-b-"},
-	{"books", "books-"},
-	{"bücher", "bcher-kva"},
-	{"Hello世界", "Hello-ck1hg65u"},
-	{"ü", "tda"},
-	{"üý", "tdac"},
-
-	// The test cases below come from RFC 3492 section 7.1 with Errata 3026.
-	{
-		// (A) Arabic (Egyptian).
-		"\u0644\u064A\u0647\u0645\u0627\u0628\u062A\u0643\u0644" +
-			"\u0645\u0648\u0634\u0639\u0631\u0628\u064A\u061F",
-		"egbpdaj6bu4bxfgehfvwxn",
-	},
-	{
-		// (B) Chinese (simplified).
-		"\u4ED6\u4EEC\u4E3A\u4EC0\u4E48\u4E0D\u8BF4\u4E2D\u6587",
-		"ihqwcrb4cv8a8dqg056pqjye",
-	},
-	{
-		// (C) Chinese (traditional).
-		"\u4ED6\u5011\u7232\u4EC0\u9EBD\u4E0D\u8AAA\u4E2D\u6587",
-		"ihqwctvzc91f659drss3x8bo0yb",
-	},
-	{
-		// (D) Czech.
-		"\u0050\u0072\u006F\u010D\u0070\u0072\u006F\u0073\u0074" +
-			"\u011B\u006E\u0065\u006D\u006C\u0075\u0076\u00ED\u010D" +
-			"\u0065\u0073\u006B\u0079",
-		"Proprostnemluvesky-uyb24dma41a",
-	},
-	{
-		// (E) Hebrew.
-		"\u05DC\u05DE\u05D4\u05D4\u05DD\u05E4\u05E9\u05D5\u05D8" +
-			"\u05DC\u05D0\u05DE\u05D3\u05D1\u05E8\u05D9\u05DD\u05E2" +
-			"\u05D1\u05E8\u05D9\u05EA",
-		"4dbcagdahymbxekheh6e0a7fei0b",
-	},
-	{
-		// (F) Hindi (Devanagari).
-		"\u092F\u0939\u0932\u094B\u0917\u0939\u093F\u0928\u094D" +
-			"\u0926\u0940\u0915\u094D\u092F\u094B\u0902\u0928\u0939" +
-			"\u0940\u0902\u092C\u094B\u0932\u0938\u0915\u0924\u0947" +
-			"\u0939\u0948\u0902",
-		"i1baa7eci9glrd9b2ae1bj0hfcgg6iyaf8o0a1dig0cd",
-	},
-	{
-		// (G) Japanese (kanji and hiragana).
-		"\u306A\u305C\u307F\u3093\u306A\u65E5\u672C\u8A9E\u3092" +
-			"\u8A71\u3057\u3066\u304F\u308C\u306A\u3044\u306E\u304B",
-		"n8jok5ay5dzabd5bym9f0cm5685rrjetr6pdxa",
-	},
-	{
-		// (H) Korean (Hangul syllables).
-		"\uC138\uACC4\uC758\uBAA8\uB4E0\uC0AC\uB78C\uB4E4\uC774" +
-			"\uD55C\uAD6D\uC5B4\uB97C\uC774\uD574\uD55C\uB2E4\uBA74" +
-			"\uC5BC\uB9C8\uB098\uC88B\uC744\uAE4C",
-		"989aomsvi5e83db1d2a355cv1e0vak1dwrv93d5xbh15a0dt30a5j" +
-			"psd879ccm6fea98c",
-	},
-	{
-		// (I) Russian (Cyrillic).
-		"\u043F\u043E\u0447\u0435\u043C\u0443\u0436\u0435\u043E" +
-			"\u043D\u0438\u043D\u0435\u0433\u043E\u0432\u043E\u0440" +
-			"\u044F\u0442\u043F\u043E\u0440\u0443\u0441\u0441\u043A" +
-			"\u0438",
-		"b1abfaaepdrnnbgefbadotcwatmq2g4l",
-	},
-	{
-		// (J) Spanish.
-		"\u0050\u006F\u0072\u0071\u0075\u00E9\u006E\u006F\u0070" +
-			"\u0075\u0065\u0064\u0065\u006E\u0073\u0069\u006D\u0070" +
-			"\u006C\u0065\u006D\u0065\u006E\u0074\u0065\u0068\u0061" +
-			"\u0062\u006C\u0061\u0072\u0065\u006E\u0045\u0073\u0070" +
-			"\u0061\u00F1\u006F\u006C",
-		"PorqunopuedensimplementehablarenEspaol-fmd56a",
-	},
-	{
-		// (K) Vietnamese.
-		"\u0054\u1EA1\u0069\u0073\u0061\u006F\u0068\u1ECD\u006B" +
-			"\u0068\u00F4\u006E\u0067\u0074\u0068\u1EC3\u0063\u0068" +
-			"\u1EC9\u006E\u00F3\u0069\u0074\u0069\u1EBF\u006E\u0067" +
-			"\u0056\u0069\u1EC7\u0074",
-		"TisaohkhngthchnitingVit-kjcr8268qyxafd2f1b9g",
-	},
-	{
-		// (L) 3<nen>B<gumi><kinpachi><sensei>.
-		"\u0033\u5E74\u0042\u7D44\u91D1\u516B\u5148\u751F",
-		"3B-ww4c5e180e575a65lsy2b",
-	},
-	{
-		// (M) <amuro><namie>-with-SUPER-MONKEYS.
-		"\u5B89\u5BA4\u5948\u7F8E\u6075\u002D\u0077\u0069\u0074" +
-			"\u0068\u002D\u0053\u0055\u0050\u0045\u0052\u002D\u004D" +
-			"\u004F\u004E\u004B\u0045\u0059\u0053",
-		"-with-SUPER-MONKEYS-pc58ag80a8qai00g7n9n",
-	},
-	{
-		// (N) Hello-Another-Way-<sorezore><no><basho>.
-		"\u0048\u0065\u006C\u006C\u006F\u002D\u0041\u006E\u006F" +
-			"\u0074\u0068\u0065\u0072\u002D\u0057\u0061\u0079\u002D" +
-			"\u305D\u308C\u305E\u308C\u306E\u5834\u6240",
-		"Hello-Another-Way--fc4qua05auwb3674vfr0b",
-	},
-	{
-		// (O) <hitotsu><yane><no><shita>2.
-		"\u3072\u3068\u3064\u5C4B\u6839\u306E\u4E0B\u0032",
-		"2-u9tlzr9756bt3uc0v",
-	},
-	{
-		// (P) Maji<de>Koi<suru>5<byou><mae>
-		"\u004D\u0061\u006A\u0069\u3067\u004B\u006F\u0069\u3059" +
-			"\u308B\u0035\u79D2\u524D",
-		"MajiKoi5-783gue6qz075azm5e",
-	},
-	{
-		// (Q) <pafii>de<runba>
-		"\u30D1\u30D5\u30A3\u30FC\u0064\u0065\u30EB\u30F3\u30D0",
-		"de-jg4avhby1noc0d",
-	},
-	{
-		// (R) <sono><supiido><de>
-		"\u305D\u306E\u30B9\u30D4\u30FC\u30C9\u3067",
-		"d9juau41awczczp",
-	},
-	{
-		// (S) -> $1.00 <-
-		"\u002D\u003E\u0020\u0024\u0031\u002E\u0030\u0030\u0020" +
-			"\u003C\u002D",
-		"-> $1.00 <--",
-	},
-}
-
-func TestPunycode(t *testing.T) {
-	for _, tc := range punycodeTestCases {
-		if got, err := decode(tc.encoded); err != nil {
-			t.Errorf("decode(%q): %v", tc.encoded, err)
-		} else if got != tc.s {
-			t.Errorf("decode(%q): got %q, want %q", tc.encoded, got, tc.s)
-		}
-
-		if got, err := encode("", tc.s); err != nil {
-			t.Errorf(`encode("", %q): %v`, tc.s, err)
-		} else if got != tc.encoded {
-			t.Errorf(`encode("", %q): got %q, want %q`, tc.s, got, tc.encoded)
-		}
-	}
-}
-
-var punycodeErrorTestCases = [...]string{
-	"decode -",            // A sole '-' is invalid.
-	"decode foo\x00bar",   // '\x00' is not in [0-9A-Za-z].
-	"decode foo#bar",      // '#' is not in [0-9A-Za-z].
-	"decode foo\u00A3bar", // '\u00A3' is not in [0-9A-Za-z].
-	"decode 9",            // "9a" decodes to codepoint \u00A3; "9" is truncated.
-	"decode 99999a",       // "99999a" decodes to codepoint \U0048A3C1, which is > \U0010FFFF.
-	"decode 9999999999a",  // "9999999999a" overflows the int32 calculation.
-
-	"encode " + strings.Repeat("x", 65536) + "\uff00", // int32 overflow.
-}
-
-func TestPunycodeErrors(t *testing.T) {
-	for _, tc := range punycodeErrorTestCases {
-		var err error
-		switch {
-		case strings.HasPrefix(tc, "decode "):
-			_, err = decode(tc[7:])
-		case strings.HasPrefix(tc, "encode "):
-			_, err = encode("", tc[7:])
-		}
-		if err == nil {
-			if len(tc) > 256 {
-				tc = tc[:100] + "..." + tc[len(tc)-100:]
-			}
-			t.Errorf("no error for %s", tc)
-		}
-	}
-}
diff --git a/vendor/golang.org/x/net/internal/socket/socket_go1_9_test.go b/vendor/golang.org/x/net/internal/socket/socket_go1_9_test.go
deleted file mode 100644
index c4edd4a8..00000000
--- a/vendor/golang.org/x/net/internal/socket/socket_go1_9_test.go
+++ /dev/null
@@ -1,259 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.9
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
-
-package socket_test
-
-import (
-	"bytes"
-	"fmt"
-	"net"
-	"runtime"
-	"testing"
-
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/internal/socket"
-)
-
-type mockControl struct {
-	Level int
-	Type  int
-	Data  []byte
-}
-
-func TestControlMessage(t *testing.T) {
-	for _, tt := range []struct {
-		cs []mockControl
-	}{
-		{
-			[]mockControl{
-				{Level: 1, Type: 1},
-			},
-		},
-		{
-			[]mockControl{
-				{Level: 2, Type: 2, Data: []byte{0xfe}},
-			},
-		},
-		{
-			[]mockControl{
-				{Level: 3, Type: 3, Data: []byte{0xfe, 0xff, 0xff, 0xfe}},
-			},
-		},
-		{
-			[]mockControl{
-				{Level: 4, Type: 4, Data: []byte{0xfe, 0xff, 0xff, 0xfe, 0xfe, 0xff, 0xff, 0xfe}},
-			},
-		},
-		{
-			[]mockControl{
-				{Level: 4, Type: 4, Data: []byte{0xfe, 0xff, 0xff, 0xfe, 0xfe, 0xff, 0xff, 0xfe}},
-				{Level: 2, Type: 2, Data: []byte{0xfe}},
-			},
-		},
-	} {
-		var w []byte
-		var tailPadLen int
-		mm := socket.NewControlMessage([]int{0})
-		for i, c := range tt.cs {
-			m := socket.NewControlMessage([]int{len(c.Data)})
-			l := len(m) - len(mm)
-			if i == len(tt.cs)-1 && l > len(c.Data) {
-				tailPadLen = l - len(c.Data)
-			}
-			w = append(w, m...)
-		}
-
-		var err error
-		ww := make([]byte, len(w))
-		copy(ww, w)
-		m := socket.ControlMessage(ww)
-		for _, c := range tt.cs {
-			if err = m.MarshalHeader(c.Level, c.Type, len(c.Data)); err != nil {
-				t.Fatalf("(%v).MarshalHeader() = %v", tt.cs, err)
-			}
-			copy(m.Data(len(c.Data)), c.Data)
-			m = m.Next(len(c.Data))
-		}
-		m = socket.ControlMessage(w)
-		for _, c := range tt.cs {
-			m, err = m.Marshal(c.Level, c.Type, c.Data)
-			if err != nil {
-				t.Fatalf("(%v).Marshal() = %v", tt.cs, err)
-			}
-		}
-		if !bytes.Equal(ww, w) {
-			t.Fatalf("got %#v; want %#v", ww, w)
-		}
-
-		ws := [][]byte{w}
-		if tailPadLen > 0 {
-			// Test a message with no tail padding.
-			nopad := w[:len(w)-tailPadLen]
-			ws = append(ws, [][]byte{nopad}...)
-		}
-		for _, w := range ws {
-			ms, err := socket.ControlMessage(w).Parse()
-			if err != nil {
-				t.Fatalf("(%v).Parse() = %v", tt.cs, err)
-			}
-			for i, m := range ms {
-				lvl, typ, dataLen, err := m.ParseHeader()
-				if err != nil {
-					t.Fatalf("(%v).ParseHeader() = %v", tt.cs, err)
-				}
-				if lvl != tt.cs[i].Level || typ != tt.cs[i].Type || dataLen != len(tt.cs[i].Data) {
-					t.Fatalf("%v: got %d, %d, %d; want %d, %d, %d", tt.cs[i], lvl, typ, dataLen, tt.cs[i].Level, tt.cs[i].Type, len(tt.cs[i].Data))
-				}
-			}
-		}
-	}
-}
-
-func TestUDP(t *testing.T) {
-	c, err := nettest.NewLocalPacketListener("udp")
-	if err != nil {
-		t.Skipf("not supported on %s/%s: %v", runtime.GOOS, runtime.GOARCH, err)
-	}
-	defer c.Close()
-	cc, err := socket.NewConn(c.(net.Conn))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	t.Run("Message", func(t *testing.T) {
-		data := []byte("HELLO-R-U-THERE")
-		wm := socket.Message{
-			Buffers: bytes.SplitAfter(data, []byte("-")),
-			Addr:    c.LocalAddr(),
-		}
-		if err := cc.SendMsg(&wm, 0); err != nil {
-			t.Fatal(err)
-		}
-		b := make([]byte, 32)
-		rm := socket.Message{
-			Buffers: [][]byte{b[:1], b[1:3], b[3:7], b[7:11], b[11:]},
-		}
-		if err := cc.RecvMsg(&rm, 0); err != nil {
-			t.Fatal(err)
-		}
-		if !bytes.Equal(b[:rm.N], data) {
-			t.Fatalf("got %#v; want %#v", b[:rm.N], data)
-		}
-	})
-	switch runtime.GOOS {
-	case "android", "linux":
-		t.Run("Messages", func(t *testing.T) {
-			data := []byte("HELLO-R-U-THERE")
-			wmbs := bytes.SplitAfter(data, []byte("-"))
-			wms := []socket.Message{
-				{Buffers: wmbs[:1], Addr: c.LocalAddr()},
-				{Buffers: wmbs[1:], Addr: c.LocalAddr()},
-			}
-			n, err := cc.SendMsgs(wms, 0)
-			if err != nil {
-				t.Fatal(err)
-			}
-			if n != len(wms) {
-				t.Fatalf("got %d; want %d", n, len(wms))
-			}
-			b := make([]byte, 32)
-			rmbs := [][][]byte{{b[:len(wmbs[0])]}, {b[len(wmbs[0]):]}}
-			rms := []socket.Message{
-				{Buffers: rmbs[0]},
-				{Buffers: rmbs[1]},
-			}
-			n, err = cc.RecvMsgs(rms, 0)
-			if err != nil {
-				t.Fatal(err)
-			}
-			if n != len(rms) {
-				t.Fatalf("got %d; want %d", n, len(rms))
-			}
-			nn := 0
-			for i := 0; i < n; i++ {
-				nn += rms[i].N
-			}
-			if !bytes.Equal(b[:nn], data) {
-				t.Fatalf("got %#v; want %#v", b[:nn], data)
-			}
-		})
-	}
-
-	// The behavior of transmission for zero byte paylaod depends
-	// on each platform implementation. Some may transmit only
-	// protocol header and options, other may transmit nothing.
-	// We test only that SendMsg and SendMsgs will not crash with
-	// empty buffers.
-	wm := socket.Message{
-		Buffers: [][]byte{{}},
-		Addr:    c.LocalAddr(),
-	}
-	cc.SendMsg(&wm, 0)
-	wms := []socket.Message{
-		{Buffers: [][]byte{{}}, Addr: c.LocalAddr()},
-	}
-	cc.SendMsgs(wms, 0)
-}
-
-func BenchmarkUDP(b *testing.B) {
-	c, err := nettest.NewLocalPacketListener("udp")
-	if err != nil {
-		b.Skipf("not supported on %s/%s: %v", runtime.GOOS, runtime.GOARCH, err)
-	}
-	defer c.Close()
-	cc, err := socket.NewConn(c.(net.Conn))
-	if err != nil {
-		b.Fatal(err)
-	}
-	data := []byte("HELLO-R-U-THERE")
-	wm := socket.Message{
-		Buffers: [][]byte{data},
-		Addr:    c.LocalAddr(),
-	}
-	rm := socket.Message{
-		Buffers: [][]byte{make([]byte, 128)},
-		OOB:     make([]byte, 128),
-	}
-
-	for M := 1; M <= 1<<9; M = M << 1 {
-		b.Run(fmt.Sprintf("Iter-%d", M), func(b *testing.B) {
-			for i := 0; i < b.N; i++ {
-				for j := 0; j < M; j++ {
-					if err := cc.SendMsg(&wm, 0); err != nil {
-						b.Fatal(err)
-					}
-					if err := cc.RecvMsg(&rm, 0); err != nil {
-						b.Fatal(err)
-					}
-				}
-			}
-		})
-		switch runtime.GOOS {
-		case "android", "linux":
-			wms := make([]socket.Message, M)
-			for i := range wms {
-				wms[i].Buffers = [][]byte{data}
-				wms[i].Addr = c.LocalAddr()
-			}
-			rms := make([]socket.Message, M)
-			for i := range rms {
-				rms[i].Buffers = [][]byte{make([]byte, 128)}
-				rms[i].OOB = make([]byte, 128)
-			}
-			b.Run(fmt.Sprintf("Batch-%d", M), func(b *testing.B) {
-				for i := 0; i < b.N; i++ {
-					if _, err := cc.SendMsgs(wms, 0); err != nil {
-						b.Fatal(err)
-					}
-					if _, err := cc.RecvMsgs(rms, 0); err != nil {
-						b.Fatal(err)
-					}
-				}
-			})
-		}
-	}
-}
diff --git a/vendor/golang.org/x/net/internal/socket/socket_test.go b/vendor/golang.org/x/net/internal/socket/socket_test.go
deleted file mode 100644
index bf3751b5..00000000
--- a/vendor/golang.org/x/net/internal/socket/socket_test.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris windows
-
-package socket_test
-
-import (
-	"net"
-	"runtime"
-	"syscall"
-	"testing"
-
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/internal/socket"
-)
-
-func TestSocket(t *testing.T) {
-	t.Run("Option", func(t *testing.T) {
-		testSocketOption(t, &socket.Option{Level: syscall.SOL_SOCKET, Name: syscall.SO_RCVBUF, Len: 4})
-	})
-}
-
-func testSocketOption(t *testing.T, so *socket.Option) {
-	c, err := nettest.NewLocalPacketListener("udp")
-	if err != nil {
-		t.Skipf("not supported on %s/%s: %v", runtime.GOOS, runtime.GOARCH, err)
-	}
-	defer c.Close()
-	cc, err := socket.NewConn(c.(net.Conn))
-	if err != nil {
-		t.Fatal(err)
-	}
-	const N = 2048
-	if err := so.SetInt(cc, N); err != nil {
-		t.Fatal(err)
-	}
-	n, err := so.GetInt(cc)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if n < N {
-		t.Fatalf("got %d; want greater than or equal to %d", n, N)
-	}
-}
diff --git a/vendor/golang.org/x/net/internal/socks/dial_test.go b/vendor/golang.org/x/net/internal/socks/dial_test.go
deleted file mode 100644
index 3a7a31bd..00000000
--- a/vendor/golang.org/x/net/internal/socks/dial_test.go
+++ /dev/null
@@ -1,170 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package socks_test
-
-import (
-	"context"
-	"io"
-	"math/rand"
-	"net"
-	"os"
-	"testing"
-	"time"
-
-	"golang.org/x/net/internal/socks"
-	"golang.org/x/net/internal/sockstest"
-)
-
-func TestDial(t *testing.T) {
-	t.Run("Connect", func(t *testing.T) {
-		ss, err := sockstest.NewServer(sockstest.NoAuthRequired, sockstest.NoProxyRequired)
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer ss.Close()
-		d := socks.NewDialer(ss.Addr().Network(), ss.Addr().String())
-		d.AuthMethods = []socks.AuthMethod{
-			socks.AuthMethodNotRequired,
-			socks.AuthMethodUsernamePassword,
-		}
-		d.Authenticate = (&socks.UsernamePassword{
-			Username: "username",
-			Password: "password",
-		}).Authenticate
-		c, err := d.DialContext(context.Background(), ss.TargetAddr().Network(), ss.TargetAddr().String())
-		if err != nil {
-			t.Fatal(err)
-		}
-		c.(*socks.Conn).BoundAddr()
-		c.Close()
-	})
-	t.Run("ConnectWithConn", func(t *testing.T) {
-		ss, err := sockstest.NewServer(sockstest.NoAuthRequired, sockstest.NoProxyRequired)
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer ss.Close()
-		c, err := net.Dial(ss.Addr().Network(), ss.Addr().String())
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c.Close()
-		d := socks.NewDialer(ss.Addr().Network(), ss.Addr().String())
-		d.AuthMethods = []socks.AuthMethod{
-			socks.AuthMethodNotRequired,
-			socks.AuthMethodUsernamePassword,
-		}
-		d.Authenticate = (&socks.UsernamePassword{
-			Username: "username",
-			Password: "password",
-		}).Authenticate
-		a, err := d.DialWithConn(context.Background(), c, ss.TargetAddr().Network(), ss.TargetAddr().String())
-		if err != nil {
-			t.Fatal(err)
-		}
-		if _, ok := a.(*socks.Addr); !ok {
-			t.Fatalf("got %+v; want socks.Addr", a)
-		}
-	})
-	t.Run("Cancel", func(t *testing.T) {
-		ss, err := sockstest.NewServer(sockstest.NoAuthRequired, blackholeCmdFunc)
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer ss.Close()
-		d := socks.NewDialer(ss.Addr().Network(), ss.Addr().String())
-		ctx, cancel := context.WithCancel(context.Background())
-		defer cancel()
-		dialErr := make(chan error)
-		go func() {
-			c, err := d.DialContext(ctx, ss.TargetAddr().Network(), ss.TargetAddr().String())
-			if err == nil {
-				c.Close()
-			}
-			dialErr <- err
-		}()
-		time.Sleep(100 * time.Millisecond)
-		cancel()
-		err = <-dialErr
-		if perr, nerr := parseDialError(err); perr != context.Canceled && nerr == nil {
-			t.Fatalf("got %v; want context.Canceled or equivalent", err)
-		}
-	})
-	t.Run("Deadline", func(t *testing.T) {
-		ss, err := sockstest.NewServer(sockstest.NoAuthRequired, blackholeCmdFunc)
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer ss.Close()
-		d := socks.NewDialer(ss.Addr().Network(), ss.Addr().String())
-		ctx, cancel := context.WithDeadline(context.Background(), time.Now().Add(100*time.Millisecond))
-		defer cancel()
-		c, err := d.DialContext(ctx, ss.TargetAddr().Network(), ss.TargetAddr().String())
-		if err == nil {
-			c.Close()
-		}
-		if perr, nerr := parseDialError(err); perr != context.DeadlineExceeded && nerr == nil {
-			t.Fatalf("got %v; want context.DeadlineExceeded or equivalent", err)
-		}
-	})
-	t.Run("WithRogueServer", func(t *testing.T) {
-		ss, err := sockstest.NewServer(sockstest.NoAuthRequired, rogueCmdFunc)
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer ss.Close()
-		d := socks.NewDialer(ss.Addr().Network(), ss.Addr().String())
-		for i := 0; i < 2*len(rogueCmdList); i++ {
-			ctx, cancel := context.WithDeadline(context.Background(), time.Now().Add(100*time.Millisecond))
-			defer cancel()
-			c, err := d.DialContext(ctx, ss.TargetAddr().Network(), ss.TargetAddr().String())
-			if err == nil {
-				t.Log(c.(*socks.Conn).BoundAddr())
-				c.Close()
-				t.Error("should fail")
-			}
-		}
-	})
-}
-
-func blackholeCmdFunc(rw io.ReadWriter, b []byte) error {
-	if _, err := sockstest.ParseCmdRequest(b); err != nil {
-		return err
-	}
-	var bb [1]byte
-	for {
-		if _, err := rw.Read(bb[:]); err != nil {
-			return err
-		}
-	}
-}
-
-func rogueCmdFunc(rw io.ReadWriter, b []byte) error {
-	if _, err := sockstest.ParseCmdRequest(b); err != nil {
-		return err
-	}
-	rw.Write(rogueCmdList[rand.Intn(len(rogueCmdList))])
-	return nil
-}
-
-var rogueCmdList = [][]byte{
-	{0x05},
-	{0x06, 0x00, 0x00, 0x01, 192, 0, 2, 1, 0x17, 0x4b},
-	{0x05, 0x00, 0xff, 0x01, 192, 0, 2, 2, 0x17, 0x4b},
-	{0x05, 0x00, 0x00, 0x01, 192, 0, 2, 3},
-	{0x05, 0x00, 0x00, 0x03, 0x04, 'F', 'Q', 'D', 'N'},
-}
-
-func parseDialError(err error) (perr, nerr error) {
-	if e, ok := err.(*net.OpError); ok {
-		err = e.Err
-		nerr = e
-	}
-	if e, ok := err.(*os.SyscallError); ok {
-		err = e.Err
-	}
-	perr = err
-	return
-}
diff --git a/vendor/golang.org/x/net/ipv4/bpf_test.go b/vendor/golang.org/x/net/ipv4/bpf_test.go
deleted file mode 100644
index b44da905..00000000
--- a/vendor/golang.org/x/net/ipv4/bpf_test.go
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4_test
-
-import (
-	"net"
-	"runtime"
-	"testing"
-	"time"
-
-	"golang.org/x/net/bpf"
-	"golang.org/x/net/ipv4"
-)
-
-func TestBPF(t *testing.T) {
-	if runtime.GOOS != "linux" {
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-
-	l, err := net.ListenPacket("udp4", "127.0.0.1:0")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer l.Close()
-
-	p := ipv4.NewPacketConn(l)
-
-	// This filter accepts UDP packets whose first payload byte is
-	// even.
-	prog, err := bpf.Assemble([]bpf.Instruction{
-		// Load the first byte of the payload (skipping UDP header).
-		bpf.LoadAbsolute{Off: 8, Size: 1},
-		// Select LSB of the byte.
-		bpf.ALUOpConstant{Op: bpf.ALUOpAnd, Val: 1},
-		// Byte is even?
-		bpf.JumpIf{Cond: bpf.JumpEqual, Val: 0, SkipFalse: 1},
-		// Accept.
-		bpf.RetConstant{Val: 4096},
-		// Ignore.
-		bpf.RetConstant{Val: 0},
-	})
-	if err != nil {
-		t.Fatalf("compiling BPF: %s", err)
-	}
-
-	if err = p.SetBPF(prog); err != nil {
-		t.Fatalf("attaching filter to Conn: %s", err)
-	}
-
-	s, err := net.Dial("udp4", l.LocalAddr().String())
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer s.Close()
-	go func() {
-		for i := byte(0); i < 10; i++ {
-			s.Write([]byte{i})
-		}
-	}()
-
-	l.SetDeadline(time.Now().Add(2 * time.Second))
-	seen := make([]bool, 5)
-	for {
-		var b [512]byte
-		n, _, err := l.ReadFrom(b[:])
-		if err != nil {
-			t.Fatalf("reading from listener: %s", err)
-		}
-		if n != 1 {
-			t.Fatalf("unexpected packet length, want 1, got %d", n)
-		}
-		if b[0] >= 10 {
-			t.Fatalf("unexpected byte, want 0-9, got %d", b[0])
-		}
-		if b[0]%2 != 0 {
-			t.Fatalf("got odd byte %d, wanted only even bytes", b[0])
-		}
-		seen[b[0]/2] = true
-
-		seenAll := true
-		for _, v := range seen {
-			if !v {
-				seenAll = false
-				break
-			}
-		}
-		if seenAll {
-			break
-		}
-	}
-}
diff --git a/vendor/golang.org/x/net/ipv4/control_test.go b/vendor/golang.org/x/net/ipv4/control_test.go
deleted file mode 100644
index f87fe124..00000000
--- a/vendor/golang.org/x/net/ipv4/control_test.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4_test
-
-import (
-	"testing"
-
-	"golang.org/x/net/ipv4"
-)
-
-func TestControlMessageParseWithFuzz(t *testing.T) {
-	var cm ipv4.ControlMessage
-	for _, fuzz := range []string{
-		"\f\x00\x00\x00\x00\x00\x00\x00\x14\x00\x00\x00",
-		"\f\x00\x00\x00\x00\x00\x00\x00\x1a\x00\x00\x00",
-	} {
-		cm.Parse([]byte(fuzz))
-	}
-}
diff --git a/vendor/golang.org/x/net/ipv4/doc.go b/vendor/golang.org/x/net/ipv4/doc.go
index d1245554..3efa2903 100644
--- a/vendor/golang.org/x/net/ipv4/doc.go
+++ b/vendor/golang.org/x/net/ipv4/doc.go
@@ -55,7 +55,7 @@
 // Multicasting
 //
 // The options for multicasting are available for net.UDPConn and
-// net.IPconn which are created as network connections that use the
+// net.IPConn which are created as network connections that use the
 // IPv4 transport. A few network facilities must be prepared before
 // you begin multicasting, at a minimum joining network interfaces and
 // multicast groups.
diff --git a/vendor/golang.org/x/net/ipv4/example_test.go b/vendor/golang.org/x/net/ipv4/example_test.go
deleted file mode 100644
index ddc7577e..00000000
--- a/vendor/golang.org/x/net/ipv4/example_test.go
+++ /dev/null
@@ -1,224 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4_test
-
-import (
-	"fmt"
-	"log"
-	"net"
-	"os"
-	"runtime"
-	"time"
-
-	"golang.org/x/net/icmp"
-	"golang.org/x/net/ipv4"
-)
-
-func ExampleConn_markingTCP() {
-	ln, err := net.Listen("tcp", "0.0.0.0:1024")
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer ln.Close()
-
-	for {
-		c, err := ln.Accept()
-		if err != nil {
-			log.Fatal(err)
-		}
-		go func(c net.Conn) {
-			defer c.Close()
-			if c.RemoteAddr().(*net.TCPAddr).IP.To4() != nil {
-				p := ipv4.NewConn(c)
-				if err := p.SetTOS(0x28); err != nil { // DSCP AF11
-					log.Fatal(err)
-				}
-				if err := p.SetTTL(128); err != nil {
-					log.Fatal(err)
-				}
-			}
-			if _, err := c.Write([]byte("HELLO-R-U-THERE-ACK")); err != nil {
-				log.Fatal(err)
-			}
-		}(c)
-	}
-}
-
-func ExamplePacketConn_servingOneShotMulticastDNS() {
-	c, err := net.ListenPacket("udp4", "0.0.0.0:5353") // mDNS over UDP
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer c.Close()
-	p := ipv4.NewPacketConn(c)
-
-	en0, err := net.InterfaceByName("en0")
-	if err != nil {
-		log.Fatal(err)
-	}
-	mDNSLinkLocal := net.UDPAddr{IP: net.IPv4(224, 0, 0, 251)}
-	if err := p.JoinGroup(en0, &mDNSLinkLocal); err != nil {
-		log.Fatal(err)
-	}
-	defer p.LeaveGroup(en0, &mDNSLinkLocal)
-	if err := p.SetControlMessage(ipv4.FlagDst, true); err != nil {
-		log.Fatal(err)
-	}
-
-	b := make([]byte, 1500)
-	for {
-		_, cm, peer, err := p.ReadFrom(b)
-		if err != nil {
-			log.Fatal(err)
-		}
-		if !cm.Dst.IsMulticast() || !cm.Dst.Equal(mDNSLinkLocal.IP) {
-			continue
-		}
-		answers := []byte("FAKE-MDNS-ANSWERS") // fake mDNS answers, you need to implement this
-		if _, err := p.WriteTo(answers, nil, peer); err != nil {
-			log.Fatal(err)
-		}
-	}
-}
-
-func ExamplePacketConn_tracingIPPacketRoute() {
-	// Tracing an IP packet route to www.google.com.
-
-	const host = "www.google.com"
-	ips, err := net.LookupIP(host)
-	if err != nil {
-		log.Fatal(err)
-	}
-	var dst net.IPAddr
-	for _, ip := range ips {
-		if ip.To4() != nil {
-			dst.IP = ip
-			fmt.Printf("using %v for tracing an IP packet route to %s\n", dst.IP, host)
-			break
-		}
-	}
-	if dst.IP == nil {
-		log.Fatal("no A record found")
-	}
-
-	c, err := net.ListenPacket("ip4:1", "0.0.0.0") // ICMP for IPv4
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer c.Close()
-	p := ipv4.NewPacketConn(c)
-
-	if err := p.SetControlMessage(ipv4.FlagTTL|ipv4.FlagSrc|ipv4.FlagDst|ipv4.FlagInterface, true); err != nil {
-		log.Fatal(err)
-	}
-	wm := icmp.Message{
-		Type: ipv4.ICMPTypeEcho, Code: 0,
-		Body: &icmp.Echo{
-			ID:   os.Getpid() & 0xffff,
-			Data: []byte("HELLO-R-U-THERE"),
-		},
-	}
-
-	rb := make([]byte, 1500)
-	for i := 1; i <= 64; i++ { // up to 64 hops
-		wm.Body.(*icmp.Echo).Seq = i
-		wb, err := wm.Marshal(nil)
-		if err != nil {
-			log.Fatal(err)
-		}
-		if err := p.SetTTL(i); err != nil {
-			log.Fatal(err)
-		}
-
-		// In the real world usually there are several
-		// multiple traffic-engineered paths for each hop.
-		// You may need to probe a few times to each hop.
-		begin := time.Now()
-		if _, err := p.WriteTo(wb, nil, &dst); err != nil {
-			log.Fatal(err)
-		}
-		if err := p.SetReadDeadline(time.Now().Add(3 * time.Second)); err != nil {
-			log.Fatal(err)
-		}
-		n, cm, peer, err := p.ReadFrom(rb)
-		if err != nil {
-			if err, ok := err.(net.Error); ok && err.Timeout() {
-				fmt.Printf("%v\t*\n", i)
-				continue
-			}
-			log.Fatal(err)
-		}
-		rm, err := icmp.ParseMessage(1, rb[:n])
-		if err != nil {
-			log.Fatal(err)
-		}
-		rtt := time.Since(begin)
-
-		// In the real world you need to determine whether the
-		// received message is yours using ControlMessage.Src,
-		// ControlMessage.Dst, icmp.Echo.ID and icmp.Echo.Seq.
-		switch rm.Type {
-		case ipv4.ICMPTypeTimeExceeded:
-			names, _ := net.LookupAddr(peer.String())
-			fmt.Printf("%d\t%v %+v %v\n\t%+v\n", i, peer, names, rtt, cm)
-		case ipv4.ICMPTypeEchoReply:
-			names, _ := net.LookupAddr(peer.String())
-			fmt.Printf("%d\t%v %+v %v\n\t%+v\n", i, peer, names, rtt, cm)
-			return
-		default:
-			log.Printf("unknown ICMP message: %+v\n", rm)
-		}
-	}
-}
-
-func ExampleRawConn_advertisingOSPFHello() {
-	c, err := net.ListenPacket("ip4:89", "0.0.0.0") // OSPF for IPv4
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer c.Close()
-	r, err := ipv4.NewRawConn(c)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	en0, err := net.InterfaceByName("en0")
-	if err != nil {
-		log.Fatal(err)
-	}
-	allSPFRouters := net.IPAddr{IP: net.IPv4(224, 0, 0, 5)}
-	if err := r.JoinGroup(en0, &allSPFRouters); err != nil {
-		log.Fatal(err)
-	}
-	defer r.LeaveGroup(en0, &allSPFRouters)
-
-	hello := make([]byte, 24) // fake hello data, you need to implement this
-	ospf := make([]byte, 24)  // fake ospf header, you need to implement this
-	ospf[0] = 2               // version 2
-	ospf[1] = 1               // hello packet
-	ospf = append(ospf, hello...)
-	iph := &ipv4.Header{
-		Version:  ipv4.Version,
-		Len:      ipv4.HeaderLen,
-		TOS:      0xc0, // DSCP CS6
-		TotalLen: ipv4.HeaderLen + len(ospf),
-		TTL:      1,
-		Protocol: 89,
-		Dst:      allSPFRouters.IP.To4(),
-	}
-
-	var cm *ipv4.ControlMessage
-	switch runtime.GOOS {
-	case "darwin", "linux":
-		cm = &ipv4.ControlMessage{IfIndex: en0.Index}
-	default:
-		if err := r.SetMulticastInterface(en0); err != nil {
-			log.Fatal(err)
-		}
-	}
-	if err := r.WriteTo(iph, ospf, cm); err != nil {
-		log.Fatal(err)
-	}
-}
diff --git a/vendor/golang.org/x/net/ipv4/header.go b/vendor/golang.org/x/net/ipv4/header.go
index 358afe2f..a8c8f7a6 100644
--- a/vendor/golang.org/x/net/ipv4/header.go
+++ b/vendor/golang.org/x/net/ipv4/header.go
@@ -51,6 +51,10 @@ func (h *Header) String() string {
 }
 
 // Marshal returns the binary encoding of h.
+//
+// The returned slice is in the format used by a raw IP socket on the
+// local system.
+// This may differ from the wire format, depending on the system.
 func (h *Header) Marshal() ([]byte, error) {
 	if h == nil {
 		return nil, errInvalidConn
@@ -98,6 +102,10 @@ func (h *Header) Marshal() ([]byte, error) {
 }
 
 // Parse parses b as an IPv4 header and stores the result in h.
+//
+// The provided b must be in the format used by a raw IP socket on the
+// local system.
+// This may differ from the wire format, depending on the system.
 func (h *Header) Parse(b []byte) error {
 	if h == nil || len(b) < HeaderLen {
 		return errHeaderTooShort
@@ -149,6 +157,10 @@ func (h *Header) Parse(b []byte) error {
 }
 
 // ParseHeader parses b as an IPv4 header.
+//
+// The provided b must be in the format used by a raw IP socket on the
+// local system.
+// This may differ from the wire format, depending on the system.
 func ParseHeader(b []byte) (*Header, error) {
 	h := new(Header)
 	if err := h.Parse(b); err != nil {
diff --git a/vendor/golang.org/x/net/ipv4/header_test.go b/vendor/golang.org/x/net/ipv4/header_test.go
deleted file mode 100644
index a246aeea..00000000
--- a/vendor/golang.org/x/net/ipv4/header_test.go
+++ /dev/null
@@ -1,228 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4
-
-import (
-	"bytes"
-	"encoding/binary"
-	"net"
-	"reflect"
-	"runtime"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/internal/socket"
-)
-
-type headerTest struct {
-	wireHeaderFromKernel          []byte
-	wireHeaderToKernel            []byte
-	wireHeaderFromTradBSDKernel   []byte
-	wireHeaderToTradBSDKernel     []byte
-	wireHeaderFromFreeBSD10Kernel []byte
-	wireHeaderToFreeBSD10Kernel   []byte
-	*Header
-}
-
-var headerLittleEndianTests = []headerTest{
-	// TODO(mikio): Add platform dependent wire header formats when
-	// we support new platforms.
-	{
-		wireHeaderFromKernel: []byte{
-			0x45, 0x01, 0xbe, 0xef,
-			0xca, 0xfe, 0x45, 0xdc,
-			0xff, 0x01, 0xde, 0xad,
-			172, 16, 254, 254,
-			192, 168, 0, 1,
-		},
-		wireHeaderToKernel: []byte{
-			0x45, 0x01, 0xbe, 0xef,
-			0xca, 0xfe, 0x45, 0xdc,
-			0xff, 0x01, 0xde, 0xad,
-			172, 16, 254, 254,
-			192, 168, 0, 1,
-		},
-		wireHeaderFromTradBSDKernel: []byte{
-			0x45, 0x01, 0xdb, 0xbe,
-			0xca, 0xfe, 0xdc, 0x45,
-			0xff, 0x01, 0xde, 0xad,
-			172, 16, 254, 254,
-			192, 168, 0, 1,
-		},
-		wireHeaderToTradBSDKernel: []byte{
-			0x45, 0x01, 0xef, 0xbe,
-			0xca, 0xfe, 0xdc, 0x45,
-			0xff, 0x01, 0xde, 0xad,
-			172, 16, 254, 254,
-			192, 168, 0, 1,
-		},
-		wireHeaderFromFreeBSD10Kernel: []byte{
-			0x45, 0x01, 0xef, 0xbe,
-			0xca, 0xfe, 0xdc, 0x45,
-			0xff, 0x01, 0xde, 0xad,
-			172, 16, 254, 254,
-			192, 168, 0, 1,
-		},
-		wireHeaderToFreeBSD10Kernel: []byte{
-			0x45, 0x01, 0xef, 0xbe,
-			0xca, 0xfe, 0xdc, 0x45,
-			0xff, 0x01, 0xde, 0xad,
-			172, 16, 254, 254,
-			192, 168, 0, 1,
-		},
-		Header: &Header{
-			Version:  Version,
-			Len:      HeaderLen,
-			TOS:      1,
-			TotalLen: 0xbeef,
-			ID:       0xcafe,
-			Flags:    DontFragment,
-			FragOff:  1500,
-			TTL:      255,
-			Protocol: 1,
-			Checksum: 0xdead,
-			Src:      net.IPv4(172, 16, 254, 254),
-			Dst:      net.IPv4(192, 168, 0, 1),
-		},
-	},
-
-	// with option headers
-	{
-		wireHeaderFromKernel: []byte{
-			0x46, 0x01, 0xbe, 0xf3,
-			0xca, 0xfe, 0x45, 0xdc,
-			0xff, 0x01, 0xde, 0xad,
-			172, 16, 254, 254,
-			192, 168, 0, 1,
-			0xff, 0xfe, 0xfe, 0xff,
-		},
-		wireHeaderToKernel: []byte{
-			0x46, 0x01, 0xbe, 0xf3,
-			0xca, 0xfe, 0x45, 0xdc,
-			0xff, 0x01, 0xde, 0xad,
-			172, 16, 254, 254,
-			192, 168, 0, 1,
-			0xff, 0xfe, 0xfe, 0xff,
-		},
-		wireHeaderFromTradBSDKernel: []byte{
-			0x46, 0x01, 0xdb, 0xbe,
-			0xca, 0xfe, 0xdc, 0x45,
-			0xff, 0x01, 0xde, 0xad,
-			172, 16, 254, 254,
-			192, 168, 0, 1,
-			0xff, 0xfe, 0xfe, 0xff,
-		},
-		wireHeaderToTradBSDKernel: []byte{
-			0x46, 0x01, 0xf3, 0xbe,
-			0xca, 0xfe, 0xdc, 0x45,
-			0xff, 0x01, 0xde, 0xad,
-			172, 16, 254, 254,
-			192, 168, 0, 1,
-			0xff, 0xfe, 0xfe, 0xff,
-		},
-		wireHeaderFromFreeBSD10Kernel: []byte{
-			0x46, 0x01, 0xf3, 0xbe,
-			0xca, 0xfe, 0xdc, 0x45,
-			0xff, 0x01, 0xde, 0xad,
-			172, 16, 254, 254,
-			192, 168, 0, 1,
-			0xff, 0xfe, 0xfe, 0xff,
-		},
-		wireHeaderToFreeBSD10Kernel: []byte{
-			0x46, 0x01, 0xf3, 0xbe,
-			0xca, 0xfe, 0xdc, 0x45,
-			0xff, 0x01, 0xde, 0xad,
-			172, 16, 254, 254,
-			192, 168, 0, 1,
-			0xff, 0xfe, 0xfe, 0xff,
-		},
-		Header: &Header{
-			Version:  Version,
-			Len:      HeaderLen + 4,
-			TOS:      1,
-			TotalLen: 0xbef3,
-			ID:       0xcafe,
-			Flags:    DontFragment,
-			FragOff:  1500,
-			TTL:      255,
-			Protocol: 1,
-			Checksum: 0xdead,
-			Src:      net.IPv4(172, 16, 254, 254),
-			Dst:      net.IPv4(192, 168, 0, 1),
-			Options:  []byte{0xff, 0xfe, 0xfe, 0xff},
-		},
-	},
-}
-
-func TestMarshalHeader(t *testing.T) {
-	if socket.NativeEndian != binary.LittleEndian {
-		t.Skip("no test for non-little endian machine yet")
-	}
-
-	for _, tt := range headerLittleEndianTests {
-		b, err := tt.Header.Marshal()
-		if err != nil {
-			t.Fatal(err)
-		}
-		var wh []byte
-		switch runtime.GOOS {
-		case "darwin", "dragonfly", "netbsd":
-			wh = tt.wireHeaderToTradBSDKernel
-		case "freebsd":
-			switch {
-			case freebsdVersion < 1000000:
-				wh = tt.wireHeaderToTradBSDKernel
-			case 1000000 <= freebsdVersion && freebsdVersion < 1100000:
-				wh = tt.wireHeaderToFreeBSD10Kernel
-			default:
-				wh = tt.wireHeaderToKernel
-			}
-		default:
-			wh = tt.wireHeaderToKernel
-		}
-		if !bytes.Equal(b, wh) {
-			t.Fatalf("got %#v; want %#v", b, wh)
-		}
-	}
-}
-
-func TestParseHeader(t *testing.T) {
-	if socket.NativeEndian != binary.LittleEndian {
-		t.Skip("no test for big endian machine yet")
-	}
-
-	for _, tt := range headerLittleEndianTests {
-		var wh []byte
-		switch runtime.GOOS {
-		case "darwin", "dragonfly", "netbsd":
-			wh = tt.wireHeaderFromTradBSDKernel
-		case "freebsd":
-			switch {
-			case freebsdVersion < 1000000:
-				wh = tt.wireHeaderFromTradBSDKernel
-			case 1000000 <= freebsdVersion && freebsdVersion < 1100000:
-				wh = tt.wireHeaderFromFreeBSD10Kernel
-			default:
-				wh = tt.wireHeaderFromKernel
-			}
-		default:
-			wh = tt.wireHeaderFromKernel
-		}
-		h, err := ParseHeader(wh)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := h.Parse(wh); err != nil {
-			t.Fatal(err)
-		}
-		if !reflect.DeepEqual(h, tt.Header) {
-			t.Fatalf("got %#v; want %#v", h, tt.Header)
-		}
-		s := h.String()
-		if strings.Contains(s, ",") {
-			t.Fatalf("should be space-separated values: %s", s)
-		}
-	}
-}
diff --git a/vendor/golang.org/x/net/ipv4/icmp_test.go b/vendor/golang.org/x/net/ipv4/icmp_test.go
deleted file mode 100644
index 3324b54d..00000000
--- a/vendor/golang.org/x/net/ipv4/icmp_test.go
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4_test
-
-import (
-	"net"
-	"reflect"
-	"runtime"
-	"testing"
-
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv4"
-)
-
-var icmpStringTests = []struct {
-	in  ipv4.ICMPType
-	out string
-}{
-	{ipv4.ICMPTypeDestinationUnreachable, "destination unreachable"},
-
-	{256, "<nil>"},
-}
-
-func TestICMPString(t *testing.T) {
-	for _, tt := range icmpStringTests {
-		s := tt.in.String()
-		if s != tt.out {
-			t.Errorf("got %s; want %s", s, tt.out)
-		}
-	}
-}
-
-func TestICMPFilter(t *testing.T) {
-	switch runtime.GOOS {
-	case "linux":
-	default:
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-
-	var f ipv4.ICMPFilter
-	for _, toggle := range []bool{false, true} {
-		f.SetAll(toggle)
-		for _, typ := range []ipv4.ICMPType{
-			ipv4.ICMPTypeDestinationUnreachable,
-			ipv4.ICMPTypeEchoReply,
-			ipv4.ICMPTypeTimeExceeded,
-			ipv4.ICMPTypeParameterProblem,
-		} {
-			f.Accept(typ)
-			if f.WillBlock(typ) {
-				t.Errorf("ipv4.ICMPFilter.Set(%v, false) failed", typ)
-			}
-			f.Block(typ)
-			if !f.WillBlock(typ) {
-				t.Errorf("ipv4.ICMPFilter.Set(%v, true) failed", typ)
-			}
-		}
-	}
-}
-
-func TestSetICMPFilter(t *testing.T) {
-	switch runtime.GOOS {
-	case "linux":
-	default:
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if m, ok := nettest.SupportsRawIPSocket(); !ok {
-		t.Skip(m)
-	}
-
-	c, err := net.ListenPacket("ip4:icmp", "127.0.0.1")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-
-	p := ipv4.NewPacketConn(c)
-
-	var f ipv4.ICMPFilter
-	f.SetAll(true)
-	f.Accept(ipv4.ICMPTypeEcho)
-	f.Accept(ipv4.ICMPTypeEchoReply)
-	if err := p.SetICMPFilter(&f); err != nil {
-		t.Fatal(err)
-	}
-	kf, err := p.ICMPFilter()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(kf, &f) {
-		t.Fatalf("got %#v; want %#v", kf, f)
-	}
-}
diff --git a/vendor/golang.org/x/net/ipv4/multicast_test.go b/vendor/golang.org/x/net/ipv4/multicast_test.go
deleted file mode 100644
index 2136a3c6..00000000
--- a/vendor/golang.org/x/net/ipv4/multicast_test.go
+++ /dev/null
@@ -1,334 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4_test
-
-import (
-	"bytes"
-	"net"
-	"os"
-	"runtime"
-	"testing"
-	"time"
-
-	"golang.org/x/net/icmp"
-	"golang.org/x/net/internal/iana"
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv4"
-)
-
-var packetConnReadWriteMulticastUDPTests = []struct {
-	addr     string
-	grp, src *net.UDPAddr
-}{
-	{"224.0.0.0:0", &net.UDPAddr{IP: net.IPv4(224, 0, 0, 254)}, nil}, // see RFC 4727
-
-	{"232.0.1.0:0", &net.UDPAddr{IP: net.IPv4(232, 0, 1, 254)}, &net.UDPAddr{IP: net.IPv4(127, 0, 0, 1)}}, // see RFC 5771
-}
-
-func TestPacketConnReadWriteMulticastUDP(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "solaris", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagMulticast|net.FlagLoopback)
-	if ifi == nil {
-		t.Skipf("not available on %s", runtime.GOOS)
-	}
-
-	for _, tt := range packetConnReadWriteMulticastUDPTests {
-		c, err := net.ListenPacket("udp4", tt.addr)
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c.Close()
-
-		grp := *tt.grp
-		grp.Port = c.LocalAddr().(*net.UDPAddr).Port
-		p := ipv4.NewPacketConn(c)
-		defer p.Close()
-		if tt.src == nil {
-			if err := p.JoinGroup(ifi, &grp); err != nil {
-				t.Fatal(err)
-			}
-			defer p.LeaveGroup(ifi, &grp)
-		} else {
-			if err := p.JoinSourceSpecificGroup(ifi, &grp, tt.src); err != nil {
-				switch runtime.GOOS {
-				case "freebsd", "linux":
-				default: // platforms that don't support IGMPv2/3 fail here
-					t.Logf("not supported on %s", runtime.GOOS)
-					continue
-				}
-				t.Fatal(err)
-			}
-			defer p.LeaveSourceSpecificGroup(ifi, &grp, tt.src)
-		}
-		if err := p.SetMulticastInterface(ifi); err != nil {
-			t.Fatal(err)
-		}
-		if _, err := p.MulticastInterface(); err != nil {
-			t.Fatal(err)
-		}
-		if err := p.SetMulticastLoopback(true); err != nil {
-			t.Fatal(err)
-		}
-		if _, err := p.MulticastLoopback(); err != nil {
-			t.Fatal(err)
-		}
-		cf := ipv4.FlagTTL | ipv4.FlagDst | ipv4.FlagInterface
-		wb := []byte("HELLO-R-U-THERE")
-
-		for i, toggle := range []bool{true, false, true} {
-			if err := p.SetControlMessage(cf, toggle); err != nil {
-				if nettest.ProtocolNotSupported(err) {
-					t.Logf("not supported on %s", runtime.GOOS)
-					continue
-				}
-				t.Fatal(err)
-			}
-			if err := p.SetDeadline(time.Now().Add(200 * time.Millisecond)); err != nil {
-				t.Fatal(err)
-			}
-			p.SetMulticastTTL(i + 1)
-			if n, err := p.WriteTo(wb, nil, &grp); err != nil {
-				t.Fatal(err)
-			} else if n != len(wb) {
-				t.Fatalf("got %v; want %v", n, len(wb))
-			}
-			rb := make([]byte, 128)
-			if n, _, _, err := p.ReadFrom(rb); err != nil {
-				t.Fatal(err)
-			} else if !bytes.Equal(rb[:n], wb) {
-				t.Fatalf("got %v; want %v", rb[:n], wb)
-			}
-		}
-	}
-}
-
-var packetConnReadWriteMulticastICMPTests = []struct {
-	grp, src *net.IPAddr
-}{
-	{&net.IPAddr{IP: net.IPv4(224, 0, 0, 254)}, nil}, // see RFC 4727
-
-	{&net.IPAddr{IP: net.IPv4(232, 0, 1, 254)}, &net.IPAddr{IP: net.IPv4(127, 0, 0, 1)}}, // see RFC 5771
-}
-
-func TestPacketConnReadWriteMulticastICMP(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "solaris", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if m, ok := nettest.SupportsRawIPSocket(); !ok {
-		t.Skip(m)
-	}
-	ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagMulticast|net.FlagLoopback)
-	if ifi == nil {
-		t.Skipf("not available on %s", runtime.GOOS)
-	}
-
-	for _, tt := range packetConnReadWriteMulticastICMPTests {
-		c, err := net.ListenPacket("ip4:icmp", "0.0.0.0")
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c.Close()
-
-		p := ipv4.NewPacketConn(c)
-		defer p.Close()
-		if tt.src == nil {
-			if err := p.JoinGroup(ifi, tt.grp); err != nil {
-				t.Fatal(err)
-			}
-			defer p.LeaveGroup(ifi, tt.grp)
-		} else {
-			if err := p.JoinSourceSpecificGroup(ifi, tt.grp, tt.src); err != nil {
-				switch runtime.GOOS {
-				case "freebsd", "linux":
-				default: // platforms that don't support IGMPv2/3 fail here
-					t.Logf("not supported on %s", runtime.GOOS)
-					continue
-				}
-				t.Fatal(err)
-			}
-			defer p.LeaveSourceSpecificGroup(ifi, tt.grp, tt.src)
-		}
-		if err := p.SetMulticastInterface(ifi); err != nil {
-			t.Fatal(err)
-		}
-		if _, err := p.MulticastInterface(); err != nil {
-			t.Fatal(err)
-		}
-		if err := p.SetMulticastLoopback(true); err != nil {
-			t.Fatal(err)
-		}
-		if _, err := p.MulticastLoopback(); err != nil {
-			t.Fatal(err)
-		}
-		cf := ipv4.FlagDst | ipv4.FlagInterface
-		if runtime.GOOS != "solaris" {
-			// Solaris never allows to modify ICMP properties.
-			cf |= ipv4.FlagTTL
-		}
-
-		for i, toggle := range []bool{true, false, true} {
-			wb, err := (&icmp.Message{
-				Type: ipv4.ICMPTypeEcho, Code: 0,
-				Body: &icmp.Echo{
-					ID: os.Getpid() & 0xffff, Seq: i + 1,
-					Data: []byte("HELLO-R-U-THERE"),
-				},
-			}).Marshal(nil)
-			if err != nil {
-				t.Fatal(err)
-			}
-			if err := p.SetControlMessage(cf, toggle); err != nil {
-				if nettest.ProtocolNotSupported(err) {
-					t.Logf("not supported on %s", runtime.GOOS)
-					continue
-				}
-				t.Fatal(err)
-			}
-			if err := p.SetDeadline(time.Now().Add(200 * time.Millisecond)); err != nil {
-				t.Fatal(err)
-			}
-			p.SetMulticastTTL(i + 1)
-			if n, err := p.WriteTo(wb, nil, tt.grp); err != nil {
-				t.Fatal(err)
-			} else if n != len(wb) {
-				t.Fatalf("got %v; want %v", n, len(wb))
-			}
-			rb := make([]byte, 128)
-			if n, _, _, err := p.ReadFrom(rb); err != nil {
-				t.Fatal(err)
-			} else {
-				m, err := icmp.ParseMessage(iana.ProtocolICMP, rb[:n])
-				if err != nil {
-					t.Fatal(err)
-				}
-				switch {
-				case m.Type == ipv4.ICMPTypeEchoReply && m.Code == 0: // net.inet.icmp.bmcastecho=1
-				case m.Type == ipv4.ICMPTypeEcho && m.Code == 0: // net.inet.icmp.bmcastecho=0
-				default:
-					t.Fatalf("got type=%v, code=%v; want type=%v, code=%v", m.Type, m.Code, ipv4.ICMPTypeEchoReply, 0)
-				}
-			}
-		}
-	}
-}
-
-var rawConnReadWriteMulticastICMPTests = []struct {
-	grp, src *net.IPAddr
-}{
-	{&net.IPAddr{IP: net.IPv4(224, 0, 0, 254)}, nil}, // see RFC 4727
-
-	{&net.IPAddr{IP: net.IPv4(232, 0, 1, 254)}, &net.IPAddr{IP: net.IPv4(127, 0, 0, 1)}}, // see RFC 5771
-}
-
-func TestRawConnReadWriteMulticastICMP(t *testing.T) {
-	if testing.Short() {
-		t.Skip("to avoid external network")
-	}
-	if m, ok := nettest.SupportsRawIPSocket(); !ok {
-		t.Skip(m)
-	}
-	ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagMulticast|net.FlagLoopback)
-	if ifi == nil {
-		t.Skipf("not available on %s", runtime.GOOS)
-	}
-
-	for _, tt := range rawConnReadWriteMulticastICMPTests {
-		c, err := net.ListenPacket("ip4:icmp", "0.0.0.0")
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c.Close()
-
-		r, err := ipv4.NewRawConn(c)
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer r.Close()
-		if tt.src == nil {
-			if err := r.JoinGroup(ifi, tt.grp); err != nil {
-				t.Fatal(err)
-			}
-			defer r.LeaveGroup(ifi, tt.grp)
-		} else {
-			if err := r.JoinSourceSpecificGroup(ifi, tt.grp, tt.src); err != nil {
-				switch runtime.GOOS {
-				case "freebsd", "linux":
-				default: // platforms that don't support IGMPv2/3 fail here
-					t.Logf("not supported on %s", runtime.GOOS)
-					continue
-				}
-				t.Fatal(err)
-			}
-			defer r.LeaveSourceSpecificGroup(ifi, tt.grp, tt.src)
-		}
-		if err := r.SetMulticastInterface(ifi); err != nil {
-			t.Fatal(err)
-		}
-		if _, err := r.MulticastInterface(); err != nil {
-			t.Fatal(err)
-		}
-		if err := r.SetMulticastLoopback(true); err != nil {
-			t.Fatal(err)
-		}
-		if _, err := r.MulticastLoopback(); err != nil {
-			t.Fatal(err)
-		}
-		cf := ipv4.FlagTTL | ipv4.FlagDst | ipv4.FlagInterface
-
-		for i, toggle := range []bool{true, false, true} {
-			wb, err := (&icmp.Message{
-				Type: ipv4.ICMPTypeEcho, Code: 0,
-				Body: &icmp.Echo{
-					ID: os.Getpid() & 0xffff, Seq: i + 1,
-					Data: []byte("HELLO-R-U-THERE"),
-				},
-			}).Marshal(nil)
-			if err != nil {
-				t.Fatal(err)
-			}
-			wh := &ipv4.Header{
-				Version:  ipv4.Version,
-				Len:      ipv4.HeaderLen,
-				TOS:      i + 1,
-				TotalLen: ipv4.HeaderLen + len(wb),
-				Protocol: 1,
-				Dst:      tt.grp.IP,
-			}
-			if err := r.SetControlMessage(cf, toggle); err != nil {
-				if nettest.ProtocolNotSupported(err) {
-					t.Logf("not supported on %s", runtime.GOOS)
-					continue
-				}
-				t.Fatal(err)
-			}
-			if err := r.SetDeadline(time.Now().Add(200 * time.Millisecond)); err != nil {
-				t.Fatal(err)
-			}
-			r.SetMulticastTTL(i + 1)
-			if err := r.WriteTo(wh, wb, nil); err != nil {
-				t.Fatal(err)
-			}
-			rb := make([]byte, ipv4.HeaderLen+128)
-			if rh, b, _, err := r.ReadFrom(rb); err != nil {
-				t.Fatal(err)
-			} else {
-				m, err := icmp.ParseMessage(iana.ProtocolICMP, b)
-				if err != nil {
-					t.Fatal(err)
-				}
-				switch {
-				case (rh.Dst.IsLoopback() || rh.Dst.IsLinkLocalUnicast() || rh.Dst.IsGlobalUnicast()) && m.Type == ipv4.ICMPTypeEchoReply && m.Code == 0: // net.inet.icmp.bmcastecho=1
-				case rh.Dst.IsMulticast() && m.Type == ipv4.ICMPTypeEcho && m.Code == 0: // net.inet.icmp.bmcastecho=0
-				default:
-					t.Fatalf("got type=%v, code=%v; want type=%v, code=%v", m.Type, m.Code, ipv4.ICMPTypeEchoReply, 0)
-				}
-			}
-		}
-	}
-}
diff --git a/vendor/golang.org/x/net/ipv4/multicastlistener_test.go b/vendor/golang.org/x/net/ipv4/multicastlistener_test.go
deleted file mode 100644
index ba2480e4..00000000
--- a/vendor/golang.org/x/net/ipv4/multicastlistener_test.go
+++ /dev/null
@@ -1,265 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4_test
-
-import (
-	"net"
-	"runtime"
-	"testing"
-
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv4"
-)
-
-var udpMultipleGroupListenerTests = []net.Addr{
-	&net.UDPAddr{IP: net.IPv4(224, 0, 0, 249)}, // see RFC 4727
-	&net.UDPAddr{IP: net.IPv4(224, 0, 0, 250)},
-	&net.UDPAddr{IP: net.IPv4(224, 0, 0, 254)},
-}
-
-func TestUDPSinglePacketConnWithMultipleGroupListeners(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if testing.Short() {
-		t.Skip("to avoid external network")
-	}
-
-	for _, gaddr := range udpMultipleGroupListenerTests {
-		c, err := net.ListenPacket("udp4", "0.0.0.0:0") // wildcard address with no reusable port
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c.Close()
-
-		p := ipv4.NewPacketConn(c)
-		var mift []*net.Interface
-
-		ift, err := net.Interfaces()
-		if err != nil {
-			t.Fatal(err)
-		}
-		for i, ifi := range ift {
-			if _, ok := nettest.IsMulticastCapable("ip4", &ifi); !ok {
-				continue
-			}
-			if err := p.JoinGroup(&ifi, gaddr); err != nil {
-				t.Fatal(err)
-			}
-			mift = append(mift, &ift[i])
-		}
-		for _, ifi := range mift {
-			if err := p.LeaveGroup(ifi, gaddr); err != nil {
-				t.Fatal(err)
-			}
-		}
-	}
-}
-
-func TestUDPMultiplePacketConnWithMultipleGroupListeners(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if testing.Short() {
-		t.Skip("to avoid external network")
-	}
-
-	for _, gaddr := range udpMultipleGroupListenerTests {
-		c1, err := net.ListenPacket("udp4", "224.0.0.0:0") // wildcard address with reusable port
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c1.Close()
-		_, port, err := net.SplitHostPort(c1.LocalAddr().String())
-		if err != nil {
-			t.Fatal(err)
-		}
-		c2, err := net.ListenPacket("udp4", net.JoinHostPort("224.0.0.0", port)) // wildcard address with reusable port
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c2.Close()
-
-		var ps [2]*ipv4.PacketConn
-		ps[0] = ipv4.NewPacketConn(c1)
-		ps[1] = ipv4.NewPacketConn(c2)
-		var mift []*net.Interface
-
-		ift, err := net.Interfaces()
-		if err != nil {
-			t.Fatal(err)
-		}
-		for i, ifi := range ift {
-			if _, ok := nettest.IsMulticastCapable("ip4", &ifi); !ok {
-				continue
-			}
-			for _, p := range ps {
-				if err := p.JoinGroup(&ifi, gaddr); err != nil {
-					t.Fatal(err)
-				}
-			}
-			mift = append(mift, &ift[i])
-		}
-		for _, ifi := range mift {
-			for _, p := range ps {
-				if err := p.LeaveGroup(ifi, gaddr); err != nil {
-					t.Fatal(err)
-				}
-			}
-		}
-	}
-}
-
-func TestUDPPerInterfaceSinglePacketConnWithSingleGroupListener(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if testing.Short() {
-		t.Skip("to avoid external network")
-	}
-
-	gaddr := net.IPAddr{IP: net.IPv4(224, 0, 0, 254)} // see RFC 4727
-	type ml struct {
-		c   *ipv4.PacketConn
-		ifi *net.Interface
-	}
-	var mlt []*ml
-
-	ift, err := net.Interfaces()
-	if err != nil {
-		t.Fatal(err)
-	}
-	port := "0"
-	for i, ifi := range ift {
-		ip, ok := nettest.IsMulticastCapable("ip4", &ifi)
-		if !ok {
-			continue
-		}
-		c, err := net.ListenPacket("udp4", net.JoinHostPort(ip.String(), port)) // unicast address with non-reusable port
-		if err != nil {
-			// The listen may fail when the serivce is
-			// already in use, but it's fine because the
-			// purpose of this is not to test the
-			// bookkeeping of IP control block inside the
-			// kernel.
-			t.Log(err)
-			continue
-		}
-		defer c.Close()
-		if port == "0" {
-			_, port, err = net.SplitHostPort(c.LocalAddr().String())
-			if err != nil {
-				t.Fatal(err)
-			}
-		}
-		p := ipv4.NewPacketConn(c)
-		if err := p.JoinGroup(&ifi, &gaddr); err != nil {
-			t.Fatal(err)
-		}
-		mlt = append(mlt, &ml{p, &ift[i]})
-	}
-	for _, m := range mlt {
-		if err := m.c.LeaveGroup(m.ifi, &gaddr); err != nil {
-			t.Fatal(err)
-		}
-	}
-}
-
-func TestIPSingleRawConnWithSingleGroupListener(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if testing.Short() {
-		t.Skip("to avoid external network")
-	}
-	if m, ok := nettest.SupportsRawIPSocket(); !ok {
-		t.Skip(m)
-	}
-
-	c, err := net.ListenPacket("ip4:icmp", "0.0.0.0") // wildcard address
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-
-	r, err := ipv4.NewRawConn(c)
-	if err != nil {
-		t.Fatal(err)
-	}
-	gaddr := net.IPAddr{IP: net.IPv4(224, 0, 0, 254)} // see RFC 4727
-	var mift []*net.Interface
-
-	ift, err := net.Interfaces()
-	if err != nil {
-		t.Fatal(err)
-	}
-	for i, ifi := range ift {
-		if _, ok := nettest.IsMulticastCapable("ip4", &ifi); !ok {
-			continue
-		}
-		if err := r.JoinGroup(&ifi, &gaddr); err != nil {
-			t.Fatal(err)
-		}
-		mift = append(mift, &ift[i])
-	}
-	for _, ifi := range mift {
-		if err := r.LeaveGroup(ifi, &gaddr); err != nil {
-			t.Fatal(err)
-		}
-	}
-}
-
-func TestIPPerInterfaceSingleRawConnWithSingleGroupListener(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if testing.Short() {
-		t.Skip("to avoid external network")
-	}
-	if m, ok := nettest.SupportsRawIPSocket(); !ok {
-		t.Skip(m)
-	}
-
-	gaddr := net.IPAddr{IP: net.IPv4(224, 0, 0, 254)} // see RFC 4727
-	type ml struct {
-		c   *ipv4.RawConn
-		ifi *net.Interface
-	}
-	var mlt []*ml
-
-	ift, err := net.Interfaces()
-	if err != nil {
-		t.Fatal(err)
-	}
-	for i, ifi := range ift {
-		ip, ok := nettest.IsMulticastCapable("ip4", &ifi)
-		if !ok {
-			continue
-		}
-		c, err := net.ListenPacket("ip4:253", ip.String()) // unicast address
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c.Close()
-		r, err := ipv4.NewRawConn(c)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := r.JoinGroup(&ifi, &gaddr); err != nil {
-			t.Fatal(err)
-		}
-		mlt = append(mlt, &ml{r, &ift[i]})
-	}
-	for _, m := range mlt {
-		if err := m.c.LeaveGroup(m.ifi, &gaddr); err != nil {
-			t.Fatal(err)
-		}
-	}
-}
diff --git a/vendor/golang.org/x/net/ipv4/multicastsockopt_test.go b/vendor/golang.org/x/net/ipv4/multicastsockopt_test.go
deleted file mode 100644
index c0a26800..00000000
--- a/vendor/golang.org/x/net/ipv4/multicastsockopt_test.go
+++ /dev/null
@@ -1,195 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4_test
-
-import (
-	"net"
-	"runtime"
-	"testing"
-
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv4"
-)
-
-var packetConnMulticastSocketOptionTests = []struct {
-	net, proto, addr string
-	grp, src         net.Addr
-}{
-	{"udp4", "", "224.0.0.0:0", &net.UDPAddr{IP: net.IPv4(224, 0, 0, 249)}, nil}, // see RFC 4727
-	{"ip4", ":icmp", "0.0.0.0", &net.IPAddr{IP: net.IPv4(224, 0, 0, 250)}, nil},  // see RFC 4727
-
-	{"udp4", "", "232.0.0.0:0", &net.UDPAddr{IP: net.IPv4(232, 0, 1, 249)}, &net.UDPAddr{IP: net.IPv4(127, 0, 0, 1)}}, // see RFC 5771
-	{"ip4", ":icmp", "0.0.0.0", &net.IPAddr{IP: net.IPv4(232, 0, 1, 250)}, &net.UDPAddr{IP: net.IPv4(127, 0, 0, 1)}},  // see RFC 5771
-}
-
-func TestPacketConnMulticastSocketOptions(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagMulticast|net.FlagLoopback)
-	if ifi == nil {
-		t.Skipf("not available on %s", runtime.GOOS)
-	}
-
-	m, ok := nettest.SupportsRawIPSocket()
-	for _, tt := range packetConnMulticastSocketOptionTests {
-		if tt.net == "ip4" && !ok {
-			t.Log(m)
-			continue
-		}
-		c, err := net.ListenPacket(tt.net+tt.proto, tt.addr)
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c.Close()
-		p := ipv4.NewPacketConn(c)
-		defer p.Close()
-
-		if tt.src == nil {
-			testMulticastSocketOptions(t, p, ifi, tt.grp)
-		} else {
-			testSourceSpecificMulticastSocketOptions(t, p, ifi, tt.grp, tt.src)
-		}
-	}
-}
-
-var rawConnMulticastSocketOptionTests = []struct {
-	grp, src net.Addr
-}{
-	{&net.IPAddr{IP: net.IPv4(224, 0, 0, 250)}, nil}, // see RFC 4727
-
-	{&net.IPAddr{IP: net.IPv4(232, 0, 1, 250)}, &net.IPAddr{IP: net.IPv4(127, 0, 0, 1)}}, // see RFC 5771
-}
-
-func TestRawConnMulticastSocketOptions(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if m, ok := nettest.SupportsRawIPSocket(); !ok {
-		t.Skip(m)
-	}
-	ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagMulticast|net.FlagLoopback)
-	if ifi == nil {
-		t.Skipf("not available on %s", runtime.GOOS)
-	}
-
-	for _, tt := range rawConnMulticastSocketOptionTests {
-		c, err := net.ListenPacket("ip4:icmp", "0.0.0.0")
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c.Close()
-		r, err := ipv4.NewRawConn(c)
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer r.Close()
-
-		if tt.src == nil {
-			testMulticastSocketOptions(t, r, ifi, tt.grp)
-		} else {
-			testSourceSpecificMulticastSocketOptions(t, r, ifi, tt.grp, tt.src)
-		}
-	}
-}
-
-type testIPv4MulticastConn interface {
-	MulticastTTL() (int, error)
-	SetMulticastTTL(ttl int) error
-	MulticastLoopback() (bool, error)
-	SetMulticastLoopback(bool) error
-	JoinGroup(*net.Interface, net.Addr) error
-	LeaveGroup(*net.Interface, net.Addr) error
-	JoinSourceSpecificGroup(*net.Interface, net.Addr, net.Addr) error
-	LeaveSourceSpecificGroup(*net.Interface, net.Addr, net.Addr) error
-	ExcludeSourceSpecificGroup(*net.Interface, net.Addr, net.Addr) error
-	IncludeSourceSpecificGroup(*net.Interface, net.Addr, net.Addr) error
-}
-
-func testMulticastSocketOptions(t *testing.T, c testIPv4MulticastConn, ifi *net.Interface, grp net.Addr) {
-	const ttl = 255
-	if err := c.SetMulticastTTL(ttl); err != nil {
-		t.Error(err)
-		return
-	}
-	if v, err := c.MulticastTTL(); err != nil {
-		t.Error(err)
-		return
-	} else if v != ttl {
-		t.Errorf("got %v; want %v", v, ttl)
-		return
-	}
-
-	for _, toggle := range []bool{true, false} {
-		if err := c.SetMulticastLoopback(toggle); err != nil {
-			t.Error(err)
-			return
-		}
-		if v, err := c.MulticastLoopback(); err != nil {
-			t.Error(err)
-			return
-		} else if v != toggle {
-			t.Errorf("got %v; want %v", v, toggle)
-			return
-		}
-	}
-
-	if err := c.JoinGroup(ifi, grp); err != nil {
-		t.Error(err)
-		return
-	}
-	if err := c.LeaveGroup(ifi, grp); err != nil {
-		t.Error(err)
-		return
-	}
-}
-
-func testSourceSpecificMulticastSocketOptions(t *testing.T, c testIPv4MulticastConn, ifi *net.Interface, grp, src net.Addr) {
-	// MCAST_JOIN_GROUP -> MCAST_BLOCK_SOURCE -> MCAST_UNBLOCK_SOURCE -> MCAST_LEAVE_GROUP
-	if err := c.JoinGroup(ifi, grp); err != nil {
-		t.Error(err)
-		return
-	}
-	if err := c.ExcludeSourceSpecificGroup(ifi, grp, src); err != nil {
-		switch runtime.GOOS {
-		case "freebsd", "linux":
-		default: // platforms that don't support IGMPv2/3 fail here
-			t.Logf("not supported on %s", runtime.GOOS)
-			return
-		}
-		t.Error(err)
-		return
-	}
-	if err := c.IncludeSourceSpecificGroup(ifi, grp, src); err != nil {
-		t.Error(err)
-		return
-	}
-	if err := c.LeaveGroup(ifi, grp); err != nil {
-		t.Error(err)
-		return
-	}
-
-	// MCAST_JOIN_SOURCE_GROUP -> MCAST_LEAVE_SOURCE_GROUP
-	if err := c.JoinSourceSpecificGroup(ifi, grp, src); err != nil {
-		t.Error(err)
-		return
-	}
-	if err := c.LeaveSourceSpecificGroup(ifi, grp, src); err != nil {
-		t.Error(err)
-		return
-	}
-
-	// MCAST_JOIN_SOURCE_GROUP -> MCAST_LEAVE_GROUP
-	if err := c.JoinSourceSpecificGroup(ifi, grp, src); err != nil {
-		t.Error(err)
-		return
-	}
-	if err := c.LeaveGroup(ifi, grp); err != nil {
-		t.Error(err)
-		return
-	}
-}
diff --git a/vendor/golang.org/x/net/ipv4/payload_cmsg.go b/vendor/golang.org/x/net/ipv4/payload_cmsg.go
index eec520c4..204a49fe 100644
--- a/vendor/golang.org/x/net/ipv4/payload_cmsg.go
+++ b/vendor/golang.org/x/net/ipv4/payload_cmsg.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !nacl,!plan9,!windows
+// +build !js,!nacl,!plan9,!windows
 
 package ipv4
 
diff --git a/vendor/golang.org/x/net/ipv4/payload_cmsg_go1_8.go b/vendor/golang.org/x/net/ipv4/payload_cmsg_go1_8.go
index d26ccd90..8d45599f 100644
--- a/vendor/golang.org/x/net/ipv4/payload_cmsg_go1_8.go
+++ b/vendor/golang.org/x/net/ipv4/payload_cmsg_go1_8.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // +build !go1.9
-// +build !nacl,!plan9,!windows
+// +build !js,!nacl,!plan9,!windows
 
 package ipv4
 
diff --git a/vendor/golang.org/x/net/ipv4/payload_cmsg_go1_9.go b/vendor/golang.org/x/net/ipv4/payload_cmsg_go1_9.go
index 2f193118..4081aad8 100644
--- a/vendor/golang.org/x/net/ipv4/payload_cmsg_go1_9.go
+++ b/vendor/golang.org/x/net/ipv4/payload_cmsg_go1_9.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // +build go1.9
-// +build !nacl,!plan9,!windows
+// +build !js,!nacl,!plan9,!windows
 
 package ipv4
 
diff --git a/vendor/golang.org/x/net/ipv4/payload_nocmsg.go b/vendor/golang.org/x/net/ipv4/payload_nocmsg.go
index 8cb21b39..1d434c61 100644
--- a/vendor/golang.org/x/net/ipv4/payload_nocmsg.go
+++ b/vendor/golang.org/x/net/ipv4/payload_nocmsg.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build nacl plan9 windows
+// +build js nacl plan9 windows
 
 package ipv4
 
diff --git a/vendor/golang.org/x/net/ipv4/readwrite_go1_8_test.go b/vendor/golang.org/x/net/ipv4/readwrite_go1_8_test.go
deleted file mode 100644
index 83bf927e..00000000
--- a/vendor/golang.org/x/net/ipv4/readwrite_go1_8_test.go
+++ /dev/null
@@ -1,248 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !go1.9
-
-package ipv4_test
-
-import (
-	"bytes"
-	"fmt"
-	"net"
-	"runtime"
-	"strings"
-	"sync"
-	"testing"
-
-	"golang.org/x/net/internal/iana"
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv4"
-)
-
-func BenchmarkPacketConnReadWriteUnicast(b *testing.B) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		b.Skipf("not supported on %s", runtime.GOOS)
-	}
-
-	payload := []byte("HELLO-R-U-THERE")
-	iph, err := (&ipv4.Header{
-		Version:  ipv4.Version,
-		Len:      ipv4.HeaderLen,
-		TotalLen: ipv4.HeaderLen + len(payload),
-		TTL:      1,
-		Protocol: iana.ProtocolReserved,
-		Src:      net.IPv4(192, 0, 2, 1),
-		Dst:      net.IPv4(192, 0, 2, 254),
-	}).Marshal()
-	if err != nil {
-		b.Fatal(err)
-	}
-	greh := []byte{0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00}
-	datagram := append(greh, append(iph, payload...)...)
-	bb := make([]byte, 128)
-	cm := ipv4.ControlMessage{
-		Src: net.IPv4(127, 0, 0, 1),
-	}
-	if ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagLoopback); ifi != nil {
-		cm.IfIndex = ifi.Index
-	}
-
-	b.Run("UDP", func(b *testing.B) {
-		c, err := nettest.NewLocalPacketListener("udp4")
-		if err != nil {
-			b.Skipf("not supported on %s/%s: %v", runtime.GOOS, runtime.GOARCH, err)
-		}
-		defer c.Close()
-		p := ipv4.NewPacketConn(c)
-		dst := c.LocalAddr()
-		cf := ipv4.FlagTTL | ipv4.FlagInterface
-		if err := p.SetControlMessage(cf, true); err != nil {
-			b.Fatal(err)
-		}
-		b.Run("Net", func(b *testing.B) {
-			for i := 0; i < b.N; i++ {
-				if _, err := c.WriteTo(payload, dst); err != nil {
-					b.Fatal(err)
-				}
-				if _, _, err := c.ReadFrom(bb); err != nil {
-					b.Fatal(err)
-				}
-			}
-		})
-		b.Run("ToFrom", func(b *testing.B) {
-			for i := 0; i < b.N; i++ {
-				if _, err := p.WriteTo(payload, &cm, dst); err != nil {
-					b.Fatal(err)
-				}
-				if _, _, _, err := p.ReadFrom(bb); err != nil {
-					b.Fatal(err)
-				}
-			}
-		})
-	})
-	b.Run("IP", func(b *testing.B) {
-		switch runtime.GOOS {
-		case "netbsd":
-			b.Skip("need to configure gre on netbsd")
-		case "openbsd":
-			b.Skip("net.inet.gre.allow=0 by default on openbsd")
-		}
-
-		c, err := net.ListenPacket(fmt.Sprintf("ip4:%d", iana.ProtocolGRE), "127.0.0.1")
-		if err != nil {
-			b.Skipf("not supported on %s/%s: %v", runtime.GOOS, runtime.GOARCH, err)
-		}
-		defer c.Close()
-		p := ipv4.NewPacketConn(c)
-		dst := c.LocalAddr()
-		cf := ipv4.FlagTTL | ipv4.FlagInterface
-		if err := p.SetControlMessage(cf, true); err != nil {
-			b.Fatal(err)
-		}
-		b.Run("Net", func(b *testing.B) {
-			for i := 0; i < b.N; i++ {
-				if _, err := c.WriteTo(datagram, dst); err != nil {
-					b.Fatal(err)
-				}
-				if _, _, err := c.ReadFrom(bb); err != nil {
-					b.Fatal(err)
-				}
-			}
-		})
-		b.Run("ToFrom", func(b *testing.B) {
-			for i := 0; i < b.N; i++ {
-				if _, err := p.WriteTo(datagram, &cm, dst); err != nil {
-					b.Fatal(err)
-				}
-				if _, _, _, err := p.ReadFrom(bb); err != nil {
-					b.Fatal(err)
-				}
-			}
-		})
-	})
-}
-
-func TestPacketConnConcurrentReadWriteUnicast(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-
-	payload := []byte("HELLO-R-U-THERE")
-	iph, err := (&ipv4.Header{
-		Version:  ipv4.Version,
-		Len:      ipv4.HeaderLen,
-		TotalLen: ipv4.HeaderLen + len(payload),
-		TTL:      1,
-		Protocol: iana.ProtocolReserved,
-		Src:      net.IPv4(192, 0, 2, 1),
-		Dst:      net.IPv4(192, 0, 2, 254),
-	}).Marshal()
-	if err != nil {
-		t.Fatal(err)
-	}
-	greh := []byte{0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00}
-	datagram := append(greh, append(iph, payload...)...)
-
-	t.Run("UDP", func(t *testing.T) {
-		c, err := nettest.NewLocalPacketListener("udp4")
-		if err != nil {
-			t.Skipf("not supported on %s/%s: %v", runtime.GOOS, runtime.GOARCH, err)
-		}
-		defer c.Close()
-		p := ipv4.NewPacketConn(c)
-		t.Run("ToFrom", func(t *testing.T) {
-			testPacketConnConcurrentReadWriteUnicast(t, p, payload, c.LocalAddr())
-		})
-	})
-	t.Run("IP", func(t *testing.T) {
-		switch runtime.GOOS {
-		case "netbsd":
-			t.Skip("need to configure gre on netbsd")
-		case "openbsd":
-			t.Skip("net.inet.gre.allow=0 by default on openbsd")
-		}
-
-		c, err := net.ListenPacket(fmt.Sprintf("ip4:%d", iana.ProtocolGRE), "127.0.0.1")
-		if err != nil {
-			t.Skipf("not supported on %s/%s: %v", runtime.GOOS, runtime.GOARCH, err)
-		}
-		defer c.Close()
-		p := ipv4.NewPacketConn(c)
-		t.Run("ToFrom", func(t *testing.T) {
-			testPacketConnConcurrentReadWriteUnicast(t, p, datagram, c.LocalAddr())
-		})
-	})
-}
-
-func testPacketConnConcurrentReadWriteUnicast(t *testing.T, p *ipv4.PacketConn, data []byte, dst net.Addr) {
-	ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagLoopback)
-	cf := ipv4.FlagTTL | ipv4.FlagSrc | ipv4.FlagDst | ipv4.FlagInterface
-
-	if err := p.SetControlMessage(cf, true); err != nil { // probe before test
-		if nettest.ProtocolNotSupported(err) {
-			t.Skipf("not supported on %s", runtime.GOOS)
-		}
-		t.Fatal(err)
-	}
-
-	var wg sync.WaitGroup
-	reader := func() {
-		defer wg.Done()
-		b := make([]byte, 128)
-		n, cm, _, err := p.ReadFrom(b)
-		if err != nil {
-			t.Error(err)
-			return
-		}
-		if !bytes.Equal(b[:n], data) {
-			t.Errorf("got %#v; want %#v", b[:n], data)
-			return
-		}
-		s := cm.String()
-		if strings.Contains(s, ",") {
-			t.Errorf("should be space-separated values: %s", s)
-			return
-		}
-	}
-	writer := func(toggle bool) {
-		defer wg.Done()
-		cm := ipv4.ControlMessage{
-			Src: net.IPv4(127, 0, 0, 1),
-		}
-		if ifi != nil {
-			cm.IfIndex = ifi.Index
-		}
-		if err := p.SetControlMessage(cf, toggle); err != nil {
-			t.Error(err)
-			return
-		}
-		n, err := p.WriteTo(data, &cm, dst)
-		if err != nil {
-			t.Error(err)
-			return
-		}
-		if n != len(data) {
-			t.Errorf("got %d; want %d", n, len(data))
-			return
-		}
-	}
-
-	const N = 10
-	wg.Add(N)
-	for i := 0; i < N; i++ {
-		go reader()
-	}
-	wg.Add(2 * N)
-	for i := 0; i < 2*N; i++ {
-		go writer(i%2 != 0)
-
-	}
-	wg.Add(N)
-	for i := 0; i < N; i++ {
-		go reader()
-	}
-	wg.Wait()
-}
diff --git a/vendor/golang.org/x/net/ipv4/readwrite_go1_9_test.go b/vendor/golang.org/x/net/ipv4/readwrite_go1_9_test.go
deleted file mode 100644
index ef76c8a7..00000000
--- a/vendor/golang.org/x/net/ipv4/readwrite_go1_9_test.go
+++ /dev/null
@@ -1,388 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.9
-
-package ipv4_test
-
-import (
-	"bytes"
-	"fmt"
-	"net"
-	"runtime"
-	"strings"
-	"sync"
-	"testing"
-
-	"golang.org/x/net/internal/iana"
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv4"
-)
-
-func BenchmarkPacketConnReadWriteUnicast(b *testing.B) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		b.Skipf("not supported on %s", runtime.GOOS)
-	}
-
-	payload := []byte("HELLO-R-U-THERE")
-	iph, err := (&ipv4.Header{
-		Version:  ipv4.Version,
-		Len:      ipv4.HeaderLen,
-		TotalLen: ipv4.HeaderLen + len(payload),
-		TTL:      1,
-		Protocol: iana.ProtocolReserved,
-		Src:      net.IPv4(192, 0, 2, 1),
-		Dst:      net.IPv4(192, 0, 2, 254),
-	}).Marshal()
-	if err != nil {
-		b.Fatal(err)
-	}
-	greh := []byte{0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00}
-	datagram := append(greh, append(iph, payload...)...)
-	bb := make([]byte, 128)
-	cm := ipv4.ControlMessage{
-		Src: net.IPv4(127, 0, 0, 1),
-	}
-	if ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagLoopback); ifi != nil {
-		cm.IfIndex = ifi.Index
-	}
-
-	b.Run("UDP", func(b *testing.B) {
-		c, err := nettest.NewLocalPacketListener("udp4")
-		if err != nil {
-			b.Skipf("not supported on %s/%s: %v", runtime.GOOS, runtime.GOARCH, err)
-		}
-		defer c.Close()
-		p := ipv4.NewPacketConn(c)
-		dst := c.LocalAddr()
-		cf := ipv4.FlagTTL | ipv4.FlagInterface
-		if err := p.SetControlMessage(cf, true); err != nil {
-			b.Fatal(err)
-		}
-		wms := []ipv4.Message{
-			{
-				Buffers: [][]byte{payload},
-				Addr:    dst,
-				OOB:     cm.Marshal(),
-			},
-		}
-		rms := []ipv4.Message{
-			{
-				Buffers: [][]byte{bb},
-				OOB:     ipv4.NewControlMessage(cf),
-			},
-		}
-		b.Run("Net", func(b *testing.B) {
-			for i := 0; i < b.N; i++ {
-				if _, err := c.WriteTo(payload, dst); err != nil {
-					b.Fatal(err)
-				}
-				if _, _, err := c.ReadFrom(bb); err != nil {
-					b.Fatal(err)
-				}
-			}
-		})
-		b.Run("ToFrom", func(b *testing.B) {
-			for i := 0; i < b.N; i++ {
-				if _, err := p.WriteTo(payload, &cm, dst); err != nil {
-					b.Fatal(err)
-				}
-				if _, _, _, err := p.ReadFrom(bb); err != nil {
-					b.Fatal(err)
-				}
-			}
-		})
-		b.Run("Batch", func(b *testing.B) {
-			for i := 0; i < b.N; i++ {
-				if _, err := p.WriteBatch(wms, 0); err != nil {
-					b.Fatal(err)
-				}
-				if _, err := p.ReadBatch(rms, 0); err != nil {
-					b.Fatal(err)
-				}
-			}
-		})
-	})
-	b.Run("IP", func(b *testing.B) {
-		switch runtime.GOOS {
-		case "netbsd":
-			b.Skip("need to configure gre on netbsd")
-		case "openbsd":
-			b.Skip("net.inet.gre.allow=0 by default on openbsd")
-		}
-
-		c, err := net.ListenPacket(fmt.Sprintf("ip4:%d", iana.ProtocolGRE), "127.0.0.1")
-		if err != nil {
-			b.Skipf("not supported on %s/%s: %v", runtime.GOOS, runtime.GOARCH, err)
-		}
-		defer c.Close()
-		p := ipv4.NewPacketConn(c)
-		dst := c.LocalAddr()
-		cf := ipv4.FlagTTL | ipv4.FlagInterface
-		if err := p.SetControlMessage(cf, true); err != nil {
-			b.Fatal(err)
-		}
-		wms := []ipv4.Message{
-			{
-				Buffers: [][]byte{datagram},
-				Addr:    dst,
-				OOB:     cm.Marshal(),
-			},
-		}
-		rms := []ipv4.Message{
-			{
-				Buffers: [][]byte{bb},
-				OOB:     ipv4.NewControlMessage(cf),
-			},
-		}
-		b.Run("Net", func(b *testing.B) {
-			for i := 0; i < b.N; i++ {
-				if _, err := c.WriteTo(datagram, dst); err != nil {
-					b.Fatal(err)
-				}
-				if _, _, err := c.ReadFrom(bb); err != nil {
-					b.Fatal(err)
-				}
-			}
-		})
-		b.Run("ToFrom", func(b *testing.B) {
-			for i := 0; i < b.N; i++ {
-				if _, err := p.WriteTo(datagram, &cm, dst); err != nil {
-					b.Fatal(err)
-				}
-				if _, _, _, err := p.ReadFrom(bb); err != nil {
-					b.Fatal(err)
-				}
-			}
-		})
-		b.Run("Batch", func(b *testing.B) {
-			for i := 0; i < b.N; i++ {
-				if _, err := p.WriteBatch(wms, 0); err != nil {
-					b.Fatal(err)
-				}
-				if _, err := p.ReadBatch(rms, 0); err != nil {
-					b.Fatal(err)
-				}
-			}
-		})
-	})
-}
-
-func TestPacketConnConcurrentReadWriteUnicast(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-
-	payload := []byte("HELLO-R-U-THERE")
-	iph, err := (&ipv4.Header{
-		Version:  ipv4.Version,
-		Len:      ipv4.HeaderLen,
-		TotalLen: ipv4.HeaderLen + len(payload),
-		TTL:      1,
-		Protocol: iana.ProtocolReserved,
-		Src:      net.IPv4(192, 0, 2, 1),
-		Dst:      net.IPv4(192, 0, 2, 254),
-	}).Marshal()
-	if err != nil {
-		t.Fatal(err)
-	}
-	greh := []byte{0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00}
-	datagram := append(greh, append(iph, payload...)...)
-
-	t.Run("UDP", func(t *testing.T) {
-		c, err := nettest.NewLocalPacketListener("udp4")
-		if err != nil {
-			t.Skipf("not supported on %s/%s: %v", runtime.GOOS, runtime.GOARCH, err)
-		}
-		defer c.Close()
-		p := ipv4.NewPacketConn(c)
-		t.Run("ToFrom", func(t *testing.T) {
-			testPacketConnConcurrentReadWriteUnicast(t, p, payload, c.LocalAddr(), false)
-		})
-		t.Run("Batch", func(t *testing.T) {
-			testPacketConnConcurrentReadWriteUnicast(t, p, payload, c.LocalAddr(), true)
-		})
-	})
-	t.Run("IP", func(t *testing.T) {
-		switch runtime.GOOS {
-		case "netbsd":
-			t.Skip("need to configure gre on netbsd")
-		case "openbsd":
-			t.Skip("net.inet.gre.allow=0 by default on openbsd")
-		}
-
-		c, err := net.ListenPacket(fmt.Sprintf("ip4:%d", iana.ProtocolGRE), "127.0.0.1")
-		if err != nil {
-			t.Skipf("not supported on %s/%s: %v", runtime.GOOS, runtime.GOARCH, err)
-		}
-		defer c.Close()
-		p := ipv4.NewPacketConn(c)
-		t.Run("ToFrom", func(t *testing.T) {
-			testPacketConnConcurrentReadWriteUnicast(t, p, datagram, c.LocalAddr(), false)
-		})
-		t.Run("Batch", func(t *testing.T) {
-			testPacketConnConcurrentReadWriteUnicast(t, p, datagram, c.LocalAddr(), true)
-		})
-	})
-}
-
-func testPacketConnConcurrentReadWriteUnicast(t *testing.T, p *ipv4.PacketConn, data []byte, dst net.Addr, batch bool) {
-	ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagLoopback)
-	cf := ipv4.FlagTTL | ipv4.FlagSrc | ipv4.FlagDst | ipv4.FlagInterface
-
-	if err := p.SetControlMessage(cf, true); err != nil { // probe before test
-		if nettest.ProtocolNotSupported(err) {
-			t.Skipf("not supported on %s", runtime.GOOS)
-		}
-		t.Fatal(err)
-	}
-
-	var wg sync.WaitGroup
-	reader := func() {
-		defer wg.Done()
-		b := make([]byte, 128)
-		n, cm, _, err := p.ReadFrom(b)
-		if err != nil {
-			t.Error(err)
-			return
-		}
-		if !bytes.Equal(b[:n], data) {
-			t.Errorf("got %#v; want %#v", b[:n], data)
-			return
-		}
-		s := cm.String()
-		if strings.Contains(s, ",") {
-			t.Errorf("should be space-separated values: %s", s)
-			return
-		}
-	}
-	batchReader := func() {
-		defer wg.Done()
-		ms := []ipv4.Message{
-			{
-				Buffers: [][]byte{make([]byte, 128)},
-				OOB:     ipv4.NewControlMessage(cf),
-			},
-		}
-		n, err := p.ReadBatch(ms, 0)
-		if err != nil {
-			t.Error(err)
-			return
-		}
-		if n != len(ms) {
-			t.Errorf("got %d; want %d", n, len(ms))
-			return
-		}
-		var cm ipv4.ControlMessage
-		if err := cm.Parse(ms[0].OOB[:ms[0].NN]); err != nil {
-			t.Error(err)
-			return
-		}
-		var b []byte
-		if _, ok := dst.(*net.IPAddr); ok {
-			var h ipv4.Header
-			if err := h.Parse(ms[0].Buffers[0][:ms[0].N]); err != nil {
-				t.Error(err)
-				return
-			}
-			b = ms[0].Buffers[0][h.Len:ms[0].N]
-		} else {
-			b = ms[0].Buffers[0][:ms[0].N]
-		}
-		if !bytes.Equal(b, data) {
-			t.Errorf("got %#v; want %#v", b, data)
-			return
-		}
-		s := cm.String()
-		if strings.Contains(s, ",") {
-			t.Errorf("should be space-separated values: %s", s)
-			return
-		}
-	}
-	writer := func(toggle bool) {
-		defer wg.Done()
-		cm := ipv4.ControlMessage{
-			Src: net.IPv4(127, 0, 0, 1),
-		}
-		if ifi != nil {
-			cm.IfIndex = ifi.Index
-		}
-		if err := p.SetControlMessage(cf, toggle); err != nil {
-			t.Error(err)
-			return
-		}
-		n, err := p.WriteTo(data, &cm, dst)
-		if err != nil {
-			t.Error(err)
-			return
-		}
-		if n != len(data) {
-			t.Errorf("got %d; want %d", n, len(data))
-			return
-		}
-	}
-	batchWriter := func(toggle bool) {
-		defer wg.Done()
-		cm := ipv4.ControlMessage{
-			Src: net.IPv4(127, 0, 0, 1),
-		}
-		if ifi != nil {
-			cm.IfIndex = ifi.Index
-		}
-		if err := p.SetControlMessage(cf, toggle); err != nil {
-			t.Error(err)
-			return
-		}
-		ms := []ipv4.Message{
-			{
-				Buffers: [][]byte{data},
-				OOB:     cm.Marshal(),
-				Addr:    dst,
-			},
-		}
-		n, err := p.WriteBatch(ms, 0)
-		if err != nil {
-			t.Error(err)
-			return
-		}
-		if n != len(ms) {
-			t.Errorf("got %d; want %d", n, len(ms))
-			return
-		}
-		if ms[0].N != len(data) {
-			t.Errorf("got %d; want %d", ms[0].N, len(data))
-			return
-		}
-	}
-
-	const N = 10
-	wg.Add(N)
-	for i := 0; i < N; i++ {
-		if batch {
-			go batchReader()
-		} else {
-			go reader()
-		}
-	}
-	wg.Add(2 * N)
-	for i := 0; i < 2*N; i++ {
-		if batch {
-			go batchWriter(i%2 != 0)
-		} else {
-			go writer(i%2 != 0)
-		}
-
-	}
-	wg.Add(N)
-	for i := 0; i < N; i++ {
-		if batch {
-			go batchReader()
-		} else {
-			go reader()
-		}
-	}
-	wg.Wait()
-}
diff --git a/vendor/golang.org/x/net/ipv4/readwrite_test.go b/vendor/golang.org/x/net/ipv4/readwrite_test.go
deleted file mode 100644
index 1b7f7488..00000000
--- a/vendor/golang.org/x/net/ipv4/readwrite_test.go
+++ /dev/null
@@ -1,140 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4_test
-
-import (
-	"bytes"
-	"net"
-	"runtime"
-	"strings"
-	"sync"
-	"testing"
-
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv4"
-)
-
-func BenchmarkReadWriteUnicast(b *testing.B) {
-	c, err := nettest.NewLocalPacketListener("udp4")
-	if err != nil {
-		b.Skipf("not supported on %s/%s: %v", runtime.GOOS, runtime.GOARCH, err)
-	}
-	defer c.Close()
-
-	dst := c.LocalAddr()
-	wb, rb := []byte("HELLO-R-U-THERE"), make([]byte, 128)
-
-	b.Run("NetUDP", func(b *testing.B) {
-		for i := 0; i < b.N; i++ {
-			if _, err := c.WriteTo(wb, dst); err != nil {
-				b.Fatal(err)
-			}
-			if _, _, err := c.ReadFrom(rb); err != nil {
-				b.Fatal(err)
-			}
-		}
-	})
-	b.Run("IPv4UDP", func(b *testing.B) {
-		p := ipv4.NewPacketConn(c)
-		cf := ipv4.FlagTTL | ipv4.FlagInterface
-		if err := p.SetControlMessage(cf, true); err != nil {
-			b.Fatal(err)
-		}
-		cm := ipv4.ControlMessage{TTL: 1}
-		ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagLoopback)
-		if ifi != nil {
-			cm.IfIndex = ifi.Index
-		}
-
-		for i := 0; i < b.N; i++ {
-			if _, err := p.WriteTo(wb, &cm, dst); err != nil {
-				b.Fatal(err)
-			}
-			if _, _, _, err := p.ReadFrom(rb); err != nil {
-				b.Fatal(err)
-			}
-		}
-	})
-}
-
-func TestPacketConnConcurrentReadWriteUnicastUDP(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-
-	c, err := nettest.NewLocalPacketListener("udp4")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-	p := ipv4.NewPacketConn(c)
-	defer p.Close()
-
-	dst := c.LocalAddr()
-	ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagLoopback)
-	cf := ipv4.FlagTTL | ipv4.FlagSrc | ipv4.FlagDst | ipv4.FlagInterface
-	wb := []byte("HELLO-R-U-THERE")
-
-	if err := p.SetControlMessage(cf, true); err != nil { // probe before test
-		if nettest.ProtocolNotSupported(err) {
-			t.Skipf("not supported on %s", runtime.GOOS)
-		}
-		t.Fatal(err)
-	}
-
-	var wg sync.WaitGroup
-	reader := func() {
-		defer wg.Done()
-		rb := make([]byte, 128)
-		if n, cm, _, err := p.ReadFrom(rb); err != nil {
-			t.Error(err)
-			return
-		} else if !bytes.Equal(rb[:n], wb) {
-			t.Errorf("got %v; want %v", rb[:n], wb)
-			return
-		} else {
-			s := cm.String()
-			if strings.Contains(s, ",") {
-				t.Errorf("should be space-separated values: %s", s)
-			}
-		}
-	}
-	writer := func(toggle bool) {
-		defer wg.Done()
-		cm := ipv4.ControlMessage{
-			Src: net.IPv4(127, 0, 0, 1),
-		}
-		if ifi != nil {
-			cm.IfIndex = ifi.Index
-		}
-		if err := p.SetControlMessage(cf, toggle); err != nil {
-			t.Error(err)
-			return
-		}
-		if n, err := p.WriteTo(wb, &cm, dst); err != nil {
-			t.Error(err)
-			return
-		} else if n != len(wb) {
-			t.Errorf("got %d; want %d", n, len(wb))
-			return
-		}
-	}
-
-	const N = 10
-	wg.Add(N)
-	for i := 0; i < N; i++ {
-		go reader()
-	}
-	wg.Add(2 * N)
-	for i := 0; i < 2*N; i++ {
-		go writer(i%2 != 0)
-	}
-	wg.Add(N)
-	for i := 0; i < N; i++ {
-		go reader()
-	}
-	wg.Wait()
-}
diff --git a/vendor/golang.org/x/net/ipv4/unicast_test.go b/vendor/golang.org/x/net/ipv4/unicast_test.go
deleted file mode 100644
index 274a558c..00000000
--- a/vendor/golang.org/x/net/ipv4/unicast_test.go
+++ /dev/null
@@ -1,247 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4_test
-
-import (
-	"bytes"
-	"net"
-	"os"
-	"runtime"
-	"testing"
-	"time"
-
-	"golang.org/x/net/icmp"
-	"golang.org/x/net/internal/iana"
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv4"
-)
-
-func TestPacketConnReadWriteUnicastUDP(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagLoopback)
-	if ifi == nil {
-		t.Skipf("not available on %s", runtime.GOOS)
-	}
-
-	c, err := nettest.NewLocalPacketListener("udp4")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-	p := ipv4.NewPacketConn(c)
-	defer p.Close()
-
-	dst := c.LocalAddr()
-	cf := ipv4.FlagTTL | ipv4.FlagDst | ipv4.FlagInterface
-	wb := []byte("HELLO-R-U-THERE")
-
-	for i, toggle := range []bool{true, false, true} {
-		if err := p.SetControlMessage(cf, toggle); err != nil {
-			if nettest.ProtocolNotSupported(err) {
-				t.Logf("not supported on %s", runtime.GOOS)
-				continue
-			}
-			t.Fatal(err)
-		}
-		p.SetTTL(i + 1)
-		if err := p.SetWriteDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
-			t.Fatal(err)
-		}
-		if n, err := p.WriteTo(wb, nil, dst); err != nil {
-			t.Fatal(err)
-		} else if n != len(wb) {
-			t.Fatalf("got %v; want %v", n, len(wb))
-		}
-		rb := make([]byte, 128)
-		if err := p.SetReadDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
-			t.Fatal(err)
-		}
-		if n, _, _, err := p.ReadFrom(rb); err != nil {
-			t.Fatal(err)
-		} else if !bytes.Equal(rb[:n], wb) {
-			t.Fatalf("got %v; want %v", rb[:n], wb)
-		}
-	}
-}
-
-func TestPacketConnReadWriteUnicastICMP(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if m, ok := nettest.SupportsRawIPSocket(); !ok {
-		t.Skip(m)
-	}
-	ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagLoopback)
-	if ifi == nil {
-		t.Skipf("not available on %s", runtime.GOOS)
-	}
-
-	c, err := net.ListenPacket("ip4:icmp", "0.0.0.0")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-
-	dst, err := net.ResolveIPAddr("ip4", "127.0.0.1")
-	if err != nil {
-		t.Fatal(err)
-	}
-	p := ipv4.NewPacketConn(c)
-	defer p.Close()
-	cf := ipv4.FlagDst | ipv4.FlagInterface
-	if runtime.GOOS != "solaris" {
-		// Solaris never allows to modify ICMP properties.
-		cf |= ipv4.FlagTTL
-	}
-
-	for i, toggle := range []bool{true, false, true} {
-		wb, err := (&icmp.Message{
-			Type: ipv4.ICMPTypeEcho, Code: 0,
-			Body: &icmp.Echo{
-				ID: os.Getpid() & 0xffff, Seq: i + 1,
-				Data: []byte("HELLO-R-U-THERE"),
-			},
-		}).Marshal(nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := p.SetControlMessage(cf, toggle); err != nil {
-			if nettest.ProtocolNotSupported(err) {
-				t.Logf("not supported on %s", runtime.GOOS)
-				continue
-			}
-			t.Fatal(err)
-		}
-		p.SetTTL(i + 1)
-		if err := p.SetWriteDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
-			t.Fatal(err)
-		}
-		if n, err := p.WriteTo(wb, nil, dst); err != nil {
-			t.Fatal(err)
-		} else if n != len(wb) {
-			t.Fatalf("got %v; want %v", n, len(wb))
-		}
-		rb := make([]byte, 128)
-	loop:
-		if err := p.SetReadDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
-			t.Fatal(err)
-		}
-		if n, _, _, err := p.ReadFrom(rb); err != nil {
-			switch runtime.GOOS {
-			case "darwin": // older darwin kernels have some limitation on receiving icmp packet through raw socket
-				t.Logf("not supported on %s", runtime.GOOS)
-				continue
-			}
-			t.Fatal(err)
-		} else {
-			m, err := icmp.ParseMessage(iana.ProtocolICMP, rb[:n])
-			if err != nil {
-				t.Fatal(err)
-			}
-			if runtime.GOOS == "linux" && m.Type == ipv4.ICMPTypeEcho {
-				// On Linux we must handle own sent packets.
-				goto loop
-			}
-			if m.Type != ipv4.ICMPTypeEchoReply || m.Code != 0 {
-				t.Fatalf("got type=%v, code=%v; want type=%v, code=%v", m.Type, m.Code, ipv4.ICMPTypeEchoReply, 0)
-			}
-		}
-	}
-}
-
-func TestRawConnReadWriteUnicastICMP(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if m, ok := nettest.SupportsRawIPSocket(); !ok {
-		t.Skip(m)
-	}
-	ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagLoopback)
-	if ifi == nil {
-		t.Skipf("not available on %s", runtime.GOOS)
-	}
-
-	c, err := net.ListenPacket("ip4:icmp", "0.0.0.0")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-
-	dst, err := net.ResolveIPAddr("ip4", "127.0.0.1")
-	if err != nil {
-		t.Fatal(err)
-	}
-	r, err := ipv4.NewRawConn(c)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer r.Close()
-	cf := ipv4.FlagTTL | ipv4.FlagDst | ipv4.FlagInterface
-
-	for i, toggle := range []bool{true, false, true} {
-		wb, err := (&icmp.Message{
-			Type: ipv4.ICMPTypeEcho, Code: 0,
-			Body: &icmp.Echo{
-				ID: os.Getpid() & 0xffff, Seq: i + 1,
-				Data: []byte("HELLO-R-U-THERE"),
-			},
-		}).Marshal(nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-		wh := &ipv4.Header{
-			Version:  ipv4.Version,
-			Len:      ipv4.HeaderLen,
-			TOS:      i + 1,
-			TotalLen: ipv4.HeaderLen + len(wb),
-			TTL:      i + 1,
-			Protocol: 1,
-			Dst:      dst.IP,
-		}
-		if err := r.SetControlMessage(cf, toggle); err != nil {
-			if nettest.ProtocolNotSupported(err) {
-				t.Logf("not supported on %s", runtime.GOOS)
-				continue
-			}
-			t.Fatal(err)
-		}
-		if err := r.SetWriteDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
-			t.Fatal(err)
-		}
-		if err := r.WriteTo(wh, wb, nil); err != nil {
-			t.Fatal(err)
-		}
-		rb := make([]byte, ipv4.HeaderLen+128)
-	loop:
-		if err := r.SetReadDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
-			t.Fatal(err)
-		}
-		if _, b, _, err := r.ReadFrom(rb); err != nil {
-			switch runtime.GOOS {
-			case "darwin": // older darwin kernels have some limitation on receiving icmp packet through raw socket
-				t.Logf("not supported on %s", runtime.GOOS)
-				continue
-			}
-			t.Fatal(err)
-		} else {
-			m, err := icmp.ParseMessage(iana.ProtocolICMP, b)
-			if err != nil {
-				t.Fatal(err)
-			}
-			if runtime.GOOS == "linux" && m.Type == ipv4.ICMPTypeEcho {
-				// On Linux we must handle own sent packets.
-				goto loop
-			}
-			if m.Type != ipv4.ICMPTypeEchoReply || m.Code != 0 {
-				t.Fatalf("got type=%v, code=%v; want type=%v, code=%v", m.Type, m.Code, ipv4.ICMPTypeEchoReply, 0)
-			}
-		}
-	}
-}
diff --git a/vendor/golang.org/x/net/ipv4/unicastsockopt_test.go b/vendor/golang.org/x/net/ipv4/unicastsockopt_test.go
deleted file mode 100644
index 2bfda7ff..00000000
--- a/vendor/golang.org/x/net/ipv4/unicastsockopt_test.go
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4_test
-
-import (
-	"net"
-	"runtime"
-	"testing"
-
-	"golang.org/x/net/internal/iana"
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv4"
-)
-
-func TestConnUnicastSocketOptions(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagLoopback)
-	if ifi == nil {
-		t.Skipf("not available on %s", runtime.GOOS)
-	}
-
-	ln, err := net.Listen("tcp4", "127.0.0.1:0")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer ln.Close()
-
-	errc := make(chan error, 1)
-	go func() {
-		c, err := ln.Accept()
-		if err != nil {
-			errc <- err
-			return
-		}
-		errc <- c.Close()
-	}()
-
-	c, err := net.Dial("tcp4", ln.Addr().String())
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-
-	testUnicastSocketOptions(t, ipv4.NewConn(c))
-
-	if err := <-errc; err != nil {
-		t.Errorf("server: %v", err)
-	}
-}
-
-var packetConnUnicastSocketOptionTests = []struct {
-	net, proto, addr string
-}{
-	{"udp4", "", "127.0.0.1:0"},
-	{"ip4", ":icmp", "127.0.0.1"},
-}
-
-func TestPacketConnUnicastSocketOptions(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagLoopback)
-	if ifi == nil {
-		t.Skipf("not available on %s", runtime.GOOS)
-	}
-
-	m, ok := nettest.SupportsRawIPSocket()
-	for _, tt := range packetConnUnicastSocketOptionTests {
-		if tt.net == "ip4" && !ok {
-			t.Log(m)
-			continue
-		}
-		c, err := net.ListenPacket(tt.net+tt.proto, tt.addr)
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c.Close()
-
-		testUnicastSocketOptions(t, ipv4.NewPacketConn(c))
-	}
-}
-
-func TestRawConnUnicastSocketOptions(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if m, ok := nettest.SupportsRawIPSocket(); !ok {
-		t.Skip(m)
-	}
-	ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagLoopback)
-	if ifi == nil {
-		t.Skipf("not available on %s", runtime.GOOS)
-	}
-
-	c, err := net.ListenPacket("ip4:icmp", "127.0.0.1")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-
-	r, err := ipv4.NewRawConn(c)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	testUnicastSocketOptions(t, r)
-}
-
-type testIPv4UnicastConn interface {
-	TOS() (int, error)
-	SetTOS(int) error
-	TTL() (int, error)
-	SetTTL(int) error
-}
-
-func testUnicastSocketOptions(t *testing.T, c testIPv4UnicastConn) {
-	tos := iana.DiffServCS0 | iana.NotECNTransport
-	switch runtime.GOOS {
-	case "windows":
-		// IP_TOS option is supported on Windows 8 and beyond.
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-
-	if err := c.SetTOS(tos); err != nil {
-		t.Fatal(err)
-	}
-	if v, err := c.TOS(); err != nil {
-		t.Fatal(err)
-	} else if v != tos {
-		t.Fatalf("got %v; want %v", v, tos)
-	}
-	const ttl = 255
-	if err := c.SetTTL(ttl); err != nil {
-		t.Fatal(err)
-	}
-	if v, err := c.TTL(); err != nil {
-		t.Fatal(err)
-	} else if v != ttl {
-		t.Fatalf("got %v; want %v", v, ttl)
-	}
-}
diff --git a/vendor/golang.org/x/net/ipv6/bpf_test.go b/vendor/golang.org/x/net/ipv6/bpf_test.go
deleted file mode 100644
index 8253e1f4..00000000
--- a/vendor/golang.org/x/net/ipv6/bpf_test.go
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6_test
-
-import (
-	"net"
-	"runtime"
-	"testing"
-	"time"
-
-	"golang.org/x/net/bpf"
-	"golang.org/x/net/ipv6"
-)
-
-func TestBPF(t *testing.T) {
-	if runtime.GOOS != "linux" {
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-
-	l, err := net.ListenPacket("udp6", "[::1]:0")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer l.Close()
-
-	p := ipv6.NewPacketConn(l)
-
-	// This filter accepts UDP packets whose first payload byte is
-	// even.
-	prog, err := bpf.Assemble([]bpf.Instruction{
-		// Load the first byte of the payload (skipping UDP header).
-		bpf.LoadAbsolute{Off: 8, Size: 1},
-		// Select LSB of the byte.
-		bpf.ALUOpConstant{Op: bpf.ALUOpAnd, Val: 1},
-		// Byte is even?
-		bpf.JumpIf{Cond: bpf.JumpEqual, Val: 0, SkipFalse: 1},
-		// Accept.
-		bpf.RetConstant{Val: 4096},
-		// Ignore.
-		bpf.RetConstant{Val: 0},
-	})
-	if err != nil {
-		t.Fatalf("compiling BPF: %s", err)
-	}
-
-	if err = p.SetBPF(prog); err != nil {
-		t.Fatalf("attaching filter to Conn: %s", err)
-	}
-
-	s, err := net.Dial("udp6", l.LocalAddr().String())
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer s.Close()
-	go func() {
-		for i := byte(0); i < 10; i++ {
-			s.Write([]byte{i})
-		}
-	}()
-
-	l.SetDeadline(time.Now().Add(2 * time.Second))
-	seen := make([]bool, 5)
-	for {
-		var b [512]byte
-		n, _, err := l.ReadFrom(b[:])
-		if err != nil {
-			t.Fatalf("reading from listener: %s", err)
-		}
-		if n != 1 {
-			t.Fatalf("unexpected packet length, want 1, got %d", n)
-		}
-		if b[0] >= 10 {
-			t.Fatalf("unexpected byte, want 0-9, got %d", b[0])
-		}
-		if b[0]%2 != 0 {
-			t.Fatalf("got odd byte %d, wanted only even bytes", b[0])
-		}
-		seen[b[0]/2] = true
-
-		seenAll := true
-		for _, v := range seen {
-			if !v {
-				seenAll = false
-				break
-			}
-		}
-		if seenAll {
-			break
-		}
-	}
-}
diff --git a/vendor/golang.org/x/net/ipv6/control_test.go b/vendor/golang.org/x/net/ipv6/control_test.go
deleted file mode 100644
index c186ca99..00000000
--- a/vendor/golang.org/x/net/ipv6/control_test.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6_test
-
-import (
-	"testing"
-
-	"golang.org/x/net/ipv6"
-)
-
-func TestControlMessageParseWithFuzz(t *testing.T) {
-	var cm ipv6.ControlMessage
-	for _, fuzz := range []string{
-		"\f\x00\x00\x00)\x00\x00\x00.\x00\x00\x00",
-		"\f\x00\x00\x00)\x00\x00\x00,\x00\x00\x00",
-	} {
-		cm.Parse([]byte(fuzz))
-	}
-}
diff --git a/vendor/golang.org/x/net/ipv6/doc.go b/vendor/golang.org/x/net/ipv6/doc.go
index cb400062..e0be9d50 100644
--- a/vendor/golang.org/x/net/ipv6/doc.go
+++ b/vendor/golang.org/x/net/ipv6/doc.go
@@ -56,7 +56,7 @@
 // Multicasting
 //
 // The options for multicasting are available for net.UDPConn and
-// net.IPconn which are created as network connections that use the
+// net.IPConn which are created as network connections that use the
 // IPv6 transport. A few network facilities must be prepared before
 // you begin multicasting, at a minimum joining network interfaces and
 // multicast groups.
diff --git a/vendor/golang.org/x/net/ipv6/example_test.go b/vendor/golang.org/x/net/ipv6/example_test.go
deleted file mode 100644
index e761aa2a..00000000
--- a/vendor/golang.org/x/net/ipv6/example_test.go
+++ /dev/null
@@ -1,216 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6_test
-
-import (
-	"fmt"
-	"log"
-	"net"
-	"os"
-	"time"
-
-	"golang.org/x/net/icmp"
-	"golang.org/x/net/ipv6"
-)
-
-func ExampleConn_markingTCP() {
-	ln, err := net.Listen("tcp", "[::]:1024")
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer ln.Close()
-
-	for {
-		c, err := ln.Accept()
-		if err != nil {
-			log.Fatal(err)
-		}
-		go func(c net.Conn) {
-			defer c.Close()
-			if c.RemoteAddr().(*net.TCPAddr).IP.To16() != nil && c.RemoteAddr().(*net.TCPAddr).IP.To4() == nil {
-				p := ipv6.NewConn(c)
-				if err := p.SetTrafficClass(0x28); err != nil { // DSCP AF11
-					log.Fatal(err)
-				}
-				if err := p.SetHopLimit(128); err != nil {
-					log.Fatal(err)
-				}
-			}
-			if _, err := c.Write([]byte("HELLO-R-U-THERE-ACK")); err != nil {
-				log.Fatal(err)
-			}
-		}(c)
-	}
-}
-
-func ExamplePacketConn_servingOneShotMulticastDNS() {
-	c, err := net.ListenPacket("udp6", "[::]:5353") // mDNS over UDP
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer c.Close()
-	p := ipv6.NewPacketConn(c)
-
-	en0, err := net.InterfaceByName("en0")
-	if err != nil {
-		log.Fatal(err)
-	}
-	mDNSLinkLocal := net.UDPAddr{IP: net.ParseIP("ff02::fb")}
-	if err := p.JoinGroup(en0, &mDNSLinkLocal); err != nil {
-		log.Fatal(err)
-	}
-	defer p.LeaveGroup(en0, &mDNSLinkLocal)
-	if err := p.SetControlMessage(ipv6.FlagDst|ipv6.FlagInterface, true); err != nil {
-		log.Fatal(err)
-	}
-
-	var wcm ipv6.ControlMessage
-	b := make([]byte, 1500)
-	for {
-		_, rcm, peer, err := p.ReadFrom(b)
-		if err != nil {
-			log.Fatal(err)
-		}
-		if !rcm.Dst.IsMulticast() || !rcm.Dst.Equal(mDNSLinkLocal.IP) {
-			continue
-		}
-		wcm.IfIndex = rcm.IfIndex
-		answers := []byte("FAKE-MDNS-ANSWERS") // fake mDNS answers, you need to implement this
-		if _, err := p.WriteTo(answers, &wcm, peer); err != nil {
-			log.Fatal(err)
-		}
-	}
-}
-
-func ExamplePacketConn_tracingIPPacketRoute() {
-	// Tracing an IP packet route to www.google.com.
-
-	const host = "www.google.com"
-	ips, err := net.LookupIP(host)
-	if err != nil {
-		log.Fatal(err)
-	}
-	var dst net.IPAddr
-	for _, ip := range ips {
-		if ip.To16() != nil && ip.To4() == nil {
-			dst.IP = ip
-			fmt.Printf("using %v for tracing an IP packet route to %s\n", dst.IP, host)
-			break
-		}
-	}
-	if dst.IP == nil {
-		log.Fatal("no AAAA record found")
-	}
-
-	c, err := net.ListenPacket("ip6:58", "::") // ICMP for IPv6
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer c.Close()
-	p := ipv6.NewPacketConn(c)
-
-	if err := p.SetControlMessage(ipv6.FlagHopLimit|ipv6.FlagSrc|ipv6.FlagDst|ipv6.FlagInterface, true); err != nil {
-		log.Fatal(err)
-	}
-	wm := icmp.Message{
-		Type: ipv6.ICMPTypeEchoRequest, Code: 0,
-		Body: &icmp.Echo{
-			ID:   os.Getpid() & 0xffff,
-			Data: []byte("HELLO-R-U-THERE"),
-		},
-	}
-	var f ipv6.ICMPFilter
-	f.SetAll(true)
-	f.Accept(ipv6.ICMPTypeTimeExceeded)
-	f.Accept(ipv6.ICMPTypeEchoReply)
-	if err := p.SetICMPFilter(&f); err != nil {
-		log.Fatal(err)
-	}
-
-	var wcm ipv6.ControlMessage
-	rb := make([]byte, 1500)
-	for i := 1; i <= 64; i++ { // up to 64 hops
-		wm.Body.(*icmp.Echo).Seq = i
-		wb, err := wm.Marshal(nil)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		// In the real world usually there are several
-		// multiple traffic-engineered paths for each hop.
-		// You may need to probe a few times to each hop.
-		begin := time.Now()
-		wcm.HopLimit = i
-		if _, err := p.WriteTo(wb, &wcm, &dst); err != nil {
-			log.Fatal(err)
-		}
-		if err := p.SetReadDeadline(time.Now().Add(3 * time.Second)); err != nil {
-			log.Fatal(err)
-		}
-		n, rcm, peer, err := p.ReadFrom(rb)
-		if err != nil {
-			if err, ok := err.(net.Error); ok && err.Timeout() {
-				fmt.Printf("%v\t*\n", i)
-				continue
-			}
-			log.Fatal(err)
-		}
-		rm, err := icmp.ParseMessage(58, rb[:n])
-		if err != nil {
-			log.Fatal(err)
-		}
-		rtt := time.Since(begin)
-
-		// In the real world you need to determine whether the
-		// received message is yours using ControlMessage.Src,
-		// ControlMesage.Dst, icmp.Echo.ID and icmp.Echo.Seq.
-		switch rm.Type {
-		case ipv6.ICMPTypeTimeExceeded:
-			names, _ := net.LookupAddr(peer.String())
-			fmt.Printf("%d\t%v %+v %v\n\t%+v\n", i, peer, names, rtt, rcm)
-		case ipv6.ICMPTypeEchoReply:
-			names, _ := net.LookupAddr(peer.String())
-			fmt.Printf("%d\t%v %+v %v\n\t%+v\n", i, peer, names, rtt, rcm)
-			return
-		}
-	}
-}
-
-func ExamplePacketConn_advertisingOSPFHello() {
-	c, err := net.ListenPacket("ip6:89", "::") // OSPF for IPv6
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer c.Close()
-	p := ipv6.NewPacketConn(c)
-
-	en0, err := net.InterfaceByName("en0")
-	if err != nil {
-		log.Fatal(err)
-	}
-	allSPFRouters := net.IPAddr{IP: net.ParseIP("ff02::5")}
-	if err := p.JoinGroup(en0, &allSPFRouters); err != nil {
-		log.Fatal(err)
-	}
-	defer p.LeaveGroup(en0, &allSPFRouters)
-
-	hello := make([]byte, 24) // fake hello data, you need to implement this
-	ospf := make([]byte, 16)  // fake ospf header, you need to implement this
-	ospf[0] = 3               // version 3
-	ospf[1] = 1               // hello packet
-	ospf = append(ospf, hello...)
-	if err := p.SetChecksum(true, 12); err != nil {
-		log.Fatal(err)
-	}
-
-	cm := ipv6.ControlMessage{
-		TrafficClass: 0xc0, // DSCP CS6
-		HopLimit:     1,
-		IfIndex:      en0.Index,
-	}
-	if _, err := p.WriteTo(ospf, &cm, &allSPFRouters); err != nil {
-		log.Fatal(err)
-	}
-}
diff --git a/vendor/golang.org/x/net/ipv6/header_test.go b/vendor/golang.org/x/net/ipv6/header_test.go
deleted file mode 100644
index ca11dc23..00000000
--- a/vendor/golang.org/x/net/ipv6/header_test.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6_test
-
-import (
-	"net"
-	"reflect"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/internal/iana"
-	"golang.org/x/net/ipv6"
-)
-
-var (
-	wireHeaderFromKernel = [ipv6.HeaderLen]byte{
-		0x69, 0x8b, 0xee, 0xf1,
-		0xca, 0xfe, 0x2c, 0x01,
-		0x20, 0x01, 0x0d, 0xb8,
-		0x00, 0x01, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x01,
-		0x20, 0x01, 0x0d, 0xb8,
-		0x00, 0x02, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x01,
-	}
-
-	testHeader = &ipv6.Header{
-		Version:      ipv6.Version,
-		TrafficClass: iana.DiffServAF43,
-		FlowLabel:    0xbeef1,
-		PayloadLen:   0xcafe,
-		NextHeader:   iana.ProtocolIPv6Frag,
-		HopLimit:     1,
-		Src:          net.ParseIP("2001:db8:1::1"),
-		Dst:          net.ParseIP("2001:db8:2::1"),
-	}
-)
-
-func TestParseHeader(t *testing.T) {
-	h, err := ipv6.ParseHeader(wireHeaderFromKernel[:])
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(h, testHeader) {
-		t.Fatalf("got %#v; want %#v", h, testHeader)
-	}
-	s := h.String()
-	if strings.Contains(s, ",") {
-		t.Fatalf("should be space-separated values: %s", s)
-	}
-}
diff --git a/vendor/golang.org/x/net/ipv6/icmp_test.go b/vendor/golang.org/x/net/ipv6/icmp_test.go
deleted file mode 100644
index bdde2fdb..00000000
--- a/vendor/golang.org/x/net/ipv6/icmp_test.go
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6_test
-
-import (
-	"net"
-	"reflect"
-	"runtime"
-	"testing"
-
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv6"
-)
-
-var icmpStringTests = []struct {
-	in  ipv6.ICMPType
-	out string
-}{
-	{ipv6.ICMPTypeDestinationUnreachable, "destination unreachable"},
-
-	{256, "<nil>"},
-}
-
-func TestICMPString(t *testing.T) {
-	for _, tt := range icmpStringTests {
-		s := tt.in.String()
-		if s != tt.out {
-			t.Errorf("got %s; want %s", s, tt.out)
-		}
-	}
-}
-
-func TestICMPFilter(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-
-	var f ipv6.ICMPFilter
-	for _, toggle := range []bool{false, true} {
-		f.SetAll(toggle)
-		for _, typ := range []ipv6.ICMPType{
-			ipv6.ICMPTypeDestinationUnreachable,
-			ipv6.ICMPTypeEchoReply,
-			ipv6.ICMPTypeNeighborSolicitation,
-			ipv6.ICMPTypeDuplicateAddressConfirmation,
-		} {
-			f.Accept(typ)
-			if f.WillBlock(typ) {
-				t.Errorf("ipv6.ICMPFilter.Set(%v, false) failed", typ)
-			}
-			f.Block(typ)
-			if !f.WillBlock(typ) {
-				t.Errorf("ipv6.ICMPFilter.Set(%v, true) failed", typ)
-			}
-		}
-	}
-}
-
-func TestSetICMPFilter(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-	if m, ok := nettest.SupportsRawIPSocket(); !ok {
-		t.Skip(m)
-	}
-
-	c, err := net.ListenPacket("ip6:ipv6-icmp", "::1")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-
-	p := ipv6.NewPacketConn(c)
-
-	var f ipv6.ICMPFilter
-	f.SetAll(true)
-	f.Accept(ipv6.ICMPTypeEchoRequest)
-	f.Accept(ipv6.ICMPTypeEchoReply)
-	if err := p.SetICMPFilter(&f); err != nil {
-		t.Fatal(err)
-	}
-	kf, err := p.ICMPFilter()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(kf, &f) {
-		t.Fatalf("got %#v; want %#v", kf, f)
-	}
-}
diff --git a/vendor/golang.org/x/net/ipv6/mocktransponder_test.go b/vendor/golang.org/x/net/ipv6/mocktransponder_test.go
deleted file mode 100644
index 6efe56c6..00000000
--- a/vendor/golang.org/x/net/ipv6/mocktransponder_test.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6_test
-
-import (
-	"net"
-	"testing"
-)
-
-func connector(t *testing.T, network, addr string, done chan<- bool) {
-	defer func() { done <- true }()
-
-	c, err := net.Dial(network, addr)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	c.Close()
-}
-
-func acceptor(t *testing.T, ln net.Listener, done chan<- bool) {
-	defer func() { done <- true }()
-
-	c, err := ln.Accept()
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	c.Close()
-}
diff --git a/vendor/golang.org/x/net/ipv6/multicast_test.go b/vendor/golang.org/x/net/ipv6/multicast_test.go
deleted file mode 100644
index 50442c36..00000000
--- a/vendor/golang.org/x/net/ipv6/multicast_test.go
+++ /dev/null
@@ -1,264 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6_test
-
-import (
-	"bytes"
-	"net"
-	"os"
-	"runtime"
-	"testing"
-	"time"
-
-	"golang.org/x/net/icmp"
-	"golang.org/x/net/internal/iana"
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv6"
-)
-
-var packetConnReadWriteMulticastUDPTests = []struct {
-	addr     string
-	grp, src *net.UDPAddr
-}{
-	{"[ff02::]:0", &net.UDPAddr{IP: net.ParseIP("ff02::114")}, nil}, // see RFC 4727
-
-	{"[ff30::8000:0]:0", &net.UDPAddr{IP: net.ParseIP("ff30::8000:1")}, &net.UDPAddr{IP: net.IPv6loopback}}, // see RFC 5771
-}
-
-func TestPacketConnReadWriteMulticastUDP(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-	if !nettest.SupportsIPv6MulticastDeliveryOnLoopback() {
-		t.Skipf("multicast delivery doesn't work correctly on %s", runtime.GOOS)
-	}
-	ifi := nettest.RoutedInterface("ip6", net.FlagUp|net.FlagMulticast|net.FlagLoopback)
-	if ifi == nil {
-		t.Skipf("not available on %s", runtime.GOOS)
-	}
-
-	for _, tt := range packetConnReadWriteMulticastUDPTests {
-		c, err := net.ListenPacket("udp6", tt.addr)
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c.Close()
-
-		grp := *tt.grp
-		grp.Port = c.LocalAddr().(*net.UDPAddr).Port
-		p := ipv6.NewPacketConn(c)
-		defer p.Close()
-		if tt.src == nil {
-			if err := p.JoinGroup(ifi, &grp); err != nil {
-				t.Fatal(err)
-			}
-			defer p.LeaveGroup(ifi, &grp)
-		} else {
-			if err := p.JoinSourceSpecificGroup(ifi, &grp, tt.src); err != nil {
-				switch runtime.GOOS {
-				case "freebsd", "linux":
-				default: // platforms that don't support MLDv2 fail here
-					t.Logf("not supported on %s", runtime.GOOS)
-					continue
-				}
-				t.Fatal(err)
-			}
-			defer p.LeaveSourceSpecificGroup(ifi, &grp, tt.src)
-		}
-		if err := p.SetMulticastInterface(ifi); err != nil {
-			t.Fatal(err)
-		}
-		if _, err := p.MulticastInterface(); err != nil {
-			t.Fatal(err)
-		}
-		if err := p.SetMulticastLoopback(true); err != nil {
-			t.Fatal(err)
-		}
-		if _, err := p.MulticastLoopback(); err != nil {
-			t.Fatal(err)
-		}
-
-		cm := ipv6.ControlMessage{
-			TrafficClass: iana.DiffServAF11 | iana.CongestionExperienced,
-			Src:          net.IPv6loopback,
-			IfIndex:      ifi.Index,
-		}
-		cf := ipv6.FlagTrafficClass | ipv6.FlagHopLimit | ipv6.FlagSrc | ipv6.FlagDst | ipv6.FlagInterface | ipv6.FlagPathMTU
-		wb := []byte("HELLO-R-U-THERE")
-
-		for i, toggle := range []bool{true, false, true} {
-			if err := p.SetControlMessage(cf, toggle); err != nil {
-				if nettest.ProtocolNotSupported(err) {
-					t.Logf("not supported on %s", runtime.GOOS)
-					continue
-				}
-				t.Fatal(err)
-			}
-			if err := p.SetDeadline(time.Now().Add(200 * time.Millisecond)); err != nil {
-				t.Fatal(err)
-			}
-			cm.HopLimit = i + 1
-			if n, err := p.WriteTo(wb, &cm, &grp); err != nil {
-				t.Fatal(err)
-			} else if n != len(wb) {
-				t.Fatal(err)
-			}
-			rb := make([]byte, 128)
-			if n, _, _, err := p.ReadFrom(rb); err != nil {
-				t.Fatal(err)
-			} else if !bytes.Equal(rb[:n], wb) {
-				t.Fatalf("got %v; want %v", rb[:n], wb)
-			}
-		}
-	}
-}
-
-var packetConnReadWriteMulticastICMPTests = []struct {
-	grp, src *net.IPAddr
-}{
-	{&net.IPAddr{IP: net.ParseIP("ff02::114")}, nil}, // see RFC 4727
-
-	{&net.IPAddr{IP: net.ParseIP("ff30::8000:1")}, &net.IPAddr{IP: net.IPv6loopback}}, // see RFC 5771
-}
-
-func TestPacketConnReadWriteMulticastICMP(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-	if !nettest.SupportsIPv6MulticastDeliveryOnLoopback() {
-		t.Skipf("multicast delivery doesn't work correctly on %s", runtime.GOOS)
-	}
-	if m, ok := nettest.SupportsRawIPSocket(); !ok {
-		t.Skip(m)
-	}
-	ifi := nettest.RoutedInterface("ip6", net.FlagUp|net.FlagMulticast|net.FlagLoopback)
-	if ifi == nil {
-		t.Skipf("not available on %s", runtime.GOOS)
-	}
-
-	for _, tt := range packetConnReadWriteMulticastICMPTests {
-		c, err := net.ListenPacket("ip6:ipv6-icmp", "::")
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c.Close()
-
-		pshicmp := icmp.IPv6PseudoHeader(c.LocalAddr().(*net.IPAddr).IP, tt.grp.IP)
-		p := ipv6.NewPacketConn(c)
-		defer p.Close()
-		if tt.src == nil {
-			if err := p.JoinGroup(ifi, tt.grp); err != nil {
-				t.Fatal(err)
-			}
-			defer p.LeaveGroup(ifi, tt.grp)
-		} else {
-			if err := p.JoinSourceSpecificGroup(ifi, tt.grp, tt.src); err != nil {
-				switch runtime.GOOS {
-				case "freebsd", "linux":
-				default: // platforms that don't support MLDv2 fail here
-					t.Logf("not supported on %s", runtime.GOOS)
-					continue
-				}
-				t.Fatal(err)
-			}
-			defer p.LeaveSourceSpecificGroup(ifi, tt.grp, tt.src)
-		}
-		if err := p.SetMulticastInterface(ifi); err != nil {
-			t.Fatal(err)
-		}
-		if _, err := p.MulticastInterface(); err != nil {
-			t.Fatal(err)
-		}
-		if err := p.SetMulticastLoopback(true); err != nil {
-			t.Fatal(err)
-		}
-		if _, err := p.MulticastLoopback(); err != nil {
-			t.Fatal(err)
-		}
-
-		cm := ipv6.ControlMessage{
-			TrafficClass: iana.DiffServAF11 | iana.CongestionExperienced,
-			Src:          net.IPv6loopback,
-			IfIndex:      ifi.Index,
-		}
-		cf := ipv6.FlagTrafficClass | ipv6.FlagHopLimit | ipv6.FlagSrc | ipv6.FlagDst | ipv6.FlagInterface | ipv6.FlagPathMTU
-
-		var f ipv6.ICMPFilter
-		f.SetAll(true)
-		f.Accept(ipv6.ICMPTypeEchoReply)
-		if err := p.SetICMPFilter(&f); err != nil {
-			t.Fatal(err)
-		}
-
-		var psh []byte
-		for i, toggle := range []bool{true, false, true} {
-			if toggle {
-				psh = nil
-				if err := p.SetChecksum(true, 2); err != nil {
-					// Solaris never allows to
-					// modify ICMP properties.
-					if runtime.GOOS != "solaris" {
-						t.Fatal(err)
-					}
-				}
-			} else {
-				psh = pshicmp
-				// Some platforms never allow to
-				// disable the kernel checksum
-				// processing.
-				p.SetChecksum(false, -1)
-			}
-			wb, err := (&icmp.Message{
-				Type: ipv6.ICMPTypeEchoRequest, Code: 0,
-				Body: &icmp.Echo{
-					ID: os.Getpid() & 0xffff, Seq: i + 1,
-					Data: []byte("HELLO-R-U-THERE"),
-				},
-			}).Marshal(psh)
-			if err != nil {
-				t.Fatal(err)
-			}
-			if err := p.SetControlMessage(cf, toggle); err != nil {
-				if nettest.ProtocolNotSupported(err) {
-					t.Logf("not supported on %s", runtime.GOOS)
-					continue
-				}
-				t.Fatal(err)
-			}
-			if err := p.SetDeadline(time.Now().Add(200 * time.Millisecond)); err != nil {
-				t.Fatal(err)
-			}
-			cm.HopLimit = i + 1
-			if n, err := p.WriteTo(wb, &cm, tt.grp); err != nil {
-				t.Fatal(err)
-			} else if n != len(wb) {
-				t.Fatalf("got %v; want %v", n, len(wb))
-			}
-			rb := make([]byte, 128)
-			if n, _, _, err := p.ReadFrom(rb); err != nil {
-				switch runtime.GOOS {
-				case "darwin": // older darwin kernels have some limitation on receiving icmp packet through raw socket
-					t.Logf("not supported on %s", runtime.GOOS)
-					continue
-				}
-				t.Fatal(err)
-			} else {
-				if m, err := icmp.ParseMessage(iana.ProtocolIPv6ICMP, rb[:n]); err != nil {
-					t.Fatal(err)
-				} else if m.Type != ipv6.ICMPTypeEchoReply || m.Code != 0 {
-					t.Fatalf("got type=%v, code=%v; want type=%v, code=%v", m.Type, m.Code, ipv6.ICMPTypeEchoReply, 0)
-				}
-			}
-		}
-	}
-}
diff --git a/vendor/golang.org/x/net/ipv6/multicastlistener_test.go b/vendor/golang.org/x/net/ipv6/multicastlistener_test.go
deleted file mode 100644
index 1ee0549d..00000000
--- a/vendor/golang.org/x/net/ipv6/multicastlistener_test.go
+++ /dev/null
@@ -1,261 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6_test
-
-import (
-	"net"
-	"runtime"
-	"testing"
-
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv6"
-)
-
-var udpMultipleGroupListenerTests = []net.Addr{
-	&net.UDPAddr{IP: net.ParseIP("ff02::114")}, // see RFC 4727
-	&net.UDPAddr{IP: net.ParseIP("ff02::1:114")},
-	&net.UDPAddr{IP: net.ParseIP("ff02::2:114")},
-}
-
-func TestUDPSinglePacketConnWithMultipleGroupListeners(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-
-	for _, gaddr := range udpMultipleGroupListenerTests {
-		c, err := net.ListenPacket("udp6", "[::]:0") // wildcard address with non-reusable port
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c.Close()
-
-		p := ipv6.NewPacketConn(c)
-		var mift []*net.Interface
-
-		ift, err := net.Interfaces()
-		if err != nil {
-			t.Fatal(err)
-		}
-		for i, ifi := range ift {
-			if _, ok := nettest.IsMulticastCapable("ip6", &ifi); !ok {
-				continue
-			}
-			if err := p.JoinGroup(&ifi, gaddr); err != nil {
-				t.Fatal(err)
-			}
-			mift = append(mift, &ift[i])
-		}
-		for _, ifi := range mift {
-			if err := p.LeaveGroup(ifi, gaddr); err != nil {
-				t.Fatal(err)
-			}
-		}
-	}
-}
-
-func TestUDPMultiplePacketConnWithMultipleGroupListeners(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-
-	for _, gaddr := range udpMultipleGroupListenerTests {
-		c1, err := net.ListenPacket("udp6", "[ff02::]:0") // wildcard address with reusable port
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c1.Close()
-		_, port, err := net.SplitHostPort(c1.LocalAddr().String())
-		if err != nil {
-			t.Fatal(err)
-		}
-		c2, err := net.ListenPacket("udp6", net.JoinHostPort("ff02::", port)) // wildcard address with reusable port
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c2.Close()
-
-		var ps [2]*ipv6.PacketConn
-		ps[0] = ipv6.NewPacketConn(c1)
-		ps[1] = ipv6.NewPacketConn(c2)
-		var mift []*net.Interface
-
-		ift, err := net.Interfaces()
-		if err != nil {
-			t.Fatal(err)
-		}
-		for i, ifi := range ift {
-			if _, ok := nettest.IsMulticastCapable("ip6", &ifi); !ok {
-				continue
-			}
-			for _, p := range ps {
-				if err := p.JoinGroup(&ifi, gaddr); err != nil {
-					t.Fatal(err)
-				}
-			}
-			mift = append(mift, &ift[i])
-		}
-		for _, ifi := range mift {
-			for _, p := range ps {
-				if err := p.LeaveGroup(ifi, gaddr); err != nil {
-					t.Fatal(err)
-				}
-			}
-		}
-	}
-}
-
-func TestUDPPerInterfaceSinglePacketConnWithSingleGroupListener(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-
-	gaddr := net.IPAddr{IP: net.ParseIP("ff02::114")} // see RFC 4727
-	type ml struct {
-		c   *ipv6.PacketConn
-		ifi *net.Interface
-	}
-	var mlt []*ml
-
-	ift, err := net.Interfaces()
-	if err != nil {
-		t.Fatal(err)
-	}
-	port := "0"
-	for i, ifi := range ift {
-		ip, ok := nettest.IsMulticastCapable("ip6", &ifi)
-		if !ok {
-			continue
-		}
-		c, err := net.ListenPacket("udp6", net.JoinHostPort(ip.String()+"%"+ifi.Name, port)) // unicast address with non-reusable port
-		if err != nil {
-			// The listen may fail when the serivce is
-			// already in use, but it's fine because the
-			// purpose of this is not to test the
-			// bookkeeping of IP control block inside the
-			// kernel.
-			t.Log(err)
-			continue
-		}
-		defer c.Close()
-		if port == "0" {
-			_, port, err = net.SplitHostPort(c.LocalAddr().String())
-			if err != nil {
-				t.Fatal(err)
-			}
-		}
-		p := ipv6.NewPacketConn(c)
-		if err := p.JoinGroup(&ifi, &gaddr); err != nil {
-			t.Fatal(err)
-		}
-		mlt = append(mlt, &ml{p, &ift[i]})
-	}
-	for _, m := range mlt {
-		if err := m.c.LeaveGroup(m.ifi, &gaddr); err != nil {
-			t.Fatal(err)
-		}
-	}
-}
-
-func TestIPSinglePacketConnWithSingleGroupListener(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-	if m, ok := nettest.SupportsRawIPSocket(); !ok {
-		t.Skip(m)
-	}
-
-	c, err := net.ListenPacket("ip6:ipv6-icmp", "::") // wildcard address
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-
-	p := ipv6.NewPacketConn(c)
-	gaddr := net.IPAddr{IP: net.ParseIP("ff02::114")} // see RFC 4727
-	var mift []*net.Interface
-
-	ift, err := net.Interfaces()
-	if err != nil {
-		t.Fatal(err)
-	}
-	for i, ifi := range ift {
-		if _, ok := nettest.IsMulticastCapable("ip6", &ifi); !ok {
-			continue
-		}
-		if err := p.JoinGroup(&ifi, &gaddr); err != nil {
-			t.Fatal(err)
-		}
-		mift = append(mift, &ift[i])
-	}
-	for _, ifi := range mift {
-		if err := p.LeaveGroup(ifi, &gaddr); err != nil {
-			t.Fatal(err)
-		}
-	}
-}
-
-func TestIPPerInterfaceSinglePacketConnWithSingleGroupListener(t *testing.T) {
-	switch runtime.GOOS {
-	case "darwin", "dragonfly", "openbsd": // platforms that return fe80::1%lo0: bind: can't assign requested address
-		t.Skipf("not supported on %s", runtime.GOOS)
-	case "js", "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-	if m, ok := nettest.SupportsRawIPSocket(); !ok {
-		t.Skip(m)
-	}
-
-	gaddr := net.IPAddr{IP: net.ParseIP("ff02::114")} // see RFC 4727
-	type ml struct {
-		c   *ipv6.PacketConn
-		ifi *net.Interface
-	}
-	var mlt []*ml
-
-	ift, err := net.Interfaces()
-	if err != nil {
-		t.Fatal(err)
-	}
-	for i, ifi := range ift {
-		ip, ok := nettest.IsMulticastCapable("ip6", &ifi)
-		if !ok {
-			continue
-		}
-		c, err := net.ListenPacket("ip6:ipv6-icmp", ip.String()+"%"+ifi.Name) // unicast address
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c.Close()
-		p := ipv6.NewPacketConn(c)
-		if err := p.JoinGroup(&ifi, &gaddr); err != nil {
-			t.Fatal(err)
-		}
-		mlt = append(mlt, &ml{p, &ift[i]})
-	}
-	for _, m := range mlt {
-		if err := m.c.LeaveGroup(m.ifi, &gaddr); err != nil {
-			t.Fatal(err)
-		}
-	}
-}
diff --git a/vendor/golang.org/x/net/ipv6/multicastsockopt_test.go b/vendor/golang.org/x/net/ipv6/multicastsockopt_test.go
deleted file mode 100644
index 9906e876..00000000
--- a/vendor/golang.org/x/net/ipv6/multicastsockopt_test.go
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6_test
-
-import (
-	"net"
-	"runtime"
-	"testing"
-
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv6"
-)
-
-var packetConnMulticastSocketOptionTests = []struct {
-	net, proto, addr string
-	grp, src         net.Addr
-}{
-	{"udp6", "", "[ff02::]:0", &net.UDPAddr{IP: net.ParseIP("ff02::114")}, nil}, // see RFC 4727
-	{"ip6", ":ipv6-icmp", "::", &net.IPAddr{IP: net.ParseIP("ff02::115")}, nil}, // see RFC 4727
-
-	{"udp6", "", "[ff30::8000:0]:0", &net.UDPAddr{IP: net.ParseIP("ff30::8000:1")}, &net.UDPAddr{IP: net.IPv6loopback}}, // see RFC 5771
-	{"ip6", ":ipv6-icmp", "::", &net.IPAddr{IP: net.ParseIP("ff30::8000:2")}, &net.IPAddr{IP: net.IPv6loopback}},        // see RFC 5771
-}
-
-func TestPacketConnMulticastSocketOptions(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-	ifi := nettest.RoutedInterface("ip6", net.FlagUp|net.FlagMulticast|net.FlagLoopback)
-	if ifi == nil {
-		t.Skipf("not available on %s", runtime.GOOS)
-	}
-
-	m, ok := nettest.SupportsRawIPSocket()
-	for _, tt := range packetConnMulticastSocketOptionTests {
-		if tt.net == "ip6" && !ok {
-			t.Log(m)
-			continue
-		}
-		c, err := net.ListenPacket(tt.net+tt.proto, tt.addr)
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c.Close()
-		p := ipv6.NewPacketConn(c)
-		defer p.Close()
-
-		if tt.src == nil {
-			testMulticastSocketOptions(t, p, ifi, tt.grp)
-		} else {
-			testSourceSpecificMulticastSocketOptions(t, p, ifi, tt.grp, tt.src)
-		}
-	}
-}
-
-type testIPv6MulticastConn interface {
-	MulticastHopLimit() (int, error)
-	SetMulticastHopLimit(ttl int) error
-	MulticastLoopback() (bool, error)
-	SetMulticastLoopback(bool) error
-	JoinGroup(*net.Interface, net.Addr) error
-	LeaveGroup(*net.Interface, net.Addr) error
-	JoinSourceSpecificGroup(*net.Interface, net.Addr, net.Addr) error
-	LeaveSourceSpecificGroup(*net.Interface, net.Addr, net.Addr) error
-	ExcludeSourceSpecificGroup(*net.Interface, net.Addr, net.Addr) error
-	IncludeSourceSpecificGroup(*net.Interface, net.Addr, net.Addr) error
-}
-
-func testMulticastSocketOptions(t *testing.T, c testIPv6MulticastConn, ifi *net.Interface, grp net.Addr) {
-	const hoplim = 255
-	if err := c.SetMulticastHopLimit(hoplim); err != nil {
-		t.Error(err)
-		return
-	}
-	if v, err := c.MulticastHopLimit(); err != nil {
-		t.Error(err)
-		return
-	} else if v != hoplim {
-		t.Errorf("got %v; want %v", v, hoplim)
-		return
-	}
-
-	for _, toggle := range []bool{true, false} {
-		if err := c.SetMulticastLoopback(toggle); err != nil {
-			t.Error(err)
-			return
-		}
-		if v, err := c.MulticastLoopback(); err != nil {
-			t.Error(err)
-			return
-		} else if v != toggle {
-			t.Errorf("got %v; want %v", v, toggle)
-			return
-		}
-	}
-
-	if err := c.JoinGroup(ifi, grp); err != nil {
-		t.Error(err)
-		return
-	}
-	if err := c.LeaveGroup(ifi, grp); err != nil {
-		t.Error(err)
-		return
-	}
-}
-
-func testSourceSpecificMulticastSocketOptions(t *testing.T, c testIPv6MulticastConn, ifi *net.Interface, grp, src net.Addr) {
-	// MCAST_JOIN_GROUP -> MCAST_BLOCK_SOURCE -> MCAST_UNBLOCK_SOURCE -> MCAST_LEAVE_GROUP
-	if err := c.JoinGroup(ifi, grp); err != nil {
-		t.Error(err)
-		return
-	}
-	if err := c.ExcludeSourceSpecificGroup(ifi, grp, src); err != nil {
-		switch runtime.GOOS {
-		case "freebsd", "linux":
-		default: // platforms that don't support MLDv2 fail here
-			t.Logf("not supported on %s", runtime.GOOS)
-			return
-		}
-		t.Error(err)
-		return
-	}
-	if err := c.IncludeSourceSpecificGroup(ifi, grp, src); err != nil {
-		t.Error(err)
-		return
-	}
-	if err := c.LeaveGroup(ifi, grp); err != nil {
-		t.Error(err)
-		return
-	}
-
-	// MCAST_JOIN_SOURCE_GROUP -> MCAST_LEAVE_SOURCE_GROUP
-	if err := c.JoinSourceSpecificGroup(ifi, grp, src); err != nil {
-		t.Error(err)
-		return
-	}
-	if err := c.LeaveSourceSpecificGroup(ifi, grp, src); err != nil {
-		t.Error(err)
-		return
-	}
-
-	// MCAST_JOIN_SOURCE_GROUP -> MCAST_LEAVE_GROUP
-	if err := c.JoinSourceSpecificGroup(ifi, grp, src); err != nil {
-		t.Error(err)
-		return
-	}
-	if err := c.LeaveGroup(ifi, grp); err != nil {
-		t.Error(err)
-		return
-	}
-}
diff --git a/vendor/golang.org/x/net/ipv6/payload_cmsg.go b/vendor/golang.org/x/net/ipv6/payload_cmsg.go
index b7ccdbda..3f23b5d2 100644
--- a/vendor/golang.org/x/net/ipv6/payload_cmsg.go
+++ b/vendor/golang.org/x/net/ipv6/payload_cmsg.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !nacl,!plan9,!windows
+// +build !js,!nacl,!plan9,!windows
 
 package ipv6
 
diff --git a/vendor/golang.org/x/net/ipv6/payload_cmsg_go1_8.go b/vendor/golang.org/x/net/ipv6/payload_cmsg_go1_8.go
index fdc6c399..bc4209db 100644
--- a/vendor/golang.org/x/net/ipv6/payload_cmsg_go1_8.go
+++ b/vendor/golang.org/x/net/ipv6/payload_cmsg_go1_8.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // +build !go1.9
-// +build !nacl,!plan9,!windows
+// +build !js,!nacl,!plan9,!windows
 
 package ipv6
 
diff --git a/vendor/golang.org/x/net/ipv6/payload_cmsg_go1_9.go b/vendor/golang.org/x/net/ipv6/payload_cmsg_go1_9.go
index 8f6d02e2..7dd65048 100644
--- a/vendor/golang.org/x/net/ipv6/payload_cmsg_go1_9.go
+++ b/vendor/golang.org/x/net/ipv6/payload_cmsg_go1_9.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // +build go1.9
-// +build !nacl,!plan9,!windows
+// +build !js,!nacl,!plan9,!windows
 
 package ipv6
 
diff --git a/vendor/golang.org/x/net/ipv6/payload_nocmsg.go b/vendor/golang.org/x/net/ipv6/payload_nocmsg.go
index 83585072..459142d2 100644
--- a/vendor/golang.org/x/net/ipv6/payload_nocmsg.go
+++ b/vendor/golang.org/x/net/ipv6/payload_nocmsg.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build nacl plan9 windows
+// +build js nacl plan9 windows
 
 package ipv6
 
diff --git a/vendor/golang.org/x/net/ipv6/readwrite_go1_8_test.go b/vendor/golang.org/x/net/ipv6/readwrite_go1_8_test.go
deleted file mode 100644
index b3fbda13..00000000
--- a/vendor/golang.org/x/net/ipv6/readwrite_go1_8_test.go
+++ /dev/null
@@ -1,242 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !go1.9
-
-package ipv6_test
-
-import (
-	"bytes"
-	"fmt"
-	"net"
-	"runtime"
-	"strings"
-	"sync"
-	"testing"
-
-	"golang.org/x/net/internal/iana"
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv6"
-)
-
-func BenchmarkPacketConnReadWriteUnicast(b *testing.B) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		b.Skipf("not supported on %s", runtime.GOOS)
-	}
-
-	payload := []byte("HELLO-R-U-THERE")
-	iph := []byte{
-		0x69, 0x8b, 0xee, 0xf1, 0xca, 0xfe, 0xff, 0x01,
-		0x20, 0x01, 0x0d, 0xb8, 0x00, 0x01, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-		0x20, 0x01, 0x0d, 0xb8, 0x00, 0x02, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-	}
-	greh := []byte{0x00, 0x00, 0x86, 0xdd, 0x00, 0x00, 0x00, 0x00}
-	datagram := append(greh, append(iph, payload...)...)
-	bb := make([]byte, 128)
-	cm := ipv6.ControlMessage{
-		TrafficClass: iana.DiffServAF11 | iana.CongestionExperienced,
-		HopLimit:     1,
-		Src:          net.IPv6loopback,
-	}
-	if ifi := nettest.RoutedInterface("ip6", net.FlagUp|net.FlagLoopback); ifi != nil {
-		cm.IfIndex = ifi.Index
-	}
-
-	b.Run("UDP", func(b *testing.B) {
-		c, err := nettest.NewLocalPacketListener("udp6")
-		if err != nil {
-			b.Skipf("not supported on %s/%s: %v", runtime.GOOS, runtime.GOARCH, err)
-		}
-		defer c.Close()
-		p := ipv6.NewPacketConn(c)
-		dst := c.LocalAddr()
-		cf := ipv6.FlagHopLimit | ipv6.FlagInterface
-		if err := p.SetControlMessage(cf, true); err != nil {
-			b.Fatal(err)
-		}
-		b.Run("Net", func(b *testing.B) {
-			for i := 0; i < b.N; i++ {
-				if _, err := c.WriteTo(payload, dst); err != nil {
-					b.Fatal(err)
-				}
-				if _, _, err := c.ReadFrom(bb); err != nil {
-					b.Fatal(err)
-				}
-			}
-		})
-		b.Run("ToFrom", func(b *testing.B) {
-			for i := 0; i < b.N; i++ {
-				if _, err := p.WriteTo(payload, &cm, dst); err != nil {
-					b.Fatal(err)
-				}
-				if _, _, _, err := p.ReadFrom(bb); err != nil {
-					b.Fatal(err)
-				}
-			}
-		})
-	})
-	b.Run("IP", func(b *testing.B) {
-		switch runtime.GOOS {
-		case "netbsd":
-			b.Skip("need to configure gre on netbsd")
-		case "openbsd":
-			b.Skip("net.inet.gre.allow=0 by default on openbsd")
-		}
-
-		c, err := net.ListenPacket(fmt.Sprintf("ip6:%d", iana.ProtocolGRE), "::1")
-		if err != nil {
-			b.Skipf("not supported on %s/%s: %v", runtime.GOOS, runtime.GOARCH, err)
-		}
-		defer c.Close()
-		p := ipv6.NewPacketConn(c)
-		dst := c.LocalAddr()
-		cf := ipv6.FlagTrafficClass | ipv6.FlagHopLimit | ipv6.FlagSrc | ipv6.FlagDst | ipv6.FlagInterface | ipv6.FlagPathMTU
-		if err := p.SetControlMessage(cf, true); err != nil {
-			b.Fatal(err)
-		}
-		b.Run("Net", func(b *testing.B) {
-			for i := 0; i < b.N; i++ {
-				if _, err := c.WriteTo(datagram, dst); err != nil {
-					b.Fatal(err)
-				}
-				if _, _, err := c.ReadFrom(bb); err != nil {
-					b.Fatal(err)
-				}
-			}
-		})
-		b.Run("ToFrom", func(b *testing.B) {
-			for i := 0; i < b.N; i++ {
-				if _, err := p.WriteTo(datagram, &cm, dst); err != nil {
-					b.Fatal(err)
-				}
-				if _, _, _, err := p.ReadFrom(bb); err != nil {
-					b.Fatal(err)
-				}
-			}
-		})
-	})
-}
-
-func TestPacketConnConcurrentReadWriteUnicast(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-
-	payload := []byte("HELLO-R-U-THERE")
-	iph := []byte{
-		0x69, 0x8b, 0xee, 0xf1, 0xca, 0xfe, 0xff, 0x01,
-		0x20, 0x01, 0x0d, 0xb8, 0x00, 0x01, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-		0x20, 0x01, 0x0d, 0xb8, 0x00, 0x02, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-	}
-	greh := []byte{0x00, 0x00, 0x86, 0xdd, 0x00, 0x00, 0x00, 0x00}
-	datagram := append(greh, append(iph, payload...)...)
-
-	t.Run("UDP", func(t *testing.T) {
-		c, err := nettest.NewLocalPacketListener("udp6")
-		if err != nil {
-			t.Skipf("not supported on %s/%s: %v", runtime.GOOS, runtime.GOARCH, err)
-		}
-		defer c.Close()
-		p := ipv6.NewPacketConn(c)
-		t.Run("ToFrom", func(t *testing.T) {
-			testPacketConnConcurrentReadWriteUnicast(t, p, payload, c.LocalAddr())
-		})
-	})
-	t.Run("IP", func(t *testing.T) {
-		switch runtime.GOOS {
-		case "netbsd":
-			t.Skip("need to configure gre on netbsd")
-		case "openbsd":
-			t.Skip("net.inet.gre.allow=0 by default on openbsd")
-		}
-
-		c, err := net.ListenPacket(fmt.Sprintf("ip6:%d", iana.ProtocolGRE), "::1")
-		if err != nil {
-			t.Skipf("not supported on %s/%s: %v", runtime.GOOS, runtime.GOARCH, err)
-		}
-		defer c.Close()
-		p := ipv6.NewPacketConn(c)
-		t.Run("ToFrom", func(t *testing.T) {
-			testPacketConnConcurrentReadWriteUnicast(t, p, datagram, c.LocalAddr())
-		})
-	})
-}
-
-func testPacketConnConcurrentReadWriteUnicast(t *testing.T, p *ipv6.PacketConn, data []byte, dst net.Addr) {
-	ifi := nettest.RoutedInterface("ip6", net.FlagUp|net.FlagLoopback)
-	cf := ipv6.FlagTrafficClass | ipv6.FlagHopLimit | ipv6.FlagSrc | ipv6.FlagDst | ipv6.FlagInterface | ipv6.FlagPathMTU
-
-	if err := p.SetControlMessage(cf, true); err != nil { // probe before test
-		if nettest.ProtocolNotSupported(err) {
-			t.Skipf("not supported on %s", runtime.GOOS)
-		}
-		t.Fatal(err)
-	}
-
-	var wg sync.WaitGroup
-	reader := func() {
-		defer wg.Done()
-		b := make([]byte, 128)
-		n, cm, _, err := p.ReadFrom(b)
-		if err != nil {
-			t.Error(err)
-			return
-		}
-		if !bytes.Equal(b[:n], data) {
-			t.Errorf("got %#v; want %#v", b[:n], data)
-			return
-		}
-		s := cm.String()
-		if strings.Contains(s, ",") {
-			t.Errorf("should be space-separated values: %s", s)
-			return
-		}
-	}
-	writer := func(toggle bool) {
-		defer wg.Done()
-		cm := ipv6.ControlMessage{
-			TrafficClass: iana.DiffServAF11 | iana.CongestionExperienced,
-			HopLimit:     1,
-			Src:          net.IPv6loopback,
-		}
-		if ifi != nil {
-			cm.IfIndex = ifi.Index
-		}
-		if err := p.SetControlMessage(cf, toggle); err != nil {
-			t.Error(err)
-			return
-		}
-		n, err := p.WriteTo(data, &cm, dst)
-		if err != nil {
-			t.Error(err)
-			return
-		}
-		if n != len(data) {
-			t.Errorf("got %d; want %d", n, len(data))
-			return
-		}
-	}
-
-	const N = 10
-	wg.Add(N)
-	for i := 0; i < N; i++ {
-		go reader()
-	}
-	wg.Add(2 * N)
-	for i := 0; i < 2*N; i++ {
-		go writer(i%2 != 0)
-
-	}
-	wg.Add(N)
-	for i := 0; i < N; i++ {
-		go reader()
-	}
-	wg.Wait()
-}
diff --git a/vendor/golang.org/x/net/ipv6/readwrite_go1_9_test.go b/vendor/golang.org/x/net/ipv6/readwrite_go1_9_test.go
deleted file mode 100644
index 7110619b..00000000
--- a/vendor/golang.org/x/net/ipv6/readwrite_go1_9_test.go
+++ /dev/null
@@ -1,373 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.9
-
-package ipv6_test
-
-import (
-	"bytes"
-	"fmt"
-	"net"
-	"runtime"
-	"strings"
-	"sync"
-	"testing"
-
-	"golang.org/x/net/internal/iana"
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv6"
-)
-
-func BenchmarkPacketConnReadWriteUnicast(b *testing.B) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		b.Skipf("not supported on %s", runtime.GOOS)
-	}
-
-	payload := []byte("HELLO-R-U-THERE")
-	iph := []byte{
-		0x69, 0x8b, 0xee, 0xf1, 0xca, 0xfe, 0xff, 0x01,
-		0x20, 0x01, 0x0d, 0xb8, 0x00, 0x01, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-		0x20, 0x01, 0x0d, 0xb8, 0x00, 0x02, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-	}
-	greh := []byte{0x00, 0x00, 0x86, 0xdd, 0x00, 0x00, 0x00, 0x00}
-	datagram := append(greh, append(iph, payload...)...)
-	bb := make([]byte, 128)
-	cm := ipv6.ControlMessage{
-		TrafficClass: iana.DiffServAF11 | iana.CongestionExperienced,
-		HopLimit:     1,
-		Src:          net.IPv6loopback,
-	}
-	if ifi := nettest.RoutedInterface("ip6", net.FlagUp|net.FlagLoopback); ifi != nil {
-		cm.IfIndex = ifi.Index
-	}
-
-	b.Run("UDP", func(b *testing.B) {
-		c, err := nettest.NewLocalPacketListener("udp6")
-		if err != nil {
-			b.Skipf("not supported on %s/%s: %v", runtime.GOOS, runtime.GOARCH, err)
-		}
-		defer c.Close()
-		p := ipv6.NewPacketConn(c)
-		dst := c.LocalAddr()
-		cf := ipv6.FlagHopLimit | ipv6.FlagInterface
-		if err := p.SetControlMessage(cf, true); err != nil {
-			b.Fatal(err)
-		}
-		wms := []ipv6.Message{
-			{
-				Buffers: [][]byte{payload},
-				Addr:    dst,
-				OOB:     cm.Marshal(),
-			},
-		}
-		rms := []ipv6.Message{
-			{
-				Buffers: [][]byte{bb},
-				OOB:     ipv6.NewControlMessage(cf),
-			},
-		}
-		b.Run("Net", func(b *testing.B) {
-			for i := 0; i < b.N; i++ {
-				if _, err := c.WriteTo(payload, dst); err != nil {
-					b.Fatal(err)
-				}
-				if _, _, err := c.ReadFrom(bb); err != nil {
-					b.Fatal(err)
-				}
-			}
-		})
-		b.Run("ToFrom", func(b *testing.B) {
-			for i := 0; i < b.N; i++ {
-				if _, err := p.WriteTo(payload, &cm, dst); err != nil {
-					b.Fatal(err)
-				}
-				if _, _, _, err := p.ReadFrom(bb); err != nil {
-					b.Fatal(err)
-				}
-			}
-		})
-		b.Run("Batch", func(b *testing.B) {
-			for i := 0; i < b.N; i++ {
-				if _, err := p.WriteBatch(wms, 0); err != nil {
-					b.Fatal(err)
-				}
-				if _, err := p.ReadBatch(rms, 0); err != nil {
-					b.Fatal(err)
-				}
-			}
-		})
-	})
-	b.Run("IP", func(b *testing.B) {
-		switch runtime.GOOS {
-		case "netbsd":
-			b.Skip("need to configure gre on netbsd")
-		case "openbsd":
-			b.Skip("net.inet.gre.allow=0 by default on openbsd")
-		}
-
-		c, err := net.ListenPacket(fmt.Sprintf("ip6:%d", iana.ProtocolGRE), "::1")
-		if err != nil {
-			b.Skipf("not supported on %s/%s: %v", runtime.GOOS, runtime.GOARCH, err)
-		}
-		defer c.Close()
-		p := ipv6.NewPacketConn(c)
-		dst := c.LocalAddr()
-		cf := ipv6.FlagTrafficClass | ipv6.FlagHopLimit | ipv6.FlagSrc | ipv6.FlagDst | ipv6.FlagInterface | ipv6.FlagPathMTU
-		if err := p.SetControlMessage(cf, true); err != nil {
-			b.Fatal(err)
-		}
-		wms := []ipv6.Message{
-			{
-				Buffers: [][]byte{datagram},
-				Addr:    dst,
-				OOB:     cm.Marshal(),
-			},
-		}
-		rms := []ipv6.Message{
-			{
-				Buffers: [][]byte{bb},
-				OOB:     ipv6.NewControlMessage(cf),
-			},
-		}
-		b.Run("Net", func(b *testing.B) {
-			for i := 0; i < b.N; i++ {
-				if _, err := c.WriteTo(datagram, dst); err != nil {
-					b.Fatal(err)
-				}
-				if _, _, err := c.ReadFrom(bb); err != nil {
-					b.Fatal(err)
-				}
-			}
-		})
-		b.Run("ToFrom", func(b *testing.B) {
-			for i := 0; i < b.N; i++ {
-				if _, err := p.WriteTo(datagram, &cm, dst); err != nil {
-					b.Fatal(err)
-				}
-				if _, _, _, err := p.ReadFrom(bb); err != nil {
-					b.Fatal(err)
-				}
-			}
-		})
-		b.Run("Batch", func(b *testing.B) {
-			for i := 0; i < b.N; i++ {
-				if _, err := p.WriteBatch(wms, 0); err != nil {
-					b.Fatal(err)
-				}
-				if _, err := p.ReadBatch(rms, 0); err != nil {
-					b.Fatal(err)
-				}
-			}
-		})
-	})
-}
-
-func TestPacketConnConcurrentReadWriteUnicast(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-
-	payload := []byte("HELLO-R-U-THERE")
-	iph := []byte{
-		0x69, 0x8b, 0xee, 0xf1, 0xca, 0xfe, 0xff, 0x01,
-		0x20, 0x01, 0x0d, 0xb8, 0x00, 0x01, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-		0x20, 0x01, 0x0d, 0xb8, 0x00, 0x02, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-	}
-	greh := []byte{0x00, 0x00, 0x86, 0xdd, 0x00, 0x00, 0x00, 0x00}
-	datagram := append(greh, append(iph, payload...)...)
-
-	t.Run("UDP", func(t *testing.T) {
-		c, err := nettest.NewLocalPacketListener("udp6")
-		if err != nil {
-			t.Skipf("not supported on %s/%s: %v", runtime.GOOS, runtime.GOARCH, err)
-		}
-		defer c.Close()
-		p := ipv6.NewPacketConn(c)
-		t.Run("ToFrom", func(t *testing.T) {
-			testPacketConnConcurrentReadWriteUnicast(t, p, payload, c.LocalAddr(), false)
-		})
-		t.Run("Batch", func(t *testing.T) {
-			testPacketConnConcurrentReadWriteUnicast(t, p, payload, c.LocalAddr(), true)
-		})
-	})
-	t.Run("IP", func(t *testing.T) {
-		switch runtime.GOOS {
-		case "netbsd":
-			t.Skip("need to configure gre on netbsd")
-		case "openbsd":
-			t.Skip("net.inet.gre.allow=0 by default on openbsd")
-		}
-
-		c, err := net.ListenPacket(fmt.Sprintf("ip6:%d", iana.ProtocolGRE), "::1")
-		if err != nil {
-			t.Skipf("not supported on %s/%s: %v", runtime.GOOS, runtime.GOARCH, err)
-		}
-		defer c.Close()
-		p := ipv6.NewPacketConn(c)
-		t.Run("ToFrom", func(t *testing.T) {
-			testPacketConnConcurrentReadWriteUnicast(t, p, datagram, c.LocalAddr(), false)
-		})
-		t.Run("Batch", func(t *testing.T) {
-			testPacketConnConcurrentReadWriteUnicast(t, p, datagram, c.LocalAddr(), true)
-		})
-	})
-}
-
-func testPacketConnConcurrentReadWriteUnicast(t *testing.T, p *ipv6.PacketConn, data []byte, dst net.Addr, batch bool) {
-	ifi := nettest.RoutedInterface("ip6", net.FlagUp|net.FlagLoopback)
-	cf := ipv6.FlagTrafficClass | ipv6.FlagHopLimit | ipv6.FlagSrc | ipv6.FlagDst | ipv6.FlagInterface | ipv6.FlagPathMTU
-
-	if err := p.SetControlMessage(cf, true); err != nil { // probe before test
-		if nettest.ProtocolNotSupported(err) {
-			t.Skipf("not supported on %s", runtime.GOOS)
-		}
-		t.Fatal(err)
-	}
-
-	var wg sync.WaitGroup
-	reader := func() {
-		defer wg.Done()
-		b := make([]byte, 128)
-		n, cm, _, err := p.ReadFrom(b)
-		if err != nil {
-			t.Error(err)
-			return
-		}
-		if !bytes.Equal(b[:n], data) {
-			t.Errorf("got %#v; want %#v", b[:n], data)
-			return
-		}
-		s := cm.String()
-		if strings.Contains(s, ",") {
-			t.Errorf("should be space-separated values: %s", s)
-			return
-		}
-	}
-	batchReader := func() {
-		defer wg.Done()
-		ms := []ipv6.Message{
-			{
-				Buffers: [][]byte{make([]byte, 128)},
-				OOB:     ipv6.NewControlMessage(cf),
-			},
-		}
-		n, err := p.ReadBatch(ms, 0)
-		if err != nil {
-			t.Error(err)
-			return
-		}
-		if n != len(ms) {
-			t.Errorf("got %d; want %d", n, len(ms))
-			return
-		}
-		var cm ipv6.ControlMessage
-		if err := cm.Parse(ms[0].OOB[:ms[0].NN]); err != nil {
-			t.Error(err)
-			return
-		}
-		b := ms[0].Buffers[0][:ms[0].N]
-		if !bytes.Equal(b, data) {
-			t.Errorf("got %#v; want %#v", b, data)
-			return
-		}
-		s := cm.String()
-		if strings.Contains(s, ",") {
-			t.Errorf("should be space-separated values: %s", s)
-			return
-		}
-	}
-	writer := func(toggle bool) {
-		defer wg.Done()
-		cm := ipv6.ControlMessage{
-			TrafficClass: iana.DiffServAF11 | iana.CongestionExperienced,
-			HopLimit:     1,
-			Src:          net.IPv6loopback,
-		}
-		if ifi != nil {
-			cm.IfIndex = ifi.Index
-		}
-		if err := p.SetControlMessage(cf, toggle); err != nil {
-			t.Error(err)
-			return
-		}
-		n, err := p.WriteTo(data, &cm, dst)
-		if err != nil {
-			t.Error(err)
-			return
-		}
-		if n != len(data) {
-			t.Errorf("got %d; want %d", n, len(data))
-			return
-		}
-	}
-	batchWriter := func(toggle bool) {
-		defer wg.Done()
-		cm := ipv6.ControlMessage{
-			TrafficClass: iana.DiffServAF11 | iana.CongestionExperienced,
-			HopLimit:     1,
-			Src:          net.IPv6loopback,
-		}
-		if ifi != nil {
-			cm.IfIndex = ifi.Index
-		}
-		if err := p.SetControlMessage(cf, toggle); err != nil {
-			t.Error(err)
-			return
-		}
-		ms := []ipv6.Message{
-			{
-				Buffers: [][]byte{data},
-				OOB:     cm.Marshal(),
-				Addr:    dst,
-			},
-		}
-		n, err := p.WriteBatch(ms, 0)
-		if err != nil {
-			t.Error(err)
-			return
-		}
-		if n != len(ms) {
-			t.Errorf("got %d; want %d", n, len(ms))
-			return
-		}
-		if ms[0].N != len(data) {
-			t.Errorf("got %d; want %d", ms[0].N, len(data))
-			return
-		}
-	}
-
-	const N = 10
-	wg.Add(N)
-	for i := 0; i < N; i++ {
-		if batch {
-			go batchReader()
-		} else {
-			go reader()
-		}
-	}
-	wg.Add(2 * N)
-	for i := 0; i < 2*N; i++ {
-		if batch {
-			go batchWriter(i%2 != 0)
-		} else {
-			go writer(i%2 != 0)
-		}
-	}
-	wg.Add(N)
-	for i := 0; i < N; i++ {
-		if batch {
-			go batchReader()
-		} else {
-			go reader()
-		}
-	}
-	wg.Wait()
-}
diff --git a/vendor/golang.org/x/net/ipv6/readwrite_test.go b/vendor/golang.org/x/net/ipv6/readwrite_test.go
deleted file mode 100644
index 668208f2..00000000
--- a/vendor/golang.org/x/net/ipv6/readwrite_test.go
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6_test
-
-import (
-	"bytes"
-	"net"
-	"runtime"
-	"strings"
-	"sync"
-	"testing"
-
-	"golang.org/x/net/internal/iana"
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv6"
-)
-
-func BenchmarkReadWriteUnicast(b *testing.B) {
-	c, err := nettest.NewLocalPacketListener("udp6")
-	if err != nil {
-		b.Skipf("not supported on %s/%s: %v", runtime.GOOS, runtime.GOARCH, err)
-	}
-	defer c.Close()
-
-	dst := c.LocalAddr()
-	wb, rb := []byte("HELLO-R-U-THERE"), make([]byte, 128)
-
-	b.Run("NetUDP", func(b *testing.B) {
-		for i := 0; i < b.N; i++ {
-			if _, err := c.WriteTo(wb, dst); err != nil {
-				b.Fatal(err)
-			}
-			if _, _, err := c.ReadFrom(rb); err != nil {
-				b.Fatal(err)
-			}
-		}
-	})
-	b.Run("IPv6UDP", func(b *testing.B) {
-		p := ipv6.NewPacketConn(c)
-		cf := ipv6.FlagTrafficClass | ipv6.FlagHopLimit | ipv6.FlagSrc | ipv6.FlagDst | ipv6.FlagInterface | ipv6.FlagPathMTU
-		if err := p.SetControlMessage(cf, true); err != nil {
-			b.Fatal(err)
-		}
-		cm := ipv6.ControlMessage{
-			TrafficClass: iana.DiffServAF11 | iana.CongestionExperienced,
-			HopLimit:     1,
-		}
-		ifi := nettest.RoutedInterface("ip6", net.FlagUp|net.FlagLoopback)
-		if ifi != nil {
-			cm.IfIndex = ifi.Index
-		}
-
-		for i := 0; i < b.N; i++ {
-			if _, err := p.WriteTo(wb, &cm, dst); err != nil {
-				b.Fatal(err)
-			}
-			if _, _, _, err := p.ReadFrom(rb); err != nil {
-				b.Fatal(err)
-			}
-		}
-	})
-}
-
-func TestPacketConnConcurrentReadWriteUnicastUDP(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-
-	c, err := nettest.NewLocalPacketListener("udp6")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-	p := ipv6.NewPacketConn(c)
-	defer p.Close()
-
-	dst := c.LocalAddr()
-	ifi := nettest.RoutedInterface("ip6", net.FlagUp|net.FlagLoopback)
-	cf := ipv6.FlagTrafficClass | ipv6.FlagHopLimit | ipv6.FlagSrc | ipv6.FlagDst | ipv6.FlagInterface | ipv6.FlagPathMTU
-	wb := []byte("HELLO-R-U-THERE")
-
-	if err := p.SetControlMessage(cf, true); err != nil { // probe before test
-		if nettest.ProtocolNotSupported(err) {
-			t.Skipf("not supported on %s", runtime.GOOS)
-		}
-		t.Fatal(err)
-	}
-
-	var wg sync.WaitGroup
-	reader := func() {
-		defer wg.Done()
-		rb := make([]byte, 128)
-		if n, cm, _, err := p.ReadFrom(rb); err != nil {
-			t.Error(err)
-			return
-		} else if !bytes.Equal(rb[:n], wb) {
-			t.Errorf("got %v; want %v", rb[:n], wb)
-			return
-		} else {
-			s := cm.String()
-			if strings.Contains(s, ",") {
-				t.Errorf("should be space-separated values: %s", s)
-			}
-		}
-	}
-	writer := func(toggle bool) {
-		defer wg.Done()
-		cm := ipv6.ControlMessage{
-			TrafficClass: iana.DiffServAF11 | iana.CongestionExperienced,
-			Src:          net.IPv6loopback,
-		}
-		if ifi != nil {
-			cm.IfIndex = ifi.Index
-		}
-		if err := p.SetControlMessage(cf, toggle); err != nil {
-			t.Error(err)
-			return
-		}
-		if n, err := p.WriteTo(wb, &cm, dst); err != nil {
-			t.Error(err)
-			return
-		} else if n != len(wb) {
-			t.Errorf("got %d; want %d", n, len(wb))
-			return
-		}
-	}
-
-	const N = 10
-	wg.Add(N)
-	for i := 0; i < N; i++ {
-		go reader()
-	}
-	wg.Add(2 * N)
-	for i := 0; i < 2*N; i++ {
-		go writer(i%2 != 0)
-	}
-	wg.Add(N)
-	for i := 0; i < N; i++ {
-		go reader()
-	}
-	wg.Wait()
-}
diff --git a/vendor/golang.org/x/net/ipv6/sockopt_test.go b/vendor/golang.org/x/net/ipv6/sockopt_test.go
deleted file mode 100644
index add045e3..00000000
--- a/vendor/golang.org/x/net/ipv6/sockopt_test.go
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6_test
-
-import (
-	"fmt"
-	"net"
-	"runtime"
-	"testing"
-
-	"golang.org/x/net/internal/iana"
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv6"
-)
-
-var supportsIPv6 bool = nettest.SupportsIPv6()
-
-func TestConnInitiatorPathMTU(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-
-	ln, err := net.Listen("tcp6", "[::1]:0")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer ln.Close()
-
-	done := make(chan bool)
-	go acceptor(t, ln, done)
-
-	c, err := net.Dial("tcp6", ln.Addr().String())
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-
-	if pmtu, err := ipv6.NewConn(c).PathMTU(); err != nil {
-		switch runtime.GOOS {
-		case "darwin": // older darwin kernels don't support IPV6_PATHMTU option
-			t.Logf("not supported on %s", runtime.GOOS)
-		default:
-			t.Fatal(err)
-		}
-	} else {
-		t.Logf("path mtu for %v: %v", c.RemoteAddr(), pmtu)
-	}
-
-	<-done
-}
-
-func TestConnResponderPathMTU(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-
-	ln, err := net.Listen("tcp6", "[::1]:0")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer ln.Close()
-
-	done := make(chan bool)
-	go connector(t, "tcp6", ln.Addr().String(), done)
-
-	c, err := ln.Accept()
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-
-	if pmtu, err := ipv6.NewConn(c).PathMTU(); err != nil {
-		switch runtime.GOOS {
-		case "darwin": // older darwin kernels don't support IPV6_PATHMTU option
-			t.Logf("not supported on %s", runtime.GOOS)
-		default:
-			t.Fatal(err)
-		}
-	} else {
-		t.Logf("path mtu for %v: %v", c.RemoteAddr(), pmtu)
-	}
-
-	<-done
-}
-
-func TestPacketConnChecksum(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-	if m, ok := nettest.SupportsRawIPSocket(); !ok {
-		t.Skip(m)
-	}
-
-	c, err := net.ListenPacket(fmt.Sprintf("ip6:%d", iana.ProtocolOSPFIGP), "::") // OSPF for IPv6
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-
-	p := ipv6.NewPacketConn(c)
-	offset := 12 // see RFC 5340
-
-	for _, toggle := range []bool{false, true} {
-		if err := p.SetChecksum(toggle, offset); err != nil {
-			if toggle {
-				t.Fatalf("ipv6.PacketConn.SetChecksum(%v, %v) failed: %v", toggle, offset, err)
-			} else {
-				// Some platforms never allow to disable the kernel
-				// checksum processing.
-				t.Logf("ipv6.PacketConn.SetChecksum(%v, %v) failed: %v", toggle, offset, err)
-			}
-		}
-		if on, offset, err := p.Checksum(); err != nil {
-			t.Fatal(err)
-		} else {
-			t.Logf("kernel checksum processing enabled=%v, offset=%v", on, offset)
-		}
-	}
-}
diff --git a/vendor/golang.org/x/net/ipv6/unicast_test.go b/vendor/golang.org/x/net/ipv6/unicast_test.go
deleted file mode 100644
index 159bb39b..00000000
--- a/vendor/golang.org/x/net/ipv6/unicast_test.go
+++ /dev/null
@@ -1,184 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6_test
-
-import (
-	"bytes"
-	"net"
-	"os"
-	"runtime"
-	"testing"
-	"time"
-
-	"golang.org/x/net/icmp"
-	"golang.org/x/net/internal/iana"
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv6"
-)
-
-func TestPacketConnReadWriteUnicastUDP(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-
-	c, err := nettest.NewLocalPacketListener("udp6")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-	p := ipv6.NewPacketConn(c)
-	defer p.Close()
-
-	dst := c.LocalAddr()
-	cm := ipv6.ControlMessage{
-		TrafficClass: iana.DiffServAF11 | iana.CongestionExperienced,
-		Src:          net.IPv6loopback,
-	}
-	cf := ipv6.FlagTrafficClass | ipv6.FlagHopLimit | ipv6.FlagSrc | ipv6.FlagDst | ipv6.FlagInterface | ipv6.FlagPathMTU
-	ifi := nettest.RoutedInterface("ip6", net.FlagUp|net.FlagLoopback)
-	if ifi != nil {
-		cm.IfIndex = ifi.Index
-	}
-	wb := []byte("HELLO-R-U-THERE")
-
-	for i, toggle := range []bool{true, false, true} {
-		if err := p.SetControlMessage(cf, toggle); err != nil {
-			if nettest.ProtocolNotSupported(err) {
-				t.Logf("not supported on %s", runtime.GOOS)
-				continue
-			}
-			t.Fatal(err)
-		}
-		cm.HopLimit = i + 1
-		if err := p.SetWriteDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
-			t.Fatal(err)
-		}
-		if n, err := p.WriteTo(wb, &cm, dst); err != nil {
-			t.Fatal(err)
-		} else if n != len(wb) {
-			t.Fatalf("got %v; want %v", n, len(wb))
-		}
-		rb := make([]byte, 128)
-		if err := p.SetReadDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
-			t.Fatal(err)
-		}
-		if n, _, _, err := p.ReadFrom(rb); err != nil {
-			t.Fatal(err)
-		} else if !bytes.Equal(rb[:n], wb) {
-			t.Fatalf("got %v; want %v", rb[:n], wb)
-		}
-	}
-}
-
-func TestPacketConnReadWriteUnicastICMP(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-	if m, ok := nettest.SupportsRawIPSocket(); !ok {
-		t.Skip(m)
-	}
-
-	c, err := net.ListenPacket("ip6:ipv6-icmp", "::1")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-	p := ipv6.NewPacketConn(c)
-	defer p.Close()
-
-	dst, err := net.ResolveIPAddr("ip6", "::1")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	pshicmp := icmp.IPv6PseudoHeader(c.LocalAddr().(*net.IPAddr).IP, dst.IP)
-	cm := ipv6.ControlMessage{
-		TrafficClass: iana.DiffServAF11 | iana.CongestionExperienced,
-		Src:          net.IPv6loopback,
-	}
-	cf := ipv6.FlagTrafficClass | ipv6.FlagHopLimit | ipv6.FlagSrc | ipv6.FlagDst | ipv6.FlagInterface | ipv6.FlagPathMTU
-	ifi := nettest.RoutedInterface("ip6", net.FlagUp|net.FlagLoopback)
-	if ifi != nil {
-		cm.IfIndex = ifi.Index
-	}
-
-	var f ipv6.ICMPFilter
-	f.SetAll(true)
-	f.Accept(ipv6.ICMPTypeEchoReply)
-	if err := p.SetICMPFilter(&f); err != nil {
-		t.Fatal(err)
-	}
-
-	var psh []byte
-	for i, toggle := range []bool{true, false, true} {
-		if toggle {
-			psh = nil
-			if err := p.SetChecksum(true, 2); err != nil {
-				// Solaris never allows to modify
-				// ICMP properties.
-				if runtime.GOOS != "solaris" {
-					t.Fatal(err)
-				}
-			}
-		} else {
-			psh = pshicmp
-			// Some platforms never allow to disable the
-			// kernel checksum processing.
-			p.SetChecksum(false, -1)
-		}
-		wb, err := (&icmp.Message{
-			Type: ipv6.ICMPTypeEchoRequest, Code: 0,
-			Body: &icmp.Echo{
-				ID: os.Getpid() & 0xffff, Seq: i + 1,
-				Data: []byte("HELLO-R-U-THERE"),
-			},
-		}).Marshal(psh)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := p.SetControlMessage(cf, toggle); err != nil {
-			if nettest.ProtocolNotSupported(err) {
-				t.Logf("not supported on %s", runtime.GOOS)
-				continue
-			}
-			t.Fatal(err)
-		}
-		cm.HopLimit = i + 1
-		if err := p.SetWriteDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
-			t.Fatal(err)
-		}
-		if n, err := p.WriteTo(wb, &cm, dst); err != nil {
-			t.Fatal(err)
-		} else if n != len(wb) {
-			t.Fatalf("got %v; want %v", n, len(wb))
-		}
-		rb := make([]byte, 128)
-		if err := p.SetReadDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
-			t.Fatal(err)
-		}
-		if n, _, _, err := p.ReadFrom(rb); err != nil {
-			switch runtime.GOOS {
-			case "darwin": // older darwin kernels have some limitation on receiving icmp packet through raw socket
-				t.Logf("not supported on %s", runtime.GOOS)
-				continue
-			}
-			t.Fatal(err)
-		} else {
-			if m, err := icmp.ParseMessage(iana.ProtocolIPv6ICMP, rb[:n]); err != nil {
-				t.Fatal(err)
-			} else if m.Type != ipv6.ICMPTypeEchoReply || m.Code != 0 {
-				t.Fatalf("got type=%v, code=%v; want type=%v, code=%v", m.Type, m.Code, ipv6.ICMPTypeEchoReply, 0)
-			}
-		}
-	}
-}
diff --git a/vendor/golang.org/x/net/ipv6/unicastsockopt_test.go b/vendor/golang.org/x/net/ipv6/unicastsockopt_test.go
deleted file mode 100644
index 69adefe8..00000000
--- a/vendor/golang.org/x/net/ipv6/unicastsockopt_test.go
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6_test
-
-import (
-	"net"
-	"runtime"
-	"testing"
-
-	"golang.org/x/net/internal/iana"
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv6"
-)
-
-func TestConnUnicastSocketOptions(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-
-	ln, err := net.Listen("tcp6", "[::1]:0")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer ln.Close()
-
-	errc := make(chan error, 1)
-	go func() {
-		c, err := ln.Accept()
-		if err != nil {
-			errc <- err
-			return
-		}
-		errc <- c.Close()
-	}()
-
-	c, err := net.Dial("tcp6", ln.Addr().String())
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-
-	testUnicastSocketOptions(t, ipv6.NewConn(c))
-
-	if err := <-errc; err != nil {
-		t.Errorf("server: %v", err)
-	}
-}
-
-var packetConnUnicastSocketOptionTests = []struct {
-	net, proto, addr string
-}{
-	{"udp6", "", "[::1]:0"},
-	{"ip6", ":ipv6-icmp", "::1"},
-}
-
-func TestPacketConnUnicastSocketOptions(t *testing.T) {
-	switch runtime.GOOS {
-	case "js", "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-
-	m, ok := nettest.SupportsRawIPSocket()
-	for _, tt := range packetConnUnicastSocketOptionTests {
-		if tt.net == "ip6" && !ok {
-			t.Log(m)
-			continue
-		}
-		c, err := net.ListenPacket(tt.net+tt.proto, tt.addr)
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c.Close()
-
-		testUnicastSocketOptions(t, ipv6.NewPacketConn(c))
-	}
-}
-
-type testIPv6UnicastConn interface {
-	TrafficClass() (int, error)
-	SetTrafficClass(int) error
-	HopLimit() (int, error)
-	SetHopLimit(int) error
-}
-
-func testUnicastSocketOptions(t *testing.T, c testIPv6UnicastConn) {
-	tclass := iana.DiffServCS0 | iana.NotECNTransport
-	if err := c.SetTrafficClass(tclass); err != nil {
-		switch runtime.GOOS {
-		case "darwin": // older darwin kernels don't support IPV6_TCLASS option
-			t.Logf("not supported on %s", runtime.GOOS)
-			goto next
-		}
-		t.Fatal(err)
-	}
-	if v, err := c.TrafficClass(); err != nil {
-		t.Fatal(err)
-	} else if v != tclass {
-		t.Fatalf("got %v; want %v", v, tclass)
-	}
-
-next:
-	hoplim := 255
-	if err := c.SetHopLimit(hoplim); err != nil {
-		t.Fatal(err)
-	}
-	if v, err := c.HopLimit(); err != nil {
-		t.Fatal(err)
-	} else if v != hoplim {
-		t.Fatalf("got %v; want %v", v, hoplim)
-	}
-}
diff --git a/vendor/golang.org/x/net/proxy/per_host_test.go b/vendor/golang.org/x/net/proxy/per_host_test.go
deleted file mode 100644
index a7d80957..00000000
--- a/vendor/golang.org/x/net/proxy/per_host_test.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package proxy
-
-import (
-	"errors"
-	"net"
-	"reflect"
-	"testing"
-)
-
-type recordingProxy struct {
-	addrs []string
-}
-
-func (r *recordingProxy) Dial(network, addr string) (net.Conn, error) {
-	r.addrs = append(r.addrs, addr)
-	return nil, errors.New("recordingProxy")
-}
-
-func TestPerHost(t *testing.T) {
-	var def, bypass recordingProxy
-	perHost := NewPerHost(&def, &bypass)
-	perHost.AddFromString("localhost,*.zone,127.0.0.1,10.0.0.1/8,1000::/16")
-
-	expectedDef := []string{
-		"example.com:123",
-		"1.2.3.4:123",
-		"[1001::]:123",
-	}
-	expectedBypass := []string{
-		"localhost:123",
-		"zone:123",
-		"foo.zone:123",
-		"127.0.0.1:123",
-		"10.1.2.3:123",
-		"[1000::]:123",
-	}
-
-	for _, addr := range expectedDef {
-		perHost.Dial("tcp", addr)
-	}
-	for _, addr := range expectedBypass {
-		perHost.Dial("tcp", addr)
-	}
-
-	if !reflect.DeepEqual(expectedDef, def.addrs) {
-		t.Errorf("Hosts which went to the default proxy didn't match. Got %v, want %v", def.addrs, expectedDef)
-	}
-	if !reflect.DeepEqual(expectedBypass, bypass.addrs) {
-		t.Errorf("Hosts which went to the bypass proxy didn't match. Got %v, want %v", bypass.addrs, expectedBypass)
-	}
-}
diff --git a/vendor/golang.org/x/net/proxy/proxy_test.go b/vendor/golang.org/x/net/proxy/proxy_test.go
deleted file mode 100644
index 0be1b422..00000000
--- a/vendor/golang.org/x/net/proxy/proxy_test.go
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package proxy
-
-import (
-	"bytes"
-	"fmt"
-	"net/url"
-	"os"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/internal/sockstest"
-)
-
-type proxyFromEnvTest struct {
-	allProxyEnv string
-	noProxyEnv  string
-	wantTypeOf  Dialer
-}
-
-func (t proxyFromEnvTest) String() string {
-	var buf bytes.Buffer
-	space := func() {
-		if buf.Len() > 0 {
-			buf.WriteByte(' ')
-		}
-	}
-	if t.allProxyEnv != "" {
-		fmt.Fprintf(&buf, "all_proxy=%q", t.allProxyEnv)
-	}
-	if t.noProxyEnv != "" {
-		space()
-		fmt.Fprintf(&buf, "no_proxy=%q", t.noProxyEnv)
-	}
-	return strings.TrimSpace(buf.String())
-}
-
-func TestFromEnvironment(t *testing.T) {
-	ResetProxyEnv()
-
-	type dummyDialer struct {
-		direct
-	}
-
-	RegisterDialerType("irc", func(_ *url.URL, _ Dialer) (Dialer, error) {
-		return dummyDialer{}, nil
-	})
-
-	proxyFromEnvTests := []proxyFromEnvTest{
-		{allProxyEnv: "127.0.0.1:8080", noProxyEnv: "localhost, 127.0.0.1", wantTypeOf: direct{}},
-		{allProxyEnv: "ftp://example.com:8000", noProxyEnv: "localhost, 127.0.0.1", wantTypeOf: direct{}},
-		{allProxyEnv: "socks5://example.com:8080", noProxyEnv: "localhost, 127.0.0.1", wantTypeOf: &PerHost{}},
-		{allProxyEnv: "irc://example.com:8000", wantTypeOf: dummyDialer{}},
-		{noProxyEnv: "localhost, 127.0.0.1", wantTypeOf: direct{}},
-		{wantTypeOf: direct{}},
-	}
-
-	for _, tt := range proxyFromEnvTests {
-		os.Setenv("ALL_PROXY", tt.allProxyEnv)
-		os.Setenv("NO_PROXY", tt.noProxyEnv)
-		ResetCachedEnvironment()
-
-		d := FromEnvironment()
-		if got, want := fmt.Sprintf("%T", d), fmt.Sprintf("%T", tt.wantTypeOf); got != want {
-			t.Errorf("%v: got type = %T, want %T", tt, d, tt.wantTypeOf)
-		}
-	}
-}
-
-func TestFromURL(t *testing.T) {
-	ss, err := sockstest.NewServer(sockstest.NoAuthRequired, sockstest.NoProxyRequired)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer ss.Close()
-	url, err := url.Parse("socks5://user:password@" + ss.Addr().String())
-	if err != nil {
-		t.Fatal(err)
-	}
-	proxy, err := FromURL(url, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	c, err := proxy.Dial("tcp", "fqdn.doesnotexist:5963")
-	if err != nil {
-		t.Fatal(err)
-	}
-	c.Close()
-}
-
-func TestSOCKS5(t *testing.T) {
-	ss, err := sockstest.NewServer(sockstest.NoAuthRequired, sockstest.NoProxyRequired)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer ss.Close()
-	proxy, err := SOCKS5("tcp", ss.Addr().String(), nil, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	c, err := proxy.Dial("tcp", ss.TargetAddr().String())
-	if err != nil {
-		t.Fatal(err)
-	}
-	c.Close()
-}
-
-func ResetProxyEnv() {
-	for _, env := range []*envOnce{allProxyEnv, noProxyEnv} {
-		for _, v := range env.names {
-			os.Setenv(v, "")
-		}
-	}
-	ResetCachedEnvironment()
-}
-
-func ResetCachedEnvironment() {
-	allProxyEnv.reset()
-	noProxyEnv.reset()
-}
diff --git a/vendor/golang.org/x/sys/.gitattributes b/vendor/golang.org/x/sys/.gitattributes
deleted file mode 100644
index d2f212e5..00000000
--- a/vendor/golang.org/x/sys/.gitattributes
+++ /dev/null
@@ -1,10 +0,0 @@
-# Treat all files in this repo as binary, with no git magic updating
-# line endings. Windows users contributing to Go will need to use a
-# modern version of git and editors capable of LF line endings.
-#
-# We'll prevent accidental CRLF line endings from entering the repo
-# via the git-review gofmt checks.
-#
-# See golang.org/issue/9281
-
-* -text
diff --git a/vendor/golang.org/x/sys/.gitignore b/vendor/golang.org/x/sys/.gitignore
deleted file mode 100644
index 8339fd61..00000000
--- a/vendor/golang.org/x/sys/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Add no patterns to .hgignore except for files generated by the build.
-last-change
diff --git a/vendor/golang.org/x/sys/CONTRIBUTING.md b/vendor/golang.org/x/sys/CONTRIBUTING.md
deleted file mode 100644
index d0485e88..00000000
--- a/vendor/golang.org/x/sys/CONTRIBUTING.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Contributing to Go
-
-Go is an open source project.
-
-It is the work of hundreds of contributors. We appreciate your help!
-
-## Filing issues
-
-When [filing an issue](https://golang.org/issue/new), make sure to answer these five questions:
-
-1.  What version of Go are you using (`go version`)?
-2.  What operating system and processor architecture are you using?
-3.  What did you do?
-4.  What did you expect to see?
-5.  What did you see instead?
-
-General questions should go to the [golang-nuts mailing list](https://groups.google.com/group/golang-nuts) instead of the issue tracker.
-The gophers there will answer or ask you to file an issue if you've tripped over a bug.
-
-## Contributing code
-
-Please read the [Contribution Guidelines](https://golang.org/doc/contribute.html)
-before sending patches.
-
-Unless otherwise noted, the Go source files are distributed under
-the BSD-style license found in the LICENSE file.
diff --git a/vendor/golang.org/x/sys/README.md b/vendor/golang.org/x/sys/README.md
deleted file mode 100644
index ef6c9e59..00000000
--- a/vendor/golang.org/x/sys/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# sys
-
-This repository holds supplemental Go packages for low-level interactions with
-the operating system.
-
-## Download/Install
-
-The easiest way to install is to run `go get -u golang.org/x/sys`. You can
-also manually git clone the repository to `$GOPATH/src/golang.org/x/sys`.
-
-## Report Issues / Send Patches
-
-This repository uses Gerrit for code changes. To learn how to submit changes to
-this repository, see https://golang.org/doc/contribute.html.
-
-The main issue tracker for the sys repository is located at
-https://github.com/golang/go/issues. Prefix your issue with "x/sys:" in the
-subject line, so it is easy to find.
diff --git a/vendor/golang.org/x/sys/codereview.cfg b/vendor/golang.org/x/sys/codereview.cfg
deleted file mode 100644
index 3f8b14b6..00000000
--- a/vendor/golang.org/x/sys/codereview.cfg
+++ /dev/null
@@ -1 +0,0 @@
-issuerepo: golang/go
diff --git a/vendor/golang.org/x/sys/cpu/cpu_test.go b/vendor/golang.org/x/sys/cpu/cpu_test.go
deleted file mode 100644
index baf4b87b..00000000
--- a/vendor/golang.org/x/sys/cpu/cpu_test.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package cpu_test
-
-import (
-	"runtime"
-	"testing"
-
-	"golang.org/x/sys/cpu"
-)
-
-func TestAMD64minimalFeatures(t *testing.T) {
-	if runtime.GOARCH == "amd64" {
-		if !cpu.X86.HasSSE2 {
-			t.Fatal("HasSSE2 expected true, got false")
-		}
-	}
-}
-
-func TestAVX2hasAVX(t *testing.T) {
-	if runtime.GOARCH == "amd64" {
-		if cpu.X86.HasAVX2 && !cpu.X86.HasAVX {
-			t.Fatal("HasAVX expected true, got false")
-		}
-	}
-}
diff --git a/vendor/golang.org/x/sys/unix/example_test.go b/vendor/golang.org/x/sys/unix/aliases.go
similarity index 56%
rename from vendor/golang.org/x/sys/unix/example_test.go
rename to vendor/golang.org/x/sys/unix/aliases.go
index 10619afd..d87a681b 100644
--- a/vendor/golang.org/x/sys/unix/example_test.go
+++ b/vendor/golang.org/x/sys/unix/aliases.go
@@ -3,17 +3,12 @@
 // license that can be found in the LICENSE file.
 
 // +build darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build go1.9
 
-package unix_test
+package unix
 
-import (
-	"log"
-	"os"
+import "syscall"
 
-	"golang.org/x/sys/unix"
-)
-
-func ExampleExec() {
-	err := unix.Exec("/bin/ls", []string{"ls", "-al"}, os.Environ())
-	log.Fatal(err)
-}
+type Signal = syscall.Signal
+type Errno = syscall.Errno
+type SysProcAttr = syscall.SysProcAttr
diff --git a/vendor/golang.org/x/sys/unix/creds_test.go b/vendor/golang.org/x/sys/unix/creds_test.go
deleted file mode 100644
index 1b508319..00000000
--- a/vendor/golang.org/x/sys/unix/creds_test.go
+++ /dev/null
@@ -1,134 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build linux
-
-package unix_test
-
-import (
-	"bytes"
-	"go/build"
-	"net"
-	"os"
-	"testing"
-
-	"golang.org/x/sys/unix"
-)
-
-// TestSCMCredentials tests the sending and receiving of credentials
-// (PID, UID, GID) in an ancillary message between two UNIX
-// sockets. The SO_PASSCRED socket option is enabled on the sending
-// socket for this to work.
-func TestSCMCredentials(t *testing.T) {
-	socketTypeTests := []struct {
-		socketType int
-		dataLen    int
-	}{
-		{
-			unix.SOCK_STREAM,
-			1,
-		}, {
-			unix.SOCK_DGRAM,
-			0,
-		},
-	}
-
-	for _, tt := range socketTypeTests {
-		if tt.socketType == unix.SOCK_DGRAM && !atLeast1p10() {
-			t.Log("skipping DGRAM test on pre-1.10")
-			continue
-		}
-
-		fds, err := unix.Socketpair(unix.AF_LOCAL, tt.socketType, 0)
-		if err != nil {
-			t.Fatalf("Socketpair: %v", err)
-		}
-		defer unix.Close(fds[0])
-		defer unix.Close(fds[1])
-
-		err = unix.SetsockoptInt(fds[0], unix.SOL_SOCKET, unix.SO_PASSCRED, 1)
-		if err != nil {
-			t.Fatalf("SetsockoptInt: %v", err)
-		}
-
-		srvFile := os.NewFile(uintptr(fds[0]), "server")
-		defer srvFile.Close()
-		srv, err := net.FileConn(srvFile)
-		if err != nil {
-			t.Errorf("FileConn: %v", err)
-			return
-		}
-		defer srv.Close()
-
-		cliFile := os.NewFile(uintptr(fds[1]), "client")
-		defer cliFile.Close()
-		cli, err := net.FileConn(cliFile)
-		if err != nil {
-			t.Errorf("FileConn: %v", err)
-			return
-		}
-		defer cli.Close()
-
-		var ucred unix.Ucred
-		ucred.Pid = int32(os.Getpid())
-		ucred.Uid = uint32(os.Getuid())
-		ucred.Gid = uint32(os.Getgid())
-		oob := unix.UnixCredentials(&ucred)
-
-		// On SOCK_STREAM, this is internally going to send a dummy byte
-		n, oobn, err := cli.(*net.UnixConn).WriteMsgUnix(nil, oob, nil)
-		if err != nil {
-			t.Fatalf("WriteMsgUnix: %v", err)
-		}
-		if n != 0 {
-			t.Fatalf("WriteMsgUnix n = %d, want 0", n)
-		}
-		if oobn != len(oob) {
-			t.Fatalf("WriteMsgUnix oobn = %d, want %d", oobn, len(oob))
-		}
-
-		oob2 := make([]byte, 10*len(oob))
-		n, oobn2, flags, _, err := srv.(*net.UnixConn).ReadMsgUnix(nil, oob2)
-		if err != nil {
-			t.Fatalf("ReadMsgUnix: %v", err)
-		}
-		if flags != 0 {
-			t.Fatalf("ReadMsgUnix flags = 0x%x, want 0", flags)
-		}
-		if n != tt.dataLen {
-			t.Fatalf("ReadMsgUnix n = %d, want %d", n, tt.dataLen)
-		}
-		if oobn2 != oobn {
-			// without SO_PASSCRED set on the socket, ReadMsgUnix will
-			// return zero oob bytes
-			t.Fatalf("ReadMsgUnix oobn = %d, want %d", oobn2, oobn)
-		}
-		oob2 = oob2[:oobn2]
-		if !bytes.Equal(oob, oob2) {
-			t.Fatal("ReadMsgUnix oob bytes don't match")
-		}
-
-		scm, err := unix.ParseSocketControlMessage(oob2)
-		if err != nil {
-			t.Fatalf("ParseSocketControlMessage: %v", err)
-		}
-		newUcred, err := unix.ParseUnixCredentials(&scm[0])
-		if err != nil {
-			t.Fatalf("ParseUnixCredentials: %v", err)
-		}
-		if *newUcred != ucred {
-			t.Fatalf("ParseUnixCredentials = %+v, want %+v", newUcred, ucred)
-		}
-	}
-}
-
-// atLeast1p10 reports whether we are running on Go 1.10 or later.
-func atLeast1p10() bool {
-	for _, ver := range build.Default.ReleaseTags {
-		if ver == "go1.10" {
-			return true
-		}
-	}
-	return false
-}
diff --git a/vendor/golang.org/x/sys/unix/dev_linux_test.go b/vendor/golang.org/x/sys/unix/dev_linux_test.go
deleted file mode 100644
index 51645289..00000000
--- a/vendor/golang.org/x/sys/unix/dev_linux_test.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.7
-
-package unix_test
-
-import (
-	"fmt"
-	"testing"
-
-	"golang.org/x/sys/unix"
-)
-
-func TestDevices(t *testing.T) {
-	testCases := []struct {
-		path  string
-		major uint32
-		minor uint32
-	}{
-		// well known major/minor numbers according to
-		// https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/admin-guide/devices.txt
-		{"/dev/null", 1, 3},
-		{"/dev/zero", 1, 5},
-		{"/dev/random", 1, 8},
-		{"/dev/full", 1, 7},
-		{"/dev/urandom", 1, 9},
-		{"/dev/tty", 5, 0},
-	}
-	for _, tc := range testCases {
-		t.Run(fmt.Sprintf("%s %v:%v", tc.path, tc.major, tc.minor), func(t *testing.T) {
-			var stat unix.Stat_t
-			err := unix.Stat(tc.path, &stat)
-			if err != nil {
-				if err == unix.EACCES {
-					t.Skip("no permission to stat device, skipping test")
-				}
-				t.Errorf("failed to stat device: %v", err)
-				return
-			}
-
-			dev := uint64(stat.Rdev)
-			if unix.Major(dev) != tc.major {
-				t.Errorf("for %s Major(%#x) == %d, want %d", tc.path, dev, unix.Major(dev), tc.major)
-			}
-			if unix.Minor(dev) != tc.minor {
-				t.Errorf("for %s Minor(%#x) == %d, want %d", tc.path, dev, unix.Minor(dev), tc.minor)
-			}
-			if unix.Mkdev(tc.major, tc.minor) != dev {
-				t.Errorf("for %s Mkdev(%d, %d) == %#x, want %#x", tc.path, tc.major, tc.minor, unix.Mkdev(tc.major, tc.minor), dev)
-			}
-		})
-
-	}
-}
diff --git a/vendor/golang.org/x/sys/unix/export_test.go b/vendor/golang.org/x/sys/unix/export_test.go
deleted file mode 100644
index e8024690..00000000
--- a/vendor/golang.org/x/sys/unix/export_test.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
-
-package unix
-
-var Itoa = itoa
diff --git a/vendor/golang.org/x/sys/unix/ioctl.go b/vendor/golang.org/x/sys/unix/ioctl.go
new file mode 100644
index 00000000..8c9aaeb2
--- /dev/null
+++ b/vendor/golang.org/x/sys/unix/ioctl.go
@@ -0,0 +1,30 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+
+package unix
+
+import "runtime"
+
+// IoctlSetWinsize performs an ioctl on fd with a *Winsize argument.
+//
+// To change fd's window size, the req argument should be TIOCSWINSZ.
+func IoctlSetWinsize(fd int, req uint, value *Winsize) error {
+	// TODO: if we get the chance, remove the req parameter and
+	// hardcode TIOCSWINSZ.
+	err := ioctlSetWinsize(fd, req, value)
+	runtime.KeepAlive(value)
+	return err
+}
+
+// IoctlSetTermios performs an ioctl on fd with a *Termios.
+//
+// The req value will usually be TCSETA or TIOCSETA.
+func IoctlSetTermios(fd int, req uint, value *Termios) error {
+	// TODO: if we get the chance, remove the req parameter.
+	err := ioctlSetTermios(fd, req, value)
+	runtime.KeepAlive(value)
+	return err
+}
diff --git a/vendor/golang.org/x/sys/unix/mkerrors.sh b/vendor/golang.org/x/sys/unix/mkerrors.sh
index 4a2c5dc9..49bd8e75 100755
--- a/vendor/golang.org/x/sys/unix/mkerrors.sh
+++ b/vendor/golang.org/x/sys/unix/mkerrors.sh
@@ -175,6 +175,7 @@ struct ltchars {
 #include <linux/magic.h>
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netlink.h>
+#include <linux/net_namespace.h>
 #include <linux/perf_event.h>
 #include <linux/random.h>
 #include <linux/reboot.h>
@@ -260,6 +261,7 @@ includes_OpenBSD='
 #include <sys/sysctl.h>
 #include <sys/termios.h>
 #include <sys/ttycom.h>
+#include <sys/unistd.h>
 #include <sys/wait.h>
 #include <net/bpf.h>
 #include <net/if.h>
@@ -405,7 +407,7 @@ ccflags="$@"
 		$2 ~ /^LINUX_REBOOT_CMD_/ ||
 		$2 ~ /^LINUX_REBOOT_MAGIC[12]$/ ||
 		$2 !~ "NLA_TYPE_MASK" &&
-		$2 ~ /^(NETLINK|NLM|NLMSG|NLA|IFA|IFAN|RT|RTC|RTCF|RTN|RTPROT|RTNH|ARPHRD|ETH_P)_/ ||
+		$2 ~ /^(NETLINK|NLM|NLMSG|NLA|IFA|IFAN|RT|RTC|RTCF|RTN|RTPROT|RTNH|ARPHRD|ETH_P|NETNSA)_/ ||
 		$2 ~ /^SIOC/ ||
 		$2 ~ /^TIOC/ ||
 		$2 ~ /^TCGET/ ||
@@ -439,6 +441,7 @@ ccflags="$@"
 		$2 ~ /^CGROUPSTATS_/ ||
 		$2 ~ /^GENL_/ ||
 		$2 ~ /^STATX_/ ||
+		$2 ~ /^RENAME/ ||
 		$2 ~ /^UTIME_/ ||
 		$2 ~ /^XATTR_(CREATE|REPLACE|NO(DEFAULT|FOLLOW|SECURITY)|SHOWCOMPRESSION)/ ||
 		$2 ~ /^ATTR_(BIT_MAP_COUNT|(CMN|VOL|FILE)_)/ ||
diff --git a/vendor/golang.org/x/sys/unix/mmap_unix_test.go b/vendor/golang.org/x/sys/unix/mmap_unix_test.go
deleted file mode 100644
index 3258ca32..00000000
--- a/vendor/golang.org/x/sys/unix/mmap_unix_test.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
-
-package unix_test
-
-import (
-	"testing"
-
-	"golang.org/x/sys/unix"
-)
-
-func TestMmap(t *testing.T) {
-	b, err := unix.Mmap(-1, 0, unix.Getpagesize(), unix.PROT_NONE, unix.MAP_ANON|unix.MAP_PRIVATE)
-	if err != nil {
-		t.Fatalf("Mmap: %v", err)
-	}
-	if err := unix.Mprotect(b, unix.PROT_READ|unix.PROT_WRITE); err != nil {
-		t.Fatalf("Mprotect: %v", err)
-	}
-
-	b[0] = 42
-
-	if err := unix.Msync(b, unix.MS_SYNC); err != nil {
-		t.Fatalf("Msync: %v", err)
-	}
-	if err := unix.Madvise(b, unix.MADV_DONTNEED); err != nil {
-		t.Fatalf("Madvise: %v", err)
-	}
-	if err := unix.Munmap(b); err != nil {
-		t.Fatalf("Munmap: %v", err)
-	}
-}
diff --git a/vendor/golang.org/x/sys/unix/openbsd_test.go b/vendor/golang.org/x/sys/unix/openbsd_test.go
deleted file mode 100644
index 734d7658..00000000
--- a/vendor/golang.org/x/sys/unix/openbsd_test.go
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build openbsd
-
-// This, on the face of it, bizarre testing mechanism is necessary because
-// the only reliable way to gauge whether or not a pledge(2) call has succeeded
-// is that the program has been killed as a result of breaking its pledge.
-
-package unix_test
-
-import (
-	"flag"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"testing"
-
-	"golang.org/x/sys/unix"
-)
-
-type testProc struct {
-	fn      func()       // should always exit instead of returning
-	cleanup func() error // for instance, delete coredumps from testing pledge
-	success bool         // whether zero-exit means success or failure
-}
-
-var (
-	testProcs = map[string]testProc{}
-	procName  = ""
-)
-
-const (
-	optName = "sys-unix-internal-procname"
-)
-
-func init() {
-	flag.StringVar(&procName, optName, "", "internal use only")
-}
-
-// testCmd generates a proper command that, when executed, runs the test
-// corresponding to the given key.
-func testCmd(procName string) (*exec.Cmd, error) {
-	exe, err := filepath.Abs(os.Args[0])
-	if err != nil {
-		return nil, err
-	}
-	cmd := exec.Command(exe, "-"+optName+"="+procName)
-	cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr
-	return cmd, nil
-}
-
-// ExitsCorrectly is a comprehensive, one-line-of-use wrapper for testing
-// a testProc with a key.
-func ExitsCorrectly(procName string, t *testing.T) {
-	s := testProcs[procName]
-	c, err := testCmd(procName)
-	defer func() {
-		if s.cleanup() != nil {
-			t.Fatalf("Failed to run cleanup for %s", procName)
-		}
-	}()
-	if err != nil {
-		t.Fatalf("Failed to construct command for %s", procName)
-	}
-	if (c.Run() == nil) != s.success {
-		result := "succeed"
-		if !s.success {
-			result = "fail"
-		}
-		t.Fatalf("Process did not %s when it was supposed to", result)
-	}
-}
-
-func TestMain(m *testing.M) {
-	flag.Parse()
-	if procName != "" {
-		testProcs[procName].fn()
-	}
-	os.Exit(m.Run())
-}
-
-// For example, add a test for pledge.
-func init() {
-	testProcs["pledge"] = testProc{
-		func() {
-			fmt.Println(unix.Pledge("", nil))
-			os.Exit(0)
-		},
-		func() error {
-			files, err := ioutil.ReadDir(".")
-			if err != nil {
-				return err
-			}
-			for _, file := range files {
-				if filepath.Ext(file.Name()) == ".core" {
-					if err := os.Remove(file.Name()); err != nil {
-						return err
-					}
-				}
-			}
-			return nil
-		},
-		false,
-	}
-}
-
-func TestPledge(t *testing.T) {
-	ExitsCorrectly("pledge", t)
-}
diff --git a/vendor/golang.org/x/sys/unix/syscall_bsd.go b/vendor/golang.org/x/sys/unix/syscall_bsd.go
index 53fb8518..33c8b5f0 100644
--- a/vendor/golang.org/x/sys/unix/syscall_bsd.go
+++ b/vendor/golang.org/x/sys/unix/syscall_bsd.go
@@ -206,7 +206,7 @@ func (sa *SockaddrDatalink) sockaddr() (unsafe.Pointer, _Socklen, error) {
 	return unsafe.Pointer(&sa.raw), SizeofSockaddrDatalink, nil
 }
 
-func anyToSockaddr(rsa *RawSockaddrAny) (Sockaddr, error) {
+func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
 	switch rsa.Addr.Family {
 	case AF_LINK:
 		pp := (*RawSockaddrDatalink)(unsafe.Pointer(rsa))
@@ -286,7 +286,7 @@ func Accept(fd int) (nfd int, sa Sockaddr, err error) {
 		Close(nfd)
 		return 0, nil, ECONNABORTED
 	}
-	sa, err = anyToSockaddr(&rsa)
+	sa, err = anyToSockaddr(fd, &rsa)
 	if err != nil {
 		Close(nfd)
 		nfd = 0
@@ -306,7 +306,7 @@ func Getsockname(fd int) (sa Sockaddr, err error) {
 		rsa.Addr.Family = AF_UNIX
 		rsa.Addr.Len = SizeofSockaddrUnix
 	}
-	return anyToSockaddr(&rsa)
+	return anyToSockaddr(fd, &rsa)
 }
 
 //sysnb socketpair(domain int, typ int, proto int, fd *[2]int32) (err error)
@@ -356,7 +356,7 @@ func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from
 	recvflags = int(msg.Flags)
 	// source address is only specified if the socket is unconnected
 	if rsa.Addr.Family != AF_UNSPEC {
-		from, err = anyToSockaddr(&rsa)
+		from, err = anyToSockaddr(fd, &rsa)
 	}
 	return
 }
diff --git a/vendor/golang.org/x/sys/unix/syscall_bsd_test.go b/vendor/golang.org/x/sys/unix/syscall_bsd_test.go
deleted file mode 100644
index 6c4e2aca..00000000
--- a/vendor/golang.org/x/sys/unix/syscall_bsd_test.go
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd openbsd
-
-package unix_test
-
-import (
-	"os/exec"
-	"runtime"
-	"testing"
-	"time"
-
-	"golang.org/x/sys/unix"
-)
-
-const MNT_WAIT = 1
-const MNT_NOWAIT = 2
-
-func TestGetfsstat(t *testing.T) {
-	const flags = MNT_NOWAIT // see golang.org/issue/16937
-	n, err := unix.Getfsstat(nil, flags)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	data := make([]unix.Statfs_t, n)
-	n2, err := unix.Getfsstat(data, flags)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if n != n2 {
-		t.Errorf("Getfsstat(nil) = %d, but subsequent Getfsstat(slice) = %d", n, n2)
-	}
-	for i, stat := range data {
-		if stat == (unix.Statfs_t{}) {
-			t.Errorf("index %v is an empty Statfs_t struct", i)
-		}
-	}
-	if t.Failed() {
-		for i, stat := range data[:n2] {
-			t.Logf("data[%v] = %+v", i, stat)
-		}
-		mount, err := exec.Command("mount").CombinedOutput()
-		if err != nil {
-			t.Logf("mount: %v\n%s", err, mount)
-		} else {
-			t.Logf("mount: %s", mount)
-		}
-	}
-}
-
-func TestSelect(t *testing.T) {
-	err := unix.Select(0, nil, nil, nil, &unix.Timeval{Sec: 0, Usec: 0})
-	if err != nil {
-		t.Fatalf("Select: %v", err)
-	}
-
-	dur := 250 * time.Millisecond
-	tv := unix.NsecToTimeval(int64(dur))
-	start := time.Now()
-	err = unix.Select(0, nil, nil, nil, &tv)
-	took := time.Since(start)
-	if err != nil {
-		t.Fatalf("Select: %v", err)
-	}
-
-	// On some BSDs the actual timeout might also be slightly less than the requested.
-	// Add an acceptable margin to avoid flaky tests.
-	if took < dur*2/3 {
-		t.Errorf("Select: timeout should have been at least %v, got %v", dur, took)
-	}
-}
-
-func TestSysctlRaw(t *testing.T) {
-	if runtime.GOOS == "openbsd" {
-		t.Skip("kern.proc.pid does not exist on OpenBSD")
-	}
-
-	_, err := unix.SysctlRaw("kern.proc.pid", unix.Getpid())
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestSysctlUint32(t *testing.T) {
-	maxproc, err := unix.SysctlUint32("kern.maxproc")
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Logf("kern.maxproc: %v", maxproc)
-}
diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin.go b/vendor/golang.org/x/sys/unix/syscall_darwin.go
index 79e94767..1aabc560 100644
--- a/vendor/golang.org/x/sys/unix/syscall_darwin.go
+++ b/vendor/golang.org/x/sys/unix/syscall_darwin.go
@@ -199,7 +199,13 @@ func Lgetxattr(link string, attr string, dest []byte) (sz int, err error) {
 	return getxattr(link, attr, xattrPointer(dest), len(dest), 0, XATTR_NOFOLLOW)
 }
 
-//sys  setxattr(path string, attr string, data *byte, size int, position uint32, options int) (err error)
+//sys	fgetxattr(fd int, attr string, dest *byte, size int, position uint32, options int) (sz int, err error)
+
+func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) {
+	return fgetxattr(fd, attr, xattrPointer(dest), len(dest), 0, 0)
+}
+
+//sys	setxattr(path string, attr string, data *byte, size int, position uint32, options int) (err error)
 
 func Setxattr(path string, attr string, data []byte, flags int) (err error) {
 	// The parameters for the OS X implementation vary slightly compared to the
@@ -235,7 +241,13 @@ func Lsetxattr(link string, attr string, data []byte, flags int) (err error) {
 	return setxattr(link, attr, xattrPointer(data), len(data), 0, flags|XATTR_NOFOLLOW)
 }
 
-//sys removexattr(path string, attr string, options int) (err error)
+//sys	fsetxattr(fd int, attr string, data *byte, size int, position uint32, options int) (err error)
+
+func Fsetxattr(fd int, attr string, data []byte, flags int) (err error) {
+	return fsetxattr(fd, attr, xattrPointer(data), len(data), 0, 0)
+}
+
+//sys	removexattr(path string, attr string, options int) (err error)
 
 func Removexattr(path string, attr string) (err error) {
 	// We wrap around and explicitly zero out the options provided to the OS X
@@ -248,6 +260,12 @@ func Lremovexattr(link string, attr string) (err error) {
 	return removexattr(link, attr, XATTR_NOFOLLOW)
 }
 
+//sys	fremovexattr(fd int, attr string, options int) (err error)
+
+func Fremovexattr(fd int, attr string) (err error) {
+	return fremovexattr(fd, attr, 0)
+}
+
 //sys	listxattr(path string, dest *byte, size int, options int) (sz int, err error)
 
 func Listxattr(path string, dest []byte) (sz int, err error) {
@@ -258,6 +276,12 @@ func Llistxattr(link string, dest []byte) (sz int, err error) {
 	return listxattr(link, xattrPointer(dest), len(dest), XATTR_NOFOLLOW)
 }
 
+//sys	flistxattr(fd int, dest *byte, size int, options int) (sz int, err error)
+
+func Flistxattr(fd int, dest []byte) (sz int, err error) {
+	return flistxattr(fd, xattrPointer(dest), len(dest), 0)
+}
+
 func setattrlistTimes(path string, times []Timespec, flags int) error {
 	_p0, err := BytePtrFromString(path)
 	if err != nil {
@@ -313,11 +337,11 @@ func IoctlSetInt(fd int, req uint, value int) error {
 	return ioctl(fd, req, uintptr(value))
 }
 
-func IoctlSetWinsize(fd int, req uint, value *Winsize) error {
+func ioctlSetWinsize(fd int, req uint, value *Winsize) error {
 	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
 }
 
-func IoctlSetTermios(fd int, req uint, value *Termios) error {
+func ioctlSetTermios(fd int, req uint, value *Termios) error {
 	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
 }
 
@@ -529,10 +553,6 @@ func Uname(uname *Utsname) error {
 // Watchevent
 // Waitevent
 // Modwatch
-// Fgetxattr
-// Fsetxattr
-// Fremovexattr
-// Flistxattr
 // Fsctl
 // Initgroups
 // Posix_spawn
diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin_test.go b/vendor/golang.org/x/sys/unix/syscall_darwin_test.go
deleted file mode 100644
index 65691d5c..00000000
--- a/vendor/golang.org/x/sys/unix/syscall_darwin_test.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package unix_test
-
-// stringsFromByteSlice converts a sequence of attributes to a []string.
-// On Darwin, each entry is a NULL-terminated string.
-func stringsFromByteSlice(buf []byte) []string {
-	var result []string
-	off := 0
-	for i, b := range buf {
-		if b == 0 {
-			result = append(result, string(buf[off:i]))
-			off = i + 1
-		}
-	}
-	return result
-}
diff --git a/vendor/golang.org/x/sys/unix/syscall_dragonfly.go b/vendor/golang.org/x/sys/unix/syscall_dragonfly.go
index b5072de2..79d125b3 100644
--- a/vendor/golang.org/x/sys/unix/syscall_dragonfly.go
+++ b/vendor/golang.org/x/sys/unix/syscall_dragonfly.go
@@ -87,7 +87,7 @@ func Accept4(fd, flags int) (nfd int, sa Sockaddr, err error) {
 	if len > SizeofSockaddrAny {
 		panic("RawSockaddrAny too small")
 	}
-	sa, err = anyToSockaddr(&rsa)
+	sa, err = anyToSockaddr(fd, &rsa)
 	if err != nil {
 		Close(nfd)
 		nfd = 0
@@ -143,11 +143,11 @@ func IoctlSetInt(fd int, req uint, value int) error {
 	return ioctl(fd, req, uintptr(value))
 }
 
-func IoctlSetWinsize(fd int, req uint, value *Winsize) error {
+func ioctlSetWinsize(fd int, req uint, value *Winsize) error {
 	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
 }
 
-func IoctlSetTermios(fd int, req uint, value *Termios) error {
+func ioctlSetTermios(fd int, req uint, value *Termios) error {
 	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
 }
 
diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd.go b/vendor/golang.org/x/sys/unix/syscall_freebsd.go
index ba9df4ac..e12cc985 100644
--- a/vendor/golang.org/x/sys/unix/syscall_freebsd.go
+++ b/vendor/golang.org/x/sys/unix/syscall_freebsd.go
@@ -89,7 +89,7 @@ func Accept4(fd, flags int) (nfd int, sa Sockaddr, err error) {
 	if len > SizeofSockaddrAny {
 		panic("RawSockaddrAny too small")
 	}
-	sa, err = anyToSockaddr(&rsa)
+	sa, err = anyToSockaddr(fd, &rsa)
 	if err != nil {
 		Close(nfd)
 		nfd = 0
@@ -364,11 +364,11 @@ func IoctlSetInt(fd int, req uint, value int) error {
 	return ioctl(fd, req, uintptr(value))
 }
 
-func IoctlSetWinsize(fd int, req uint, value *Winsize) error {
+func ioctlSetWinsize(fd int, req uint, value *Winsize) error {
 	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
 }
 
-func IoctlSetTermios(fd int, req uint, value *Termios) error {
+func ioctlSetTermios(fd int, req uint, value *Termios) error {
 	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
 }
 
@@ -602,14 +602,6 @@ func Uname(uname *Utsname) error {
 // Watchevent
 // Waitevent
 // Modwatch
-// Getxattr
-// Fgetxattr
-// Setxattr
-// Fsetxattr
-// Removexattr
-// Fremovexattr
-// Listxattr
-// Flistxattr
 // Fsctl
 // Initgroups
 // Posix_spawn
diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd_test.go b/vendor/golang.org/x/sys/unix/syscall_freebsd_test.go
deleted file mode 100644
index 0fec1a82..00000000
--- a/vendor/golang.org/x/sys/unix/syscall_freebsd_test.go
+++ /dev/null
@@ -1,312 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build freebsd
-
-package unix_test
-
-import (
-	"flag"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path"
-	"path/filepath"
-	"runtime"
-	"testing"
-
-	"golang.org/x/sys/unix"
-)
-
-func TestSysctlUint64(t *testing.T) {
-	_, err := unix.SysctlUint64("vm.swap_total")
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-// FIXME: Infrastructure for launching tests in subprocesses stolen from openbsd_test.go - refactor?
-// testCmd generates a proper command that, when executed, runs the test
-// corresponding to the given key.
-
-type testProc struct {
-	fn      func()                    // should always exit instead of returning
-	arg     func(t *testing.T) string // generate argument for test
-	cleanup func(arg string) error    // for instance, delete coredumps from testing pledge
-	success bool                      // whether zero-exit means success or failure
-}
-
-var (
-	testProcs = map[string]testProc{}
-	procName  = ""
-	procArg   = ""
-)
-
-const (
-	optName = "sys-unix-internal-procname"
-	optArg  = "sys-unix-internal-arg"
-)
-
-func init() {
-	flag.StringVar(&procName, optName, "", "internal use only")
-	flag.StringVar(&procArg, optArg, "", "internal use only")
-
-}
-
-func testCmd(procName string, procArg string) (*exec.Cmd, error) {
-	exe, err := filepath.Abs(os.Args[0])
-	if err != nil {
-		return nil, err
-	}
-	cmd := exec.Command(exe, "-"+optName+"="+procName, "-"+optArg+"="+procArg)
-	cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr
-	return cmd, nil
-}
-
-// ExitsCorrectly is a comprehensive, one-line-of-use wrapper for testing
-// a testProc with a key.
-func ExitsCorrectly(t *testing.T, procName string) {
-	s := testProcs[procName]
-	arg := "-"
-	if s.arg != nil {
-		arg = s.arg(t)
-	}
-	c, err := testCmd(procName, arg)
-	defer func(arg string) {
-		if err := s.cleanup(arg); err != nil {
-			t.Fatalf("Failed to run cleanup for %s %s %#v", procName, err, err)
-		}
-	}(arg)
-	if err != nil {
-		t.Fatalf("Failed to construct command for %s", procName)
-	}
-	if (c.Run() == nil) != s.success {
-		result := "succeed"
-		if !s.success {
-			result = "fail"
-		}
-		t.Fatalf("Process did not %s when it was supposed to", result)
-	}
-}
-
-func TestMain(m *testing.M) {
-	flag.Parse()
-	if procName != "" {
-		t := testProcs[procName]
-		t.fn()
-		os.Stderr.WriteString("test function did not exit\n")
-		if t.success {
-			os.Exit(1)
-		} else {
-			os.Exit(0)
-		}
-	}
-	os.Exit(m.Run())
-}
-
-// end of infrastructure
-
-const testfile = "gocapmodetest"
-const testfile2 = testfile + "2"
-
-func CapEnterTest() {
-	_, err := os.OpenFile(path.Join(procArg, testfile), os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0666)
-	if err != nil {
-		panic(fmt.Sprintf("OpenFile: %s", err))
-	}
-
-	err = unix.CapEnter()
-	if err != nil {
-		panic(fmt.Sprintf("CapEnter: %s", err))
-	}
-
-	_, err = os.OpenFile(path.Join(procArg, testfile2), os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0666)
-	if err == nil {
-		panic("OpenFile works!")
-	}
-	if err.(*os.PathError).Err != unix.ECAPMODE {
-		panic(fmt.Sprintf("OpenFile failed wrong: %s %#v", err, err))
-	}
-	os.Exit(0)
-}
-
-func makeTempDir(t *testing.T) string {
-	d, err := ioutil.TempDir("", "go_openat_test")
-	if err != nil {
-		t.Fatalf("TempDir failed: %s", err)
-	}
-	return d
-}
-
-func removeTempDir(arg string) error {
-	err := os.RemoveAll(arg)
-	if err != nil && err.(*os.PathError).Err == unix.ENOENT {
-		return nil
-	}
-	return err
-}
-
-func init() {
-	testProcs["cap_enter"] = testProc{
-		CapEnterTest,
-		makeTempDir,
-		removeTempDir,
-		true,
-	}
-}
-
-func TestCapEnter(t *testing.T) {
-	if runtime.GOARCH != "amd64" {
-		t.Skipf("skipping test on %s", runtime.GOARCH)
-	}
-	ExitsCorrectly(t, "cap_enter")
-}
-
-func OpenatTest() {
-	f, err := os.Open(procArg)
-	if err != nil {
-		panic(err)
-	}
-
-	err = unix.CapEnter()
-	if err != nil {
-		panic(fmt.Sprintf("CapEnter: %s", err))
-	}
-
-	fxx, err := unix.Openat(int(f.Fd()), "xx", os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0666)
-	if err != nil {
-		panic(err)
-	}
-	unix.Close(fxx)
-
-	// The right to open BASE/xx is not ambient
-	_, err = os.OpenFile(procArg+"/xx", os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0666)
-	if err == nil {
-		panic("OpenFile succeeded")
-	}
-	if err.(*os.PathError).Err != unix.ECAPMODE {
-		panic(fmt.Sprintf("OpenFile failed wrong: %s %#v", err, err))
-	}
-
-	// Can't make a new directory either
-	err = os.Mkdir(procArg+"2", 0777)
-	if err == nil {
-		panic("MKdir succeeded")
-	}
-	if err.(*os.PathError).Err != unix.ECAPMODE {
-		panic(fmt.Sprintf("Mkdir failed wrong: %s %#v", err, err))
-	}
-
-	// Remove all caps except read and lookup.
-	r, err := unix.CapRightsInit([]uint64{unix.CAP_READ, unix.CAP_LOOKUP})
-	if err != nil {
-		panic(fmt.Sprintf("CapRightsInit failed: %s %#v", err, err))
-	}
-	err = unix.CapRightsLimit(f.Fd(), r)
-	if err != nil {
-		panic(fmt.Sprintf("CapRightsLimit failed: %s %#v", err, err))
-	}
-
-	// Check we can get the rights back again
-	r, err = unix.CapRightsGet(f.Fd())
-	if err != nil {
-		panic(fmt.Sprintf("CapRightsGet failed: %s %#v", err, err))
-	}
-	b, err := unix.CapRightsIsSet(r, []uint64{unix.CAP_READ, unix.CAP_LOOKUP})
-	if err != nil {
-		panic(fmt.Sprintf("CapRightsIsSet failed: %s %#v", err, err))
-	}
-	if !b {
-		panic(fmt.Sprintf("Unexpected rights"))
-	}
-	b, err = unix.CapRightsIsSet(r, []uint64{unix.CAP_READ, unix.CAP_LOOKUP, unix.CAP_WRITE})
-	if err != nil {
-		panic(fmt.Sprintf("CapRightsIsSet failed: %s %#v", err, err))
-	}
-	if b {
-		panic(fmt.Sprintf("Unexpected rights (2)"))
-	}
-
-	// Can no longer create a file
-	_, err = unix.Openat(int(f.Fd()), "xx2", os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0666)
-	if err == nil {
-		panic("Openat succeeded")
-	}
-	if err != unix.ENOTCAPABLE {
-		panic(fmt.Sprintf("OpenFileAt failed wrong: %s %#v", err, err))
-	}
-
-	// But can read an existing one
-	_, err = unix.Openat(int(f.Fd()), "xx", os.O_RDONLY, 0666)
-	if err != nil {
-		panic(fmt.Sprintf("Openat failed: %s %#v", err, err))
-	}
-
-	os.Exit(0)
-}
-
-func init() {
-	testProcs["openat"] = testProc{
-		OpenatTest,
-		makeTempDir,
-		removeTempDir,
-		true,
-	}
-}
-
-func TestOpenat(t *testing.T) {
-	if runtime.GOARCH != "amd64" {
-		t.Skipf("skipping test on %s", runtime.GOARCH)
-	}
-	ExitsCorrectly(t, "openat")
-}
-
-func TestCapRightsSetAndClear(t *testing.T) {
-	r, err := unix.CapRightsInit([]uint64{unix.CAP_READ, unix.CAP_WRITE, unix.CAP_PDWAIT})
-	if err != nil {
-		t.Fatalf("CapRightsInit failed: %s", err)
-	}
-
-	err = unix.CapRightsSet(r, []uint64{unix.CAP_EVENT, unix.CAP_LISTEN})
-	if err != nil {
-		t.Fatalf("CapRightsSet failed: %s", err)
-	}
-
-	b, err := unix.CapRightsIsSet(r, []uint64{unix.CAP_READ, unix.CAP_WRITE, unix.CAP_PDWAIT, unix.CAP_EVENT, unix.CAP_LISTEN})
-	if err != nil {
-		t.Fatalf("CapRightsIsSet failed: %s", err)
-	}
-	if !b {
-		t.Fatalf("Wrong rights set")
-	}
-
-	err = unix.CapRightsClear(r, []uint64{unix.CAP_READ, unix.CAP_PDWAIT})
-	if err != nil {
-		t.Fatalf("CapRightsClear failed: %s", err)
-	}
-
-	b, err = unix.CapRightsIsSet(r, []uint64{unix.CAP_WRITE, unix.CAP_EVENT, unix.CAP_LISTEN})
-	if err != nil {
-		t.Fatalf("CapRightsIsSet failed: %s", err)
-	}
-	if !b {
-		t.Fatalf("Wrong rights set")
-	}
-}
-
-// stringsFromByteSlice converts a sequence of attributes to a []string.
-// On FreeBSD, each entry consists of a single byte containing the length
-// of the attribute name, followed by the attribute name.
-// The name is _not_ NULL-terminated.
-func stringsFromByteSlice(buf []byte) []string {
-	var result []string
-	i := 0
-	for i < len(buf) {
-		next := i + 1 + int(buf[i])
-		result = append(result, string(buf[i+1:next]))
-		i = next
-	}
-	return result
-}
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux.go b/vendor/golang.org/x/sys/unix/syscall_linux.go
index 9908030c..eb633540 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux.go
@@ -61,11 +61,11 @@ func IoctlSetInt(fd int, req uint, value int) error {
 	return ioctl(fd, req, uintptr(value))
 }
 
-func IoctlSetWinsize(fd int, req uint, value *Winsize) error {
+func ioctlSetWinsize(fd int, req uint, value *Winsize) error {
 	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
 }
 
-func IoctlSetTermios(fd int, req uint, value *Termios) error {
+func ioctlSetTermios(fd int, req uint, value *Termios) error {
 	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
 }
 
@@ -489,6 +489,47 @@ func (sa *SockaddrL2) sockaddr() (unsafe.Pointer, _Socklen, error) {
 	return unsafe.Pointer(&sa.raw), SizeofSockaddrL2, nil
 }
 
+// SockaddrRFCOMM implements the Sockaddr interface for AF_BLUETOOTH type sockets
+// using the RFCOMM protocol.
+//
+// Server example:
+//
+//      fd, _ := Socket(AF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM)
+//      _ = unix.Bind(fd, &unix.SockaddrRFCOMM{
+//      	Channel: 1,
+//      	Addr:    [6]uint8{0, 0, 0, 0, 0, 0}, // BDADDR_ANY or 00:00:00:00:00:00
+//      })
+//      _ = Listen(fd, 1)
+//      nfd, sa, _ := Accept(fd)
+//      fmt.Printf("conn addr=%v fd=%d", sa.(*unix.SockaddrRFCOMM).Addr, nfd)
+//      Read(nfd, buf)
+//
+// Client example:
+//
+//      fd, _ := Socket(AF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM)
+//      _ = Connect(fd, &SockaddrRFCOMM{
+//      	Channel: 1,
+//      	Addr:    [6]byte{0x11, 0x22, 0x33, 0xaa, 0xbb, 0xcc}, // CC:BB:AA:33:22:11
+//      })
+//      Write(fd, []byte(`hello`))
+type SockaddrRFCOMM struct {
+	// Addr represents a bluetooth address, byte ordering is little-endian.
+	Addr [6]uint8
+
+	// Channel is a designated bluetooth channel, only 1-30 are available for use.
+	// Since Linux 2.6.7 and further zero value is the first available channel.
+	Channel uint8
+
+	raw RawSockaddrRFCOMM
+}
+
+func (sa *SockaddrRFCOMM) sockaddr() (unsafe.Pointer, _Socklen, error) {
+	sa.raw.Family = AF_BLUETOOTH
+	sa.raw.Channel = sa.Channel
+	sa.raw.Bdaddr = sa.Addr
+	return unsafe.Pointer(&sa.raw), SizeofSockaddrRFCOMM, nil
+}
+
 // SockaddrCAN implements the Sockaddr interface for AF_CAN type sockets.
 // The RxID and TxID fields are used for transport protocol addressing in
 // (CAN_TP16, CAN_TP20, CAN_MCNET, and CAN_ISOTP), they can be left with
@@ -651,7 +692,7 @@ func (sa *SockaddrVM) sockaddr() (unsafe.Pointer, _Socklen, error) {
 	return unsafe.Pointer(&sa.raw), SizeofSockaddrVM, nil
 }
 
-func anyToSockaddr(rsa *RawSockaddrAny) (Sockaddr, error) {
+func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
 	switch rsa.Addr.Family {
 	case AF_NETLINK:
 		pp := (*RawSockaddrNetlink)(unsafe.Pointer(rsa))
@@ -728,6 +769,30 @@ func anyToSockaddr(rsa *RawSockaddrAny) (Sockaddr, error) {
 			Port: pp.Port,
 		}
 		return sa, nil
+	case AF_BLUETOOTH:
+		proto, err := GetsockoptInt(fd, SOL_SOCKET, SO_PROTOCOL)
+		if err != nil {
+			return nil, err
+		}
+		// only BTPROTO_L2CAP and BTPROTO_RFCOMM can accept connections
+		switch proto {
+		case BTPROTO_L2CAP:
+			pp := (*RawSockaddrL2)(unsafe.Pointer(rsa))
+			sa := &SockaddrL2{
+				PSM:      pp.Psm,
+				CID:      pp.Cid,
+				Addr:     pp.Bdaddr,
+				AddrType: pp.Bdaddr_type,
+			}
+			return sa, nil
+		case BTPROTO_RFCOMM:
+			pp := (*RawSockaddrRFCOMM)(unsafe.Pointer(rsa))
+			sa := &SockaddrRFCOMM{
+				Channel: pp.Channel,
+				Addr:    pp.Bdaddr,
+			}
+			return sa, nil
+		}
 	}
 	return nil, EAFNOSUPPORT
 }
@@ -739,7 +804,7 @@ func Accept(fd int) (nfd int, sa Sockaddr, err error) {
 	if err != nil {
 		return
 	}
-	sa, err = anyToSockaddr(&rsa)
+	sa, err = anyToSockaddr(fd, &rsa)
 	if err != nil {
 		Close(nfd)
 		nfd = 0
@@ -757,7 +822,7 @@ func Accept4(fd int, flags int) (nfd int, sa Sockaddr, err error) {
 	if len > SizeofSockaddrAny {
 		panic("RawSockaddrAny too small")
 	}
-	sa, err = anyToSockaddr(&rsa)
+	sa, err = anyToSockaddr(fd, &rsa)
 	if err != nil {
 		Close(nfd)
 		nfd = 0
@@ -771,7 +836,7 @@ func Getsockname(fd int) (sa Sockaddr, err error) {
 	if err = getsockname(fd, &rsa, &len); err != nil {
 		return
 	}
-	return anyToSockaddr(&rsa)
+	return anyToSockaddr(fd, &rsa)
 }
 
 func GetsockoptIPMreqn(fd, level, opt int) (*IPMreqn, error) {
@@ -960,7 +1025,7 @@ func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from
 	recvflags = int(msg.Flags)
 	// source address is only specified if the socket is unconnected
 	if rsa.Addr.Family != AF_UNSPEC {
-		from, err = anyToSockaddr(&rsa)
+		from, err = anyToSockaddr(fd, &rsa)
 	}
 	return
 }
@@ -1223,7 +1288,11 @@ func Mount(source string, target string, fstype string, flags uintptr, data stri
 //sys	Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error)
 //sys	fcntl(fd int, cmd int, arg int) (val int, err error)
 //sys	Fdatasync(fd int) (err error)
+//sys	Fgetxattr(fd int, attr string, dest []byte) (sz int, err error)
+//sys	Flistxattr(fd int, dest []byte) (sz int, err error)
 //sys	Flock(fd int, how int) (err error)
+//sys	Fremovexattr(fd int, attr string) (err error)
+//sys	Fsetxattr(fd int, attr string, dest []byte, flags int) (err error)
 //sys	Fsync(fd int) (err error)
 //sys	Getdents(fd int, buf []byte) (n int, err error) = SYS_GETDENTS64
 //sysnb	Getpgid(pid int) (pgid int, err error)
@@ -1262,6 +1331,7 @@ func Getpgrp() (pid int) {
 //sys	read(fd int, p []byte) (n int, err error)
 //sys	Removexattr(path string, attr string) (err error)
 //sys	Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error)
+//sys	Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error)
 //sys	RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error)
 //sys	Setdomainname(p []byte) (err error)
 //sys	Sethostname(p []byte) (err error)
@@ -1350,10 +1420,70 @@ func Vmsplice(fd int, iovs []Iovec, flags int) (int, error) {
 func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
 	if flags & ^(AT_SYMLINK_NOFOLLOW|AT_EACCESS) != 0 {
 		return EINVAL
-	} else if flags&(AT_SYMLINK_NOFOLLOW|AT_EACCESS) != 0 {
-		return EOPNOTSUPP
 	}
-	return faccessat(dirfd, path, mode)
+
+	// The Linux kernel faccessat system call does not take any flags.
+	// The glibc faccessat implements the flags itself; see
+	// https://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/faccessat.c;hb=HEAD
+	// Because people naturally expect syscall.Faccessat to act
+	// like C faccessat, we do the same.
+
+	if flags == 0 {
+		return faccessat(dirfd, path, mode)
+	}
+
+	var st Stat_t
+	if err := Fstatat(dirfd, path, &st, flags&AT_SYMLINK_NOFOLLOW); err != nil {
+		return err
+	}
+
+	mode &= 7
+	if mode == 0 {
+		return nil
+	}
+
+	var uid int
+	if flags&AT_EACCESS != 0 {
+		uid = Geteuid()
+	} else {
+		uid = Getuid()
+	}
+
+	if uid == 0 {
+		if mode&1 == 0 {
+			// Root can read and write any file.
+			return nil
+		}
+		if st.Mode&0111 != 0 {
+			// Root can execute any file that anybody can execute.
+			return nil
+		}
+		return EACCES
+	}
+
+	var fmode uint32
+	if uint32(uid) == st.Uid {
+		fmode = (st.Mode >> 6) & 7
+	} else {
+		var gid int
+		if flags&AT_EACCESS != 0 {
+			gid = Getegid()
+		} else {
+			gid = Getgid()
+		}
+
+		if uint32(gid) == st.Gid {
+			fmode = (st.Mode >> 3) & 7
+		} else {
+			fmode = st.Mode & 7
+		}
+	}
+
+	if fmode&mode == mode {
+		return nil
+	}
+
+	return EACCES
 }
 
 /*
@@ -1375,11 +1505,7 @@ func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
 // EpollPwait
 // EpollWaitOld
 // Execve
-// Fgetxattr
-// Flistxattr
 // Fork
-// Fremovexattr
-// Fsetxattr
 // Futex
 // GetKernelSyms
 // GetMempolicy
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go b/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go
index 0e059248..99e0e999 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go
@@ -124,14 +124,13 @@ func Pipe2(p []int, flags int) (err error) {
 	return
 }
 
+//sysnb pipe() (p1 int, p2 int, err error)
+
 func Pipe(p []int) (err error) {
 	if len(p) != 2 {
 		return EINVAL
 	}
-	var pp [2]_C_int
-	err = pipe2(&pp, 0)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
+	p[0], p[1], err = pipe()
 	return
 }
 
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_test.go b/vendor/golang.org/x/sys/unix/syscall_linux_test.go
deleted file mode 100644
index eed17268..00000000
--- a/vendor/golang.org/x/sys/unix/syscall_linux_test.go
+++ /dev/null
@@ -1,421 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build linux
-
-package unix_test
-
-import (
-	"os"
-	"runtime"
-	"runtime/debug"
-	"testing"
-	"time"
-
-	"golang.org/x/sys/unix"
-)
-
-func TestIoctlGetInt(t *testing.T) {
-	f, err := os.Open("/dev/random")
-	if err != nil {
-		t.Fatalf("failed to open device: %v", err)
-	}
-	defer f.Close()
-
-	v, err := unix.IoctlGetInt(int(f.Fd()), unix.RNDGETENTCNT)
-	if err != nil {
-		t.Fatalf("failed to perform ioctl: %v", err)
-	}
-
-	t.Logf("%d bits of entropy available", v)
-}
-
-func TestPpoll(t *testing.T) {
-	if runtime.GOOS == "android" {
-		t.Skip("mkfifo syscall is not available on android, skipping test")
-	}
-
-	f, cleanup := mktmpfifo(t)
-	defer cleanup()
-
-	const timeout = 100 * time.Millisecond
-
-	ok := make(chan bool, 1)
-	go func() {
-		select {
-		case <-time.After(10 * timeout):
-			t.Errorf("Ppoll: failed to timeout after %d", 10*timeout)
-		case <-ok:
-		}
-	}()
-
-	fds := []unix.PollFd{{Fd: int32(f.Fd()), Events: unix.POLLIN}}
-	timeoutTs := unix.NsecToTimespec(int64(timeout))
-	n, err := unix.Ppoll(fds, &timeoutTs, nil)
-	ok <- true
-	if err != nil {
-		t.Errorf("Ppoll: unexpected error: %v", err)
-		return
-	}
-	if n != 0 {
-		t.Errorf("Ppoll: wrong number of events: got %v, expected %v", n, 0)
-		return
-	}
-}
-
-func TestTime(t *testing.T) {
-	var ut unix.Time_t
-	ut2, err := unix.Time(&ut)
-	if err != nil {
-		t.Fatalf("Time: %v", err)
-	}
-	if ut != ut2 {
-		t.Errorf("Time: return value %v should be equal to argument %v", ut2, ut)
-	}
-
-	var now time.Time
-
-	for i := 0; i < 10; i++ {
-		ut, err = unix.Time(nil)
-		if err != nil {
-			t.Fatalf("Time: %v", err)
-		}
-
-		now = time.Now()
-
-		if int64(ut) == now.Unix() {
-			return
-		}
-	}
-
-	t.Errorf("Time: return value %v should be nearly equal to time.Now().Unix() %v", ut, now.Unix())
-}
-
-func TestUtime(t *testing.T) {
-	defer chtmpdir(t)()
-
-	touch(t, "file1")
-
-	buf := &unix.Utimbuf{
-		Modtime: 12345,
-	}
-
-	err := unix.Utime("file1", buf)
-	if err != nil {
-		t.Fatalf("Utime: %v", err)
-	}
-
-	fi, err := os.Stat("file1")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if fi.ModTime().Unix() != 12345 {
-		t.Errorf("Utime: failed to change modtime: expected %v, got %v", 12345, fi.ModTime().Unix())
-	}
-}
-
-func TestUtimesNanoAt(t *testing.T) {
-	defer chtmpdir(t)()
-
-	symlink := "symlink1"
-	os.Remove(symlink)
-	err := os.Symlink("nonexisting", symlink)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	ts := []unix.Timespec{
-		{Sec: 1111, Nsec: 2222},
-		{Sec: 3333, Nsec: 4444},
-	}
-	err = unix.UtimesNanoAt(unix.AT_FDCWD, symlink, ts, unix.AT_SYMLINK_NOFOLLOW)
-	if err != nil {
-		t.Fatalf("UtimesNanoAt: %v", err)
-	}
-
-	var st unix.Stat_t
-	err = unix.Lstat(symlink, &st)
-	if err != nil {
-		t.Fatalf("Lstat: %v", err)
-	}
-
-	// Only check Mtim, Atim might not be supported by the underlying filesystem
-	expected := ts[1]
-	if st.Mtim.Nsec == 0 {
-		// Some filesystems only support 1-second time stamp resolution
-		// and will always set Nsec to 0.
-		expected.Nsec = 0
-	}
-	if st.Mtim != expected {
-		t.Errorf("UtimesNanoAt: wrong mtime: expected %v, got %v", expected, st.Mtim)
-	}
-}
-
-func TestRlimitAs(t *testing.T) {
-	// disable GC during to avoid flaky test
-	defer debug.SetGCPercent(debug.SetGCPercent(-1))
-
-	var rlim unix.Rlimit
-	err := unix.Getrlimit(unix.RLIMIT_AS, &rlim)
-	if err != nil {
-		t.Fatalf("Getrlimit: %v", err)
-	}
-	var zero unix.Rlimit
-	if zero == rlim {
-		t.Fatalf("Getrlimit: got zero value %#v", rlim)
-	}
-	set := rlim
-	set.Cur = uint64(unix.Getpagesize())
-	err = unix.Setrlimit(unix.RLIMIT_AS, &set)
-	if err != nil {
-		t.Fatalf("Setrlimit: set failed: %#v %v", set, err)
-	}
-
-	// RLIMIT_AS was set to the page size, so mmap()'ing twice the page size
-	// should fail. See 'man 2 getrlimit'.
-	_, err = unix.Mmap(-1, 0, 2*unix.Getpagesize(), unix.PROT_NONE, unix.MAP_ANON|unix.MAP_PRIVATE)
-	if err == nil {
-		t.Fatal("Mmap: unexpectedly suceeded after setting RLIMIT_AS")
-	}
-
-	err = unix.Setrlimit(unix.RLIMIT_AS, &rlim)
-	if err != nil {
-		t.Fatalf("Setrlimit: restore failed: %#v %v", rlim, err)
-	}
-
-	b, err := unix.Mmap(-1, 0, 2*unix.Getpagesize(), unix.PROT_NONE, unix.MAP_ANON|unix.MAP_PRIVATE)
-	if err != nil {
-		t.Fatalf("Mmap: %v", err)
-	}
-	err = unix.Munmap(b)
-	if err != nil {
-		t.Fatalf("Munmap: %v", err)
-	}
-}
-
-func TestSelect(t *testing.T) {
-	_, err := unix.Select(0, nil, nil, nil, &unix.Timeval{Sec: 0, Usec: 0})
-	if err != nil {
-		t.Fatalf("Select: %v", err)
-	}
-
-	dur := 150 * time.Millisecond
-	tv := unix.NsecToTimeval(int64(dur))
-	start := time.Now()
-	_, err = unix.Select(0, nil, nil, nil, &tv)
-	took := time.Since(start)
-	if err != nil {
-		t.Fatalf("Select: %v", err)
-	}
-
-	if took < dur {
-		t.Errorf("Select: timeout should have been at least %v, got %v", dur, took)
-	}
-}
-
-func TestPselect(t *testing.T) {
-	_, err := unix.Pselect(0, nil, nil, nil, &unix.Timespec{Sec: 0, Nsec: 0}, nil)
-	if err != nil {
-		t.Fatalf("Pselect: %v", err)
-	}
-
-	dur := 2500 * time.Microsecond
-	ts := unix.NsecToTimespec(int64(dur))
-	start := time.Now()
-	_, err = unix.Pselect(0, nil, nil, nil, &ts, nil)
-	took := time.Since(start)
-	if err != nil {
-		t.Fatalf("Pselect: %v", err)
-	}
-
-	if took < dur {
-		t.Errorf("Pselect: timeout should have been at least %v, got %v", dur, took)
-	}
-}
-
-func TestSchedSetaffinity(t *testing.T) {
-	runtime.LockOSThread()
-	defer runtime.UnlockOSThread()
-
-	var oldMask unix.CPUSet
-	err := unix.SchedGetaffinity(0, &oldMask)
-	if err != nil {
-		t.Fatalf("SchedGetaffinity: %v", err)
-	}
-
-	var newMask unix.CPUSet
-	newMask.Zero()
-	if newMask.Count() != 0 {
-		t.Errorf("CpuZero: didn't zero CPU set: %v", newMask)
-	}
-	cpu := 1
-	newMask.Set(cpu)
-	if newMask.Count() != 1 || !newMask.IsSet(cpu) {
-		t.Errorf("CpuSet: didn't set CPU %d in set: %v", cpu, newMask)
-	}
-	cpu = 5
-	newMask.Set(cpu)
-	if newMask.Count() != 2 || !newMask.IsSet(cpu) {
-		t.Errorf("CpuSet: didn't set CPU %d in set: %v", cpu, newMask)
-	}
-	newMask.Clear(cpu)
-	if newMask.Count() != 1 || newMask.IsSet(cpu) {
-		t.Errorf("CpuClr: didn't clear CPU %d in set: %v", cpu, newMask)
-	}
-
-	if runtime.NumCPU() < 2 {
-		t.Skip("skipping setaffinity tests on single CPU system")
-	}
-	if runtime.GOOS == "android" {
-		t.Skip("skipping setaffinity tests on android")
-	}
-
-	err = unix.SchedSetaffinity(0, &newMask)
-	if err != nil {
-		t.Fatalf("SchedSetaffinity: %v", err)
-	}
-
-	var gotMask unix.CPUSet
-	err = unix.SchedGetaffinity(0, &gotMask)
-	if err != nil {
-		t.Fatalf("SchedGetaffinity: %v", err)
-	}
-
-	if gotMask != newMask {
-		t.Errorf("SchedSetaffinity: returned affinity mask does not match set affinity mask")
-	}
-
-	// Restore old mask so it doesn't affect successive tests
-	err = unix.SchedSetaffinity(0, &oldMask)
-	if err != nil {
-		t.Fatalf("SchedSetaffinity: %v", err)
-	}
-}
-
-func TestStatx(t *testing.T) {
-	var stx unix.Statx_t
-	err := unix.Statx(unix.AT_FDCWD, ".", 0, 0, &stx)
-	if err == unix.ENOSYS || err == unix.EPERM {
-		t.Skip("statx syscall is not available, skipping test")
-	} else if err != nil {
-		t.Fatalf("Statx: %v", err)
-	}
-
-	defer chtmpdir(t)()
-	touch(t, "file1")
-
-	var st unix.Stat_t
-	err = unix.Stat("file1", &st)
-	if err != nil {
-		t.Fatalf("Stat: %v", err)
-	}
-
-	flags := unix.AT_STATX_SYNC_AS_STAT
-	err = unix.Statx(unix.AT_FDCWD, "file1", flags, unix.STATX_ALL, &stx)
-	if err != nil {
-		t.Fatalf("Statx: %v", err)
-	}
-
-	if uint32(stx.Mode) != st.Mode {
-		t.Errorf("Statx: returned stat mode does not match Stat")
-	}
-
-	ctime := unix.StatxTimestamp{Sec: int64(st.Ctim.Sec), Nsec: uint32(st.Ctim.Nsec)}
-	mtime := unix.StatxTimestamp{Sec: int64(st.Mtim.Sec), Nsec: uint32(st.Mtim.Nsec)}
-
-	if stx.Ctime != ctime {
-		t.Errorf("Statx: returned stat ctime does not match Stat")
-	}
-	if stx.Mtime != mtime {
-		t.Errorf("Statx: returned stat mtime does not match Stat")
-	}
-
-	err = os.Symlink("file1", "symlink1")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = unix.Lstat("symlink1", &st)
-	if err != nil {
-		t.Fatalf("Lstat: %v", err)
-	}
-
-	err = unix.Statx(unix.AT_FDCWD, "symlink1", flags, unix.STATX_BASIC_STATS, &stx)
-	if err != nil {
-		t.Fatalf("Statx: %v", err)
-	}
-
-	// follow symlink, expect a regulat file
-	if stx.Mode&unix.S_IFREG == 0 {
-		t.Errorf("Statx: didn't follow symlink")
-	}
-
-	err = unix.Statx(unix.AT_FDCWD, "symlink1", flags|unix.AT_SYMLINK_NOFOLLOW, unix.STATX_ALL, &stx)
-	if err != nil {
-		t.Fatalf("Statx: %v", err)
-	}
-
-	// follow symlink, expect a symlink
-	if stx.Mode&unix.S_IFLNK == 0 {
-		t.Errorf("Statx: unexpectedly followed symlink")
-	}
-	if uint32(stx.Mode) != st.Mode {
-		t.Errorf("Statx: returned stat mode does not match Lstat")
-	}
-
-	ctime = unix.StatxTimestamp{Sec: int64(st.Ctim.Sec), Nsec: uint32(st.Ctim.Nsec)}
-	mtime = unix.StatxTimestamp{Sec: int64(st.Mtim.Sec), Nsec: uint32(st.Mtim.Nsec)}
-
-	if stx.Ctime != ctime {
-		t.Errorf("Statx: returned stat ctime does not match Lstat")
-	}
-	if stx.Mtime != mtime {
-		t.Errorf("Statx: returned stat mtime does not match Lstat")
-	}
-}
-
-// stringsFromByteSlice converts a sequence of attributes to a []string.
-// On Linux, each entry is a NULL-terminated string.
-func stringsFromByteSlice(buf []byte) []string {
-	var result []string
-	off := 0
-	for i, b := range buf {
-		if b == 0 {
-			result = append(result, string(buf[off:i]))
-			off = i + 1
-		}
-	}
-	return result
-}
-
-func TestFaccessat(t *testing.T) {
-	defer chtmpdir(t)()
-	touch(t, "file1")
-
-	err := unix.Faccessat(unix.AT_FDCWD, "file1", unix.O_RDONLY, 0)
-	if err != nil {
-		t.Errorf("Faccessat: unexpected error: %v", err)
-	}
-
-	err = unix.Faccessat(unix.AT_FDCWD, "file1", unix.O_RDONLY, 2)
-	if err != unix.EINVAL {
-		t.Errorf("Faccessat: unexpected error: %v, want EINVAL", err)
-	}
-
-	err = unix.Faccessat(unix.AT_FDCWD, "file1", unix.O_RDONLY, unix.AT_EACCESS)
-	if err != unix.EOPNOTSUPP {
-		t.Errorf("Faccessat: unexpected error: %v, want EOPNOTSUPP", err)
-	}
-
-	err = os.Symlink("file1", "symlink1")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = unix.Faccessat(unix.AT_FDCWD, "symlink1", unix.O_RDONLY, unix.AT_SYMLINK_NOFOLLOW)
-	if err != unix.EOPNOTSUPP {
-		t.Errorf("Faccessat: unexpected error: %v, want EOPNOTSUPP", err)
-	}
-}
diff --git a/vendor/golang.org/x/sys/unix/syscall_netbsd.go b/vendor/golang.org/x/sys/unix/syscall_netbsd.go
index 369a2be2..71bb0925 100644
--- a/vendor/golang.org/x/sys/unix/syscall_netbsd.go
+++ b/vendor/golang.org/x/sys/unix/syscall_netbsd.go
@@ -145,11 +145,11 @@ func IoctlSetInt(fd int, req uint, value int) error {
 	return ioctl(fd, req, uintptr(value))
 }
 
-func IoctlSetWinsize(fd int, req uint, value *Winsize) error {
+func ioctlSetWinsize(fd int, req uint, value *Winsize) error {
 	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
 }
 
-func IoctlSetTermios(fd int, req uint, value *Termios) error {
+func ioctlSetTermios(fd int, req uint, value *Termios) error {
 	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
 }
 
diff --git a/vendor/golang.org/x/sys/unix/syscall_openbsd.go b/vendor/golang.org/x/sys/unix/syscall_openbsd.go
index 9fc9c06a..07e6669c 100644
--- a/vendor/golang.org/x/sys/unix/syscall_openbsd.go
+++ b/vendor/golang.org/x/sys/unix/syscall_openbsd.go
@@ -113,11 +113,11 @@ func IoctlSetInt(fd int, req uint, value int) error {
 	return ioctl(fd, req, uintptr(value))
 }
 
-func IoctlSetWinsize(fd int, req uint, value *Winsize) error {
+func ioctlSetWinsize(fd int, req uint, value *Winsize) error {
 	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
 }
 
-func IoctlSetTermios(fd int, req uint, value *Termios) error {
+func ioctlSetTermios(fd int, req uint, value *Termios) error {
 	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
 }
 
diff --git a/vendor/golang.org/x/sys/unix/syscall_solaris.go b/vendor/golang.org/x/sys/unix/syscall_solaris.go
index 820ef77a..53b80782 100644
--- a/vendor/golang.org/x/sys/unix/syscall_solaris.go
+++ b/vendor/golang.org/x/sys/unix/syscall_solaris.go
@@ -112,7 +112,7 @@ func Getsockname(fd int) (sa Sockaddr, err error) {
 	if err = getsockname(fd, &rsa, &len); err != nil {
 		return
 	}
-	return anyToSockaddr(&rsa)
+	return anyToSockaddr(fd, &rsa)
 }
 
 // GetsockoptString returns the string value of the socket option opt for the
@@ -360,7 +360,7 @@ func Futimes(fd int, tv []Timeval) error {
 	return futimesat(fd, nil, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
 }
 
-func anyToSockaddr(rsa *RawSockaddrAny) (Sockaddr, error) {
+func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
 	switch rsa.Addr.Family {
 	case AF_UNIX:
 		pp := (*RawSockaddrUnix)(unsafe.Pointer(rsa))
@@ -411,7 +411,7 @@ func Accept(fd int) (nfd int, sa Sockaddr, err error) {
 	if nfd == -1 {
 		return
 	}
-	sa, err = anyToSockaddr(&rsa)
+	sa, err = anyToSockaddr(fd, &rsa)
 	if err != nil {
 		Close(nfd)
 		nfd = 0
@@ -448,7 +448,7 @@ func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from
 	oobn = int(msg.Accrightslen)
 	// source address is only specified if the socket is unconnected
 	if rsa.Addr.Family != AF_UNSPEC {
-		from, err = anyToSockaddr(&rsa)
+		from, err = anyToSockaddr(fd, &rsa)
 	}
 	return
 }
@@ -540,11 +540,11 @@ func IoctlSetInt(fd int, req uint, value int) (err error) {
 	return ioctl(fd, req, uintptr(value))
 }
 
-func IoctlSetWinsize(fd int, req uint, value *Winsize) (err error) {
+func ioctlSetWinsize(fd int, req uint, value *Winsize) (err error) {
 	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
 }
 
-func IoctlSetTermios(fd int, req uint, value *Termios) (err error) {
+func ioctlSetTermios(fd int, req uint, value *Termios) (err error) {
 	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
 }
 
diff --git a/vendor/golang.org/x/sys/unix/syscall_solaris_test.go b/vendor/golang.org/x/sys/unix/syscall_solaris_test.go
deleted file mode 100644
index 57dba882..00000000
--- a/vendor/golang.org/x/sys/unix/syscall_solaris_test.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build solaris
-
-package unix_test
-
-import (
-	"os/exec"
-	"testing"
-	"time"
-
-	"golang.org/x/sys/unix"
-)
-
-func TestSelect(t *testing.T) {
-	err := unix.Select(0, nil, nil, nil, &unix.Timeval{Sec: 0, Usec: 0})
-	if err != nil {
-		t.Fatalf("Select: %v", err)
-	}
-
-	dur := 150 * time.Millisecond
-	tv := unix.NsecToTimeval(int64(dur))
-	start := time.Now()
-	err = unix.Select(0, nil, nil, nil, &tv)
-	took := time.Since(start)
-	if err != nil {
-		t.Fatalf("Select: %v", err)
-	}
-
-	if took < dur {
-		t.Errorf("Select: timeout should have been at least %v, got %v", dur, took)
-	}
-}
-
-func TestStatvfs(t *testing.T) {
-	if err := unix.Statvfs("", nil); err == nil {
-		t.Fatal(`Statvfs("") expected failure`)
-	}
-
-	statvfs := unix.Statvfs_t{}
-	if err := unix.Statvfs("/", &statvfs); err != nil {
-		t.Errorf(`Statvfs("/") failed: %v`, err)
-	}
-
-	if t.Failed() {
-		mount, err := exec.Command("mount").CombinedOutput()
-		if err != nil {
-			t.Logf("mount: %v\n%s", err, mount)
-		} else {
-			t.Logf("mount: %s", mount)
-		}
-	}
-}
diff --git a/vendor/golang.org/x/sys/unix/syscall_test.go b/vendor/golang.org/x/sys/unix/syscall_test.go
deleted file mode 100644
index a8eef7cf..00000000
--- a/vendor/golang.org/x/sys/unix/syscall_test.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
-
-package unix_test
-
-import (
-	"fmt"
-	"testing"
-
-	"golang.org/x/sys/unix"
-)
-
-func testSetGetenv(t *testing.T, key, value string) {
-	err := unix.Setenv(key, value)
-	if err != nil {
-		t.Fatalf("Setenv failed to set %q: %v", value, err)
-	}
-	newvalue, found := unix.Getenv(key)
-	if !found {
-		t.Fatalf("Getenv failed to find %v variable (want value %q)", key, value)
-	}
-	if newvalue != value {
-		t.Fatalf("Getenv(%v) = %q; want %q", key, newvalue, value)
-	}
-}
-
-func TestEnv(t *testing.T) {
-	testSetGetenv(t, "TESTENV", "AVALUE")
-	// make sure TESTENV gets set to "", not deleted
-	testSetGetenv(t, "TESTENV", "")
-}
-
-func TestItoa(t *testing.T) {
-	// Make most negative integer: 0x8000...
-	i := 1
-	for i<<1 != 0 {
-		i <<= 1
-	}
-	if i >= 0 {
-		t.Fatal("bad math")
-	}
-	s := unix.Itoa(i)
-	f := fmt.Sprint(i)
-	if s != f {
-		t.Fatalf("itoa(%d) = %s, want %s", i, s, f)
-	}
-}
-
-func TestUname(t *testing.T) {
-	var utsname unix.Utsname
-	err := unix.Uname(&utsname)
-	if err != nil {
-		t.Fatalf("Uname: %v", err)
-	}
-
-	t.Logf("OS: %s/%s %s", utsname.Sysname[:], utsname.Machine[:], utsname.Release[:])
-}
diff --git a/vendor/golang.org/x/sys/unix/syscall_unix.go b/vendor/golang.org/x/sys/unix/syscall_unix.go
index b835bad0..95b2180a 100644
--- a/vendor/golang.org/x/sys/unix/syscall_unix.go
+++ b/vendor/golang.org/x/sys/unix/syscall_unix.go
@@ -219,7 +219,7 @@ func Getpeername(fd int) (sa Sockaddr, err error) {
 	if err = getpeername(fd, &rsa, &len); err != nil {
 		return
 	}
-	return anyToSockaddr(&rsa)
+	return anyToSockaddr(fd, &rsa)
 }
 
 func GetsockoptByte(fd, level, opt int) (value byte, err error) {
@@ -291,7 +291,7 @@ func Recvfrom(fd int, p []byte, flags int) (n int, from Sockaddr, err error) {
 		return
 	}
 	if rsa.Addr.Family != AF_UNSPEC {
-		from, err = anyToSockaddr(&rsa)
+		from, err = anyToSockaddr(fd, &rsa)
 	}
 	return
 }
diff --git a/vendor/golang.org/x/sys/unix/syscall_unix_test.go b/vendor/golang.org/x/sys/unix/syscall_unix_test.go
deleted file mode 100644
index d694990d..00000000
--- a/vendor/golang.org/x/sys/unix/syscall_unix_test.go
+++ /dev/null
@@ -1,657 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
-
-package unix_test
-
-import (
-	"flag"
-	"fmt"
-	"io/ioutil"
-	"net"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"syscall"
-	"testing"
-	"time"
-
-	"golang.org/x/sys/unix"
-)
-
-// Tests that below functions, structures and constants are consistent
-// on all Unix-like systems.
-func _() {
-	// program scheduling priority functions and constants
-	var (
-		_ func(int, int, int) error   = unix.Setpriority
-		_ func(int, int) (int, error) = unix.Getpriority
-	)
-	const (
-		_ int = unix.PRIO_USER
-		_ int = unix.PRIO_PROCESS
-		_ int = unix.PRIO_PGRP
-	)
-
-	// termios constants
-	const (
-		_ int = unix.TCIFLUSH
-		_ int = unix.TCIOFLUSH
-		_ int = unix.TCOFLUSH
-	)
-
-	// fcntl file locking structure and constants
-	var (
-		_ = unix.Flock_t{
-			Type:   int16(0),
-			Whence: int16(0),
-			Start:  int64(0),
-			Len:    int64(0),
-			Pid:    int32(0),
-		}
-	)
-	const (
-		_ = unix.F_GETLK
-		_ = unix.F_SETLK
-		_ = unix.F_SETLKW
-	)
-}
-
-func TestErrnoSignalName(t *testing.T) {
-	testErrors := []struct {
-		num  syscall.Errno
-		name string
-	}{
-		{syscall.EPERM, "EPERM"},
-		{syscall.EINVAL, "EINVAL"},
-		{syscall.ENOENT, "ENOENT"},
-	}
-
-	for _, te := range testErrors {
-		t.Run(fmt.Sprintf("%d/%s", te.num, te.name), func(t *testing.T) {
-			e := unix.ErrnoName(te.num)
-			if e != te.name {
-				t.Errorf("ErrnoName(%d) returned %s, want %s", te.num, e, te.name)
-			}
-		})
-	}
-
-	testSignals := []struct {
-		num  syscall.Signal
-		name string
-	}{
-		{syscall.SIGHUP, "SIGHUP"},
-		{syscall.SIGPIPE, "SIGPIPE"},
-		{syscall.SIGSEGV, "SIGSEGV"},
-	}
-
-	for _, ts := range testSignals {
-		t.Run(fmt.Sprintf("%d/%s", ts.num, ts.name), func(t *testing.T) {
-			s := unix.SignalName(ts.num)
-			if s != ts.name {
-				t.Errorf("SignalName(%d) returned %s, want %s", ts.num, s, ts.name)
-			}
-		})
-	}
-}
-
-func TestFcntlInt(t *testing.T) {
-	t.Parallel()
-	file, err := ioutil.TempFile("", "TestFnctlInt")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.Remove(file.Name())
-	defer file.Close()
-	f := file.Fd()
-	flags, err := unix.FcntlInt(f, unix.F_GETFD, 0)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if flags&unix.FD_CLOEXEC == 0 {
-		t.Errorf("flags %#x do not include FD_CLOEXEC", flags)
-	}
-}
-
-// TestFcntlFlock tests whether the file locking structure matches
-// the calling convention of each kernel.
-func TestFcntlFlock(t *testing.T) {
-	name := filepath.Join(os.TempDir(), "TestFcntlFlock")
-	fd, err := unix.Open(name, unix.O_CREAT|unix.O_RDWR|unix.O_CLOEXEC, 0)
-	if err != nil {
-		t.Fatalf("Open failed: %v", err)
-	}
-	defer unix.Unlink(name)
-	defer unix.Close(fd)
-	flock := unix.Flock_t{
-		Type:  unix.F_RDLCK,
-		Start: 0, Len: 0, Whence: 1,
-	}
-	if err := unix.FcntlFlock(uintptr(fd), unix.F_GETLK, &flock); err != nil {
-		t.Fatalf("FcntlFlock failed: %v", err)
-	}
-}
-
-// TestPassFD tests passing a file descriptor over a Unix socket.
-//
-// This test involved both a parent and child process. The parent
-// process is invoked as a normal test, with "go test", which then
-// runs the child process by running the current test binary with args
-// "-test.run=^TestPassFD$" and an environment variable used to signal
-// that the test should become the child process instead.
-func TestPassFD(t *testing.T) {
-	if runtime.GOOS == "darwin" && (runtime.GOARCH == "arm" || runtime.GOARCH == "arm64") {
-		t.Skip("cannot exec subprocess on iOS, skipping test")
-	}
-
-	if os.Getenv("GO_WANT_HELPER_PROCESS") == "1" {
-		passFDChild()
-		return
-	}
-
-	tempDir, err := ioutil.TempDir("", "TestPassFD")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tempDir)
-
-	fds, err := unix.Socketpair(unix.AF_LOCAL, unix.SOCK_STREAM, 0)
-	if err != nil {
-		t.Fatalf("Socketpair: %v", err)
-	}
-	defer unix.Close(fds[0])
-	defer unix.Close(fds[1])
-	writeFile := os.NewFile(uintptr(fds[0]), "child-writes")
-	readFile := os.NewFile(uintptr(fds[1]), "parent-reads")
-	defer writeFile.Close()
-	defer readFile.Close()
-
-	cmd := exec.Command(os.Args[0], "-test.run=^TestPassFD$", "--", tempDir)
-	cmd.Env = []string{"GO_WANT_HELPER_PROCESS=1"}
-	if lp := os.Getenv("LD_LIBRARY_PATH"); lp != "" {
-		cmd.Env = append(cmd.Env, "LD_LIBRARY_PATH="+lp)
-	}
-	cmd.ExtraFiles = []*os.File{writeFile}
-
-	out, err := cmd.CombinedOutput()
-	if len(out) > 0 || err != nil {
-		t.Fatalf("child process: %q, %v", out, err)
-	}
-
-	c, err := net.FileConn(readFile)
-	if err != nil {
-		t.Fatalf("FileConn: %v", err)
-	}
-	defer c.Close()
-
-	uc, ok := c.(*net.UnixConn)
-	if !ok {
-		t.Fatalf("unexpected FileConn type; expected UnixConn, got %T", c)
-	}
-
-	buf := make([]byte, 32) // expect 1 byte
-	oob := make([]byte, 32) // expect 24 bytes
-	closeUnix := time.AfterFunc(5*time.Second, func() {
-		t.Logf("timeout reading from unix socket")
-		uc.Close()
-	})
-	_, oobn, _, _, err := uc.ReadMsgUnix(buf, oob)
-	if err != nil {
-		t.Fatalf("ReadMsgUnix: %v", err)
-	}
-	closeUnix.Stop()
-
-	scms, err := unix.ParseSocketControlMessage(oob[:oobn])
-	if err != nil {
-		t.Fatalf("ParseSocketControlMessage: %v", err)
-	}
-	if len(scms) != 1 {
-		t.Fatalf("expected 1 SocketControlMessage; got scms = %#v", scms)
-	}
-	scm := scms[0]
-	gotFds, err := unix.ParseUnixRights(&scm)
-	if err != nil {
-		t.Fatalf("unix.ParseUnixRights: %v", err)
-	}
-	if len(gotFds) != 1 {
-		t.Fatalf("wanted 1 fd; got %#v", gotFds)
-	}
-
-	f := os.NewFile(uintptr(gotFds[0]), "fd-from-child")
-	defer f.Close()
-
-	got, err := ioutil.ReadAll(f)
-	want := "Hello from child process!\n"
-	if string(got) != want {
-		t.Errorf("child process ReadAll: %q, %v; want %q", got, err, want)
-	}
-}
-
-// passFDChild is the child process used by TestPassFD.
-func passFDChild() {
-	defer os.Exit(0)
-
-	// Look for our fd. It should be fd 3, but we work around an fd leak
-	// bug here (http://golang.org/issue/2603) to let it be elsewhere.
-	var uc *net.UnixConn
-	for fd := uintptr(3); fd <= 10; fd++ {
-		f := os.NewFile(fd, "unix-conn")
-		var ok bool
-		netc, _ := net.FileConn(f)
-		uc, ok = netc.(*net.UnixConn)
-		if ok {
-			break
-		}
-	}
-	if uc == nil {
-		fmt.Println("failed to find unix fd")
-		return
-	}
-
-	// Make a file f to send to our parent process on uc.
-	// We make it in tempDir, which our parent will clean up.
-	flag.Parse()
-	tempDir := flag.Arg(0)
-	f, err := ioutil.TempFile(tempDir, "")
-	if err != nil {
-		fmt.Printf("TempFile: %v", err)
-		return
-	}
-
-	f.Write([]byte("Hello from child process!\n"))
-	f.Seek(0, 0)
-
-	rights := unix.UnixRights(int(f.Fd()))
-	dummyByte := []byte("x")
-	n, oobn, err := uc.WriteMsgUnix(dummyByte, rights, nil)
-	if err != nil {
-		fmt.Printf("WriteMsgUnix: %v", err)
-		return
-	}
-	if n != 1 || oobn != len(rights) {
-		fmt.Printf("WriteMsgUnix = %d, %d; want 1, %d", n, oobn, len(rights))
-		return
-	}
-}
-
-// TestUnixRightsRoundtrip tests that UnixRights, ParseSocketControlMessage,
-// and ParseUnixRights are able to successfully round-trip lists of file descriptors.
-func TestUnixRightsRoundtrip(t *testing.T) {
-	testCases := [...][][]int{
-		{{42}},
-		{{1, 2}},
-		{{3, 4, 5}},
-		{{}},
-		{{1, 2}, {3, 4, 5}, {}, {7}},
-	}
-	for _, testCase := range testCases {
-		b := []byte{}
-		var n int
-		for _, fds := range testCase {
-			// Last assignment to n wins
-			n = len(b) + unix.CmsgLen(4*len(fds))
-			b = append(b, unix.UnixRights(fds...)...)
-		}
-		// Truncate b
-		b = b[:n]
-
-		scms, err := unix.ParseSocketControlMessage(b)
-		if err != nil {
-			t.Fatalf("ParseSocketControlMessage: %v", err)
-		}
-		if len(scms) != len(testCase) {
-			t.Fatalf("expected %v SocketControlMessage; got scms = %#v", len(testCase), scms)
-		}
-		for i, scm := range scms {
-			gotFds, err := unix.ParseUnixRights(&scm)
-			if err != nil {
-				t.Fatalf("ParseUnixRights: %v", err)
-			}
-			wantFds := testCase[i]
-			if len(gotFds) != len(wantFds) {
-				t.Fatalf("expected %v fds, got %#v", len(wantFds), gotFds)
-			}
-			for j, fd := range gotFds {
-				if fd != wantFds[j] {
-					t.Fatalf("expected fd %v, got %v", wantFds[j], fd)
-				}
-			}
-		}
-	}
-}
-
-func TestRlimit(t *testing.T) {
-	var rlimit, zero unix.Rlimit
-	err := unix.Getrlimit(unix.RLIMIT_NOFILE, &rlimit)
-	if err != nil {
-		t.Fatalf("Getrlimit: save failed: %v", err)
-	}
-	if zero == rlimit {
-		t.Fatalf("Getrlimit: save failed: got zero value %#v", rlimit)
-	}
-	set := rlimit
-	set.Cur = set.Max - 1
-	err = unix.Setrlimit(unix.RLIMIT_NOFILE, &set)
-	if err != nil {
-		t.Fatalf("Setrlimit: set failed: %#v %v", set, err)
-	}
-	var get unix.Rlimit
-	err = unix.Getrlimit(unix.RLIMIT_NOFILE, &get)
-	if err != nil {
-		t.Fatalf("Getrlimit: get failed: %v", err)
-	}
-	set = rlimit
-	set.Cur = set.Max - 1
-	if set != get {
-		// Seems like Darwin requires some privilege to
-		// increase the soft limit of rlimit sandbox, though
-		// Setrlimit never reports an error.
-		switch runtime.GOOS {
-		case "darwin":
-		default:
-			t.Fatalf("Rlimit: change failed: wanted %#v got %#v", set, get)
-		}
-	}
-	err = unix.Setrlimit(unix.RLIMIT_NOFILE, &rlimit)
-	if err != nil {
-		t.Fatalf("Setrlimit: restore failed: %#v %v", rlimit, err)
-	}
-}
-
-func TestSeekFailure(t *testing.T) {
-	_, err := unix.Seek(-1, 0, 0)
-	if err == nil {
-		t.Fatalf("Seek(-1, 0, 0) did not fail")
-	}
-	str := err.Error() // used to crash on Linux
-	t.Logf("Seek: %v", str)
-	if str == "" {
-		t.Fatalf("Seek(-1, 0, 0) return error with empty message")
-	}
-}
-
-func TestDup(t *testing.T) {
-	file, err := ioutil.TempFile("", "TestDup")
-	if err != nil {
-		t.Fatalf("Tempfile failed: %v", err)
-	}
-	defer os.Remove(file.Name())
-	defer file.Close()
-	f := int(file.Fd())
-
-	newFd, err := unix.Dup(f)
-	if err != nil {
-		t.Fatalf("Dup: %v", err)
-	}
-
-	err = unix.Dup2(newFd, newFd+1)
-	if err != nil {
-		t.Fatalf("Dup2: %v", err)
-	}
-
-	b1 := []byte("Test123")
-	b2 := make([]byte, 7)
-	_, err = unix.Write(newFd+1, b1)
-	if err != nil {
-		t.Fatalf("Write to dup2 fd failed: %v", err)
-	}
-	_, err = unix.Seek(f, 0, 0)
-	if err != nil {
-		t.Fatalf("Seek failed: %v", err)
-	}
-	_, err = unix.Read(f, b2)
-	if err != nil {
-		t.Fatalf("Read back failed: %v", err)
-	}
-	if string(b1) != string(b2) {
-		t.Errorf("Dup: stdout write not in file, expected %v, got %v", string(b1), string(b2))
-	}
-}
-
-func TestPoll(t *testing.T) {
-	if runtime.GOOS == "android" ||
-		(runtime.GOOS == "darwin" && (runtime.GOARCH == "arm" || runtime.GOARCH == "arm64")) {
-		t.Skip("mkfifo syscall is not available on android and iOS, skipping test")
-	}
-
-	f, cleanup := mktmpfifo(t)
-	defer cleanup()
-
-	const timeout = 100
-
-	ok := make(chan bool, 1)
-	go func() {
-		select {
-		case <-time.After(10 * timeout * time.Millisecond):
-			t.Errorf("Poll: failed to timeout after %d milliseconds", 10*timeout)
-		case <-ok:
-		}
-	}()
-
-	fds := []unix.PollFd{{Fd: int32(f.Fd()), Events: unix.POLLIN}}
-	n, err := unix.Poll(fds, timeout)
-	ok <- true
-	if err != nil {
-		t.Errorf("Poll: unexpected error: %v", err)
-		return
-	}
-	if n != 0 {
-		t.Errorf("Poll: wrong number of events: got %v, expected %v", n, 0)
-		return
-	}
-}
-
-func TestGetwd(t *testing.T) {
-	fd, err := os.Open(".")
-	if err != nil {
-		t.Fatalf("Open .: %s", err)
-	}
-	defer fd.Close()
-	// These are chosen carefully not to be symlinks on a Mac
-	// (unlike, say, /var, /etc)
-	dirs := []string{"/", "/usr/bin"}
-	switch runtime.GOOS {
-	case "android":
-		dirs = []string{"/", "/system/bin"}
-	case "darwin":
-		switch runtime.GOARCH {
-		case "arm", "arm64":
-			d1, err := ioutil.TempDir("", "d1")
-			if err != nil {
-				t.Fatalf("TempDir: %v", err)
-			}
-			d2, err := ioutil.TempDir("", "d2")
-			if err != nil {
-				t.Fatalf("TempDir: %v", err)
-			}
-			dirs = []string{d1, d2}
-		}
-	}
-	oldwd := os.Getenv("PWD")
-	for _, d := range dirs {
-		err = os.Chdir(d)
-		if err != nil {
-			t.Fatalf("Chdir: %v", err)
-		}
-		pwd, err := unix.Getwd()
-		if err != nil {
-			t.Fatalf("Getwd in %s: %s", d, err)
-		}
-		os.Setenv("PWD", oldwd)
-		err = fd.Chdir()
-		if err != nil {
-			// We changed the current directory and cannot go back.
-			// Don't let the tests continue; they'll scribble
-			// all over some other directory.
-			fmt.Fprintf(os.Stderr, "fchdir back to dot failed: %s\n", err)
-			os.Exit(1)
-		}
-		if pwd != d {
-			t.Fatalf("Getwd returned %q want %q", pwd, d)
-		}
-	}
-}
-
-func TestFstatat(t *testing.T) {
-	defer chtmpdir(t)()
-
-	touch(t, "file1")
-
-	var st1 unix.Stat_t
-	err := unix.Stat("file1", &st1)
-	if err != nil {
-		t.Fatalf("Stat: %v", err)
-	}
-
-	var st2 unix.Stat_t
-	err = unix.Fstatat(unix.AT_FDCWD, "file1", &st2, 0)
-	if err != nil {
-		t.Fatalf("Fstatat: %v", err)
-	}
-
-	if st1 != st2 {
-		t.Errorf("Fstatat: returned stat does not match Stat")
-	}
-
-	err = os.Symlink("file1", "symlink1")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = unix.Lstat("symlink1", &st1)
-	if err != nil {
-		t.Fatalf("Lstat: %v", err)
-	}
-
-	err = unix.Fstatat(unix.AT_FDCWD, "symlink1", &st2, unix.AT_SYMLINK_NOFOLLOW)
-	if err != nil {
-		t.Fatalf("Fstatat: %v", err)
-	}
-
-	if st1 != st2 {
-		t.Errorf("Fstatat: returned stat does not match Lstat")
-	}
-}
-
-func TestFchmodat(t *testing.T) {
-	defer chtmpdir(t)()
-
-	touch(t, "file1")
-	err := os.Symlink("file1", "symlink1")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	mode := os.FileMode(0444)
-	err = unix.Fchmodat(unix.AT_FDCWD, "symlink1", uint32(mode), 0)
-	if err != nil {
-		t.Fatalf("Fchmodat: unexpected error: %v", err)
-	}
-
-	fi, err := os.Stat("file1")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if fi.Mode() != mode {
-		t.Errorf("Fchmodat: failed to change file mode: expected %v, got %v", mode, fi.Mode())
-	}
-
-	mode = os.FileMode(0644)
-	didChmodSymlink := true
-	err = unix.Fchmodat(unix.AT_FDCWD, "symlink1", uint32(mode), unix.AT_SYMLINK_NOFOLLOW)
-	if err != nil {
-		if (runtime.GOOS == "android" || runtime.GOOS == "linux" || runtime.GOOS == "solaris") && err == unix.EOPNOTSUPP {
-			// Linux and Illumos don't support flags != 0
-			didChmodSymlink = false
-		} else {
-			t.Fatalf("Fchmodat: unexpected error: %v", err)
-		}
-	}
-
-	if !didChmodSymlink {
-		// Didn't change mode of the symlink. On Linux, the permissions
-		// of a symbolic link are always 0777 according to symlink(7)
-		mode = os.FileMode(0777)
-	}
-
-	var st unix.Stat_t
-	err = unix.Lstat("symlink1", &st)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	got := os.FileMode(st.Mode & 0777)
-	if got != mode {
-		t.Errorf("Fchmodat: failed to change symlink mode: expected %v, got %v", mode, got)
-	}
-}
-
-func TestMkdev(t *testing.T) {
-	major := uint32(42)
-	minor := uint32(7)
-	dev := unix.Mkdev(major, minor)
-
-	if unix.Major(dev) != major {
-		t.Errorf("Major(%#x) == %d, want %d", dev, unix.Major(dev), major)
-	}
-	if unix.Minor(dev) != minor {
-		t.Errorf("Minor(%#x) == %d, want %d", dev, unix.Minor(dev), minor)
-	}
-}
-
-// mktmpfifo creates a temporary FIFO and provides a cleanup function.
-func mktmpfifo(t *testing.T) (*os.File, func()) {
-	err := unix.Mkfifo("fifo", 0666)
-	if err != nil {
-		t.Fatalf("mktmpfifo: failed to create FIFO: %v", err)
-	}
-
-	f, err := os.OpenFile("fifo", os.O_RDWR, 0666)
-	if err != nil {
-		os.Remove("fifo")
-		t.Fatalf("mktmpfifo: failed to open FIFO: %v", err)
-	}
-
-	return f, func() {
-		f.Close()
-		os.Remove("fifo")
-	}
-}
-
-// utilities taken from os/os_test.go
-
-func touch(t *testing.T, name string) {
-	f, err := os.Create(name)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := f.Close(); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// chtmpdir changes the working directory to a new temporary directory and
-// provides a cleanup function. Used when PWD is read-only.
-func chtmpdir(t *testing.T) func() {
-	oldwd, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("chtmpdir: %v", err)
-	}
-	d, err := ioutil.TempDir("", "test")
-	if err != nil {
-		t.Fatalf("chtmpdir: %v", err)
-	}
-	if err := os.Chdir(d); err != nil {
-		t.Fatalf("chtmpdir: %v", err)
-	}
-	return func() {
-		if err := os.Chdir(oldwd); err != nil {
-			t.Fatalf("chtmpdir: %v", err)
-		}
-		os.RemoveAll(d)
-	}
-}
diff --git a/vendor/golang.org/x/sys/unix/timestruct_test.go b/vendor/golang.org/x/sys/unix/timestruct_test.go
deleted file mode 100644
index 4215f46d..00000000
--- a/vendor/golang.org/x/sys/unix/timestruct_test.go
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2017 The Go Authors. All right reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
-
-package unix_test
-
-import (
-	"testing"
-	"time"
-	"unsafe"
-
-	"golang.org/x/sys/unix"
-)
-
-func TestTimeToTimespec(t *testing.T) {
-	timeTests := []struct {
-		time  time.Time
-		valid bool
-	}{
-		{time.Unix(0, 0), true},
-		{time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC), true},
-		{time.Date(2262, time.December, 31, 23, 0, 0, 0, time.UTC), false},
-		{time.Unix(0x7FFFFFFF, 0), true},
-		{time.Unix(0x80000000, 0), false},
-		{time.Unix(0x7FFFFFFF, 1000000000), false},
-		{time.Unix(0x7FFFFFFF, 999999999), true},
-		{time.Unix(-0x80000000, 0), true},
-		{time.Unix(-0x80000001, 0), false},
-		{time.Date(2038, time.January, 19, 3, 14, 7, 0, time.UTC), true},
-		{time.Date(2038, time.January, 19, 3, 14, 8, 0, time.UTC), false},
-		{time.Date(1901, time.December, 13, 20, 45, 52, 0, time.UTC), true},
-		{time.Date(1901, time.December, 13, 20, 45, 51, 0, time.UTC), false},
-	}
-
-	// Currently all targets have either int32 or int64 for Timespec.Sec.
-	// If there were a new target with unsigned or floating point type for
-	// it, this test must be adjusted.
-	have64BitTime := (unsafe.Sizeof(unix.Timespec{}.Sec) == 8)
-	for _, tt := range timeTests {
-		ts, err := unix.TimeToTimespec(tt.time)
-		tt.valid = tt.valid || have64BitTime
-		if tt.valid && err != nil {
-			t.Errorf("TimeToTimespec(%v): %v", tt.time, err)
-		}
-		if err == nil {
-			tstime := time.Unix(int64(ts.Sec), int64(ts.Nsec))
-			if !tstime.Equal(tt.time) {
-				t.Errorf("TimeToTimespec(%v) is the time %v", tt.time, tstime)
-			}
-		}
-	}
-}
diff --git a/vendor/golang.org/x/sys/unix/types_freebsd.go b/vendor/golang.org/x/sys/unix/types_freebsd.go
index 4eb02cd4..f4b6bf96 100644
--- a/vendor/golang.org/x/sys/unix/types_freebsd.go
+++ b/vendor/golang.org/x/sys/unix/types_freebsd.go
@@ -204,6 +204,8 @@ const ( // Directory mode bits
 	S_IRUSR  = C.S_IRUSR
 	S_IWUSR  = C.S_IWUSR
 	S_IXUSR  = C.S_IXUSR
+	S_IRWXG  = C.S_IRWXG
+	S_IRWXO  = C.S_IRWXO
 )
 
 type Stat_t C.struct_stat8
diff --git a/vendor/golang.org/x/sys/unix/xattr_test.go b/vendor/golang.org/x/sys/unix/xattr_test.go
deleted file mode 100644
index b8b28d0c..00000000
--- a/vendor/golang.org/x/sys/unix/xattr_test.go
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright 2018 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin freebsd linux
-
-package unix_test
-
-import (
-	"os"
-	"runtime"
-	"strings"
-	"testing"
-
-	"golang.org/x/sys/unix"
-)
-
-func TestXattr(t *testing.T) {
-	defer chtmpdir(t)()
-
-	f := "xattr1"
-	touch(t, f)
-
-	xattrName := "user.test"
-	xattrDataSet := "gopher"
-	err := unix.Setxattr(f, xattrName, []byte(xattrDataSet), 0)
-	if err == unix.ENOTSUP || err == unix.EOPNOTSUPP {
-		t.Skip("filesystem does not support extended attributes, skipping test")
-	} else if err != nil {
-		t.Fatalf("Setxattr: %v", err)
-	}
-
-	// find size
-	size, err := unix.Listxattr(f, nil)
-	if err != nil {
-		t.Fatalf("Listxattr: %v", err)
-	}
-
-	if size <= 0 {
-		t.Fatalf("Listxattr returned an empty list of attributes")
-	}
-
-	buf := make([]byte, size)
-	read, err := unix.Listxattr(f, buf)
-	if err != nil {
-		t.Fatalf("Listxattr: %v", err)
-	}
-
-	xattrs := stringsFromByteSlice(buf[:read])
-
-	xattrWant := xattrName
-	if runtime.GOOS == "freebsd" {
-		// On FreeBSD, the namespace is stored separately from the xattr
-		// name and Listxattr doesn't return the namespace prefix.
-		xattrWant = strings.TrimPrefix(xattrWant, "user.")
-	}
-	found := false
-	for _, name := range xattrs {
-		if name == xattrWant {
-			found = true
-		}
-	}
-
-	if !found {
-		t.Errorf("Listxattr did not return previously set attribute '%s'", xattrName)
-	}
-
-	// find size
-	size, err = unix.Getxattr(f, xattrName, nil)
-	if err != nil {
-		t.Fatalf("Getxattr: %v", err)
-	}
-
-	if size <= 0 {
-		t.Fatalf("Getxattr returned an empty attribute")
-	}
-
-	xattrDataGet := make([]byte, size)
-	_, err = unix.Getxattr(f, xattrName, xattrDataGet)
-	if err != nil {
-		t.Fatalf("Getxattr: %v", err)
-	}
-
-	got := string(xattrDataGet)
-	if got != xattrDataSet {
-		t.Errorf("Getxattr: expected attribute value %s, got %s", xattrDataSet, got)
-	}
-
-	err = unix.Removexattr(f, xattrName)
-	if err != nil {
-		t.Fatalf("Removexattr: %v", err)
-	}
-
-	n := "nonexistent"
-	err = unix.Lsetxattr(n, xattrName, []byte(xattrDataSet), 0)
-	if err != unix.ENOENT {
-		t.Errorf("Lsetxattr: expected %v on non-existent file, got %v", unix.ENOENT, err)
-	}
-
-	_, err = unix.Lgetxattr(n, xattrName, nil)
-	if err != unix.ENOENT {
-		t.Errorf("Lgetxattr: %v", err)
-	}
-
-	s := "symlink1"
-	err = os.Symlink(n, s)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = unix.Lsetxattr(s, xattrName, []byte(xattrDataSet), 0)
-	if err != nil {
-		// Linux and Android doen't support xattrs on symlinks according
-		// to xattr(7), so just test that we get the proper error.
-		if (runtime.GOOS != "linux" && runtime.GOOS != "android") || err != unix.EPERM {
-			t.Fatalf("Lsetxattr: %v", err)
-		}
-	}
-}
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_386.go b/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
index 2f0091bb..e398aab9 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
@@ -1076,6 +1076,8 @@ const (
 	NETLINK_UNUSED                       = 0x1
 	NETLINK_USERSOCK                     = 0x2
 	NETLINK_XFRM                         = 0x6
+	NETNSA_MAX                           = 0x3
+	NETNSA_NSID_NOT_ASSIGNED             = -0x1
 	NFNETLINK_V0                         = 0x0
 	NFNLGRP_ACCT_QUOTA                   = 0x8
 	NFNLGRP_CONNTRACK_DESTROY            = 0x3
@@ -1427,6 +1429,9 @@ const (
 	RAMFS_MAGIC                          = 0x858458f6
 	RDTGROUP_SUPER_MAGIC                 = 0x7655821
 	REISERFS_SUPER_MAGIC                 = 0x52654973
+	RENAME_EXCHANGE                      = 0x2
+	RENAME_NOREPLACE                     = 0x1
+	RENAME_WHITEOUT                      = 0x4
 	RLIMIT_AS                            = 0x9
 	RLIMIT_CORE                          = 0x4
 	RLIMIT_CPU                           = 0x0
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
index a80c7ae5..12a147cf 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
@@ -1076,6 +1076,8 @@ const (
 	NETLINK_UNUSED                       = 0x1
 	NETLINK_USERSOCK                     = 0x2
 	NETLINK_XFRM                         = 0x6
+	NETNSA_MAX                           = 0x3
+	NETNSA_NSID_NOT_ASSIGNED             = -0x1
 	NFNETLINK_V0                         = 0x0
 	NFNLGRP_ACCT_QUOTA                   = 0x8
 	NFNLGRP_CONNTRACK_DESTROY            = 0x3
@@ -1428,6 +1430,9 @@ const (
 	RAMFS_MAGIC                          = 0x858458f6
 	RDTGROUP_SUPER_MAGIC                 = 0x7655821
 	REISERFS_SUPER_MAGIC                 = 0x52654973
+	RENAME_EXCHANGE                      = 0x2
+	RENAME_NOREPLACE                     = 0x1
+	RENAME_WHITEOUT                      = 0x4
 	RLIMIT_AS                            = 0x9
 	RLIMIT_CORE                          = 0x4
 	RLIMIT_CPU                           = 0x0
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go b/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
index 49a9b013..ee623b89 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
@@ -1074,6 +1074,8 @@ const (
 	NETLINK_UNUSED                       = 0x1
 	NETLINK_USERSOCK                     = 0x2
 	NETLINK_XFRM                         = 0x6
+	NETNSA_MAX                           = 0x3
+	NETNSA_NSID_NOT_ASSIGNED             = -0x1
 	NFNETLINK_V0                         = 0x0
 	NFNLGRP_ACCT_QUOTA                   = 0x8
 	NFNLGRP_CONNTRACK_DESTROY            = 0x3
@@ -1434,6 +1436,9 @@ const (
 	RAMFS_MAGIC                          = 0x858458f6
 	RDTGROUP_SUPER_MAGIC                 = 0x7655821
 	REISERFS_SUPER_MAGIC                 = 0x52654973
+	RENAME_EXCHANGE                      = 0x2
+	RENAME_NOREPLACE                     = 0x1
+	RENAME_WHITEOUT                      = 0x4
 	RLIMIT_AS                            = 0x9
 	RLIMIT_CORE                          = 0x4
 	RLIMIT_CPU                           = 0x0
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
index 8d70233b..deab46bc 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
@@ -1077,6 +1077,8 @@ const (
 	NETLINK_UNUSED                       = 0x1
 	NETLINK_USERSOCK                     = 0x2
 	NETLINK_XFRM                         = 0x6
+	NETNSA_MAX                           = 0x3
+	NETNSA_NSID_NOT_ASSIGNED             = -0x1
 	NFNETLINK_V0                         = 0x0
 	NFNLGRP_ACCT_QUOTA                   = 0x8
 	NFNLGRP_CONNTRACK_DESTROY            = 0x3
@@ -1418,6 +1420,9 @@ const (
 	RAMFS_MAGIC                          = 0x858458f6
 	RDTGROUP_SUPER_MAGIC                 = 0x7655821
 	REISERFS_SUPER_MAGIC                 = 0x52654973
+	RENAME_EXCHANGE                      = 0x2
+	RENAME_NOREPLACE                     = 0x1
+	RENAME_WHITEOUT                      = 0x4
 	RLIMIT_AS                            = 0x9
 	RLIMIT_CORE                          = 0x4
 	RLIMIT_CPU                           = 0x0
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
index 410ab56b..3bd5e10c 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
@@ -1075,6 +1075,8 @@ const (
 	NETLINK_UNUSED                       = 0x1
 	NETLINK_USERSOCK                     = 0x2
 	NETLINK_XFRM                         = 0x6
+	NETNSA_MAX                           = 0x3
+	NETNSA_NSID_NOT_ASSIGNED             = -0x1
 	NFNETLINK_V0                         = 0x0
 	NFNLGRP_ACCT_QUOTA                   = 0x8
 	NFNLGRP_CONNTRACK_DESTROY            = 0x3
@@ -1428,6 +1430,9 @@ const (
 	RAMFS_MAGIC                          = 0x858458f6
 	RDTGROUP_SUPER_MAGIC                 = 0x7655821
 	REISERFS_SUPER_MAGIC                 = 0x52654973
+	RENAME_EXCHANGE                      = 0x2
+	RENAME_NOREPLACE                     = 0x1
+	RENAME_WHITEOUT                      = 0x4
 	RLIMIT_AS                            = 0x6
 	RLIMIT_CORE                          = 0x4
 	RLIMIT_CPU                           = 0x0
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
index dac4d90f..d3a3cdc8 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
@@ -1075,6 +1075,8 @@ const (
 	NETLINK_UNUSED                       = 0x1
 	NETLINK_USERSOCK                     = 0x2
 	NETLINK_XFRM                         = 0x6
+	NETNSA_MAX                           = 0x3
+	NETNSA_NSID_NOT_ASSIGNED             = -0x1
 	NFNETLINK_V0                         = 0x0
 	NFNLGRP_ACCT_QUOTA                   = 0x8
 	NFNLGRP_CONNTRACK_DESTROY            = 0x3
@@ -1428,6 +1430,9 @@ const (
 	RAMFS_MAGIC                          = 0x858458f6
 	RDTGROUP_SUPER_MAGIC                 = 0x7655821
 	REISERFS_SUPER_MAGIC                 = 0x52654973
+	RENAME_EXCHANGE                      = 0x2
+	RENAME_NOREPLACE                     = 0x1
+	RENAME_WHITEOUT                      = 0x4
 	RLIMIT_AS                            = 0x6
 	RLIMIT_CORE                          = 0x4
 	RLIMIT_CPU                           = 0x0
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
index 1d2f0e63..01200224 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
@@ -1075,6 +1075,8 @@ const (
 	NETLINK_UNUSED                       = 0x1
 	NETLINK_USERSOCK                     = 0x2
 	NETLINK_XFRM                         = 0x6
+	NETNSA_MAX                           = 0x3
+	NETNSA_NSID_NOT_ASSIGNED             = -0x1
 	NFNETLINK_V0                         = 0x0
 	NFNLGRP_ACCT_QUOTA                   = 0x8
 	NFNLGRP_CONNTRACK_DESTROY            = 0x3
@@ -1428,6 +1430,9 @@ const (
 	RAMFS_MAGIC                          = 0x858458f6
 	RDTGROUP_SUPER_MAGIC                 = 0x7655821
 	REISERFS_SUPER_MAGIC                 = 0x52654973
+	RENAME_EXCHANGE                      = 0x2
+	RENAME_NOREPLACE                     = 0x1
+	RENAME_WHITEOUT                      = 0x4
 	RLIMIT_AS                            = 0x6
 	RLIMIT_CORE                          = 0x4
 	RLIMIT_CPU                           = 0x0
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
index 33b99402..26adfa68 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
@@ -1075,6 +1075,8 @@ const (
 	NETLINK_UNUSED                       = 0x1
 	NETLINK_USERSOCK                     = 0x2
 	NETLINK_XFRM                         = 0x6
+	NETNSA_MAX                           = 0x3
+	NETNSA_NSID_NOT_ASSIGNED             = -0x1
 	NFNETLINK_V0                         = 0x0
 	NFNLGRP_ACCT_QUOTA                   = 0x8
 	NFNLGRP_CONNTRACK_DESTROY            = 0x3
@@ -1428,6 +1430,9 @@ const (
 	RAMFS_MAGIC                          = 0x858458f6
 	RDTGROUP_SUPER_MAGIC                 = 0x7655821
 	REISERFS_SUPER_MAGIC                 = 0x52654973
+	RENAME_EXCHANGE                      = 0x2
+	RENAME_NOREPLACE                     = 0x1
+	RENAME_WHITEOUT                      = 0x4
 	RLIMIT_AS                            = 0x6
 	RLIMIT_CORE                          = 0x4
 	RLIMIT_CPU                           = 0x0
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
index c78d6697..24b588b1 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
@@ -1074,6 +1074,8 @@ const (
 	NETLINK_UNUSED                       = 0x1
 	NETLINK_USERSOCK                     = 0x2
 	NETLINK_XFRM                         = 0x6
+	NETNSA_MAX                           = 0x3
+	NETNSA_NSID_NOT_ASSIGNED             = -0x1
 	NFNETLINK_V0                         = 0x0
 	NFNLGRP_ACCT_QUOTA                   = 0x8
 	NFNLGRP_CONNTRACK_DESTROY            = 0x3
@@ -1484,6 +1486,9 @@ const (
 	RAMFS_MAGIC                          = 0x858458f6
 	RDTGROUP_SUPER_MAGIC                 = 0x7655821
 	REISERFS_SUPER_MAGIC                 = 0x52654973
+	RENAME_EXCHANGE                      = 0x2
+	RENAME_NOREPLACE                     = 0x1
+	RENAME_WHITEOUT                      = 0x4
 	RLIMIT_AS                            = 0x9
 	RLIMIT_CORE                          = 0x4
 	RLIMIT_CPU                           = 0x0
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
index 63493756..d184544e 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
@@ -1074,6 +1074,8 @@ const (
 	NETLINK_UNUSED                       = 0x1
 	NETLINK_USERSOCK                     = 0x2
 	NETLINK_XFRM                         = 0x6
+	NETNSA_MAX                           = 0x3
+	NETNSA_NSID_NOT_ASSIGNED             = -0x1
 	NFNETLINK_V0                         = 0x0
 	NFNLGRP_ACCT_QUOTA                   = 0x8
 	NFNLGRP_CONNTRACK_DESTROY            = 0x3
@@ -1484,6 +1486,9 @@ const (
 	RAMFS_MAGIC                          = 0x858458f6
 	RDTGROUP_SUPER_MAGIC                 = 0x7655821
 	REISERFS_SUPER_MAGIC                 = 0x52654973
+	RENAME_EXCHANGE                      = 0x2
+	RENAME_NOREPLACE                     = 0x1
+	RENAME_WHITEOUT                      = 0x4
 	RLIMIT_AS                            = 0x9
 	RLIMIT_CORE                          = 0x4
 	RLIMIT_CPU                           = 0x0
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go b/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
index 3814df85..1832f0e2 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
@@ -1074,6 +1074,8 @@ const (
 	NETLINK_UNUSED                       = 0x1
 	NETLINK_USERSOCK                     = 0x2
 	NETLINK_XFRM                         = 0x6
+	NETNSA_MAX                           = 0x3
+	NETNSA_NSID_NOT_ASSIGNED             = -0x1
 	NFNETLINK_V0                         = 0x0
 	NFNLGRP_ACCT_QUOTA                   = 0x8
 	NFNLGRP_CONNTRACK_DESTROY            = 0x3
@@ -1488,6 +1490,9 @@ const (
 	RAMFS_MAGIC                          = 0x858458f6
 	RDTGROUP_SUPER_MAGIC                 = 0x7655821
 	REISERFS_SUPER_MAGIC                 = 0x52654973
+	RENAME_EXCHANGE                      = 0x2
+	RENAME_NOREPLACE                     = 0x1
+	RENAME_WHITEOUT                      = 0x4
 	RLIMIT_AS                            = 0x9
 	RLIMIT_CORE                          = 0x4
 	RLIMIT_CPU                           = 0x0
diff --git a/vendor/golang.org/x/sys/unix/zerrors_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_openbsd_amd64.go
index acfc6646..97107362 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_openbsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_openbsd_amd64.go
@@ -472,6 +472,7 @@ const (
 	F_GETLK                           = 0x7
 	F_GETOWN                          = 0x5
 	F_ISATTY                          = 0xb
+	F_OK                              = 0x0
 	F_RDLCK                           = 0x1
 	F_SETFD                           = 0x2
 	F_SETFL                           = 0x4
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go
index ac02d4d8..9ce06df6 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go
@@ -420,6 +420,22 @@ func getxattr(path string, attr string, dest *byte, size int, position uint32, o
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func fgetxattr(fd int, attr string, dest *byte, size int, position uint32, options int) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(dest)), uintptr(size), uintptr(position), uintptr(options))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func setxattr(path string, attr string, data *byte, size int, position uint32, options int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -440,6 +456,21 @@ func setxattr(path string, attr string, data *byte, size int, position uint32, o
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func fsetxattr(fd int, attr string, data *byte, size int, position uint32, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(data)), uintptr(size), uintptr(position), uintptr(options))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func removexattr(path string, attr string, options int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -460,6 +491,21 @@ func removexattr(path string, attr string, options int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func fremovexattr(fd int, attr string, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(options))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func listxattr(path string, dest *byte, size int, options int) (sz int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -476,6 +522,17 @@ func listxattr(path string, dest *byte, size int, options int) (sz int, err erro
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func flistxattr(fd int, dest *byte, size int, options int) (sz int, err error) {
+	r0, _, e1 := Syscall6(SYS_FLISTXATTR, uintptr(fd), uintptr(unsafe.Pointer(dest)), uintptr(size), uintptr(options), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func kill(pid int, signum int, posix int) (err error) {
 	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix))
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
index 1dd3cfa0..de992704 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
@@ -420,6 +420,22 @@ func getxattr(path string, attr string, dest *byte, size int, position uint32, o
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func fgetxattr(fd int, attr string, dest *byte, size int, position uint32, options int) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(dest)), uintptr(size), uintptr(position), uintptr(options))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func setxattr(path string, attr string, data *byte, size int, position uint32, options int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -440,6 +456,21 @@ func setxattr(path string, attr string, data *byte, size int, position uint32, o
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func fsetxattr(fd int, attr string, data *byte, size int, position uint32, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(data)), uintptr(size), uintptr(position), uintptr(options))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func removexattr(path string, attr string, options int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -460,6 +491,21 @@ func removexattr(path string, attr string, options int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func fremovexattr(fd int, attr string, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(options))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func listxattr(path string, dest *byte, size int, options int) (sz int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -476,6 +522,17 @@ func listxattr(path string, dest *byte, size int, options int) (sz int, err erro
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func flistxattr(fd int, dest *byte, size int, options int) (sz int, err error) {
+	r0, _, e1 := Syscall6(SYS_FLISTXATTR, uintptr(fd), uintptr(unsafe.Pointer(dest)), uintptr(size), uintptr(options), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func kill(pid int, signum int, posix int) (err error) {
 	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix))
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go
index cab46e74..81c4f093 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go
@@ -420,6 +420,22 @@ func getxattr(path string, attr string, dest *byte, size int, position uint32, o
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func fgetxattr(fd int, attr string, dest *byte, size int, position uint32, options int) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(dest)), uintptr(size), uintptr(position), uintptr(options))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func setxattr(path string, attr string, data *byte, size int, position uint32, options int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -440,6 +456,21 @@ func setxattr(path string, attr string, data *byte, size int, position uint32, o
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func fsetxattr(fd int, attr string, data *byte, size int, position uint32, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(data)), uintptr(size), uintptr(position), uintptr(options))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func removexattr(path string, attr string, options int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -460,6 +491,21 @@ func removexattr(path string, attr string, options int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func fremovexattr(fd int, attr string, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(options))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func listxattr(path string, dest *byte, size int, options int) (sz int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -476,6 +522,17 @@ func listxattr(path string, dest *byte, size int, options int) (sz int, err erro
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func flistxattr(fd int, dest *byte, size int, options int) (sz int, err error) {
+	r0, _, e1 := Syscall6(SYS_FLISTXATTR, uintptr(fd), uintptr(unsafe.Pointer(dest)), uintptr(size), uintptr(options), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func kill(pid int, signum int, posix int) (err error) {
 	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix))
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
index 13478dd0..338c32d4 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
@@ -420,6 +420,22 @@ func getxattr(path string, attr string, dest *byte, size int, position uint32, o
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func fgetxattr(fd int, attr string, dest *byte, size int, position uint32, options int) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(dest)), uintptr(size), uintptr(position), uintptr(options))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func setxattr(path string, attr string, data *byte, size int, position uint32, options int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -440,6 +456,21 @@ func setxattr(path string, attr string, data *byte, size int, position uint32, o
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func fsetxattr(fd int, attr string, data *byte, size int, position uint32, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(data)), uintptr(size), uintptr(position), uintptr(options))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func removexattr(path string, attr string, options int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -460,6 +491,21 @@ func removexattr(path string, attr string, options int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func fremovexattr(fd int, attr string, options int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(options))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func listxattr(path string, dest *byte, size int, options int) (sz int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -476,6 +522,17 @@ func listxattr(path string, dest *byte, size int, options int) (sz int, err erro
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func flistxattr(fd int, dest *byte, size int, options int) (sz int, err error) {
+	r0, _, e1 := Syscall6(SYS_FLISTXATTR, uintptr(fd), uintptr(unsafe.Pointer(dest)), uintptr(size), uintptr(options), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func kill(pid int, signum int, posix int) (err error) {
 	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), uintptr(posix))
 	if e1 != 0 {
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
index 237e9609..8e8d427d 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
@@ -574,6 +574,45 @@ func Fdatasync(fd int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flistxattr(fd int, dest []byte) (sz int, err error) {
+	var _p0 unsafe.Pointer
+	if len(dest) > 0 {
+		_p0 = unsafe.Pointer(&dest[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Flock(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
@@ -584,6 +623,42 @@ func Flock(fd int, how int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fremovexattr(fd int, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fsync(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -1063,6 +1138,26 @@ func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err e
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(keyType)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
index 9b40f580..2f60780c 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
@@ -574,6 +574,45 @@ func Fdatasync(fd int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flistxattr(fd int, dest []byte) (sz int, err error) {
+	var _p0 unsafe.Pointer
+	if len(dest) > 0 {
+		_p0 = unsafe.Pointer(&dest[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Flock(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
@@ -584,6 +623,42 @@ func Flock(fd int, how int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fremovexattr(fd int, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fsync(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -1063,6 +1138,26 @@ func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err e
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(keyType)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
index d93cc2f3..d29a11c9 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
@@ -574,6 +574,45 @@ func Fdatasync(fd int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flistxattr(fd int, dest []byte) (sz int, err error) {
+	var _p0 unsafe.Pointer
+	if len(dest) > 0 {
+		_p0 = unsafe.Pointer(&dest[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Flock(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
@@ -584,6 +623,42 @@ func Flock(fd int, how int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fremovexattr(fd int, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fsync(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -1063,6 +1138,26 @@ func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err e
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(keyType)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
index 5f7d0213..d03eb296 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
@@ -574,6 +574,45 @@ func Fdatasync(fd int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flistxattr(fd int, dest []byte) (sz int, err error) {
+	var _p0 unsafe.Pointer
+	if len(dest) > 0 {
+		_p0 = unsafe.Pointer(&dest[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Flock(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
@@ -584,6 +623,42 @@ func Flock(fd int, how int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fremovexattr(fd int, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fsync(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -1063,6 +1138,26 @@ func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err e
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(keyType)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go
index e7617052..dea09328 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go
@@ -574,6 +574,45 @@ func Fdatasync(fd int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flistxattr(fd int, dest []byte) (sz int, err error) {
+	var _p0 unsafe.Pointer
+	if len(dest) > 0 {
+		_p0 = unsafe.Pointer(&dest[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Flock(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
@@ -584,6 +623,42 @@ func Flock(fd int, how int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fremovexattr(fd int, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fsync(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -1063,6 +1138,26 @@ func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err e
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(keyType)
@@ -2137,6 +2232,18 @@ func pipe2(p *[2]_C_int, flags int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func pipe() (p1 int, p2 int, err error) {
+	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
+	p1 = int(r0)
+	p2 = int(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func mmap2(addr uintptr, length uintptr, prot int, flags int, fd int, pageOffset uintptr) (xaddr uintptr, err error) {
 	r0, _, e1 := Syscall6(SYS_MMAP2, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(pageOffset))
 	xaddr = uintptr(r0)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
index 382e072f..31bbcff4 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
@@ -574,6 +574,45 @@ func Fdatasync(fd int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flistxattr(fd int, dest []byte) (sz int, err error) {
+	var _p0 unsafe.Pointer
+	if len(dest) > 0 {
+		_p0 = unsafe.Pointer(&dest[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Flock(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
@@ -584,6 +623,42 @@ func Flock(fd int, how int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fremovexattr(fd int, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fsync(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -1063,6 +1138,26 @@ func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err e
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(keyType)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
index da33eb12..e025a33a 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
@@ -574,6 +574,45 @@ func Fdatasync(fd int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flistxattr(fd int, dest []byte) (sz int, err error) {
+	var _p0 unsafe.Pointer
+	if len(dest) > 0 {
+		_p0 = unsafe.Pointer(&dest[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Flock(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
@@ -584,6 +623,42 @@ func Flock(fd int, how int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fremovexattr(fd int, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fsync(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -1063,6 +1138,26 @@ func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err e
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(keyType)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go
index f6e45189..57d7d931 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go
@@ -574,6 +574,45 @@ func Fdatasync(fd int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flistxattr(fd int, dest []byte) (sz int, err error) {
+	var _p0 unsafe.Pointer
+	if len(dest) > 0 {
+		_p0 = unsafe.Pointer(&dest[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Flock(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
@@ -584,6 +623,42 @@ func Flock(fd int, how int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fremovexattr(fd int, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fsync(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -1063,6 +1138,26 @@ func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err e
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(keyType)
@@ -2137,6 +2232,18 @@ func pipe2(p *[2]_C_int, flags int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func pipe() (p1 int, p2 int, err error) {
+	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
+	p1 = int(r0)
+	p2 = int(r1)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func mmap2(addr uintptr, length uintptr, prot int, flags int, fd int, pageOffset uintptr) (xaddr uintptr, err error) {
 	r0, _, e1 := Syscall6(SYS_MMAP2, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flags), uintptr(fd), uintptr(pageOffset))
 	xaddr = uintptr(r0)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
index 7cc1bfd1..2f7110d7 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
@@ -574,6 +574,45 @@ func Fdatasync(fd int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flistxattr(fd int, dest []byte) (sz int, err error) {
+	var _p0 unsafe.Pointer
+	if len(dest) > 0 {
+		_p0 = unsafe.Pointer(&dest[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Flock(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
@@ -584,6 +623,42 @@ func Flock(fd int, how int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fremovexattr(fd int, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fsync(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -1063,6 +1138,26 @@ func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err e
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(keyType)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
index c3dcb381..bb3bd595 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
@@ -574,6 +574,45 @@ func Fdatasync(fd int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flistxattr(fd int, dest []byte) (sz int, err error) {
+	var _p0 unsafe.Pointer
+	if len(dest) > 0 {
+		_p0 = unsafe.Pointer(&dest[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Flock(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
@@ -584,6 +623,42 @@ func Flock(fd int, how int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fremovexattr(fd int, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fsync(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -1063,6 +1138,26 @@ func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err e
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(keyType)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
index 38f903cd..c637da95 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
@@ -574,6 +574,45 @@ func Fdatasync(fd int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fgetxattr(fd int, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_FGETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flistxattr(fd int, dest []byte) (sz int, err error) {
+	var _p0 unsafe.Pointer
+	if len(dest) > 0 {
+		_p0 = unsafe.Pointer(&dest[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_FLISTXATTR, uintptr(fd), uintptr(_p0), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Flock(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
@@ -584,6 +623,42 @@ func Flock(fd int, how int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fremovexattr(fd int, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FREMOVEXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fsync(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -1063,6 +1138,26 @@ func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err e
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT2, uintptr(olddirfd), uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(keyType)
diff --git a/vendor/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go b/vendor/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go
index 10edff07..bc7fa579 100644
--- a/vendor/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go
@@ -116,6 +116,7 @@ const (
 	SYS_PSELECT        = 110 // { int sys_pselect(int nd, fd_set *in, fd_set *ou, \
 	SYS_SIGSUSPEND     = 111 // { int sys_sigsuspend(int mask); }
 	SYS_SENDSYSLOG     = 112 // { int sys_sendsyslog(const char *buf, size_t nbyte, \
+	SYS_UNVEIL         = 114 // { int sys_unveil(const char *path, \
 	SYS_GETSOCKOPT     = 118 // { int sys_getsockopt(int s, int level, int name, \
 	SYS_THRKILL        = 119 // { int sys_thrkill(pid_t tid, int signum, void *tcb); }
 	SYS_READV          = 120 // { ssize_t sys_readv(int fd, \
diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go
index 878a21ad..81793a2a 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go
@@ -71,6 +71,8 @@ const (
 	S_IRUSR  = 0x100
 	S_IWUSR  = 0x80
 	S_IXUSR  = 0x40
+	S_IRWXG  = 0x38
+	S_IRWXO  = 0x7
 )
 
 type Stat_t struct {
diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
index 8408af12..6c7589b4 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
@@ -71,6 +71,8 @@ const (
 	S_IRUSR  = 0x100
 	S_IWUSR  = 0x80
 	S_IXUSR  = 0x40
+	S_IRWXG  = 0x38
+	S_IRWXO  = 0x7
 )
 
 type Stat_t struct {
diff --git a/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go b/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
index 4b2d9a48..f620a125 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
@@ -73,6 +73,8 @@ const (
 	S_IRUSR  = 0x100
 	S_IWUSR  = 0x80
 	S_IXUSR  = 0x40
+	S_IRWXG  = 0x38
+	S_IRWXO  = 0x7
 )
 
 type Stat_t struct {
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_386.go b/vendor/golang.org/x/sys/unix/ztypes_linux_386.go
index e89bc6b3..cb3729ea 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_386.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_386.go
@@ -248,6 +248,13 @@ type RawSockaddrL2 struct {
 	_           [1]byte
 }
 
+type RawSockaddrRFCOMM struct {
+	Family  uint16
+	Bdaddr  [6]uint8
+	Channel uint8
+	_       [1]byte
+}
+
 type RawSockaddrCAN struct {
 	Family  uint16
 	_       [2]byte
@@ -401,6 +408,7 @@ const (
 	SizeofSockaddrNetlink   = 0xc
 	SizeofSockaddrHCI       = 0x6
 	SizeofSockaddrL2        = 0xe
+	SizeofSockaddrRFCOMM    = 0xa
 	SizeofSockaddrCAN       = 0x10
 	SizeofSockaddrALG       = 0x58
 	SizeofSockaddrVM        = 0x10
@@ -433,6 +441,7 @@ const (
 	IFLA_ADDRESS         = 0x1
 	IFLA_BROADCAST       = 0x2
 	IFLA_IFNAME          = 0x3
+	IFLA_INFO_KIND       = 0x1
 	IFLA_MTU             = 0x4
 	IFLA_LINK            = 0x5
 	IFLA_QDISC           = 0x6
@@ -1844,3 +1853,32 @@ type RTCPLLInfo struct {
 	Negmult int32
 	Clock   int32
 }
+
+type BlkpgIoctlArg struct {
+	Op      int32
+	Flags   int32
+	Datalen int32
+	Data    *byte
+}
+
+type BlkpgPartition struct {
+	Start   int64
+	Length  int64
+	Pno     int32
+	Devname [64]uint8
+	Volname [64]uint8
+}
+
+const (
+	BLKPG                  = 0x1269
+	BLKPG_ADD_PARTITION    = 0x1
+	BLKPG_DEL_PARTITION    = 0x2
+	BLKPG_RESIZE_PARTITION = 0x3
+)
+
+const (
+	NETNSA_NONE = 0x0
+	NETNSA_NSID = 0x1
+	NETNSA_PID  = 0x2
+	NETNSA_FD   = 0x3
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
index d95372ba..0f3c0fb5 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
@@ -250,6 +250,13 @@ type RawSockaddrL2 struct {
 	_           [1]byte
 }
 
+type RawSockaddrRFCOMM struct {
+	Family  uint16
+	Bdaddr  [6]uint8
+	Channel uint8
+	_       [1]byte
+}
+
 type RawSockaddrCAN struct {
 	Family  uint16
 	_       [2]byte
@@ -405,6 +412,7 @@ const (
 	SizeofSockaddrNetlink   = 0xc
 	SizeofSockaddrHCI       = 0x6
 	SizeofSockaddrL2        = 0xe
+	SizeofSockaddrRFCOMM    = 0xa
 	SizeofSockaddrCAN       = 0x10
 	SizeofSockaddrALG       = 0x58
 	SizeofSockaddrVM        = 0x10
@@ -437,6 +445,7 @@ const (
 	IFLA_ADDRESS         = 0x1
 	IFLA_BROADCAST       = 0x2
 	IFLA_IFNAME          = 0x3
+	IFLA_INFO_KIND       = 0x1
 	IFLA_MTU             = 0x4
 	IFLA_LINK            = 0x5
 	IFLA_QDISC           = 0x6
@@ -1864,3 +1873,34 @@ type RTCPLLInfo struct {
 	Negmult int32
 	Clock   int64
 }
+
+type BlkpgIoctlArg struct {
+	Op      int32
+	Flags   int32
+	Datalen int32
+	_       [4]byte
+	Data    *byte
+}
+
+type BlkpgPartition struct {
+	Start   int64
+	Length  int64
+	Pno     int32
+	Devname [64]uint8
+	Volname [64]uint8
+	_       [4]byte
+}
+
+const (
+	BLKPG                  = 0x1269
+	BLKPG_ADD_PARTITION    = 0x1
+	BLKPG_DEL_PARTITION    = 0x2
+	BLKPG_RESIZE_PARTITION = 0x3
+)
+
+const (
+	NETNSA_NONE = 0x0
+	NETNSA_NSID = 0x1
+	NETNSA_PID  = 0x2
+	NETNSA_FD   = 0x3
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go b/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
index 77875ba0..bd534da8 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
@@ -251,6 +251,13 @@ type RawSockaddrL2 struct {
 	_           [1]byte
 }
 
+type RawSockaddrRFCOMM struct {
+	Family  uint16
+	Bdaddr  [6]uint8
+	Channel uint8
+	_       [1]byte
+}
+
 type RawSockaddrCAN struct {
 	Family  uint16
 	_       [2]byte
@@ -404,6 +411,7 @@ const (
 	SizeofSockaddrNetlink   = 0xc
 	SizeofSockaddrHCI       = 0x6
 	SizeofSockaddrL2        = 0xe
+	SizeofSockaddrRFCOMM    = 0xa
 	SizeofSockaddrCAN       = 0x10
 	SizeofSockaddrALG       = 0x58
 	SizeofSockaddrVM        = 0x10
@@ -436,6 +444,7 @@ const (
 	IFLA_ADDRESS         = 0x1
 	IFLA_BROADCAST       = 0x2
 	IFLA_IFNAME          = 0x3
+	IFLA_INFO_KIND       = 0x1
 	IFLA_MTU             = 0x4
 	IFLA_LINK            = 0x5
 	IFLA_QDISC           = 0x6
@@ -1833,3 +1842,33 @@ type RTCPLLInfo struct {
 	Negmult int32
 	Clock   int32
 }
+
+type BlkpgIoctlArg struct {
+	Op      int32
+	Flags   int32
+	Datalen int32
+	Data    *byte
+}
+
+type BlkpgPartition struct {
+	Start   int64
+	Length  int64
+	Pno     int32
+	Devname [64]uint8
+	Volname [64]uint8
+	_       [4]byte
+}
+
+const (
+	BLKPG                  = 0x1269
+	BLKPG_ADD_PARTITION    = 0x1
+	BLKPG_DEL_PARTITION    = 0x2
+	BLKPG_RESIZE_PARTITION = 0x3
+)
+
+const (
+	NETNSA_NONE = 0x0
+	NETNSA_NSID = 0x1
+	NETNSA_PID  = 0x2
+	NETNSA_FD   = 0x3
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
index 5a9df694..3a72fd9f 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
@@ -251,6 +251,13 @@ type RawSockaddrL2 struct {
 	_           [1]byte
 }
 
+type RawSockaddrRFCOMM struct {
+	Family  uint16
+	Bdaddr  [6]uint8
+	Channel uint8
+	_       [1]byte
+}
+
 type RawSockaddrCAN struct {
 	Family  uint16
 	_       [2]byte
@@ -406,6 +413,7 @@ const (
 	SizeofSockaddrNetlink   = 0xc
 	SizeofSockaddrHCI       = 0x6
 	SizeofSockaddrL2        = 0xe
+	SizeofSockaddrRFCOMM    = 0xa
 	SizeofSockaddrCAN       = 0x10
 	SizeofSockaddrALG       = 0x58
 	SizeofSockaddrVM        = 0x10
@@ -438,6 +446,7 @@ const (
 	IFLA_ADDRESS         = 0x1
 	IFLA_BROADCAST       = 0x2
 	IFLA_IFNAME          = 0x3
+	IFLA_INFO_KIND       = 0x1
 	IFLA_MTU             = 0x4
 	IFLA_LINK            = 0x5
 	IFLA_QDISC           = 0x6
@@ -1843,3 +1852,34 @@ type RTCPLLInfo struct {
 	Negmult int32
 	Clock   int64
 }
+
+type BlkpgIoctlArg struct {
+	Op      int32
+	Flags   int32
+	Datalen int32
+	_       [4]byte
+	Data    *byte
+}
+
+type BlkpgPartition struct {
+	Start   int64
+	Length  int64
+	Pno     int32
+	Devname [64]uint8
+	Volname [64]uint8
+	_       [4]byte
+}
+
+const (
+	BLKPG                  = 0x1269
+	BLKPG_ADD_PARTITION    = 0x1
+	BLKPG_DEL_PARTITION    = 0x2
+	BLKPG_RESIZE_PARTITION = 0x3
+)
+
+const (
+	NETNSA_NONE = 0x0
+	NETNSA_NSID = 0x1
+	NETNSA_PID  = 0x2
+	NETNSA_FD   = 0x3
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
index dcb239de..cd360b27 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
@@ -249,6 +249,13 @@ type RawSockaddrL2 struct {
 	_           [1]byte
 }
 
+type RawSockaddrRFCOMM struct {
+	Family  uint16
+	Bdaddr  [6]uint8
+	Channel uint8
+	_       [1]byte
+}
+
 type RawSockaddrCAN struct {
 	Family  uint16
 	_       [2]byte
@@ -402,6 +409,7 @@ const (
 	SizeofSockaddrNetlink   = 0xc
 	SizeofSockaddrHCI       = 0x6
 	SizeofSockaddrL2        = 0xe
+	SizeofSockaddrRFCOMM    = 0xa
 	SizeofSockaddrCAN       = 0x10
 	SizeofSockaddrALG       = 0x58
 	SizeofSockaddrVM        = 0x10
@@ -434,6 +442,7 @@ const (
 	IFLA_ADDRESS         = 0x1
 	IFLA_BROADCAST       = 0x2
 	IFLA_IFNAME          = 0x3
+	IFLA_INFO_KIND       = 0x1
 	IFLA_MTU             = 0x4
 	IFLA_LINK            = 0x5
 	IFLA_QDISC           = 0x6
@@ -1838,3 +1847,33 @@ type RTCPLLInfo struct {
 	Negmult int32
 	Clock   int32
 }
+
+type BlkpgIoctlArg struct {
+	Op      int32
+	Flags   int32
+	Datalen int32
+	Data    *byte
+}
+
+type BlkpgPartition struct {
+	Start   int64
+	Length  int64
+	Pno     int32
+	Devname [64]uint8
+	Volname [64]uint8
+	_       [4]byte
+}
+
+const (
+	BLKPG                  = 0x20001269
+	BLKPG_ADD_PARTITION    = 0x1
+	BLKPG_DEL_PARTITION    = 0x2
+	BLKPG_RESIZE_PARTITION = 0x3
+)
+
+const (
+	NETNSA_NONE = 0x0
+	NETNSA_NSID = 0x1
+	NETNSA_PID  = 0x2
+	NETNSA_FD   = 0x3
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
index 9cf85f72..d35ec602 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
@@ -251,6 +251,13 @@ type RawSockaddrL2 struct {
 	_           [1]byte
 }
 
+type RawSockaddrRFCOMM struct {
+	Family  uint16
+	Bdaddr  [6]uint8
+	Channel uint8
+	_       [1]byte
+}
+
 type RawSockaddrCAN struct {
 	Family  uint16
 	_       [2]byte
@@ -406,6 +413,7 @@ const (
 	SizeofSockaddrNetlink   = 0xc
 	SizeofSockaddrHCI       = 0x6
 	SizeofSockaddrL2        = 0xe
+	SizeofSockaddrRFCOMM    = 0xa
 	SizeofSockaddrCAN       = 0x10
 	SizeofSockaddrALG       = 0x58
 	SizeofSockaddrVM        = 0x10
@@ -438,6 +446,7 @@ const (
 	IFLA_ADDRESS         = 0x1
 	IFLA_BROADCAST       = 0x2
 	IFLA_IFNAME          = 0x3
+	IFLA_INFO_KIND       = 0x1
 	IFLA_MTU             = 0x4
 	IFLA_LINK            = 0x5
 	IFLA_QDISC           = 0x6
@@ -1845,3 +1854,34 @@ type RTCPLLInfo struct {
 	Negmult int32
 	Clock   int64
 }
+
+type BlkpgIoctlArg struct {
+	Op      int32
+	Flags   int32
+	Datalen int32
+	_       [4]byte
+	Data    *byte
+}
+
+type BlkpgPartition struct {
+	Start   int64
+	Length  int64
+	Pno     int32
+	Devname [64]uint8
+	Volname [64]uint8
+	_       [4]byte
+}
+
+const (
+	BLKPG                  = 0x20001269
+	BLKPG_ADD_PARTITION    = 0x1
+	BLKPG_DEL_PARTITION    = 0x2
+	BLKPG_RESIZE_PARTITION = 0x3
+)
+
+const (
+	NETNSA_NONE = 0x0
+	NETNSA_NSID = 0x1
+	NETNSA_PID  = 0x2
+	NETNSA_FD   = 0x3
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
index 6fd66e75..0f499302 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
@@ -251,6 +251,13 @@ type RawSockaddrL2 struct {
 	_           [1]byte
 }
 
+type RawSockaddrRFCOMM struct {
+	Family  uint16
+	Bdaddr  [6]uint8
+	Channel uint8
+	_       [1]byte
+}
+
 type RawSockaddrCAN struct {
 	Family  uint16
 	_       [2]byte
@@ -406,6 +413,7 @@ const (
 	SizeofSockaddrNetlink   = 0xc
 	SizeofSockaddrHCI       = 0x6
 	SizeofSockaddrL2        = 0xe
+	SizeofSockaddrRFCOMM    = 0xa
 	SizeofSockaddrCAN       = 0x10
 	SizeofSockaddrALG       = 0x58
 	SizeofSockaddrVM        = 0x10
@@ -438,6 +446,7 @@ const (
 	IFLA_ADDRESS         = 0x1
 	IFLA_BROADCAST       = 0x2
 	IFLA_IFNAME          = 0x3
+	IFLA_INFO_KIND       = 0x1
 	IFLA_MTU             = 0x4
 	IFLA_LINK            = 0x5
 	IFLA_QDISC           = 0x6
@@ -1845,3 +1854,34 @@ type RTCPLLInfo struct {
 	Negmult int32
 	Clock   int64
 }
+
+type BlkpgIoctlArg struct {
+	Op      int32
+	Flags   int32
+	Datalen int32
+	_       [4]byte
+	Data    *byte
+}
+
+type BlkpgPartition struct {
+	Start   int64
+	Length  int64
+	Pno     int32
+	Devname [64]uint8
+	Volname [64]uint8
+	_       [4]byte
+}
+
+const (
+	BLKPG                  = 0x20001269
+	BLKPG_ADD_PARTITION    = 0x1
+	BLKPG_DEL_PARTITION    = 0x2
+	BLKPG_RESIZE_PARTITION = 0x3
+)
+
+const (
+	NETNSA_NONE = 0x0
+	NETNSA_NSID = 0x1
+	NETNSA_PID  = 0x2
+	NETNSA_FD   = 0x3
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go b/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
index faa5b3ef..55f97c5c 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
@@ -249,6 +249,13 @@ type RawSockaddrL2 struct {
 	_           [1]byte
 }
 
+type RawSockaddrRFCOMM struct {
+	Family  uint16
+	Bdaddr  [6]uint8
+	Channel uint8
+	_       [1]byte
+}
+
 type RawSockaddrCAN struct {
 	Family  uint16
 	_       [2]byte
@@ -402,6 +409,7 @@ const (
 	SizeofSockaddrNetlink   = 0xc
 	SizeofSockaddrHCI       = 0x6
 	SizeofSockaddrL2        = 0xe
+	SizeofSockaddrRFCOMM    = 0xa
 	SizeofSockaddrCAN       = 0x10
 	SizeofSockaddrALG       = 0x58
 	SizeofSockaddrVM        = 0x10
@@ -434,6 +442,7 @@ const (
 	IFLA_ADDRESS         = 0x1
 	IFLA_BROADCAST       = 0x2
 	IFLA_IFNAME          = 0x3
+	IFLA_INFO_KIND       = 0x1
 	IFLA_MTU             = 0x4
 	IFLA_LINK            = 0x5
 	IFLA_QDISC           = 0x6
@@ -1838,3 +1847,33 @@ type RTCPLLInfo struct {
 	Negmult int32
 	Clock   int32
 }
+
+type BlkpgIoctlArg struct {
+	Op      int32
+	Flags   int32
+	Datalen int32
+	Data    *byte
+}
+
+type BlkpgPartition struct {
+	Start   int64
+	Length  int64
+	Pno     int32
+	Devname [64]uint8
+	Volname [64]uint8
+	_       [4]byte
+}
+
+const (
+	BLKPG                  = 0x20001269
+	BLKPG_ADD_PARTITION    = 0x1
+	BLKPG_DEL_PARTITION    = 0x2
+	BLKPG_RESIZE_PARTITION = 0x3
+)
+
+const (
+	NETNSA_NONE = 0x0
+	NETNSA_NSID = 0x1
+	NETNSA_PID  = 0x2
+	NETNSA_FD   = 0x3
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
index ad4c4524..f1d42644 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
@@ -252,6 +252,13 @@ type RawSockaddrL2 struct {
 	_           [1]byte
 }
 
+type RawSockaddrRFCOMM struct {
+	Family  uint16
+	Bdaddr  [6]uint8
+	Channel uint8
+	_       [1]byte
+}
+
 type RawSockaddrCAN struct {
 	Family  uint16
 	_       [2]byte
@@ -407,6 +414,7 @@ const (
 	SizeofSockaddrNetlink   = 0xc
 	SizeofSockaddrHCI       = 0x6
 	SizeofSockaddrL2        = 0xe
+	SizeofSockaddrRFCOMM    = 0xa
 	SizeofSockaddrCAN       = 0x10
 	SizeofSockaddrALG       = 0x58
 	SizeofSockaddrVM        = 0x10
@@ -439,6 +447,7 @@ const (
 	IFLA_ADDRESS         = 0x1
 	IFLA_BROADCAST       = 0x2
 	IFLA_IFNAME          = 0x3
+	IFLA_INFO_KIND       = 0x1
 	IFLA_MTU             = 0x4
 	IFLA_LINK            = 0x5
 	IFLA_QDISC           = 0x6
@@ -1853,3 +1862,34 @@ type RTCPLLInfo struct {
 	Negmult int32
 	Clock   int64
 }
+
+type BlkpgIoctlArg struct {
+	Op      int32
+	Flags   int32
+	Datalen int32
+	_       [4]byte
+	Data    *byte
+}
+
+type BlkpgPartition struct {
+	Start   int64
+	Length  int64
+	Pno     int32
+	Devname [64]uint8
+	Volname [64]uint8
+	_       [4]byte
+}
+
+const (
+	BLKPG                  = 0x20001269
+	BLKPG_ADD_PARTITION    = 0x1
+	BLKPG_DEL_PARTITION    = 0x2
+	BLKPG_RESIZE_PARTITION = 0x3
+)
+
+const (
+	NETNSA_NONE = 0x0
+	NETNSA_NSID = 0x1
+	NETNSA_PID  = 0x2
+	NETNSA_FD   = 0x3
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
index 1fdb2f21..90ab1f7a 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
@@ -252,6 +252,13 @@ type RawSockaddrL2 struct {
 	_           [1]byte
 }
 
+type RawSockaddrRFCOMM struct {
+	Family  uint16
+	Bdaddr  [6]uint8
+	Channel uint8
+	_       [1]byte
+}
+
 type RawSockaddrCAN struct {
 	Family  uint16
 	_       [2]byte
@@ -407,6 +414,7 @@ const (
 	SizeofSockaddrNetlink   = 0xc
 	SizeofSockaddrHCI       = 0x6
 	SizeofSockaddrL2        = 0xe
+	SizeofSockaddrRFCOMM    = 0xa
 	SizeofSockaddrCAN       = 0x10
 	SizeofSockaddrALG       = 0x58
 	SizeofSockaddrVM        = 0x10
@@ -439,6 +447,7 @@ const (
 	IFLA_ADDRESS         = 0x1
 	IFLA_BROADCAST       = 0x2
 	IFLA_IFNAME          = 0x3
+	IFLA_INFO_KIND       = 0x1
 	IFLA_MTU             = 0x4
 	IFLA_LINK            = 0x5
 	IFLA_QDISC           = 0x6
@@ -1853,3 +1862,34 @@ type RTCPLLInfo struct {
 	Negmult int32
 	Clock   int64
 }
+
+type BlkpgIoctlArg struct {
+	Op      int32
+	Flags   int32
+	Datalen int32
+	_       [4]byte
+	Data    *byte
+}
+
+type BlkpgPartition struct {
+	Start   int64
+	Length  int64
+	Pno     int32
+	Devname [64]uint8
+	Volname [64]uint8
+	_       [4]byte
+}
+
+const (
+	BLKPG                  = 0x20001269
+	BLKPG_ADD_PARTITION    = 0x1
+	BLKPG_DEL_PARTITION    = 0x2
+	BLKPG_RESIZE_PARTITION = 0x3
+)
+
+const (
+	NETNSA_NONE = 0x0
+	NETNSA_NSID = 0x1
+	NETNSA_PID  = 0x2
+	NETNSA_FD   = 0x3
+)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go b/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
index d32079d1..898ac451 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
@@ -250,6 +250,13 @@ type RawSockaddrL2 struct {
 	_           [1]byte
 }
 
+type RawSockaddrRFCOMM struct {
+	Family  uint16
+	Bdaddr  [6]uint8
+	Channel uint8
+	_       [1]byte
+}
+
 type RawSockaddrCAN struct {
 	Family  uint16
 	_       [2]byte
@@ -405,6 +412,7 @@ const (
 	SizeofSockaddrNetlink   = 0xc
 	SizeofSockaddrHCI       = 0x6
 	SizeofSockaddrL2        = 0xe
+	SizeofSockaddrRFCOMM    = 0xa
 	SizeofSockaddrCAN       = 0x10
 	SizeofSockaddrALG       = 0x58
 	SizeofSockaddrVM        = 0x10
@@ -437,6 +445,7 @@ const (
 	IFLA_ADDRESS         = 0x1
 	IFLA_BROADCAST       = 0x2
 	IFLA_IFNAME          = 0x3
+	IFLA_INFO_KIND       = 0x1
 	IFLA_MTU             = 0x4
 	IFLA_LINK            = 0x5
 	IFLA_QDISC           = 0x6
@@ -1870,3 +1879,34 @@ type RTCPLLInfo struct {
 	Negmult int32
 	Clock   int64
 }
+
+type BlkpgIoctlArg struct {
+	Op      int32
+	Flags   int32
+	Datalen int32
+	_       [4]byte
+	Data    *byte
+}
+
+type BlkpgPartition struct {
+	Start   int64
+	Length  int64
+	Pno     int32
+	Devname [64]uint8
+	Volname [64]uint8
+	_       [4]byte
+}
+
+const (
+	BLKPG                  = 0x1269
+	BLKPG_ADD_PARTITION    = 0x1
+	BLKPG_DEL_PARTITION    = 0x2
+	BLKPG_RESIZE_PARTITION = 0x3
+)
+
+const (
+	NETNSA_NONE = 0x0
+	NETNSA_NSID = 0x1
+	NETNSA_PID  = 0x2
+	NETNSA_FD   = 0x3
+)
diff --git a/vendor/golang.org/x/sys/windows/aliases.go b/vendor/golang.org/x/sys/windows/aliases.go
new file mode 100644
index 00000000..af3af60d
--- /dev/null
+++ b/vendor/golang.org/x/sys/windows/aliases.go
@@ -0,0 +1,13 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build windows
+// +build go1.9
+
+package windows
+
+import "syscall"
+
+type Errno = syscall.Errno
+type SysProcAttr = syscall.SysProcAttr
diff --git a/vendor/golang.org/x/sys/windows/registry/export_test.go b/vendor/golang.org/x/sys/windows/registry/export_test.go
deleted file mode 100644
index 8badf6fd..00000000
--- a/vendor/golang.org/x/sys/windows/registry/export_test.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-package registry
-
-func (k Key) SetValue(name string, valtype uint32, data []byte) error {
-	return k.setValue(name, valtype, data)
-}
diff --git a/vendor/golang.org/x/sys/windows/registry/registry_test.go b/vendor/golang.org/x/sys/windows/registry/registry_test.go
deleted file mode 100644
index 2f4dd69e..00000000
--- a/vendor/golang.org/x/sys/windows/registry/registry_test.go
+++ /dev/null
@@ -1,756 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-package registry_test
-
-import (
-	"bytes"
-	"crypto/rand"
-	"os"
-	"syscall"
-	"testing"
-	"time"
-	"unsafe"
-
-	"golang.org/x/sys/windows/registry"
-)
-
-func randKeyName(prefix string) string {
-	const numbers = "0123456789"
-	buf := make([]byte, 10)
-	rand.Read(buf)
-	for i, b := range buf {
-		buf[i] = numbers[b%byte(len(numbers))]
-	}
-	return prefix + string(buf)
-}
-
-func TestReadSubKeyNames(t *testing.T) {
-	k, err := registry.OpenKey(registry.CLASSES_ROOT, "TypeLib", registry.ENUMERATE_SUB_KEYS)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer k.Close()
-
-	names, err := k.ReadSubKeyNames(-1)
-	if err != nil {
-		t.Fatal(err)
-	}
-	var foundStdOle bool
-	for _, name := range names {
-		// Every PC has "stdole 2.0 OLE Automation" library installed.
-		if name == "{00020430-0000-0000-C000-000000000046}" {
-			foundStdOle = true
-		}
-	}
-	if !foundStdOle {
-		t.Fatal("could not find stdole 2.0 OLE Automation")
-	}
-}
-
-func TestCreateOpenDeleteKey(t *testing.T) {
-	k, err := registry.OpenKey(registry.CURRENT_USER, "Software", registry.QUERY_VALUE)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer k.Close()
-
-	testKName := randKeyName("TestCreateOpenDeleteKey_")
-
-	testK, exist, err := registry.CreateKey(k, testKName, registry.CREATE_SUB_KEY)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer testK.Close()
-
-	if exist {
-		t.Fatalf("key %q already exists", testKName)
-	}
-
-	testKAgain, exist, err := registry.CreateKey(k, testKName, registry.CREATE_SUB_KEY)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer testKAgain.Close()
-
-	if !exist {
-		t.Fatalf("key %q should already exist", testKName)
-	}
-
-	testKOpened, err := registry.OpenKey(k, testKName, registry.ENUMERATE_SUB_KEYS)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer testKOpened.Close()
-
-	err = registry.DeleteKey(k, testKName)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	testKOpenedAgain, err := registry.OpenKey(k, testKName, registry.ENUMERATE_SUB_KEYS)
-	if err == nil {
-		defer testKOpenedAgain.Close()
-		t.Fatalf("key %q should already been deleted", testKName)
-	}
-	if err != registry.ErrNotExist {
-		t.Fatalf(`unexpected error ("not exist" expected): %v`, err)
-	}
-}
-
-func equalStringSlice(a, b []string) bool {
-	if len(a) != len(b) {
-		return false
-	}
-	if a == nil {
-		return true
-	}
-	for i := range a {
-		if a[i] != b[i] {
-			return false
-		}
-	}
-	return true
-}
-
-type ValueTest struct {
-	Type     uint32
-	Name     string
-	Value    interface{}
-	WillFail bool
-}
-
-var ValueTests = []ValueTest{
-	{Type: registry.SZ, Name: "String1", Value: ""},
-	{Type: registry.SZ, Name: "String2", Value: "\000", WillFail: true},
-	{Type: registry.SZ, Name: "String3", Value: "Hello World"},
-	{Type: registry.SZ, Name: "String4", Value: "Hello World\000", WillFail: true},
-	{Type: registry.EXPAND_SZ, Name: "ExpString1", Value: ""},
-	{Type: registry.EXPAND_SZ, Name: "ExpString2", Value: "\000", WillFail: true},
-	{Type: registry.EXPAND_SZ, Name: "ExpString3", Value: "Hello World"},
-	{Type: registry.EXPAND_SZ, Name: "ExpString4", Value: "Hello\000World", WillFail: true},
-	{Type: registry.EXPAND_SZ, Name: "ExpString5", Value: "%PATH%"},
-	{Type: registry.EXPAND_SZ, Name: "ExpString6", Value: "%NO_SUCH_VARIABLE%"},
-	{Type: registry.EXPAND_SZ, Name: "ExpString7", Value: "%PATH%;."},
-	{Type: registry.BINARY, Name: "Binary1", Value: []byte{}},
-	{Type: registry.BINARY, Name: "Binary2", Value: []byte{1, 2, 3}},
-	{Type: registry.BINARY, Name: "Binary3", Value: []byte{3, 2, 1, 0, 1, 2, 3}},
-	{Type: registry.DWORD, Name: "Dword1", Value: uint64(0)},
-	{Type: registry.DWORD, Name: "Dword2", Value: uint64(1)},
-	{Type: registry.DWORD, Name: "Dword3", Value: uint64(0xff)},
-	{Type: registry.DWORD, Name: "Dword4", Value: uint64(0xffff)},
-	{Type: registry.QWORD, Name: "Qword1", Value: uint64(0)},
-	{Type: registry.QWORD, Name: "Qword2", Value: uint64(1)},
-	{Type: registry.QWORD, Name: "Qword3", Value: uint64(0xff)},
-	{Type: registry.QWORD, Name: "Qword4", Value: uint64(0xffff)},
-	{Type: registry.QWORD, Name: "Qword5", Value: uint64(0xffffff)},
-	{Type: registry.QWORD, Name: "Qword6", Value: uint64(0xffffffff)},
-	{Type: registry.MULTI_SZ, Name: "MultiString1", Value: []string{"a", "b", "c"}},
-	{Type: registry.MULTI_SZ, Name: "MultiString2", Value: []string{"abc", "", "cba"}},
-	{Type: registry.MULTI_SZ, Name: "MultiString3", Value: []string{""}},
-	{Type: registry.MULTI_SZ, Name: "MultiString4", Value: []string{"abcdef"}},
-	{Type: registry.MULTI_SZ, Name: "MultiString5", Value: []string{"\000"}, WillFail: true},
-	{Type: registry.MULTI_SZ, Name: "MultiString6", Value: []string{"a\000b"}, WillFail: true},
-	{Type: registry.MULTI_SZ, Name: "MultiString7", Value: []string{"ab", "\000", "cd"}, WillFail: true},
-	{Type: registry.MULTI_SZ, Name: "MultiString8", Value: []string{"\000", "cd"}, WillFail: true},
-	{Type: registry.MULTI_SZ, Name: "MultiString9", Value: []string{"ab", "\000"}, WillFail: true},
-}
-
-func setValues(t *testing.T, k registry.Key) {
-	for _, test := range ValueTests {
-		var err error
-		switch test.Type {
-		case registry.SZ:
-			err = k.SetStringValue(test.Name, test.Value.(string))
-		case registry.EXPAND_SZ:
-			err = k.SetExpandStringValue(test.Name, test.Value.(string))
-		case registry.MULTI_SZ:
-			err = k.SetStringsValue(test.Name, test.Value.([]string))
-		case registry.BINARY:
-			err = k.SetBinaryValue(test.Name, test.Value.([]byte))
-		case registry.DWORD:
-			err = k.SetDWordValue(test.Name, uint32(test.Value.(uint64)))
-		case registry.QWORD:
-			err = k.SetQWordValue(test.Name, test.Value.(uint64))
-		default:
-			t.Fatalf("unsupported type %d for %s value", test.Type, test.Name)
-		}
-		if test.WillFail {
-			if err == nil {
-				t.Fatalf("setting %s value %q should fail, but succeeded", test.Name, test.Value)
-			}
-		} else {
-			if err != nil {
-				t.Fatal(err)
-			}
-		}
-	}
-}
-
-func enumerateValues(t *testing.T, k registry.Key) {
-	names, err := k.ReadValueNames(-1)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	haveNames := make(map[string]bool)
-	for _, n := range names {
-		haveNames[n] = false
-	}
-	for _, test := range ValueTests {
-		wantFound := !test.WillFail
-		_, haveFound := haveNames[test.Name]
-		if wantFound && !haveFound {
-			t.Errorf("value %s is not found while enumerating", test.Name)
-		}
-		if haveFound && !wantFound {
-			t.Errorf("value %s is found while enumerating, but expected to fail", test.Name)
-		}
-		if haveFound {
-			delete(haveNames, test.Name)
-		}
-	}
-	for n, v := range haveNames {
-		t.Errorf("value %s (%v) is found while enumerating, but has not been cretaed", n, v)
-	}
-}
-
-func testErrNotExist(t *testing.T, name string, err error) {
-	if err == nil {
-		t.Errorf("%s value should not exist", name)
-		return
-	}
-	if err != registry.ErrNotExist {
-		t.Errorf("reading %s value should return 'not exist' error, but got: %s", name, err)
-		return
-	}
-}
-
-func testErrUnexpectedType(t *testing.T, test ValueTest, gottype uint32, err error) {
-	if err == nil {
-		t.Errorf("GetXValue(%q) should not succeed", test.Name)
-		return
-	}
-	if err != registry.ErrUnexpectedType {
-		t.Errorf("reading %s value should return 'unexpected key value type' error, but got: %s", test.Name, err)
-		return
-	}
-	if gottype != test.Type {
-		t.Errorf("want %s value type %v, got %v", test.Name, test.Type, gottype)
-		return
-	}
-}
-
-func testGetStringValue(t *testing.T, k registry.Key, test ValueTest) {
-	got, gottype, err := k.GetStringValue(test.Name)
-	if err != nil {
-		t.Errorf("GetStringValue(%s) failed: %v", test.Name, err)
-		return
-	}
-	if got != test.Value {
-		t.Errorf("want %s value %q, got %q", test.Name, test.Value, got)
-		return
-	}
-	if gottype != test.Type {
-		t.Errorf("want %s value type %v, got %v", test.Name, test.Type, gottype)
-		return
-	}
-	if gottype == registry.EXPAND_SZ {
-		_, err = registry.ExpandString(got)
-		if err != nil {
-			t.Errorf("ExpandString(%s) failed: %v", got, err)
-			return
-		}
-	}
-}
-
-func testGetIntegerValue(t *testing.T, k registry.Key, test ValueTest) {
-	got, gottype, err := k.GetIntegerValue(test.Name)
-	if err != nil {
-		t.Errorf("GetIntegerValue(%s) failed: %v", test.Name, err)
-		return
-	}
-	if got != test.Value.(uint64) {
-		t.Errorf("want %s value %v, got %v", test.Name, test.Value, got)
-		return
-	}
-	if gottype != test.Type {
-		t.Errorf("want %s value type %v, got %v", test.Name, test.Type, gottype)
-		return
-	}
-}
-
-func testGetBinaryValue(t *testing.T, k registry.Key, test ValueTest) {
-	got, gottype, err := k.GetBinaryValue(test.Name)
-	if err != nil {
-		t.Errorf("GetBinaryValue(%s) failed: %v", test.Name, err)
-		return
-	}
-	if !bytes.Equal(got, test.Value.([]byte)) {
-		t.Errorf("want %s value %v, got %v", test.Name, test.Value, got)
-		return
-	}
-	if gottype != test.Type {
-		t.Errorf("want %s value type %v, got %v", test.Name, test.Type, gottype)
-		return
-	}
-}
-
-func testGetStringsValue(t *testing.T, k registry.Key, test ValueTest) {
-	got, gottype, err := k.GetStringsValue(test.Name)
-	if err != nil {
-		t.Errorf("GetStringsValue(%s) failed: %v", test.Name, err)
-		return
-	}
-	if !equalStringSlice(got, test.Value.([]string)) {
-		t.Errorf("want %s value %#v, got %#v", test.Name, test.Value, got)
-		return
-	}
-	if gottype != test.Type {
-		t.Errorf("want %s value type %v, got %v", test.Name, test.Type, gottype)
-		return
-	}
-}
-
-func testGetValue(t *testing.T, k registry.Key, test ValueTest, size int) {
-	if size <= 0 {
-		return
-	}
-	// read data with no buffer
-	gotsize, gottype, err := k.GetValue(test.Name, nil)
-	if err != nil {
-		t.Errorf("GetValue(%s, [%d]byte) failed: %v", test.Name, size, err)
-		return
-	}
-	if gotsize != size {
-		t.Errorf("want %s value size of %d, got %v", test.Name, size, gotsize)
-		return
-	}
-	if gottype != test.Type {
-		t.Errorf("want %s value type %v, got %v", test.Name, test.Type, gottype)
-		return
-	}
-	// read data with short buffer
-	gotsize, gottype, err = k.GetValue(test.Name, make([]byte, size-1))
-	if err == nil {
-		t.Errorf("GetValue(%s, [%d]byte) should fail, but succeeded", test.Name, size-1)
-		return
-	}
-	if err != registry.ErrShortBuffer {
-		t.Errorf("reading %s value should return 'short buffer' error, but got: %s", test.Name, err)
-		return
-	}
-	if gotsize != size {
-		t.Errorf("want %s value size of %d, got %v", test.Name, size, gotsize)
-		return
-	}
-	if gottype != test.Type {
-		t.Errorf("want %s value type %v, got %v", test.Name, test.Type, gottype)
-		return
-	}
-	// read full data
-	gotsize, gottype, err = k.GetValue(test.Name, make([]byte, size))
-	if err != nil {
-		t.Errorf("GetValue(%s, [%d]byte) failed: %v", test.Name, size, err)
-		return
-	}
-	if gotsize != size {
-		t.Errorf("want %s value size of %d, got %v", test.Name, size, gotsize)
-		return
-	}
-	if gottype != test.Type {
-		t.Errorf("want %s value type %v, got %v", test.Name, test.Type, gottype)
-		return
-	}
-	// check GetValue returns ErrNotExist as required
-	_, _, err = k.GetValue(test.Name+"_not_there", make([]byte, size))
-	if err == nil {
-		t.Errorf("GetValue(%q) should not succeed", test.Name)
-		return
-	}
-	if err != registry.ErrNotExist {
-		t.Errorf("GetValue(%q) should return 'not exist' error, but got: %s", test.Name, err)
-		return
-	}
-}
-
-func testValues(t *testing.T, k registry.Key) {
-	for _, test := range ValueTests {
-		switch test.Type {
-		case registry.SZ, registry.EXPAND_SZ:
-			if test.WillFail {
-				_, _, err := k.GetStringValue(test.Name)
-				testErrNotExist(t, test.Name, err)
-			} else {
-				testGetStringValue(t, k, test)
-				_, gottype, err := k.GetIntegerValue(test.Name)
-				testErrUnexpectedType(t, test, gottype, err)
-				// Size of utf16 string in bytes is not perfect,
-				// but correct for current test values.
-				// Size also includes terminating 0.
-				testGetValue(t, k, test, (len(test.Value.(string))+1)*2)
-			}
-			_, _, err := k.GetStringValue(test.Name + "_string_not_created")
-			testErrNotExist(t, test.Name+"_string_not_created", err)
-		case registry.DWORD, registry.QWORD:
-			testGetIntegerValue(t, k, test)
-			_, gottype, err := k.GetBinaryValue(test.Name)
-			testErrUnexpectedType(t, test, gottype, err)
-			_, _, err = k.GetIntegerValue(test.Name + "_int_not_created")
-			testErrNotExist(t, test.Name+"_int_not_created", err)
-			size := 8
-			if test.Type == registry.DWORD {
-				size = 4
-			}
-			testGetValue(t, k, test, size)
-		case registry.BINARY:
-			testGetBinaryValue(t, k, test)
-			_, gottype, err := k.GetStringsValue(test.Name)
-			testErrUnexpectedType(t, test, gottype, err)
-			_, _, err = k.GetBinaryValue(test.Name + "_byte_not_created")
-			testErrNotExist(t, test.Name+"_byte_not_created", err)
-			testGetValue(t, k, test, len(test.Value.([]byte)))
-		case registry.MULTI_SZ:
-			if test.WillFail {
-				_, _, err := k.GetStringsValue(test.Name)
-				testErrNotExist(t, test.Name, err)
-			} else {
-				testGetStringsValue(t, k, test)
-				_, gottype, err := k.GetStringValue(test.Name)
-				testErrUnexpectedType(t, test, gottype, err)
-				size := 0
-				for _, s := range test.Value.([]string) {
-					size += len(s) + 1 // nil terminated
-				}
-				size += 1 // extra nil at the end
-				size *= 2 // count bytes, not uint16
-				testGetValue(t, k, test, size)
-			}
-			_, _, err := k.GetStringsValue(test.Name + "_strings_not_created")
-			testErrNotExist(t, test.Name+"_strings_not_created", err)
-		default:
-			t.Errorf("unsupported type %d for %s value", test.Type, test.Name)
-			continue
-		}
-	}
-}
-
-func testStat(t *testing.T, k registry.Key) {
-	subk, _, err := registry.CreateKey(k, "subkey", registry.CREATE_SUB_KEY)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	defer subk.Close()
-
-	defer registry.DeleteKey(k, "subkey")
-
-	ki, err := k.Stat()
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	if ki.SubKeyCount != 1 {
-		t.Error("key must have 1 subkey")
-	}
-	if ki.MaxSubKeyLen != 6 {
-		t.Error("key max subkey name length must be 6")
-	}
-	if ki.ValueCount != 24 {
-		t.Errorf("key must have 24 values, but is %d", ki.ValueCount)
-	}
-	if ki.MaxValueNameLen != 12 {
-		t.Errorf("key max value name length must be 10, but is %d", ki.MaxValueNameLen)
-	}
-	if ki.MaxValueLen != 38 {
-		t.Errorf("key max value length must be 38, but is %d", ki.MaxValueLen)
-	}
-	if mt, ct := ki.ModTime(), time.Now(); ct.Sub(mt) > 100*time.Millisecond {
-		t.Errorf("key mod time is not close to current time: mtime=%v current=%v delta=%v", mt, ct, ct.Sub(mt))
-	}
-}
-
-func deleteValues(t *testing.T, k registry.Key) {
-	for _, test := range ValueTests {
-		if test.WillFail {
-			continue
-		}
-		err := k.DeleteValue(test.Name)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-	}
-	names, err := k.ReadValueNames(-1)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	if len(names) != 0 {
-		t.Errorf("some values remain after deletion: %v", names)
-	}
-}
-
-func TestValues(t *testing.T) {
-	softwareK, err := registry.OpenKey(registry.CURRENT_USER, "Software", registry.QUERY_VALUE)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer softwareK.Close()
-
-	testKName := randKeyName("TestValues_")
-
-	k, exist, err := registry.CreateKey(softwareK, testKName, registry.CREATE_SUB_KEY|registry.QUERY_VALUE|registry.SET_VALUE)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer k.Close()
-
-	if exist {
-		t.Fatalf("key %q already exists", testKName)
-	}
-
-	defer registry.DeleteKey(softwareK, testKName)
-
-	setValues(t, k)
-
-	enumerateValues(t, k)
-
-	testValues(t, k)
-
-	testStat(t, k)
-
-	deleteValues(t, k)
-}
-
-func walkKey(t *testing.T, k registry.Key, kname string) {
-	names, err := k.ReadValueNames(-1)
-	if err != nil {
-		t.Fatalf("reading value names of %s failed: %v", kname, err)
-	}
-	for _, name := range names {
-		_, valtype, err := k.GetValue(name, nil)
-		if err != nil {
-			t.Fatalf("reading value type of %s of %s failed: %v", name, kname, err)
-		}
-		switch valtype {
-		case registry.NONE:
-		case registry.SZ:
-			_, _, err := k.GetStringValue(name)
-			if err != nil {
-				t.Error(err)
-			}
-		case registry.EXPAND_SZ:
-			s, _, err := k.GetStringValue(name)
-			if err != nil {
-				t.Error(err)
-			}
-			_, err = registry.ExpandString(s)
-			if err != nil {
-				t.Error(err)
-			}
-		case registry.DWORD, registry.QWORD:
-			_, _, err := k.GetIntegerValue(name)
-			if err != nil {
-				t.Error(err)
-			}
-		case registry.BINARY:
-			_, _, err := k.GetBinaryValue(name)
-			if err != nil {
-				t.Error(err)
-			}
-		case registry.MULTI_SZ:
-			_, _, err := k.GetStringsValue(name)
-			if err != nil {
-				t.Error(err)
-			}
-		case registry.FULL_RESOURCE_DESCRIPTOR, registry.RESOURCE_LIST, registry.RESOURCE_REQUIREMENTS_LIST:
-			// TODO: not implemented
-		default:
-			t.Fatalf("value type %d of %s of %s failed: %v", valtype, name, kname, err)
-		}
-	}
-
-	names, err = k.ReadSubKeyNames(-1)
-	if err != nil {
-		t.Fatalf("reading sub-keys of %s failed: %v", kname, err)
-	}
-	for _, name := range names {
-		func() {
-			subk, err := registry.OpenKey(k, name, registry.ENUMERATE_SUB_KEYS|registry.QUERY_VALUE)
-			if err != nil {
-				if err == syscall.ERROR_ACCESS_DENIED {
-					// ignore error, if we are not allowed to access this key
-					return
-				}
-				t.Fatalf("opening sub-keys %s of %s failed: %v", name, kname, err)
-			}
-			defer subk.Close()
-
-			walkKey(t, subk, kname+`\`+name)
-		}()
-	}
-}
-
-func TestWalkFullRegistry(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping long running test in short mode")
-	}
-	walkKey(t, registry.CLASSES_ROOT, "CLASSES_ROOT")
-	walkKey(t, registry.CURRENT_USER, "CURRENT_USER")
-	walkKey(t, registry.LOCAL_MACHINE, "LOCAL_MACHINE")
-	walkKey(t, registry.USERS, "USERS")
-	walkKey(t, registry.CURRENT_CONFIG, "CURRENT_CONFIG")
-}
-
-func TestExpandString(t *testing.T) {
-	got, err := registry.ExpandString("%PATH%")
-	if err != nil {
-		t.Fatal(err)
-	}
-	want := os.Getenv("PATH")
-	if got != want {
-		t.Errorf("want %q string expanded, got %q", want, got)
-	}
-}
-
-func TestInvalidValues(t *testing.T) {
-	softwareK, err := registry.OpenKey(registry.CURRENT_USER, "Software", registry.QUERY_VALUE)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer softwareK.Close()
-
-	testKName := randKeyName("TestInvalidValues_")
-
-	k, exist, err := registry.CreateKey(softwareK, testKName, registry.CREATE_SUB_KEY|registry.QUERY_VALUE|registry.SET_VALUE)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer k.Close()
-
-	if exist {
-		t.Fatalf("key %q already exists", testKName)
-	}
-
-	defer registry.DeleteKey(softwareK, testKName)
-
-	var tests = []struct {
-		Type uint32
-		Name string
-		Data []byte
-	}{
-		{registry.DWORD, "Dword1", nil},
-		{registry.DWORD, "Dword2", []byte{1, 2, 3}},
-		{registry.QWORD, "Qword1", nil},
-		{registry.QWORD, "Qword2", []byte{1, 2, 3}},
-		{registry.QWORD, "Qword3", []byte{1, 2, 3, 4, 5, 6, 7}},
-		{registry.MULTI_SZ, "MultiString1", nil},
-		{registry.MULTI_SZ, "MultiString2", []byte{0}},
-		{registry.MULTI_SZ, "MultiString3", []byte{'a', 'b', 0}},
-		{registry.MULTI_SZ, "MultiString4", []byte{'a', 0, 0, 'b', 0}},
-		{registry.MULTI_SZ, "MultiString5", []byte{'a', 0, 0}},
-	}
-
-	for _, test := range tests {
-		err := k.SetValue(test.Name, test.Type, test.Data)
-		if err != nil {
-			t.Fatalf("SetValue for %q failed: %v", test.Name, err)
-		}
-	}
-
-	for _, test := range tests {
-		switch test.Type {
-		case registry.DWORD, registry.QWORD:
-			value, valType, err := k.GetIntegerValue(test.Name)
-			if err == nil {
-				t.Errorf("GetIntegerValue(%q) succeeded. Returns type=%d value=%v", test.Name, valType, value)
-			}
-		case registry.MULTI_SZ:
-			value, valType, err := k.GetStringsValue(test.Name)
-			if err == nil {
-				if len(value) != 0 {
-					t.Errorf("GetStringsValue(%q) succeeded. Returns type=%d value=%v", test.Name, valType, value)
-				}
-			}
-		default:
-			t.Errorf("unsupported type %d for %s value", test.Type, test.Name)
-		}
-	}
-}
-
-func TestGetMUIStringValue(t *testing.T) {
-	if err := registry.LoadRegLoadMUIString(); err != nil {
-		t.Skip("regLoadMUIString not supported; skipping")
-	}
-	if err := procGetDynamicTimeZoneInformation.Find(); err != nil {
-		t.Skipf("%s not supported; skipping", procGetDynamicTimeZoneInformation.Name)
-	}
-	var dtzi DynamicTimezoneinformation
-	if _, err := GetDynamicTimeZoneInformation(&dtzi); err != nil {
-		t.Fatal(err)
-	}
-	tzKeyName := syscall.UTF16ToString(dtzi.TimeZoneKeyName[:])
-	timezoneK, err := registry.OpenKey(registry.LOCAL_MACHINE,
-		`SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\`+tzKeyName, registry.READ)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer timezoneK.Close()
-
-	type testType struct {
-		name string
-		want string
-	}
-	var tests = []testType{
-		{"MUI_Std", syscall.UTF16ToString(dtzi.StandardName[:])},
-	}
-	if dtzi.DynamicDaylightTimeDisabled == 0 {
-		tests = append(tests, testType{"MUI_Dlt", syscall.UTF16ToString(dtzi.DaylightName[:])})
-	}
-
-	for _, test := range tests {
-		got, err := timezoneK.GetMUIStringValue(test.name)
-		if err != nil {
-			t.Error("GetMUIStringValue:", err)
-		}
-
-		if got != test.want {
-			t.Errorf("GetMUIStringValue: %s: Got %q, want %q", test.name, got, test.want)
-		}
-	}
-}
-
-type DynamicTimezoneinformation struct {
-	Bias                        int32
-	StandardName                [32]uint16
-	StandardDate                syscall.Systemtime
-	StandardBias                int32
-	DaylightName                [32]uint16
-	DaylightDate                syscall.Systemtime
-	DaylightBias                int32
-	TimeZoneKeyName             [128]uint16
-	DynamicDaylightTimeDisabled uint8
-}
-
-var (
-	kernel32DLL = syscall.NewLazyDLL("kernel32")
-
-	procGetDynamicTimeZoneInformation = kernel32DLL.NewProc("GetDynamicTimeZoneInformation")
-)
-
-func GetDynamicTimeZoneInformation(dtzi *DynamicTimezoneinformation) (rc uint32, err error) {
-	r0, _, e1 := syscall.Syscall(procGetDynamicTimeZoneInformation.Addr(), 1, uintptr(unsafe.Pointer(dtzi)), 0, 0)
-	rc = uint32(r0)
-	if rc == 0xffffffff {
-		if e1 != 0 {
-			err = error(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
diff --git a/vendor/golang.org/x/sys/windows/svc/eventlog/log_test.go b/vendor/golang.org/x/sys/windows/svc/eventlog/log_test.go
deleted file mode 100644
index 6fbbd4a8..00000000
--- a/vendor/golang.org/x/sys/windows/svc/eventlog/log_test.go
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-package eventlog_test
-
-import (
-	"testing"
-
-	"golang.org/x/sys/windows/svc/eventlog"
-)
-
-func TestLog(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping test in short mode - it modifies system logs")
-	}
-
-	const name = "mylog"
-	const supports = eventlog.Error | eventlog.Warning | eventlog.Info
-	err := eventlog.InstallAsEventCreate(name, supports)
-	if err != nil {
-		t.Fatalf("Install failed: %s", err)
-	}
-	defer func() {
-		err = eventlog.Remove(name)
-		if err != nil {
-			t.Fatalf("Remove failed: %s", err)
-		}
-	}()
-
-	l, err := eventlog.Open(name)
-	if err != nil {
-		t.Fatalf("Open failed: %s", err)
-	}
-	defer l.Close()
-
-	err = l.Info(1, "info")
-	if err != nil {
-		t.Fatalf("Info failed: %s", err)
-	}
-	err = l.Warning(2, "warning")
-	if err != nil {
-		t.Fatalf("Warning failed: %s", err)
-	}
-	err = l.Error(3, "error")
-	if err != nil {
-		t.Fatalf("Error failed: %s", err)
-	}
-}
diff --git a/vendor/golang.org/x/sys/windows/svc/mgr/mgr_test.go b/vendor/golang.org/x/sys/windows/svc/mgr/mgr_test.go
deleted file mode 100644
index 13f1f381..00000000
--- a/vendor/golang.org/x/sys/windows/svc/mgr/mgr_test.go
+++ /dev/null
@@ -1,250 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-package mgr_test
-
-import (
-	"os"
-	"path/filepath"
-	"sort"
-	"strings"
-	"syscall"
-	"testing"
-	"time"
-
-	"golang.org/x/sys/windows/svc/mgr"
-)
-
-func TestOpenLanManServer(t *testing.T) {
-	m, err := mgr.Connect()
-	if err != nil {
-		if errno, ok := err.(syscall.Errno); ok && errno == syscall.ERROR_ACCESS_DENIED {
-			t.Skip("Skipping test: we don't have rights to manage services.")
-		}
-		t.Fatalf("SCM connection failed: %s", err)
-	}
-	defer m.Disconnect()
-
-	s, err := m.OpenService("LanmanServer")
-	if err != nil {
-		t.Fatalf("OpenService(lanmanserver) failed: %s", err)
-	}
-	defer s.Close()
-
-	_, err = s.Config()
-	if err != nil {
-		t.Fatalf("Config failed: %s", err)
-	}
-}
-
-func install(t *testing.T, m *mgr.Mgr, name, exepath string, c mgr.Config) {
-	// Sometimes it takes a while for the service to get
-	// removed after previous test run.
-	for i := 0; ; i++ {
-		s, err := m.OpenService(name)
-		if err != nil {
-			break
-		}
-		s.Close()
-
-		if i > 10 {
-			t.Fatalf("service %s already exists", name)
-		}
-		time.Sleep(300 * time.Millisecond)
-	}
-
-	s, err := m.CreateService(name, exepath, c)
-	if err != nil {
-		t.Fatalf("CreateService(%s) failed: %v", name, err)
-	}
-	defer s.Close()
-}
-
-func depString(d []string) string {
-	if len(d) == 0 {
-		return ""
-	}
-	for i := range d {
-		d[i] = strings.ToLower(d[i])
-	}
-	ss := sort.StringSlice(d)
-	ss.Sort()
-	return strings.Join([]string(ss), " ")
-}
-
-func testConfig(t *testing.T, s *mgr.Service, should mgr.Config) mgr.Config {
-	is, err := s.Config()
-	if err != nil {
-		t.Fatalf("Config failed: %s", err)
-	}
-	if should.DisplayName != is.DisplayName {
-		t.Fatalf("config mismatch: DisplayName is %q, but should have %q", is.DisplayName, should.DisplayName)
-	}
-	if should.StartType != is.StartType {
-		t.Fatalf("config mismatch: StartType is %v, but should have %v", is.StartType, should.StartType)
-	}
-	if should.Description != is.Description {
-		t.Fatalf("config mismatch: Description is %q, but should have %q", is.Description, should.Description)
-	}
-	if depString(should.Dependencies) != depString(is.Dependencies) {
-		t.Fatalf("config mismatch: Dependencies is %v, but should have %v", is.Dependencies, should.Dependencies)
-	}
-	return is
-}
-
-func testRecoveryActions(t *testing.T, s *mgr.Service, should []mgr.RecoveryAction) {
-	is, err := s.RecoveryActions()
-	if err != nil {
-		t.Fatalf("RecoveryActions failed: %s", err)
-	}
-	if len(should) != len(is) {
-		t.Errorf("recovery action mismatch: contains %v actions, but should have %v", len(is), len(should))
-	}
-	for i, _ := range is {
-		if should[i].Type != is[i].Type {
-			t.Errorf("recovery action mismatch: Type is %v, but should have %v", is[i].Type, should[i].Type)
-		}
-		if should[i].Delay != is[i].Delay {
-			t.Errorf("recovery action mismatch: Delay is %v, but should have %v", is[i].Delay, should[i].Delay)
-		}
-	}
-}
-
-func testResetPeriod(t *testing.T, s *mgr.Service, should uint32) {
-	is, err := s.ResetPeriod()
-	if err != nil {
-		t.Fatalf("ResetPeriod failed: %s", err)
-	}
-	if should != is {
-		t.Errorf("reset period mismatch: reset period is %v, but should have %v", is, should)
-	}
-}
-
-func testSetRecoveryActions(t *testing.T, s *mgr.Service) {
-	r := []mgr.RecoveryAction{
-		mgr.RecoveryAction{
-			Type:  mgr.NoAction,
-			Delay: 60000 * time.Millisecond,
-		},
-		mgr.RecoveryAction{
-			Type:  mgr.ServiceRestart,
-			Delay: 4 * time.Minute,
-		},
-		mgr.RecoveryAction{
-			Type:  mgr.ServiceRestart,
-			Delay: time.Minute,
-		},
-		mgr.RecoveryAction{
-			Type:  mgr.RunCommand,
-			Delay: 4000 * time.Millisecond,
-		},
-	}
-
-	// 4 recovery actions with reset period
-	err := s.SetRecoveryActions(r, uint32(10000))
-	if err != nil {
-		t.Fatalf("SetRecoveryActions failed: %v", err)
-	}
-	testRecoveryActions(t, s, r)
-	testResetPeriod(t, s, uint32(10000))
-
-	// Infinite reset period
-	err = s.SetRecoveryActions(r, syscall.INFINITE)
-	if err != nil {
-		t.Fatalf("SetRecoveryActions failed: %v", err)
-	}
-	testRecoveryActions(t, s, r)
-	testResetPeriod(t, s, syscall.INFINITE)
-
-	// nil recovery actions
-	err = s.SetRecoveryActions(nil, 0)
-	if err.Error() != "recoveryActions cannot be nil" {
-		t.Fatalf("SetRecoveryActions failed with unexpected error message of %q", err)
-	}
-
-	// Delete all recovery actions and reset period
-	err = s.ResetRecoveryActions()
-	if err != nil {
-		t.Fatalf("ResetRecoveryActions failed: %v", err)
-	}
-	testRecoveryActions(t, s, nil)
-	testResetPeriod(t, s, 0)
-}
-
-func remove(t *testing.T, s *mgr.Service) {
-	err := s.Delete()
-	if err != nil {
-		t.Fatalf("Delete failed: %s", err)
-	}
-}
-
-func TestMyService(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping test in short mode - it modifies system services")
-	}
-
-	const name = "myservice"
-
-	m, err := mgr.Connect()
-	if err != nil {
-		if errno, ok := err.(syscall.Errno); ok && errno == syscall.ERROR_ACCESS_DENIED {
-			t.Skip("Skipping test: we don't have rights to manage services.")
-		}
-		t.Fatalf("SCM connection failed: %s", err)
-	}
-	defer m.Disconnect()
-
-	c := mgr.Config{
-		StartType:    mgr.StartDisabled,
-		DisplayName:  "my service",
-		Description:  "my service is just a test",
-		Dependencies: []string{"LanmanServer", "W32Time"},
-	}
-
-	exename := os.Args[0]
-	exepath, err := filepath.Abs(exename)
-	if err != nil {
-		t.Fatalf("filepath.Abs(%s) failed: %s", exename, err)
-	}
-
-	install(t, m, name, exepath, c)
-
-	s, err := m.OpenService(name)
-	if err != nil {
-		t.Fatalf("service %s is not installed", name)
-	}
-	defer s.Close()
-
-	c.BinaryPathName = exepath
-	c = testConfig(t, s, c)
-
-	c.StartType = mgr.StartManual
-	err = s.UpdateConfig(c)
-	if err != nil {
-		t.Fatalf("UpdateConfig failed: %v", err)
-	}
-
-	testConfig(t, s, c)
-
-	svcnames, err := m.ListServices()
-	if err != nil {
-		t.Fatalf("ListServices failed: %v", err)
-	}
-	var myserviceIsInstalled bool
-	for _, sn := range svcnames {
-		if sn == name {
-			myserviceIsInstalled = true
-			break
-		}
-	}
-	if !myserviceIsInstalled {
-		t.Errorf("ListServices failed to find %q service", name)
-	}
-
-	testSetRecoveryActions(t, s)
-
-	remove(t, s)
-}
diff --git a/vendor/golang.org/x/sys/windows/svc/mgr/recovery.go b/vendor/golang.org/x/sys/windows/svc/mgr/recovery.go
index 9243dca2..71ce2b81 100644
--- a/vendor/golang.org/x/sys/windows/svc/mgr/recovery.go
+++ b/vendor/golang.org/x/sys/windows/svc/mgr/recovery.go
@@ -8,6 +8,7 @@ package mgr
 
 import (
 	"errors"
+	"syscall"
 	"time"
 	"unsafe"
 
@@ -94,3 +95,41 @@ func (s *Service) ResetPeriod() (uint32, error) {
 	p := (*windows.SERVICE_FAILURE_ACTIONS)(unsafe.Pointer(&b[0]))
 	return p.ResetPeriod, nil
 }
+
+// SetRebootMessage sets service s reboot message.
+// If msg is "", the reboot message is deleted and no message is broadcast.
+func (s *Service) SetRebootMessage(msg string) error {
+	rActions := windows.SERVICE_FAILURE_ACTIONS{
+		RebootMsg: syscall.StringToUTF16Ptr(msg),
+	}
+	return windows.ChangeServiceConfig2(s.Handle, windows.SERVICE_CONFIG_FAILURE_ACTIONS, (*byte)(unsafe.Pointer(&rActions)))
+}
+
+// RebootMessage is broadcast to server users before rebooting in response to the ComputerReboot service controller action.
+func (s *Service) RebootMessage() (string, error) {
+	b, err := s.queryServiceConfig2(windows.SERVICE_CONFIG_FAILURE_ACTIONS)
+	if err != nil {
+		return "", err
+	}
+	p := (*windows.SERVICE_FAILURE_ACTIONS)(unsafe.Pointer(&b[0]))
+	return toString(p.RebootMsg), nil
+}
+
+// SetRecoveryCommand sets the command line of the process to execute in response to the RunCommand service controller action.
+// If cmd is "", the command is deleted and no program is run when the service fails.
+func (s *Service) SetRecoveryCommand(cmd string) error {
+	rActions := windows.SERVICE_FAILURE_ACTIONS{
+		Command: syscall.StringToUTF16Ptr(cmd),
+	}
+	return windows.ChangeServiceConfig2(s.Handle, windows.SERVICE_CONFIG_FAILURE_ACTIONS, (*byte)(unsafe.Pointer(&rActions)))
+}
+
+// RecoveryCommand is the command line of the process to execute in response to the RunCommand service controller action. This process runs under the same account as the service.
+func (s *Service) RecoveryCommand() (string, error) {
+	b, err := s.queryServiceConfig2(windows.SERVICE_CONFIG_FAILURE_ACTIONS)
+	if err != nil {
+		return "", err
+	}
+	p := (*windows.SERVICE_FAILURE_ACTIONS)(unsafe.Pointer(&b[0]))
+	return toString(p.Command), nil
+}
diff --git a/vendor/golang.org/x/sys/windows/svc/svc_test.go b/vendor/golang.org/x/sys/windows/svc/svc_test.go
deleted file mode 100644
index 60eb4478..00000000
--- a/vendor/golang.org/x/sys/windows/svc/svc_test.go
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-package svc_test
-
-import (
-	"fmt"
-	"io/ioutil"
-	"math/rand"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-	"testing"
-	"time"
-
-	"golang.org/x/sys/windows/svc"
-	"golang.org/x/sys/windows/svc/mgr"
-)
-
-func getState(t *testing.T, s *mgr.Service) svc.State {
-	status, err := s.Query()
-	if err != nil {
-		t.Fatalf("Query(%s) failed: %s", s.Name, err)
-	}
-	return status.State
-}
-
-func testState(t *testing.T, s *mgr.Service, want svc.State) {
-	have := getState(t, s)
-	if have != want {
-		t.Fatalf("%s state is=%d want=%d", s.Name, have, want)
-	}
-}
-
-func waitState(t *testing.T, s *mgr.Service, want svc.State) {
-	for i := 0; ; i++ {
-		have := getState(t, s)
-		if have == want {
-			return
-		}
-		if i > 10 {
-			t.Fatalf("%s state is=%d, waiting timeout", s.Name, have)
-		}
-		time.Sleep(300 * time.Millisecond)
-	}
-}
-
-func TestExample(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping test in short mode - it modifies system services")
-	}
-
-	const name = "myservice"
-
-	m, err := mgr.Connect()
-	if err != nil {
-		t.Fatalf("SCM connection failed: %s", err)
-	}
-	defer m.Disconnect()
-
-	dir, err := ioutil.TempDir("", "svc")
-	if err != nil {
-		t.Fatalf("failed to create temp directory: %v", err)
-	}
-	defer os.RemoveAll(dir)
-
-	exepath := filepath.Join(dir, "a.exe")
-	o, err := exec.Command("go", "build", "-o", exepath, "golang.org/x/sys/windows/svc/example").CombinedOutput()
-	if err != nil {
-		t.Fatalf("failed to build service program: %v\n%v", err, string(o))
-	}
-
-	s, err := m.OpenService(name)
-	if err == nil {
-		err = s.Delete()
-		if err != nil {
-			s.Close()
-			t.Fatalf("Delete failed: %s", err)
-		}
-		s.Close()
-	}
-	s, err = m.CreateService(name, exepath, mgr.Config{DisplayName: "my service"}, "is", "auto-started")
-	if err != nil {
-		t.Fatalf("CreateService(%s) failed: %v", name, err)
-	}
-	defer s.Close()
-
-	args := []string{"is", "manual-started", fmt.Sprintf("%d", rand.Int())}
-
-	testState(t, s, svc.Stopped)
-	err = s.Start(args...)
-	if err != nil {
-		t.Fatalf("Start(%s) failed: %s", s.Name, err)
-	}
-	waitState(t, s, svc.Running)
-	time.Sleep(1 * time.Second)
-
-	// testing deadlock from issues 4.
-	_, err = s.Control(svc.Interrogate)
-	if err != nil {
-		t.Fatalf("Control(%s) failed: %s", s.Name, err)
-	}
-	_, err = s.Control(svc.Interrogate)
-	if err != nil {
-		t.Fatalf("Control(%s) failed: %s", s.Name, err)
-	}
-	time.Sleep(1 * time.Second)
-
-	_, err = s.Control(svc.Stop)
-	if err != nil {
-		t.Fatalf("Control(%s) failed: %s", s.Name, err)
-	}
-	waitState(t, s, svc.Stopped)
-
-	err = s.Delete()
-	if err != nil {
-		t.Fatalf("Delete failed: %s", err)
-	}
-
-	cmd := `Get-Eventlog -LogName Application -Newest 100` +
-		` | Where Source -eq "myservice"` +
-		` | Select -first 10` +
-		` | Format-table -HideTableHeaders -property ReplacementStrings`
-	out, err := exec.Command("powershell", "-Command", cmd).CombinedOutput()
-	if err != nil {
-		t.Fatalf("powershell failed: %v\n%v", err, string(out))
-	}
-	if want := strings.Join(append([]string{name}, args...), "-"); !strings.Contains(string(out), want) {
-		t.Errorf("%q string does not contain %q", string(out), want)
-	}
-}
diff --git a/vendor/golang.org/x/sys/windows/syscall_test.go b/vendor/golang.org/x/sys/windows/syscall_test.go
deleted file mode 100644
index d7009e44..00000000
--- a/vendor/golang.org/x/sys/windows/syscall_test.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-package windows_test
-
-import (
-	"syscall"
-	"testing"
-
-	"golang.org/x/sys/windows"
-)
-
-func testSetGetenv(t *testing.T, key, value string) {
-	err := windows.Setenv(key, value)
-	if err != nil {
-		t.Fatalf("Setenv failed to set %q: %v", value, err)
-	}
-	newvalue, found := windows.Getenv(key)
-	if !found {
-		t.Fatalf("Getenv failed to find %v variable (want value %q)", key, value)
-	}
-	if newvalue != value {
-		t.Fatalf("Getenv(%v) = %q; want %q", key, newvalue, value)
-	}
-}
-
-func TestEnv(t *testing.T) {
-	testSetGetenv(t, "TESTENV", "AVALUE")
-	// make sure TESTENV gets set to "", not deleted
-	testSetGetenv(t, "TESTENV", "")
-}
-
-func TestGetProcAddressByOrdinal(t *testing.T) {
-	// Attempt calling shlwapi.dll:IsOS, resolving it by ordinal, as
-	// suggested in
-	// https://msdn.microsoft.com/en-us/library/windows/desktop/bb773795.aspx
-	h, err := windows.LoadLibrary("shlwapi.dll")
-	if err != nil {
-		t.Fatalf("Failed to load shlwapi.dll: %s", err)
-	}
-	procIsOS, err := windows.GetProcAddressByOrdinal(h, 437)
-	if err != nil {
-		t.Fatalf("Could not find shlwapi.dll:IsOS by ordinal: %s", err)
-	}
-	const OS_NT = 1
-	r, _, _ := syscall.Syscall(procIsOS, 1, OS_NT, 0, 0)
-	if r == 0 {
-		t.Error("shlwapi.dll:IsOS(OS_NT) returned 0, expected non-zero value")
-	}
-}
diff --git a/vendor/golang.org/x/sys/windows/syscall_windows.go b/vendor/golang.org/x/sys/windows/syscall_windows.go
index 1e9f4bb4..fd89e08e 100644
--- a/vendor/golang.org/x/sys/windows/syscall_windows.go
+++ b/vendor/golang.org/x/sys/windows/syscall_windows.go
@@ -112,12 +112,14 @@ func Getpagesize() int { return 4096 }
 
 // NewCallback converts a Go function to a function pointer conforming to the stdcall calling convention.
 // This is useful when interoperating with Windows code requiring callbacks.
+// The argument is expected to be a function with with one uintptr-sized result. The function must not have arguments with size larger than the size of uintptr.
 func NewCallback(fn interface{}) uintptr {
 	return syscall.NewCallback(fn)
 }
 
 // NewCallbackCDecl converts a Go function to a function pointer conforming to the cdecl calling convention.
 // This is useful when interoperating with Windows code requiring callbacks.
+// The argument is expected to be a function with with one uintptr-sized result. The function must not have arguments with size larger than the size of uintptr.
 func NewCallbackCDecl(fn interface{}) uintptr {
 	return syscall.NewCallbackCDecl(fn)
 }
diff --git a/vendor/golang.org/x/sys/windows/syscall_windows_test.go b/vendor/golang.org/x/sys/windows/syscall_windows_test.go
deleted file mode 100644
index 0e27464e..00000000
--- a/vendor/golang.org/x/sys/windows/syscall_windows_test.go
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package windows_test
-
-import (
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"syscall"
-	"testing"
-	"unsafe"
-
-	"golang.org/x/sys/windows"
-)
-
-func TestWin32finddata(t *testing.T) {
-	dir, err := ioutil.TempDir("", "go-build")
-	if err != nil {
-		t.Fatalf("failed to create temp directory: %v", err)
-	}
-	defer os.RemoveAll(dir)
-
-	path := filepath.Join(dir, "long_name.and_extension")
-	f, err := os.Create(path)
-	if err != nil {
-		t.Fatalf("failed to create %v: %v", path, err)
-	}
-	f.Close()
-
-	type X struct {
-		fd  windows.Win32finddata
-		got byte
-		pad [10]byte // to protect ourselves
-
-	}
-	var want byte = 2 // it is unlikely to have this character in the filename
-	x := X{got: want}
-
-	pathp, _ := windows.UTF16PtrFromString(path)
-	h, err := windows.FindFirstFile(pathp, &(x.fd))
-	if err != nil {
-		t.Fatalf("FindFirstFile failed: %v", err)
-	}
-	err = windows.FindClose(h)
-	if err != nil {
-		t.Fatalf("FindClose failed: %v", err)
-	}
-
-	if x.got != want {
-		t.Fatalf("memory corruption: want=%d got=%d", want, x.got)
-	}
-}
-
-func TestFormatMessage(t *testing.T) {
-	dll := windows.MustLoadDLL("pdh.dll")
-
-	pdhOpenQuery := func(datasrc *uint16, userdata uint32, query *windows.Handle) (errno uintptr) {
-		r0, _, _ := syscall.Syscall(dll.MustFindProc("PdhOpenQueryW").Addr(), 3, uintptr(unsafe.Pointer(datasrc)), uintptr(userdata), uintptr(unsafe.Pointer(query)))
-		return r0
-	}
-
-	pdhCloseQuery := func(query windows.Handle) (errno uintptr) {
-		r0, _, _ := syscall.Syscall(dll.MustFindProc("PdhCloseQuery").Addr(), 1, uintptr(query), 0, 0)
-		return r0
-	}
-
-	var q windows.Handle
-	name, err := windows.UTF16PtrFromString("no_such_source")
-	if err != nil {
-		t.Fatal(err)
-	}
-	errno := pdhOpenQuery(name, 0, &q)
-	if errno == 0 {
-		pdhCloseQuery(q)
-		t.Fatal("PdhOpenQuery succeeded, but expected to fail.")
-	}
-
-	const flags uint32 = syscall.FORMAT_MESSAGE_FROM_HMODULE | syscall.FORMAT_MESSAGE_ARGUMENT_ARRAY | syscall.FORMAT_MESSAGE_IGNORE_INSERTS
-	buf := make([]uint16, 300)
-	_, err = windows.FormatMessage(flags, uintptr(dll.Handle), uint32(errno), 0, buf, nil)
-	if err != nil {
-		t.Fatalf("FormatMessage for handle=%x and errno=%x failed: %v", dll.Handle, errno, err)
-	}
-}
-
-func abort(funcname string, err error) {
-	panic(funcname + " failed: " + err.Error())
-}
-
-func ExampleLoadLibrary() {
-	h, err := windows.LoadLibrary("kernel32.dll")
-	if err != nil {
-		abort("LoadLibrary", err)
-	}
-	defer windows.FreeLibrary(h)
-	proc, err := windows.GetProcAddress(h, "GetVersion")
-	if err != nil {
-		abort("GetProcAddress", err)
-	}
-	r, _, _ := syscall.Syscall(uintptr(proc), 0, 0, 0, 0)
-	major := byte(r)
-	minor := uint8(r >> 8)
-	build := uint16(r >> 16)
-	print("windows version ", major, ".", minor, " (Build ", build, ")\n")
-}
-
-func TestTOKEN_ALL_ACCESS(t *testing.T) {
-	if windows.TOKEN_ALL_ACCESS != 0xF01FF {
-		t.Errorf("TOKEN_ALL_ACCESS = %x, want 0xF01FF", windows.TOKEN_ALL_ACCESS)
-	}
-}
diff --git a/vendor/golang.org/x/text/.gitattributes b/vendor/golang.org/x/text/.gitattributes
deleted file mode 100644
index d2f212e5..00000000
--- a/vendor/golang.org/x/text/.gitattributes
+++ /dev/null
@@ -1,10 +0,0 @@
-# Treat all files in this repo as binary, with no git magic updating
-# line endings. Windows users contributing to Go will need to use a
-# modern version of git and editors capable of LF line endings.
-#
-# We'll prevent accidental CRLF line endings from entering the repo
-# via the git-review gofmt checks.
-#
-# See golang.org/issue/9281
-
-* -text
diff --git a/vendor/golang.org/x/text/.gitignore b/vendor/golang.org/x/text/.gitignore
deleted file mode 100644
index b2de568b..00000000
--- a/vendor/golang.org/x/text/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-# Add no patterns to .gitignore except for files generated by the build.
-last-change
-/DATA
-# This file is rather large and the tests really only need to be run
-# after generation.
-/unicode/norm/data_test.go
\ No newline at end of file
diff --git a/vendor/golang.org/x/text/CONTRIBUTING.md b/vendor/golang.org/x/text/CONTRIBUTING.md
deleted file mode 100644
index 88dff59b..00000000
--- a/vendor/golang.org/x/text/CONTRIBUTING.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Contributing to Go
-
-Go is an open source project.
-
-It is the work of hundreds of contributors. We appreciate your help!
-
-
-## Filing issues
-
-When [filing an issue](https://golang.org/issue/new), make sure to answer these five questions:
-
-1. What version of Go are you using (`go version`)?
-2. What operating system and processor architecture are you using?
-3. What did you do?
-4. What did you expect to see?
-5. What did you see instead?
-
-General questions should go to the [golang-nuts mailing list](https://groups.google.com/group/golang-nuts) instead of the issue tracker.
-The gophers there will answer or ask you to file an issue if you've tripped over a bug.
-
-## Contributing code
-
-Please read the [Contribution Guidelines](https://golang.org/doc/contribute.html)
-before sending patches.
-
-**We do not accept GitHub pull requests**
-(we use [Gerrit](https://code.google.com/p/gerrit/) instead for code review).
-
-Unless otherwise noted, the Go source files are distributed under
-the BSD-style license found in the LICENSE file.
-
diff --git a/vendor/golang.org/x/text/README.md b/vendor/golang.org/x/text/README.md
deleted file mode 100644
index b3f365ee..00000000
--- a/vendor/golang.org/x/text/README.md
+++ /dev/null
@@ -1,93 +0,0 @@
-# Go Text
-
-This repository holds supplementary Go libraries for text processing, many involving Unicode.
-
-## Semantic Versioning
-This repo uses Semantic versioning (http://semver.org/), so
-1. MAJOR version when you make incompatible API changes,
-1. MINOR version when you add functionality in a backwards-compatible manner,
-   and
-1. PATCH version when you make backwards-compatible bug fixes.
-
-Until version 1.0.0 of x/text is reached, the minor version is considered a
-major version. So going from 0.1.0 to 0.2.0 is considered to be a major version
-bump.
-
-A major new CLDR version is mapped to a minor version increase in x/text.
-Any other new CLDR version is mapped to a patch version increase in x/text.
-
-It is important that the Unicode version used in `x/text` matches the one used
-by your Go compiler. The `x/text` repository supports multiple versions of
-Unicode and will match the version of Unicode to that of the Go compiler. At the
-moment this is supported for Go compilers from version 1.7.
-
-## Download/Install
-
-The easiest way to install is to run `go get -u golang.org/x/text`. You can
-also manually git clone the repository to `$GOPATH/src/golang.org/x/text`.
-
-## Contribute
-To submit changes to this repository, see http://golang.org/doc/contribute.html.
-
-To generate the tables in this repository (except for the encoding tables),
-run go generate from this directory. By default tables are generated for the
-Unicode version in core and the CLDR version defined in
-golang.org/x/text/unicode/cldr.
-
-Running go generate will as a side effect create a DATA subdirectory in this
-directory, which holds all files that are used as a source for generating the
-tables. This directory will also serve as a cache.
-
-## Testing
-Run
-
-    go test ./...
-
-from this directory to run all tests. Add the "-tags icu" flag to also run
-ICU conformance tests (if available). This requires that you have the correct
-ICU version installed on your system.
-
-TODO:
-- updating unversioned source files.
-
-## Generating Tables
-
-To generate the tables in this repository (except for the encoding
-tables), run `go generate` from this directory. By default tables are
-generated for the Unicode version in core and the CLDR version defined in
-golang.org/x/text/unicode/cldr.
-
-Running go generate will as a side effect create a DATA subdirectory in this
-directory which holds all files that are used as a source for generating the
-tables. This directory will also serve as a cache.
-
-## Versions
-To update a Unicode version run
-
-    UNICODE_VERSION=x.x.x go generate
-
-where `x.x.x` must correspond to a directory in http://www.unicode.org/Public/.
-If this version is newer than the version in core it will also update the
-relevant packages there. The idna package in x/net will always be updated.
-
-To update a CLDR version run
-
-    CLDR_VERSION=version go generate
-
-where `version` must correspond to a directory in
-http://www.unicode.org/Public/cldr/.
-
-Note that the code gets adapted over time to changes in the data and that
-backwards compatibility is not maintained.
-So updating to a different version may not work.
-
-The files in DATA/{iana|icu|w3|whatwg} are currently not versioned.
-
-## Report Issues / Send Patches
-
-This repository uses Gerrit for code changes. To learn how to submit changes to
-this repository, see https://golang.org/doc/contribute.html.
-
-The main issue tracker for the image repository is located at
-https://github.com/golang/go/issues. Prefix your issue with "x/image:" in the
-subject line, so it is easy to find.
diff --git a/vendor/golang.org/x/text/codereview.cfg b/vendor/golang.org/x/text/codereview.cfg
deleted file mode 100644
index 3f8b14b6..00000000
--- a/vendor/golang.org/x/text/codereview.cfg
+++ /dev/null
@@ -1 +0,0 @@
-issuerepo: golang/go
diff --git a/vendor/golang.org/x/text/collate/build/builder_test.go b/vendor/golang.org/x/text/collate/build/builder_test.go
deleted file mode 100644
index ff0aba3a..00000000
--- a/vendor/golang.org/x/text/collate/build/builder_test.go
+++ /dev/null
@@ -1,290 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package build
-
-import "testing"
-
-// cjk returns an implicit collation element for a CJK rune.
-func cjk(r rune) []rawCE {
-	// A CJK character C is represented in the DUCET as
-	//   [.AAAA.0020.0002.C][.BBBB.0000.0000.C]
-	// Where AAAA is the most significant 15 bits plus a base value.
-	// Any base value will work for the test, so we pick the common value of FB40.
-	const base = 0xFB40
-	return []rawCE{
-		{w: []int{base + int(r>>15), defaultSecondary, defaultTertiary, int(r)}},
-		{w: []int{int(r&0x7FFF) | 0x8000, 0, 0, int(r)}},
-	}
-}
-
-func pCE(p int) []rawCE {
-	return mkCE([]int{p, defaultSecondary, defaultTertiary, 0}, 0)
-}
-
-func pqCE(p, q int) []rawCE {
-	return mkCE([]int{p, defaultSecondary, defaultTertiary, q}, 0)
-}
-
-func ptCE(p, t int) []rawCE {
-	return mkCE([]int{p, defaultSecondary, t, 0}, 0)
-}
-
-func ptcCE(p, t int, ccc uint8) []rawCE {
-	return mkCE([]int{p, defaultSecondary, t, 0}, ccc)
-}
-
-func sCE(s int) []rawCE {
-	return mkCE([]int{0, s, defaultTertiary, 0}, 0)
-}
-
-func stCE(s, t int) []rawCE {
-	return mkCE([]int{0, s, t, 0}, 0)
-}
-
-func scCE(s int, ccc uint8) []rawCE {
-	return mkCE([]int{0, s, defaultTertiary, 0}, ccc)
-}
-
-func mkCE(w []int, ccc uint8) []rawCE {
-	return []rawCE{rawCE{w, ccc}}
-}
-
-// ducetElem is used to define test data that is used to generate a table.
-type ducetElem struct {
-	str string
-	ces []rawCE
-}
-
-func newBuilder(t *testing.T, ducet []ducetElem) *Builder {
-	b := NewBuilder()
-	for _, e := range ducet {
-		ces := [][]int{}
-		for _, ce := range e.ces {
-			ces = append(ces, ce.w)
-		}
-		if err := b.Add([]rune(e.str), ces, nil); err != nil {
-			t.Errorf(err.Error())
-		}
-	}
-	b.t = &table{}
-	b.root.sort()
-	return b
-}
-
-type convertTest struct {
-	in, out []rawCE
-	err     bool
-}
-
-var convLargeTests = []convertTest{
-	{pCE(0xFB39), pCE(0xFB39), false},
-	{cjk(0x2F9B2), pqCE(0x3F9B2, 0x2F9B2), false},
-	{pCE(0xFB40), pCE(0), true},
-	{append(pCE(0xFB40), pCE(0)[0]), pCE(0), true},
-	{pCE(0xFFFE), pCE(illegalOffset), false},
-	{pCE(0xFFFF), pCE(illegalOffset + 1), false},
-}
-
-func TestConvertLarge(t *testing.T) {
-	for i, tt := range convLargeTests {
-		e := new(entry)
-		for _, ce := range tt.in {
-			e.elems = append(e.elems, makeRawCE(ce.w, ce.ccc))
-		}
-		elems, err := convertLargeWeights(e.elems)
-		if tt.err {
-			if err == nil {
-				t.Errorf("%d: expected error; none found", i)
-			}
-			continue
-		} else if err != nil {
-			t.Errorf("%d: unexpected error: %v", i, err)
-		}
-		if !equalCEArrays(elems, tt.out) {
-			t.Errorf("%d: conversion was %x; want %x", i, elems, tt.out)
-		}
-	}
-}
-
-// Collation element table for simplify tests.
-var simplifyTest = []ducetElem{
-	{"\u0300", sCE(30)}, // grave
-	{"\u030C", sCE(40)}, // caron
-	{"A", ptCE(100, 8)},
-	{"D", ptCE(104, 8)},
-	{"E", ptCE(105, 8)},
-	{"I", ptCE(110, 8)},
-	{"z", ptCE(130, 8)},
-	{"\u05F2", append(ptCE(200, 4), ptCE(200, 4)[0])},
-	{"\u05B7", sCE(80)},
-	{"\u00C0", append(ptCE(100, 8), sCE(30)...)},                                // A with grave, can be removed
-	{"\u00C8", append(ptCE(105, 8), sCE(30)...)},                                // E with grave
-	{"\uFB1F", append(ptCE(200, 4), ptCE(200, 4)[0], sCE(80)[0])},               // eliminated by NFD
-	{"\u00C8\u0302", ptCE(106, 8)},                                              // block previous from simplifying
-	{"\u01C5", append(ptCE(104, 9), ptCE(130, 4)[0], stCE(40, maxTertiary)[0])}, // eliminated by NFKD
-	// no removal: tertiary value of third element is not maxTertiary
-	{"\u2162", append(ptCE(110, 9), ptCE(110, 4)[0], ptCE(110, 8)[0])},
-}
-
-var genColTests = []ducetElem{
-	{"\uFA70", pqCE(0x1FA70, 0xFA70)},
-	{"A\u0300", append(ptCE(100, 8), sCE(30)...)},
-	{"A\u0300\uFA70", append(ptCE(100, 8), sCE(30)[0], pqCE(0x1FA70, 0xFA70)[0])},
-	{"A\u0300A\u0300", append(ptCE(100, 8), sCE(30)[0], ptCE(100, 8)[0], sCE(30)[0])},
-}
-
-func TestGenColElems(t *testing.T) {
-	b := newBuilder(t, simplifyTest[:5])
-
-	for i, tt := range genColTests {
-		res := b.root.genColElems(tt.str)
-		if !equalCEArrays(tt.ces, res) {
-			t.Errorf("%d: result %X; want %X", i, res, tt.ces)
-		}
-	}
-}
-
-type strArray []string
-
-func (sa strArray) contains(s string) bool {
-	for _, e := range sa {
-		if e == s {
-			return true
-		}
-	}
-	return false
-}
-
-var simplifyRemoved = strArray{"\u00C0", "\uFB1F"}
-var simplifyMarked = strArray{"\u01C5"}
-
-func TestSimplify(t *testing.T) {
-	b := newBuilder(t, simplifyTest)
-	o := &b.root
-	simplify(o)
-
-	for i, tt := range simplifyTest {
-		if simplifyRemoved.contains(tt.str) {
-			continue
-		}
-		e := o.find(tt.str)
-		if e.str != tt.str || !equalCEArrays(e.elems, tt.ces) {
-			t.Errorf("%d: found element %s -> %X; want %s -> %X", i, e.str, e.elems, tt.str, tt.ces)
-			break
-		}
-	}
-	var i, k int
-	for e := o.front(); e != nil; e, _ = e.nextIndexed() {
-		gold := simplifyMarked.contains(e.str)
-		if gold {
-			k++
-		}
-		if gold != e.decompose {
-			t.Errorf("%d: %s has decompose %v; want %v", i, e.str, e.decompose, gold)
-		}
-		i++
-	}
-	if k != len(simplifyMarked) {
-		t.Errorf(" an entry that should be marked as decompose was deleted")
-	}
-}
-
-var expandTest = []ducetElem{
-	{"\u0300", append(scCE(29, 230), scCE(30, 230)...)},
-	{"\u00C0", append(ptCE(100, 8), scCE(30, 230)...)},
-	{"\u00C8", append(ptCE(105, 8), scCE(30, 230)...)},
-	{"\u00C9", append(ptCE(105, 8), scCE(30, 230)...)}, // identical expansion
-	{"\u05F2", append(ptCE(200, 4), ptCE(200, 4)[0], ptCE(200, 4)[0])},
-	{"\u01FF", append(ptCE(200, 4), ptcCE(201, 4, 0)[0], scCE(30, 230)[0])},
-}
-
-func TestExpand(t *testing.T) {
-	const (
-		totalExpansions = 5
-		totalElements   = 2 + 2 + 2 + 3 + 3 + totalExpansions
-	)
-	b := newBuilder(t, expandTest)
-	o := &b.root
-	b.processExpansions(o)
-
-	e := o.front()
-	for _, tt := range expandTest {
-		exp := b.t.ExpandElem[e.expansionIndex:]
-		if int(exp[0]) != len(tt.ces) {
-			t.Errorf("%U: len(expansion)==%d; want %d", []rune(tt.str)[0], exp[0], len(tt.ces))
-		}
-		exp = exp[1:]
-		for j, w := range tt.ces {
-			if ce, _ := makeCE(w); exp[j] != ce {
-				t.Errorf("%U: element %d is %X; want %X", []rune(tt.str)[0], j, exp[j], ce)
-			}
-		}
-		e, _ = e.nextIndexed()
-	}
-	// Verify uniquing.
-	if len(b.t.ExpandElem) != totalElements {
-		t.Errorf("len(expandElem)==%d; want %d", len(b.t.ExpandElem), totalElements)
-	}
-}
-
-var contractTest = []ducetElem{
-	{"abc", pCE(102)},
-	{"abd", pCE(103)},
-	{"a", pCE(100)},
-	{"ab", pCE(101)},
-	{"ac", pCE(104)},
-	{"bcd", pCE(202)},
-	{"b", pCE(200)},
-	{"bc", pCE(201)},
-	{"bd", pCE(203)},
-	// shares suffixes with a*
-	{"Ab", pCE(301)},
-	{"A", pCE(300)},
-	{"Ac", pCE(304)},
-	{"Abc", pCE(302)},
-	{"Abd", pCE(303)},
-	// starter to be ignored
-	{"z", pCE(1000)},
-}
-
-func TestContract(t *testing.T) {
-	const (
-		totalElements = 5 + 5 + 4
-	)
-	b := newBuilder(t, contractTest)
-	o := &b.root
-	b.processContractions(o)
-
-	indexMap := make(map[int]bool)
-	handleMap := make(map[rune]*entry)
-	for e := o.front(); e != nil; e, _ = e.nextIndexed() {
-		if e.contractionHandle.n > 0 {
-			handleMap[e.runes[0]] = e
-			indexMap[e.contractionHandle.index] = true
-		}
-	}
-	// Verify uniquing.
-	if len(indexMap) != 2 {
-		t.Errorf("number of tries is %d; want %d", len(indexMap), 2)
-	}
-	for _, tt := range contractTest {
-		e, ok := handleMap[[]rune(tt.str)[0]]
-		if !ok {
-			continue
-		}
-		str := tt.str[1:]
-		offset, n := lookup(&b.t.ContractTries, e.contractionHandle, []byte(str))
-		if len(str) != n {
-			t.Errorf("%s: bytes consumed==%d; want %d", tt.str, n, len(str))
-		}
-		ce := b.t.ContractElem[offset+e.contractionIndex]
-		if want, _ := makeCE(tt.ces[0]); want != ce {
-			t.Errorf("%s: element %X; want %X", tt.str, ce, want)
-		}
-	}
-	if len(b.t.ContractElem) != totalElements {
-		t.Errorf("len(expandElem)==%d; want %d", len(b.t.ContractElem), totalElements)
-	}
-}
diff --git a/vendor/golang.org/x/text/collate/build/colelem_test.go b/vendor/golang.org/x/text/collate/build/colelem_test.go
deleted file mode 100644
index d0c8d07d..00000000
--- a/vendor/golang.org/x/text/collate/build/colelem_test.go
+++ /dev/null
@@ -1,215 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package build
-
-import (
-	"testing"
-
-	"golang.org/x/text/internal/colltab"
-)
-
-type ceTest struct {
-	f   func(in []int) (uint32, error)
-	arg []int
-	val uint32
-}
-
-func normalCE(in []int) (ce uint32, err error) {
-	return makeCE(rawCE{w: in[:3], ccc: uint8(in[3])})
-}
-
-func expandCE(in []int) (ce uint32, err error) {
-	return makeExpandIndex(in[0])
-}
-
-func contractCE(in []int) (ce uint32, err error) {
-	return makeContractIndex(ctHandle{in[0], in[1]}, in[2])
-}
-
-func decompCE(in []int) (ce uint32, err error) {
-	return makeDecompose(in[0], in[1])
-}
-
-var ceTests = []ceTest{
-	{normalCE, []int{0, 0, 0, 0}, 0xA0000000},
-	{normalCE, []int{0, 0x28, 3, 0}, 0xA0002803},
-	{normalCE, []int{0, 0x28, 3, 0xFF}, 0xAFF02803},
-	{normalCE, []int{100, defaultSecondary, 3, 0}, 0x0000C883},
-	// non-ignorable primary with non-default secondary
-	{normalCE, []int{100, 0x28, defaultTertiary, 0}, 0x4000C828},
-	{normalCE, []int{100, defaultSecondary + 8, 3, 0}, 0x0000C983},
-	{normalCE, []int{100, 0, 3, 0}, 0xFFFF}, // non-ignorable primary with non-supported secondary
-	{normalCE, []int{100, 1, 3, 0}, 0xFFFF},
-	{normalCE, []int{1 << maxPrimaryBits, defaultSecondary, 0, 0}, 0xFFFF},
-	{normalCE, []int{0, 1 << maxSecondaryBits, 0, 0}, 0xFFFF},
-	{normalCE, []int{100, defaultSecondary, 1 << maxTertiaryBits, 0}, 0xFFFF},
-	{normalCE, []int{0x123, defaultSecondary, 8, 0xFF}, 0x88FF0123},
-	{normalCE, []int{0x123, defaultSecondary + 1, 8, 0xFF}, 0xFFFF},
-
-	{contractCE, []int{0, 0, 0}, 0xC0000000},
-	{contractCE, []int{1, 1, 1}, 0xC0010011},
-	{contractCE, []int{1, (1 << maxNBits) - 1, 1}, 0xC001001F},
-	{contractCE, []int{(1 << maxTrieIndexBits) - 1, 1, 1}, 0xC001FFF1},
-	{contractCE, []int{1, 1, (1 << maxContractOffsetBits) - 1}, 0xDFFF0011},
-	{contractCE, []int{1, (1 << maxNBits), 1}, 0xFFFF},
-	{contractCE, []int{(1 << maxTrieIndexBits), 1, 1}, 0xFFFF},
-	{contractCE, []int{1, (1 << maxContractOffsetBits), 1}, 0xFFFF},
-
-	{expandCE, []int{0}, 0xE0000000},
-	{expandCE, []int{5}, 0xE0000005},
-	{expandCE, []int{(1 << maxExpandIndexBits) - 1}, 0xE000FFFF},
-	{expandCE, []int{1 << maxExpandIndexBits}, 0xFFFF},
-
-	{decompCE, []int{0, 0}, 0xF0000000},
-	{decompCE, []int{1, 1}, 0xF0000101},
-	{decompCE, []int{0x1F, 0x1F}, 0xF0001F1F},
-	{decompCE, []int{256, 0x1F}, 0xFFFF},
-	{decompCE, []int{0x1F, 256}, 0xFFFF},
-}
-
-func TestColElem(t *testing.T) {
-	for i, tt := range ceTests {
-		in := make([]int, len(tt.arg))
-		copy(in, tt.arg)
-		ce, err := tt.f(in)
-		if tt.val == 0xFFFF {
-			if err == nil {
-				t.Errorf("%d: expected error for args %x", i, tt.arg)
-			}
-			continue
-		}
-		if err != nil {
-			t.Errorf("%d: unexpected error: %v", i, err.Error())
-		}
-		if ce != tt.val {
-			t.Errorf("%d: colElem=%X; want %X", i, ce, tt.val)
-		}
-	}
-}
-
-func mkRawCES(in [][]int) []rawCE {
-	out := []rawCE{}
-	for _, w := range in {
-		out = append(out, rawCE{w: w})
-	}
-	return out
-}
-
-type weightsTest struct {
-	a, b   [][]int
-	level  colltab.Level
-	result int
-}
-
-var nextWeightTests = []weightsTest{
-	{
-		a:     [][]int{{100, 20, 5, 0}},
-		b:     [][]int{{101, defaultSecondary, defaultTertiary, 0}},
-		level: colltab.Primary,
-	},
-	{
-		a:     [][]int{{100, 20, 5, 0}},
-		b:     [][]int{{100, 21, defaultTertiary, 0}},
-		level: colltab.Secondary,
-	},
-	{
-		a:     [][]int{{100, 20, 5, 0}},
-		b:     [][]int{{100, 20, 6, 0}},
-		level: colltab.Tertiary,
-	},
-	{
-		a:     [][]int{{100, 20, 5, 0}},
-		b:     [][]int{{100, 20, 5, 0}},
-		level: colltab.Identity,
-	},
-}
-
-var extra = [][]int{{200, 32, 8, 0}, {0, 32, 8, 0}, {0, 0, 8, 0}, {0, 0, 0, 0}}
-
-func TestNextWeight(t *testing.T) {
-	for i, tt := range nextWeightTests {
-		test := func(l colltab.Level, tt weightsTest, a, gold [][]int) {
-			res := nextWeight(tt.level, mkRawCES(a))
-			if !equalCEArrays(mkRawCES(gold), res) {
-				t.Errorf("%d:%d: expected weights %d; found %d", i, l, gold, res)
-			}
-		}
-		test(-1, tt, tt.a, tt.b)
-		for l := colltab.Primary; l <= colltab.Tertiary; l++ {
-			if tt.level <= l {
-				test(l, tt, append(tt.a, extra[l]), tt.b)
-			} else {
-				test(l, tt, append(tt.a, extra[l]), append(tt.b, extra[l]))
-			}
-		}
-	}
-}
-
-var compareTests = []weightsTest{
-	{
-		[][]int{{100, 20, 5, 0}},
-		[][]int{{100, 20, 5, 0}},
-		colltab.Identity,
-		0,
-	},
-	{
-		[][]int{{100, 20, 5, 0}, extra[0]},
-		[][]int{{100, 20, 5, 1}},
-		colltab.Primary,
-		1,
-	},
-	{
-		[][]int{{100, 20, 5, 0}},
-		[][]int{{101, 20, 5, 0}},
-		colltab.Primary,
-		-1,
-	},
-	{
-		[][]int{{101, 20, 5, 0}},
-		[][]int{{100, 20, 5, 0}},
-		colltab.Primary,
-		1,
-	},
-	{
-		[][]int{{100, 0, 0, 0}, {0, 20, 5, 0}},
-		[][]int{{0, 20, 5, 0}, {100, 0, 0, 0}},
-		colltab.Identity,
-		0,
-	},
-	{
-		[][]int{{100, 20, 5, 0}},
-		[][]int{{100, 21, 5, 0}},
-		colltab.Secondary,
-		-1,
-	},
-	{
-		[][]int{{100, 20, 5, 0}},
-		[][]int{{100, 20, 2, 0}},
-		colltab.Tertiary,
-		1,
-	},
-	{
-		[][]int{{100, 20, 5, 1}},
-		[][]int{{100, 20, 5, 2}},
-		colltab.Quaternary,
-		-1,
-	},
-}
-
-func TestCompareWeights(t *testing.T) {
-	for i, tt := range compareTests {
-		test := func(tt weightsTest, a, b [][]int) {
-			res, level := compareWeights(mkRawCES(a), mkRawCES(b))
-			if res != tt.result {
-				t.Errorf("%d: expected comparison result %d; found %d", i, tt.result, res)
-			}
-			if level != tt.level {
-				t.Errorf("%d: expected level %d; found %d", i, tt.level, level)
-			}
-		}
-		test(tt, tt.a, tt.b)
-		test(tt, append(tt.a, extra[0]), append(tt.b, extra[0]))
-	}
-}
diff --git a/vendor/golang.org/x/text/collate/build/contract_test.go b/vendor/golang.org/x/text/collate/build/contract_test.go
deleted file mode 100644
index 2e0eaecd..00000000
--- a/vendor/golang.org/x/text/collate/build/contract_test.go
+++ /dev/null
@@ -1,266 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package build
-
-import (
-	"bytes"
-	"sort"
-	"testing"
-
-	"golang.org/x/text/internal/colltab"
-)
-
-var largetosmall = []stridx{
-	{"a", 5},
-	{"ab", 4},
-	{"abc", 3},
-	{"abcd", 2},
-	{"abcde", 1},
-	{"abcdef", 0},
-}
-
-var offsetSortTests = [][]stridx{
-	{
-		{"bcde", 1},
-		{"bc", 5},
-		{"ab", 4},
-		{"bcd", 3},
-		{"abcd", 0},
-		{"abc", 2},
-	},
-	largetosmall,
-}
-
-func TestOffsetSort(t *testing.T) {
-	for i, st := range offsetSortTests {
-		sort.Sort(offsetSort(st))
-		for j, si := range st {
-			if j != si.index {
-				t.Errorf("%d: failed: %v", i, st)
-			}
-		}
-	}
-	for i, tt := range genStateTests {
-		// ensure input is well-formed
-		sort.Sort(offsetSort(tt.in))
-		for j, si := range tt.in {
-			if si.index != j+1 {
-				t.Errorf("%dth sort failed: %v", i, tt.in)
-			}
-		}
-	}
-}
-
-var genidxtest1 = []stridx{
-	{"bcde", 3},
-	{"bc", 6},
-	{"ab", 2},
-	{"bcd", 5},
-	{"abcd", 0},
-	{"abc", 1},
-	{"bcdf", 4},
-}
-
-var genidxSortTests = [][]stridx{
-	genidxtest1,
-	largetosmall,
-}
-
-func TestGenIdxSort(t *testing.T) {
-	for i, st := range genidxSortTests {
-		sort.Sort(genidxSort(st))
-		for j, si := range st {
-			if j != si.index {
-				t.Errorf("%dth sort failed %v", i, st)
-				break
-			}
-		}
-	}
-}
-
-var entrySortTests = []colltab.ContractTrieSet{
-	{
-		{10, 0, 1, 3},
-		{99, 0, 1, 0},
-		{20, 50, 0, 2},
-		{30, 0, 1, 1},
-	},
-}
-
-func TestEntrySort(t *testing.T) {
-	for i, et := range entrySortTests {
-		sort.Sort(entrySort(et))
-		for j, fe := range et {
-			if j != int(fe.I) {
-				t.Errorf("%dth sort failed %v", i, et)
-				break
-			}
-		}
-	}
-}
-
-type GenStateTest struct {
-	in            []stridx
-	firstBlockLen int
-	out           colltab.ContractTrieSet
-}
-
-var genStateTests = []GenStateTest{
-	{[]stridx{
-		{"abc", 1},
-	},
-		1,
-		colltab.ContractTrieSet{
-			{'a', 0, 1, noIndex},
-			{'b', 0, 1, noIndex},
-			{'c', 'c', final, 1},
-		},
-	},
-	{[]stridx{
-		{"abc", 1},
-		{"abd", 2},
-		{"abe", 3},
-	},
-		1,
-		colltab.ContractTrieSet{
-			{'a', 0, 1, noIndex},
-			{'b', 0, 1, noIndex},
-			{'c', 'e', final, 1},
-		},
-	},
-	{[]stridx{
-		{"abc", 1},
-		{"ab", 2},
-		{"a", 3},
-	},
-		1,
-		colltab.ContractTrieSet{
-			{'a', 0, 1, 3},
-			{'b', 0, 1, 2},
-			{'c', 'c', final, 1},
-		},
-	},
-	{[]stridx{
-		{"abc", 1},
-		{"abd", 2},
-		{"ab", 3},
-		{"ac", 4},
-		{"a", 5},
-		{"b", 6},
-	},
-		2,
-		colltab.ContractTrieSet{
-			{'b', 'b', final, 6},
-			{'a', 0, 2, 5},
-			{'c', 'c', final, 4},
-			{'b', 0, 1, 3},
-			{'c', 'd', final, 1},
-		},
-	},
-	{[]stridx{
-		{"bcde", 2},
-		{"bc", 7},
-		{"ab", 6},
-		{"bcd", 5},
-		{"abcd", 1},
-		{"abc", 4},
-		{"bcdf", 3},
-	},
-		2,
-		colltab.ContractTrieSet{
-			{'b', 3, 1, noIndex},
-			{'a', 0, 1, noIndex},
-			{'b', 0, 1, 6},
-			{'c', 0, 1, 4},
-			{'d', 'd', final, 1},
-			{'c', 0, 1, 7},
-			{'d', 0, 1, 5},
-			{'e', 'f', final, 2},
-		},
-	},
-}
-
-func TestGenStates(t *testing.T) {
-	for i, tt := range genStateTests {
-		si := []stridx{}
-		for _, e := range tt.in {
-			si = append(si, e)
-		}
-		// ensure input is well-formed
-		sort.Sort(genidxSort(si))
-		ct := colltab.ContractTrieSet{}
-		n, _ := genStates(&ct, si)
-		if nn := tt.firstBlockLen; nn != n {
-			t.Errorf("%d: block len %v; want %v", i, n, nn)
-		}
-		if lv, lw := len(ct), len(tt.out); lv != lw {
-			t.Errorf("%d: len %v; want %v", i, lv, lw)
-			continue
-		}
-		for j, fe := range tt.out {
-			const msg = "%d:%d: value %s=%v; want %v"
-			if fe.L != ct[j].L {
-				t.Errorf(msg, i, j, "l", ct[j].L, fe.L)
-			}
-			if fe.H != ct[j].H {
-				t.Errorf(msg, i, j, "h", ct[j].H, fe.H)
-			}
-			if fe.N != ct[j].N {
-				t.Errorf(msg, i, j, "n", ct[j].N, fe.N)
-			}
-			if fe.I != ct[j].I {
-				t.Errorf(msg, i, j, "i", ct[j].I, fe.I)
-			}
-		}
-	}
-}
-
-func TestLookupContraction(t *testing.T) {
-	for i, tt := range genStateTests {
-		input := []string{}
-		for _, e := range tt.in {
-			input = append(input, e.str)
-		}
-		cts := colltab.ContractTrieSet{}
-		h, _ := appendTrie(&cts, input)
-		for j, si := range tt.in {
-			str := si.str
-			for _, s := range []string{str, str + "X"} {
-				msg := "%d:%d: %s(%s) %v; want %v"
-				idx, sn := lookup(&cts, h, []byte(s))
-				if idx != si.index {
-					t.Errorf(msg, i, j, "index", s, idx, si.index)
-				}
-				if sn != len(str) {
-					t.Errorf(msg, i, j, "sn", s, sn, len(str))
-				}
-			}
-		}
-	}
-}
-
-func TestPrintContractionTrieSet(t *testing.T) {
-	testdata := colltab.ContractTrieSet(genStateTests[4].out)
-	buf := &bytes.Buffer{}
-	print(&testdata, buf, "test")
-	if contractTrieOutput != buf.String() {
-		t.Errorf("output differs; found\n%s", buf.String())
-		println(string(buf.Bytes()))
-	}
-}
-
-const contractTrieOutput = `// testCTEntries: 8 entries, 32 bytes
-var testCTEntries = [8]struct{L,H,N,I uint8}{
-	{0x62, 0x3, 1, 255},
-	{0x61, 0x0, 1, 255},
-	{0x62, 0x0, 1, 6},
-	{0x63, 0x0, 1, 4},
-	{0x64, 0x64, 0, 1},
-	{0x63, 0x0, 1, 7},
-	{0x64, 0x0, 1, 5},
-	{0x65, 0x66, 0, 2},
-}
-var testContractTrieSet = colltab.ContractTrieSet( testCTEntries[:] )
-`
diff --git a/vendor/golang.org/x/text/collate/build/order_test.go b/vendor/golang.org/x/text/collate/build/order_test.go
deleted file mode 100644
index 0e174bfb..00000000
--- a/vendor/golang.org/x/text/collate/build/order_test.go
+++ /dev/null
@@ -1,229 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package build
-
-import (
-	"strconv"
-	"testing"
-
-	"golang.org/x/text/internal/colltab"
-)
-
-type entryTest struct {
-	f   func(in []int) (uint32, error)
-	arg []int
-	val uint32
-}
-
-// makeList returns a list of entries of length n+2, with n normal
-// entries plus a leading and trailing anchor.
-func makeList(n int) []*entry {
-	es := make([]*entry, n+2)
-	weights := []rawCE{{w: []int{100, 20, 5, 0}}}
-	for i := range es {
-		runes := []rune{rune(i)}
-		es[i] = &entry{
-			runes: runes,
-			elems: weights,
-		}
-		weights = nextWeight(colltab.Primary, weights)
-	}
-	for i := 1; i < len(es); i++ {
-		es[i-1].next = es[i]
-		es[i].prev = es[i-1]
-		_, es[i-1].level = compareWeights(es[i-1].elems, es[i].elems)
-	}
-	es[0].exclude = true
-	es[0].logical = firstAnchor
-	es[len(es)-1].exclude = true
-	es[len(es)-1].logical = lastAnchor
-	return es
-}
-
-func TestNextIndexed(t *testing.T) {
-	const n = 5
-	es := makeList(n)
-	for i := int64(0); i < 1<<n; i++ {
-		mask := strconv.FormatInt(i+(1<<n), 2)
-		for i, c := range mask {
-			es[i].exclude = c == '1'
-		}
-		e := es[0]
-		for i, c := range mask {
-			if c == '0' {
-				e, _ = e.nextIndexed()
-				if e != es[i] {
-					t.Errorf("%d: expected entry %d; found %d", i, es[i].elems, e.elems)
-				}
-			}
-		}
-		if e, _ = e.nextIndexed(); e != nil {
-			t.Errorf("%d: expected nil entry; found %d", i, e.elems)
-		}
-	}
-}
-
-func TestRemove(t *testing.T) {
-	const n = 5
-	for i := int64(0); i < 1<<n; i++ {
-		es := makeList(n)
-		mask := strconv.FormatInt(i+(1<<n), 2)
-		for i, c := range mask {
-			if c == '0' {
-				es[i].remove()
-			}
-		}
-		e := es[0]
-		for i, c := range mask {
-			if c == '1' {
-				if e != es[i] {
-					t.Errorf("%d: expected entry %d; found %d", i, es[i].elems, e.elems)
-				}
-				e, _ = e.nextIndexed()
-			}
-		}
-		if e != nil {
-			t.Errorf("%d: expected nil entry; found %d", i, e.elems)
-		}
-	}
-}
-
-// nextPerm generates the next permutation of the array.  The starting
-// permutation is assumed to be a list of integers sorted in increasing order.
-// It returns false if there are no more permuations left.
-func nextPerm(a []int) bool {
-	i := len(a) - 2
-	for ; i >= 0; i-- {
-		if a[i] < a[i+1] {
-			break
-		}
-	}
-	if i < 0 {
-		return false
-	}
-	for j := len(a) - 1; j >= i; j-- {
-		if a[j] > a[i] {
-			a[i], a[j] = a[j], a[i]
-			break
-		}
-	}
-	for j := i + 1; j < (len(a)+i+1)/2; j++ {
-		a[j], a[len(a)+i-j] = a[len(a)+i-j], a[j]
-	}
-	return true
-}
-
-func TestInsertAfter(t *testing.T) {
-	const n = 5
-	orig := makeList(n)
-	perm := make([]int, n)
-	for i := range perm {
-		perm[i] = i + 1
-	}
-	for ok := true; ok; ok = nextPerm(perm) {
-		es := makeList(n)
-		last := es[0]
-		for _, i := range perm {
-			last.insertAfter(es[i])
-			last = es[i]
-		}
-		for _, e := range es {
-			e.elems = es[0].elems
-		}
-		e := es[0]
-		for _, i := range perm {
-			e, _ = e.nextIndexed()
-			if e.runes[0] != orig[i].runes[0] {
-				t.Errorf("%d:%d: expected entry %X; found %X", perm, i, orig[i].runes, e.runes)
-				break
-			}
-		}
-	}
-}
-
-func TestInsertBefore(t *testing.T) {
-	const n = 5
-	orig := makeList(n)
-	perm := make([]int, n)
-	for i := range perm {
-		perm[i] = i + 1
-	}
-	for ok := true; ok; ok = nextPerm(perm) {
-		es := makeList(n)
-		last := es[len(es)-1]
-		for _, i := range perm {
-			last.insertBefore(es[i])
-			last = es[i]
-		}
-		for _, e := range es {
-			e.elems = es[0].elems
-		}
-		e := es[0]
-		for i := n - 1; i >= 0; i-- {
-			e, _ = e.nextIndexed()
-			if e.runes[0] != rune(perm[i]) {
-				t.Errorf("%d:%d: expected entry %X; found %X", perm, i, orig[i].runes, e.runes)
-				break
-			}
-		}
-	}
-}
-
-type entryLessTest struct {
-	a, b *entry
-	res  bool
-}
-
-var (
-	w1 = []rawCE{{w: []int{100, 20, 5, 5}}}
-	w2 = []rawCE{{w: []int{101, 20, 5, 5}}}
-)
-
-var entryLessTests = []entryLessTest{
-	{&entry{str: "a", elems: w1},
-		&entry{str: "a", elems: w1},
-		false,
-	},
-	{&entry{str: "a", elems: w1},
-		&entry{str: "a", elems: w2},
-		true,
-	},
-	{&entry{str: "a", elems: w1},
-		&entry{str: "b", elems: w1},
-		true,
-	},
-	{&entry{str: "a", elems: w2},
-		&entry{str: "a", elems: w1},
-		false,
-	},
-	{&entry{str: "c", elems: w1},
-		&entry{str: "b", elems: w1},
-		false,
-	},
-	{&entry{str: "a", elems: w1, logical: firstAnchor},
-		&entry{str: "a", elems: w1},
-		true,
-	},
-	{&entry{str: "a", elems: w1},
-		&entry{str: "b", elems: w1, logical: firstAnchor},
-		false,
-	},
-	{&entry{str: "b", elems: w1},
-		&entry{str: "a", elems: w1, logical: lastAnchor},
-		true,
-	},
-	{&entry{str: "a", elems: w1, logical: lastAnchor},
-		&entry{str: "c", elems: w1},
-		false,
-	},
-}
-
-func TestEntryLess(t *testing.T) {
-	for i, tt := range entryLessTests {
-		if res := entryLess(tt.a, tt.b); res != tt.res {
-			t.Errorf("%d: was %v; want %v", i, res, tt.res)
-		}
-	}
-}
diff --git a/vendor/golang.org/x/text/collate/build/trie_test.go b/vendor/golang.org/x/text/collate/build/trie_test.go
deleted file mode 100644
index 4d4f6e4d..00000000
--- a/vendor/golang.org/x/text/collate/build/trie_test.go
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package build
-
-import (
-	"bytes"
-	"fmt"
-	"testing"
-)
-
-// We take the smallest, largest and an arbitrary value for each
-// of the UTF-8 sequence lengths.
-var testRunes = []rune{
-	0x01, 0x0C, 0x7F, // 1-byte sequences
-	0x80, 0x100, 0x7FF, // 2-byte sequences
-	0x800, 0x999, 0xFFFF, // 3-byte sequences
-	0x10000, 0x10101, 0x10FFFF, // 4-byte sequences
-	0x200, 0x201, 0x202, 0x210, 0x215, // five entries in one sparse block
-}
-
-func makeTestTrie(t *testing.T) trie {
-	n := newNode()
-	for i, r := range testRunes {
-		n.insert(r, uint32(i))
-	}
-	idx := newTrieBuilder()
-	idx.addTrie(n)
-	tr, err := idx.generate()
-	if err != nil {
-		t.Errorf(err.Error())
-	}
-	return *tr
-}
-
-func TestGenerateTrie(t *testing.T) {
-	testdata := makeTestTrie(t)
-	buf := &bytes.Buffer{}
-	testdata.printArrays(buf, "test")
-	fmt.Fprintf(buf, "var testTrie = ")
-	testdata.printStruct(buf, &trieHandle{19, 0}, "test")
-	if output != buf.String() {
-		t.Error("output differs")
-	}
-}
-
-var output = `// testValues: 832 entries, 3328 bytes
-// Block 2 is the null block.
-var testValues = [832]uint32 {
-	// Block 0x0, offset 0x0
-	0x000c:0x00000001, 
-	// Block 0x1, offset 0x40
-	0x007f:0x00000002, 
-	// Block 0x2, offset 0x80
-	// Block 0x3, offset 0xc0
-	0x00c0:0x00000003, 
-	// Block 0x4, offset 0x100
-	0x0100:0x00000004, 
-	// Block 0x5, offset 0x140
-	0x0140:0x0000000c, 0x0141:0x0000000d, 0x0142:0x0000000e, 
-	0x0150:0x0000000f, 
-	0x0155:0x00000010, 
-	// Block 0x6, offset 0x180
-	0x01bf:0x00000005, 
-	// Block 0x7, offset 0x1c0
-	0x01c0:0x00000006, 
-	// Block 0x8, offset 0x200
-	0x0219:0x00000007, 
-	// Block 0x9, offset 0x240
-	0x027f:0x00000008, 
-	// Block 0xa, offset 0x280
-	0x0280:0x00000009, 
-	// Block 0xb, offset 0x2c0
-	0x02c1:0x0000000a, 
-	// Block 0xc, offset 0x300
-	0x033f:0x0000000b, 
-}
-
-// testLookup: 640 entries, 1280 bytes
-// Block 0 is the null block.
-var testLookup = [640]uint16 {
-	// Block 0x0, offset 0x0
-	// Block 0x1, offset 0x40
-	// Block 0x2, offset 0x80
-	// Block 0x3, offset 0xc0
-	0x0e0:0x05, 0x0e6:0x06, 
-	// Block 0x4, offset 0x100
-	0x13f:0x07, 
-	// Block 0x5, offset 0x140
-	0x140:0x08, 0x144:0x09, 
-	// Block 0x6, offset 0x180
-	0x190:0x03, 
-	// Block 0x7, offset 0x1c0
-	0x1ff:0x0a, 
-	// Block 0x8, offset 0x200
-	0x20f:0x05, 
-	// Block 0x9, offset 0x240
-	0x242:0x01, 0x244:0x02, 
-	0x248:0x03, 
-	0x25f:0x04, 
-	0x260:0x01, 
-	0x26f:0x02, 
-	0x270:0x04, 0x274:0x06, 
-}
-
-var testTrie = trie{ testLookup[1216:], testValues[0:], testLookup[:], testValues[:]}`
diff --git a/vendor/golang.org/x/text/collate/collate_test.go b/vendor/golang.org/x/text/collate/collate_test.go
deleted file mode 100644
index 0e78b96f..00000000
--- a/vendor/golang.org/x/text/collate/collate_test.go
+++ /dev/null
@@ -1,482 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package collate
-
-import (
-	"bytes"
-	"testing"
-
-	"golang.org/x/text/internal/colltab"
-	"golang.org/x/text/language"
-)
-
-type weightsTest struct {
-	opt     opts
-	in, out ColElems
-}
-
-type opts struct {
-	lev int
-	alt alternateHandling
-	top int
-
-	backwards bool
-	caseLevel bool
-}
-
-// ignore returns an initialized boolean array based on the given Level.
-// A negative value means using the default setting of quaternary.
-func ignore(level colltab.Level) (ignore [colltab.NumLevels]bool) {
-	if level < 0 {
-		level = colltab.Quaternary
-	}
-	for i := range ignore {
-		ignore[i] = level < colltab.Level(i)
-	}
-	return ignore
-}
-
-func makeCE(w []int) colltab.Elem {
-	ce, err := colltab.MakeElem(w[0], w[1], w[2], uint8(w[3]))
-	if err != nil {
-		panic(err)
-	}
-	return ce
-}
-
-func (o opts) collator() *Collator {
-	c := &Collator{
-		options: options{
-			ignore:      ignore(colltab.Level(o.lev - 1)),
-			alternate:   o.alt,
-			backwards:   o.backwards,
-			caseLevel:   o.caseLevel,
-			variableTop: uint32(o.top),
-		},
-	}
-	return c
-}
-
-const (
-	maxQ = 0x1FFFFF
-)
-
-func wpq(p, q int) Weights {
-	return W(p, defaults.Secondary, defaults.Tertiary, q)
-}
-
-func wsq(s, q int) Weights {
-	return W(0, s, defaults.Tertiary, q)
-}
-
-func wq(q int) Weights {
-	return W(0, 0, 0, q)
-}
-
-var zero = W(0, 0, 0, 0)
-
-var processTests = []weightsTest{
-	// Shifted
-	{ // simple sequence of non-variables
-		opt: opts{alt: altShifted, top: 100},
-		in:  ColElems{W(200), W(300), W(400)},
-		out: ColElems{wpq(200, maxQ), wpq(300, maxQ), wpq(400, maxQ)},
-	},
-	{ // first is a variable
-		opt: opts{alt: altShifted, top: 250},
-		in:  ColElems{W(200), W(300), W(400)},
-		out: ColElems{wq(200), wpq(300, maxQ), wpq(400, maxQ)},
-	},
-	{ // all but first are variable
-		opt: opts{alt: altShifted, top: 999},
-		in:  ColElems{W(1000), W(200), W(300), W(400)},
-		out: ColElems{wpq(1000, maxQ), wq(200), wq(300), wq(400)},
-	},
-	{ // first is a modifier
-		opt: opts{alt: altShifted, top: 999},
-		in:  ColElems{W(0, 10), W(1000)},
-		out: ColElems{wsq(10, maxQ), wpq(1000, maxQ)},
-	},
-	{ // primary ignorables
-		opt: opts{alt: altShifted, top: 250},
-		in:  ColElems{W(200), W(0, 10), W(300), W(0, 15), W(400)},
-		out: ColElems{wq(200), zero, wpq(300, maxQ), wsq(15, maxQ), wpq(400, maxQ)},
-	},
-	{ // secondary ignorables
-		opt: opts{alt: altShifted, top: 250},
-		in:  ColElems{W(200), W(0, 0, 10), W(300), W(0, 0, 15), W(400)},
-		out: ColElems{wq(200), zero, wpq(300, maxQ), W(0, 0, 15, maxQ), wpq(400, maxQ)},
-	},
-	{ // tertiary ignorables, no change
-		opt: opts{alt: altShifted, top: 250},
-		in:  ColElems{W(200), zero, W(300), zero, W(400)},
-		out: ColElems{wq(200), zero, wpq(300, maxQ), zero, wpq(400, maxQ)},
-	},
-
-	// ShiftTrimmed (same as Shifted)
-	{ // simple sequence of non-variables
-		opt: opts{alt: altShiftTrimmed, top: 100},
-		in:  ColElems{W(200), W(300), W(400)},
-		out: ColElems{wpq(200, maxQ), wpq(300, maxQ), wpq(400, maxQ)},
-	},
-	{ // first is a variable
-		opt: opts{alt: altShiftTrimmed, top: 250},
-		in:  ColElems{W(200), W(300), W(400)},
-		out: ColElems{wq(200), wpq(300, maxQ), wpq(400, maxQ)},
-	},
-	{ // all but first are variable
-		opt: opts{alt: altShiftTrimmed, top: 999},
-		in:  ColElems{W(1000), W(200), W(300), W(400)},
-		out: ColElems{wpq(1000, maxQ), wq(200), wq(300), wq(400)},
-	},
-	{ // first is a modifier
-		opt: opts{alt: altShiftTrimmed, top: 999},
-		in:  ColElems{W(0, 10), W(1000)},
-		out: ColElems{wsq(10, maxQ), wpq(1000, maxQ)},
-	},
-	{ // primary ignorables
-		opt: opts{alt: altShiftTrimmed, top: 250},
-		in:  ColElems{W(200), W(0, 10), W(300), W(0, 15), W(400)},
-		out: ColElems{wq(200), zero, wpq(300, maxQ), wsq(15, maxQ), wpq(400, maxQ)},
-	},
-	{ // secondary ignorables
-		opt: opts{alt: altShiftTrimmed, top: 250},
-		in:  ColElems{W(200), W(0, 0, 10), W(300), W(0, 0, 15), W(400)},
-		out: ColElems{wq(200), zero, wpq(300, maxQ), W(0, 0, 15, maxQ), wpq(400, maxQ)},
-	},
-	{ // tertiary ignorables, no change
-		opt: opts{alt: altShiftTrimmed, top: 250},
-		in:  ColElems{W(200), zero, W(300), zero, W(400)},
-		out: ColElems{wq(200), zero, wpq(300, maxQ), zero, wpq(400, maxQ)},
-	},
-
-	// Blanked
-	{ // simple sequence of non-variables
-		opt: opts{alt: altBlanked, top: 100},
-		in:  ColElems{W(200), W(300), W(400)},
-		out: ColElems{W(200), W(300), W(400)},
-	},
-	{ // first is a variable
-		opt: opts{alt: altBlanked, top: 250},
-		in:  ColElems{W(200), W(300), W(400)},
-		out: ColElems{zero, W(300), W(400)},
-	},
-	{ // all but first are variable
-		opt: opts{alt: altBlanked, top: 999},
-		in:  ColElems{W(1000), W(200), W(300), W(400)},
-		out: ColElems{W(1000), zero, zero, zero},
-	},
-	{ // first is a modifier
-		opt: opts{alt: altBlanked, top: 999},
-		in:  ColElems{W(0, 10), W(1000)},
-		out: ColElems{W(0, 10), W(1000)},
-	},
-	{ // primary ignorables
-		opt: opts{alt: altBlanked, top: 250},
-		in:  ColElems{W(200), W(0, 10), W(300), W(0, 15), W(400)},
-		out: ColElems{zero, zero, W(300), W(0, 15), W(400)},
-	},
-	{ // secondary ignorables
-		opt: opts{alt: altBlanked, top: 250},
-		in:  ColElems{W(200), W(0, 0, 10), W(300), W(0, 0, 15), W(400)},
-		out: ColElems{zero, zero, W(300), W(0, 0, 15), W(400)},
-	},
-	{ // tertiary ignorables, no change
-		opt: opts{alt: altBlanked, top: 250},
-		in:  ColElems{W(200), zero, W(300), zero, W(400)},
-		out: ColElems{zero, zero, W(300), zero, W(400)},
-	},
-
-	// Non-ignorable: input is always equal to output.
-	{ // all but first are variable
-		opt: opts{alt: altNonIgnorable, top: 999},
-		in:  ColElems{W(1000), W(200), W(300), W(400)},
-		out: ColElems{W(1000), W(200), W(300), W(400)},
-	},
-	{ // primary ignorables
-		opt: opts{alt: altNonIgnorable, top: 250},
-		in:  ColElems{W(200), W(0, 10), W(300), W(0, 15), W(400)},
-		out: ColElems{W(200), W(0, 10), W(300), W(0, 15), W(400)},
-	},
-	{ // secondary ignorables
-		opt: opts{alt: altNonIgnorable, top: 250},
-		in:  ColElems{W(200), W(0, 0, 10), W(300), W(0, 0, 15), W(400)},
-		out: ColElems{W(200), W(0, 0, 10), W(300), W(0, 0, 15), W(400)},
-	},
-	{ // tertiary ignorables, no change
-		opt: opts{alt: altNonIgnorable, top: 250},
-		in:  ColElems{W(200), zero, W(300), zero, W(400)},
-		out: ColElems{W(200), zero, W(300), zero, W(400)},
-	},
-}
-
-func TestProcessWeights(t *testing.T) {
-	for i, tt := range processTests {
-		in := convertFromWeights(tt.in)
-		out := convertFromWeights(tt.out)
-		processWeights(tt.opt.alt, uint32(tt.opt.top), in)
-		for j, w := range in {
-			if w != out[j] {
-				t.Errorf("%d: Weights %d was %v; want %v", i, j, w, out[j])
-			}
-		}
-	}
-}
-
-type keyFromElemTest struct {
-	opt opts
-	in  ColElems
-	out []byte
-}
-
-var defS = byte(defaults.Secondary)
-var defT = byte(defaults.Tertiary)
-
-const sep = 0 // separator byte
-
-var keyFromElemTests = []keyFromElemTest{
-	{ // simple primary and secondary weights.
-		opts{alt: altShifted},
-		ColElems{W(0x200), W(0x7FFF), W(0, 0x30), W(0x100)},
-		[]byte{0x2, 0, 0x7F, 0xFF, 0x1, 0x00, // primary
-			sep, sep, 0, defS, 0, defS, 0, 0x30, 0, defS, // secondary
-			sep, sep, defT, defT, defT, defT, // tertiary
-			sep, 0xFF, 0xFF, 0xFF, 0xFF, // quaternary
-		},
-	},
-	{ // same as first, but with zero element that need to be removed
-		opts{alt: altShifted},
-		ColElems{W(0x200), zero, W(0x7FFF), W(0, 0x30), zero, W(0x100)},
-		[]byte{0x2, 0, 0x7F, 0xFF, 0x1, 0x00, // primary
-			sep, sep, 0, defS, 0, defS, 0, 0x30, 0, defS, // secondary
-			sep, sep, defT, defT, defT, defT, // tertiary
-			sep, 0xFF, 0xFF, 0xFF, 0xFF, // quaternary
-		},
-	},
-	{ // same as first, with large primary values
-		opts{alt: altShifted},
-		ColElems{W(0x200), W(0x8000), W(0, 0x30), W(0x12345)},
-		[]byte{0x2, 0, 0x80, 0x80, 0x00, 0x81, 0x23, 0x45, // primary
-			sep, sep, 0, defS, 0, defS, 0, 0x30, 0, defS, // secondary
-			sep, sep, defT, defT, defT, defT, // tertiary
-			sep, 0xFF, 0xFF, 0xFF, 0xFF, // quaternary
-		},
-	},
-	{ // same as first, but with the secondary level backwards
-		opts{alt: altShifted, backwards: true},
-		ColElems{W(0x200), W(0x7FFF), W(0, 0x30), W(0x100)},
-		[]byte{0x2, 0, 0x7F, 0xFF, 0x1, 0x00, // primary
-			sep, sep, 0, defS, 0, 0x30, 0, defS, 0, defS, // secondary
-			sep, sep, defT, defT, defT, defT, // tertiary
-			sep, 0xFF, 0xFF, 0xFF, 0xFF, // quaternary
-		},
-	},
-	{ // same as first, ignoring quaternary level
-		opts{alt: altShifted, lev: 3},
-		ColElems{W(0x200), zero, W(0x7FFF), W(0, 0x30), zero, W(0x100)},
-		[]byte{0x2, 0, 0x7F, 0xFF, 0x1, 0x00, // primary
-			sep, sep, 0, defS, 0, defS, 0, 0x30, 0, defS, // secondary
-			sep, sep, defT, defT, defT, defT, // tertiary
-		},
-	},
-	{ // same as first, ignoring tertiary level
-		opts{alt: altShifted, lev: 2},
-		ColElems{W(0x200), zero, W(0x7FFF), W(0, 0x30), zero, W(0x100)},
-		[]byte{0x2, 0, 0x7F, 0xFF, 0x1, 0x00, // primary
-			sep, sep, 0, defS, 0, defS, 0, 0x30, 0, defS, // secondary
-		},
-	},
-	{ // same as first, ignoring secondary level
-		opts{alt: altShifted, lev: 1},
-		ColElems{W(0x200), zero, W(0x7FFF), W(0, 0x30), zero, W(0x100)},
-		[]byte{0x2, 0, 0x7F, 0xFF, 0x1, 0x00},
-	},
-	{ // simple primary and secondary weights.
-		opts{alt: altShiftTrimmed, top: 0x250},
-		ColElems{W(0x300), W(0x200), W(0x7FFF), W(0, 0x30), W(0x800)},
-		[]byte{0x3, 0, 0x7F, 0xFF, 0x8, 0x00, // primary
-			sep, sep, 0, defS, 0, defS, 0, 0x30, 0, defS, // secondary
-			sep, sep, defT, defT, defT, defT, // tertiary
-			sep, 0xFF, 0x2, 0, // quaternary
-		},
-	},
-	{ // as first, primary with case level enabled
-		opts{alt: altShifted, lev: 1, caseLevel: true},
-		ColElems{W(0x200), W(0x7FFF), W(0, 0x30), W(0x100)},
-		[]byte{0x2, 0, 0x7F, 0xFF, 0x1, 0x00, // primary
-			sep, sep, // secondary
-			sep, sep, defT, defT, defT, defT, // tertiary
-		},
-	},
-}
-
-func TestKeyFromElems(t *testing.T) {
-	buf := Buffer{}
-	for i, tt := range keyFromElemTests {
-		buf.Reset()
-		in := convertFromWeights(tt.in)
-		processWeights(tt.opt.alt, uint32(tt.opt.top), in)
-		tt.opt.collator().keyFromElems(&buf, in)
-		res := buf.key
-		if len(res) != len(tt.out) {
-			t.Errorf("%d: len(ws) was %d; want %d (%X should be %X)", i, len(res), len(tt.out), res, tt.out)
-		}
-		n := len(res)
-		if len(tt.out) < n {
-			n = len(tt.out)
-		}
-		for j, c := range res[:n] {
-			if c != tt.out[j] {
-				t.Errorf("%d: byte %d was %X; want %X", i, j, c, tt.out[j])
-			}
-		}
-	}
-}
-
-func TestGetColElems(t *testing.T) {
-	for i, tt := range appendNextTests {
-		c, err := makeTable(tt.in)
-		if err != nil {
-			// error is reported in TestAppendNext
-			continue
-		}
-		// Create one large test per table
-		str := make([]byte, 0, 4000)
-		out := ColElems{}
-		for len(str) < 3000 {
-			for _, chk := range tt.chk {
-				str = append(str, chk.in[:chk.n]...)
-				out = append(out, chk.out...)
-			}
-		}
-		for j, chk := range append(tt.chk, check{string(str), len(str), out}) {
-			out := convertFromWeights(chk.out)
-			ce := c.getColElems([]byte(chk.in)[:chk.n])
-			if len(ce) != len(out) {
-				t.Errorf("%d:%d: len(ws) was %d; want %d", i, j, len(ce), len(out))
-				continue
-			}
-			cnt := 0
-			for k, w := range ce {
-				w, _ = colltab.MakeElem(w.Primary(), w.Secondary(), int(w.Tertiary()), 0)
-				if w != out[k] {
-					t.Errorf("%d:%d: Weights %d was %X; want %X", i, j, k, w, out[k])
-					cnt++
-				}
-				if cnt > 10 {
-					break
-				}
-			}
-		}
-	}
-}
-
-type keyTest struct {
-	in  string
-	out []byte
-}
-
-var keyTests = []keyTest{
-	{"abc",
-		[]byte{0, 100, 0, 200, 1, 44, 0, 0, 0, 32, 0, 32, 0, 32, 0, 0, 2, 2, 2, 0, 255, 255, 255},
-	},
-	{"a\u0301",
-		[]byte{0, 102, 0, 0, 0, 32, 0, 0, 2, 0, 255},
-	},
-	{"aaaaa",
-		[]byte{0, 100, 0, 100, 0, 100, 0, 100, 0, 100, 0, 0,
-			0, 32, 0, 32, 0, 32, 0, 32, 0, 32, 0, 0,
-			2, 2, 2, 2, 2, 0,
-			255, 255, 255, 255, 255,
-		},
-	},
-	// Issue 16391: incomplete rune at end of UTF-8 sequence.
-	{"\xc2", []byte{133, 255, 253, 0, 0, 0, 32, 0, 0, 2, 0, 255}},
-	{"\xc2a", []byte{133, 255, 253, 0, 100, 0, 0, 0, 32, 0, 32, 0, 0, 2, 2, 0, 255, 255}},
-}
-
-func TestKey(t *testing.T) {
-	c, _ := makeTable(appendNextTests[4].in)
-	c.alternate = altShifted
-	c.ignore = ignore(colltab.Quaternary)
-	buf := Buffer{}
-	keys1 := [][]byte{}
-	keys2 := [][]byte{}
-	for _, tt := range keyTests {
-		keys1 = append(keys1, c.Key(&buf, []byte(tt.in)))
-		keys2 = append(keys2, c.KeyFromString(&buf, tt.in))
-	}
-	// Separate generation from testing to ensure buffers are not overwritten.
-	for i, tt := range keyTests {
-		if !bytes.Equal(keys1[i], tt.out) {
-			t.Errorf("%d: Key(%q) = %d; want %d", i, tt.in, keys1[i], tt.out)
-		}
-		if !bytes.Equal(keys2[i], tt.out) {
-			t.Errorf("%d: KeyFromString(%q) = %d; want %d", i, tt.in, keys2[i], tt.out)
-		}
-	}
-}
-
-type compareTest struct {
-	a, b string
-	res  int // comparison result
-}
-
-var compareTests = []compareTest{
-	{"a\u0301", "a", 1},
-	{"a\u0301b", "ab", 1},
-	{"a", "a\u0301", -1},
-	{"ab", "a\u0301b", -1},
-	{"bc", "a\u0301c", 1},
-	{"ab", "aB", -1},
-	{"a\u0301", "a\u0301", 0},
-	{"a", "a", 0},
-	// Only clip prefixes of whole runes.
-	{"\u302E", "\u302F", 1},
-	// Don't clip prefixes when last rune of prefix may be part of contraction.
-	{"a\u035E", "a\u0301\u035F", -1},
-	{"a\u0301\u035Fb", "a\u0301\u035F", -1},
-}
-
-func TestCompare(t *testing.T) {
-	c, _ := makeTable(appendNextTests[4].in)
-	for i, tt := range compareTests {
-		if res := c.Compare([]byte(tt.a), []byte(tt.b)); res != tt.res {
-			t.Errorf("%d: Compare(%q, %q) == %d; want %d", i, tt.a, tt.b, res, tt.res)
-		}
-		if res := c.CompareString(tt.a, tt.b); res != tt.res {
-			t.Errorf("%d: CompareString(%q, %q) == %d; want %d", i, tt.a, tt.b, res, tt.res)
-		}
-	}
-}
-
-func TestNumeric(t *testing.T) {
-	c := New(language.English, Loose, Numeric)
-
-	for i, tt := range []struct {
-		a, b string
-		want int
-	}{
-		{"1", "2", -1},
-		{"2", "12", -1},
-		{"２", "１２", -1}, // Fullwidth is sorted as usual.
-		{"₂", "₁₂", 1},  // Subscript is not sorted as numbers.
-		{"②", "①②", 1},  // Circled is not sorted as numbers.
-		{ // Imperial Aramaic, is not sorted as number.
-			"\U00010859",
-			"\U00010858\U00010859",
-			1,
-		},
-		{"12", "2", 1},
-		{"A-1", "A-2", -1},
-		{"A-2", "A-12", -1},
-		{"A-12", "A-2", 1},
-		{"A-0001", "A-1", 0},
-	} {
-		if got := c.CompareString(tt.a, tt.b); got != tt.want {
-			t.Errorf("%d: CompareString(%s, %s) = %d; want %d", i, tt.a, tt.b, got, tt.want)
-		}
-	}
-}
diff --git a/vendor/golang.org/x/text/collate/export_test.go b/vendor/golang.org/x/text/collate/export_test.go
deleted file mode 100644
index 69bfeaf1..00000000
--- a/vendor/golang.org/x/text/collate/export_test.go
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package collate
-
-// Export for testing.
-// TODO: no longer necessary. Remove at some point.
-
-import (
-	"fmt"
-
-	"golang.org/x/text/internal/colltab"
-)
-
-const (
-	defaultSecondary = 0x20
-	defaultTertiary  = 0x2
-)
-
-type Weights struct {
-	Primary, Secondary, Tertiary, Quaternary int
-}
-
-func W(ce ...int) Weights {
-	w := Weights{ce[0], defaultSecondary, defaultTertiary, 0}
-	if len(ce) > 1 {
-		w.Secondary = ce[1]
-	}
-	if len(ce) > 2 {
-		w.Tertiary = ce[2]
-	}
-	if len(ce) > 3 {
-		w.Quaternary = ce[3]
-	}
-	return w
-}
-func (w Weights) String() string {
-	return fmt.Sprintf("[%X.%X.%X.%X]", w.Primary, w.Secondary, w.Tertiary, w.Quaternary)
-}
-
-func convertFromWeights(ws []Weights) []colltab.Elem {
-	out := make([]colltab.Elem, len(ws))
-	for i, w := range ws {
-		out[i], _ = colltab.MakeElem(w.Primary, w.Secondary, w.Tertiary, 0)
-		if out[i] == colltab.Ignore && w.Quaternary > 0 {
-			out[i] = colltab.MakeQuaternary(w.Quaternary)
-		}
-	}
-	return out
-}
diff --git a/vendor/golang.org/x/text/collate/option_test.go b/vendor/golang.org/x/text/collate/option_test.go
deleted file mode 100644
index 0f6ba9bc..00000000
--- a/vendor/golang.org/x/text/collate/option_test.go
+++ /dev/null
@@ -1,209 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-package collate
-
-import (
-	"reflect"
-	"strings"
-	"testing"
-
-	"golang.org/x/text/internal/colltab"
-	"golang.org/x/text/language"
-)
-
-var (
-	defaultIgnore = ignore(colltab.Tertiary)
-	defaultTable  = getTable(locales[0])
-)
-
-func TestOptions(t *testing.T) {
-	for i, tt := range []struct {
-		in  []Option
-		out options
-	}{
-		0: {
-			out: options{
-				ignore: defaultIgnore,
-			},
-		},
-		1: {
-			in: []Option{IgnoreDiacritics},
-			out: options{
-				ignore: [colltab.NumLevels]bool{false, true, false, true, true},
-			},
-		},
-		2: {
-			in: []Option{IgnoreCase, IgnoreDiacritics},
-			out: options{
-				ignore: ignore(colltab.Primary),
-			},
-		},
-		3: {
-			in: []Option{ignoreDiacritics, IgnoreWidth},
-			out: options{
-				ignore:    ignore(colltab.Primary),
-				caseLevel: true,
-			},
-		},
-		4: {
-			in: []Option{IgnoreWidth, ignoreDiacritics},
-			out: options{
-				ignore:    ignore(colltab.Primary),
-				caseLevel: true,
-			},
-		},
-		5: {
-			in: []Option{IgnoreCase, IgnoreWidth},
-			out: options{
-				ignore: ignore(colltab.Secondary),
-			},
-		},
-		6: {
-			in: []Option{IgnoreCase, IgnoreWidth, Loose},
-			out: options{
-				ignore: ignore(colltab.Primary),
-			},
-		},
-		7: {
-			in: []Option{Force, IgnoreCase, IgnoreWidth, Loose},
-			out: options{
-				ignore: [colltab.NumLevels]bool{false, true, true, true, false},
-			},
-		},
-		8: {
-			in: []Option{IgnoreDiacritics, IgnoreCase},
-			out: options{
-				ignore: ignore(colltab.Primary),
-			},
-		},
-		9: {
-			in: []Option{Numeric},
-			out: options{
-				ignore:  defaultIgnore,
-				numeric: true,
-			},
-		},
-		10: {
-			in: []Option{OptionsFromTag(language.MustParse("und-u-ks-level1"))},
-			out: options{
-				ignore: ignore(colltab.Primary),
-			},
-		},
-		11: {
-			in: []Option{OptionsFromTag(language.MustParse("und-u-ks-level4"))},
-			out: options{
-				ignore: ignore(colltab.Quaternary),
-			},
-		},
-		12: {
-			in:  []Option{OptionsFromTag(language.MustParse("und-u-ks-identic"))},
-			out: options{},
-		},
-		13: {
-			in: []Option{
-				OptionsFromTag(language.MustParse("und-u-kn-true-kb-true-kc-true")),
-			},
-			out: options{
-				ignore:    defaultIgnore,
-				caseLevel: true,
-				backwards: true,
-				numeric:   true,
-			},
-		},
-		14: {
-			in: []Option{
-				OptionsFromTag(language.MustParse("und-u-kn-true-kb-true-kc-true")),
-				OptionsFromTag(language.MustParse("und-u-kn-false-kb-false-kc-false")),
-			},
-			out: options{
-				ignore: defaultIgnore,
-			},
-		},
-		15: {
-			in: []Option{
-				OptionsFromTag(language.MustParse("und-u-kn-true-kb-true-kc-true")),
-				OptionsFromTag(language.MustParse("und-u-kn-foo-kb-foo-kc-foo")),
-			},
-			out: options{
-				ignore:    defaultIgnore,
-				caseLevel: true,
-				backwards: true,
-				numeric:   true,
-			},
-		},
-		16: { // Normal options take precedence over tag options.
-			in: []Option{
-				Numeric, IgnoreCase,
-				OptionsFromTag(language.MustParse("und-u-kn-false-kc-true")),
-			},
-			out: options{
-				ignore:    ignore(colltab.Secondary),
-				caseLevel: false,
-				numeric:   true,
-			},
-		},
-		17: {
-			in: []Option{
-				OptionsFromTag(language.MustParse("und-u-ka-shifted")),
-			},
-			out: options{
-				ignore:    defaultIgnore,
-				alternate: altShifted,
-			},
-		},
-		18: {
-			in: []Option{
-				OptionsFromTag(language.MustParse("und-u-ka-blanked")),
-			},
-			out: options{
-				ignore:    defaultIgnore,
-				alternate: altBlanked,
-			},
-		},
-		19: {
-			in: []Option{
-				OptionsFromTag(language.MustParse("und-u-ka-posix")),
-			},
-			out: options{
-				ignore:    defaultIgnore,
-				alternate: altShiftTrimmed,
-			},
-		},
-	} {
-		c := newCollator(defaultTable)
-		c.t = nil
-		c.variableTop = 0
-		c.f = 0
-
-		c.setOptions(tt.in)
-		if !reflect.DeepEqual(c.options, tt.out) {
-			t.Errorf("%d: got %v; want %v", i, c.options, tt.out)
-		}
-	}
-}
-
-func TestAlternateSortTypes(t *testing.T) {
-	testCases := []struct {
-		lang string
-		in   []string
-		want []string
-	}{{
-		lang: "zh,cmn,zh-Hant-u-co-pinyin,zh-HK-u-co-pinyin,zh-pinyin",
-		in:   []string{"爸爸", "妈妈", "儿子", "女儿"},
-		want: []string{"爸爸", "儿子", "妈妈", "女儿"},
-	}, {
-		lang: "zh-Hant,zh-u-co-stroke,zh-Hant-u-co-stroke",
-		in:   []string{"爸爸", "妈妈", "儿子", "女儿"},
-		want: []string{"儿子", "女儿", "妈妈", "爸爸"},
-	}}
-	for _, tc := range testCases {
-		for _, tag := range strings.Split(tc.lang, ",") {
-			got := append([]string{}, tc.in...)
-			New(language.MustParse(tag)).SortStrings(got)
-			if !reflect.DeepEqual(got, tc.want) {
-				t.Errorf("New(%s).SortStrings(%v) = %v; want %v", tag, tc.in, got, tc.want)
-			}
-		}
-	}
-}
diff --git a/vendor/golang.org/x/text/collate/reg_test.go b/vendor/golang.org/x/text/collate/reg_test.go
deleted file mode 100644
index 1ac5fedc..00000000
--- a/vendor/golang.org/x/text/collate/reg_test.go
+++ /dev/null
@@ -1,230 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package collate
-
-import (
-	"archive/zip"
-	"bufio"
-	"bytes"
-	"flag"
-	"io"
-	"io/ioutil"
-	"log"
-	"path"
-	"regexp"
-	"strconv"
-	"strings"
-	"testing"
-	"unicode/utf8"
-
-	"golang.org/x/text/collate/build"
-	"golang.org/x/text/internal/gen"
-	"golang.org/x/text/language"
-)
-
-var long = flag.Bool("long", false,
-	"run time-consuming tests, such as tests that fetch data online")
-
-// This regression test runs tests for the test files in CollationTest.zip
-// (taken from http://www.unicode.org/Public/UCA/<gen.UnicodeVersion()>/).
-//
-// The test files have the following form:
-// # header
-// 0009 0021;	# ('\u0009') <CHARACTER TABULATION>	[| | | 0201 025E]
-// 0009 003F;	# ('\u0009') <CHARACTER TABULATION>	[| | | 0201 0263]
-// 000A 0021;	# ('\u000A') <LINE FEED (LF)>	[| | | 0202 025E]
-// 000A 003F;	# ('\u000A') <LINE FEED (LF)>	[| | | 0202 0263]
-//
-// The part before the semicolon is the hex representation of a sequence
-// of runes. After the hash mark is a comment. The strings
-// represented by rune sequence are in the file in sorted order, as
-// defined by the DUCET.
-
-type Test struct {
-	name    string
-	str     [][]byte
-	comment []string
-}
-
-var versionRe = regexp.MustCompile(`# UCA Version: (.*)\n?$`)
-var testRe = regexp.MustCompile(`^([\dA-F ]+);.*# (.*)\n?$`)
-
-func TestCollation(t *testing.T) {
-	if !gen.IsLocal() && !*long {
-		t.Skip("skipping test to prevent downloading; to run use -long or use -local to specify a local source")
-	}
-	t.Skip("must first update to new file format to support test")
-	for _, test := range loadTestData() {
-		doTest(t, test)
-	}
-}
-
-func Error(e error) {
-	if e != nil {
-		log.Fatal(e)
-	}
-}
-
-// parseUCA parses a Default Unicode Collation Element Table of the format
-// specified in http://www.unicode.org/reports/tr10/#File_Format.
-// It returns the variable top.
-func parseUCA(builder *build.Builder) {
-	r := gen.OpenUnicodeFile("UCA", "", "allkeys.txt")
-	defer r.Close()
-	input := bufio.NewReader(r)
-	colelem := regexp.MustCompile(`\[([.*])([0-9A-F.]+)\]`)
-	for i := 1; true; i++ {
-		l, prefix, err := input.ReadLine()
-		if err == io.EOF {
-			break
-		}
-		Error(err)
-		line := string(l)
-		if prefix {
-			log.Fatalf("%d: buffer overflow", i)
-		}
-		if len(line) == 0 || line[0] == '#' {
-			continue
-		}
-		if line[0] == '@' {
-			if strings.HasPrefix(line[1:], "version ") {
-				if v := strings.Split(line[1:], " ")[1]; v != gen.UnicodeVersion() {
-					log.Fatalf("incompatible version %s; want %s", v, gen.UnicodeVersion())
-				}
-			}
-		} else {
-			// parse entries
-			part := strings.Split(line, " ; ")
-			if len(part) != 2 {
-				log.Fatalf("%d: production rule without ';': %v", i, line)
-			}
-			lhs := []rune{}
-			for _, v := range strings.Split(part[0], " ") {
-				if v != "" {
-					lhs = append(lhs, rune(convHex(i, v)))
-				}
-			}
-			vars := []int{}
-			rhs := [][]int{}
-			for i, m := range colelem.FindAllStringSubmatch(part[1], -1) {
-				if m[1] == "*" {
-					vars = append(vars, i)
-				}
-				elem := []int{}
-				for _, h := range strings.Split(m[2], ".") {
-					elem = append(elem, convHex(i, h))
-				}
-				rhs = append(rhs, elem)
-			}
-			builder.Add(lhs, rhs, vars)
-		}
-	}
-}
-
-func convHex(line int, s string) int {
-	r, e := strconv.ParseInt(s, 16, 32)
-	if e != nil {
-		log.Fatalf("%d: %v", line, e)
-	}
-	return int(r)
-}
-
-func loadTestData() []Test {
-	f := gen.OpenUnicodeFile("UCA", "", "CollationTest.zip")
-	buffer, err := ioutil.ReadAll(f)
-	f.Close()
-	Error(err)
-	archive, err := zip.NewReader(bytes.NewReader(buffer), int64(len(buffer)))
-	Error(err)
-	tests := []Test{}
-	for _, f := range archive.File {
-		// Skip the short versions, which are simply duplicates of the long versions.
-		if strings.Contains(f.Name, "SHORT") || f.FileInfo().IsDir() {
-			continue
-		}
-		ff, err := f.Open()
-		Error(err)
-		defer ff.Close()
-		scanner := bufio.NewScanner(ff)
-		test := Test{name: path.Base(f.Name)}
-		for scanner.Scan() {
-			line := scanner.Text()
-			if len(line) <= 1 || line[0] == '#' {
-				if m := versionRe.FindStringSubmatch(line); m != nil {
-					if m[1] != gen.UnicodeVersion() {
-						log.Printf("warning:%s: version is %s; want %s", f.Name, m[1], gen.UnicodeVersion())
-					}
-				}
-				continue
-			}
-			m := testRe.FindStringSubmatch(line)
-			if m == nil || len(m) < 3 {
-				log.Fatalf(`Failed to parse: "%s" result: %#v`, line, m)
-			}
-			str := []byte{}
-			// In the regression test data (unpaired) surrogates are assigned a weight
-			// corresponding to their code point value.  However, utf8.DecodeRune,
-			// which is used to compute the implicit weight, assigns FFFD to surrogates.
-			// We therefore skip tests with surrogates.  This skips about 35 entries
-			// per test.
-			valid := true
-			for _, split := range strings.Split(m[1], " ") {
-				r, err := strconv.ParseUint(split, 16, 64)
-				Error(err)
-				valid = valid && utf8.ValidRune(rune(r))
-				str = append(str, string(rune(r))...)
-			}
-			if valid {
-				test.str = append(test.str, str)
-				test.comment = append(test.comment, m[2])
-			}
-		}
-		if scanner.Err() != nil {
-			log.Fatal(scanner.Err())
-		}
-		tests = append(tests, test)
-	}
-	return tests
-}
-
-var errorCount int
-
-func runes(b []byte) []rune {
-	return []rune(string(b))
-}
-
-var shifted = language.MustParse("und-u-ka-shifted-ks-level4")
-
-func doTest(t *testing.T, tc Test) {
-	bld := build.NewBuilder()
-	parseUCA(bld)
-	w, err := bld.Build()
-	Error(err)
-	var tag language.Tag
-	if !strings.Contains(tc.name, "NON_IGNOR") {
-		tag = shifted
-	}
-	c := NewFromTable(w, OptionsFromTag(tag))
-	b := &Buffer{}
-	prev := tc.str[0]
-	for i := 1; i < len(tc.str); i++ {
-		b.Reset()
-		s := tc.str[i]
-		ka := c.Key(b, prev)
-		kb := c.Key(b, s)
-		if r := bytes.Compare(ka, kb); r == 1 {
-			t.Errorf("%s:%d: Key(%.4X) < Key(%.4X) (%X < %X) == %d; want -1 or 0", tc.name, i, []rune(string(prev)), []rune(string(s)), ka, kb, r)
-			prev = s
-			continue
-		}
-		if r := c.Compare(prev, s); r == 1 {
-			t.Errorf("%s:%d: Compare(%.4X, %.4X) == %d; want -1 or 0", tc.name, i, runes(prev), runes(s), r)
-		}
-		if r := c.Compare(s, prev); r == -1 {
-			t.Errorf("%s:%d: Compare(%.4X, %.4X) == %d; want 1 or 0", tc.name, i, runes(s), runes(prev), r)
-		}
-		prev = s
-	}
-}
diff --git a/vendor/golang.org/x/text/collate/sort_test.go b/vendor/golang.org/x/text/collate/sort_test.go
deleted file mode 100644
index d9e7f31c..00000000
--- a/vendor/golang.org/x/text/collate/sort_test.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package collate_test
-
-import (
-	"fmt"
-	"testing"
-
-	"golang.org/x/text/collate"
-	"golang.org/x/text/language"
-)
-
-func ExampleCollator_Strings() {
-	c := collate.New(language.Und)
-	strings := []string{
-		"ad",
-		"ab",
-		"äb",
-		"ac",
-	}
-	c.SortStrings(strings)
-	fmt.Println(strings)
-	// Output: [ab äb ac ad]
-}
-
-type sorter []string
-
-func (s sorter) Len() int {
-	return len(s)
-}
-
-func (s sorter) Swap(i, j int) {
-	s[j], s[i] = s[i], s[j]
-}
-
-func (s sorter) Bytes(i int) []byte {
-	return []byte(s[i])
-}
-
-func TestSort(t *testing.T) {
-	c := collate.New(language.English)
-	strings := []string{
-		"bcd",
-		"abc",
-		"ddd",
-	}
-	c.Sort(sorter(strings))
-	res := fmt.Sprint(strings)
-	want := "[abc bcd ddd]"
-	if res != want {
-		t.Errorf("found %s; want %s", res, want)
-	}
-}
diff --git a/vendor/golang.org/x/text/collate/table_test.go b/vendor/golang.org/x/text/collate/table_test.go
deleted file mode 100644
index 3a6b12fd..00000000
--- a/vendor/golang.org/x/text/collate/table_test.go
+++ /dev/null
@@ -1,291 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package collate
-
-import (
-	"testing"
-
-	"golang.org/x/text/collate/build"
-	"golang.org/x/text/internal/colltab"
-	"golang.org/x/text/unicode/norm"
-)
-
-type ColElems []Weights
-
-type input struct {
-	str string
-	ces [][]int
-}
-
-type check struct {
-	in  string
-	n   int
-	out ColElems
-}
-
-type tableTest struct {
-	in  []input
-	chk []check
-}
-
-func w(ce ...int) Weights {
-	return W(ce...)
-}
-
-var defaults = w(0)
-
-func pt(p, t int) []int {
-	return []int{p, defaults.Secondary, t}
-}
-
-func makeTable(in []input) (*Collator, error) {
-	b := build.NewBuilder()
-	for _, r := range in {
-		if e := b.Add([]rune(r.str), r.ces, nil); e != nil {
-			panic(e)
-		}
-	}
-	t, err := b.Build()
-	if err != nil {
-		return nil, err
-	}
-	return NewFromTable(t), nil
-}
-
-// modSeq holds a seqeunce of modifiers in increasing order of CCC long enough
-// to cause a segment overflow if not handled correctly. The last rune in this
-// list has a CCC of 214.
-var modSeq = []rune{
-	0x05B1, 0x05B2, 0x05B3, 0x05B4, 0x05B5, 0x05B6, 0x05B7, 0x05B8, 0x05B9, 0x05BB,
-	0x05BC, 0x05BD, 0x05BF, 0x05C1, 0x05C2, 0xFB1E, 0x064B, 0x064C, 0x064D, 0x064E,
-	0x064F, 0x0650, 0x0651, 0x0652, 0x0670, 0x0711, 0x0C55, 0x0C56, 0x0E38, 0x0E48,
-	0x0EB8, 0x0EC8, 0x0F71, 0x0F72, 0x0F74, 0x0321, 0x1DCE,
-}
-
-var mods []input
-var modW = func() ColElems {
-	ws := ColElems{}
-	for _, r := range modSeq {
-		rune := norm.NFC.PropertiesString(string(r))
-		ws = append(ws, w(0, int(rune.CCC())))
-		mods = append(mods, input{string(r), [][]int{{0, int(rune.CCC())}}})
-	}
-	return ws
-}()
-
-var appendNextTests = []tableTest{
-	{ // test getWeights
-		[]input{
-			{"a", [][]int{{100}}},
-			{"b", [][]int{{105}}},
-			{"c", [][]int{{110}}},
-			{"ß", [][]int{{120}}},
-		},
-		[]check{
-			{"a", 1, ColElems{w(100)}},
-			{"b", 1, ColElems{w(105)}},
-			{"c", 1, ColElems{w(110)}},
-			{"d", 1, ColElems{w(0x50064)}},
-			{"ab", 1, ColElems{w(100)}},
-			{"bc", 1, ColElems{w(105)}},
-			{"dd", 1, ColElems{w(0x50064)}},
-			{"ß", 2, ColElems{w(120)}},
-		},
-	},
-	{ // test expansion
-		[]input{
-			{"u", [][]int{{100}}},
-			{"U", [][]int{{100}, {0, 25}}},
-			{"w", [][]int{{100}, {100}}},
-			{"W", [][]int{{100}, {0, 25}, {100}, {0, 25}}},
-		},
-		[]check{
-			{"u", 1, ColElems{w(100)}},
-			{"U", 1, ColElems{w(100), w(0, 25)}},
-			{"w", 1, ColElems{w(100), w(100)}},
-			{"W", 1, ColElems{w(100), w(0, 25), w(100), w(0, 25)}},
-		},
-	},
-	{ // test decompose
-		[]input{
-			{"D", [][]int{pt(104, 8)}},
-			{"z", [][]int{pt(130, 8)}},
-			{"\u030C", [][]int{{0, 40}}},                               // Caron
-			{"\u01C5", [][]int{pt(104, 9), pt(130, 4), {0, 40, 0x1F}}}, // Dž = D+z+caron
-		},
-		[]check{
-			{"\u01C5", 2, ColElems{w(pt(104, 9)...), w(pt(130, 4)...), w(0, 40, 0x1F)}},
-		},
-	},
-	{ // test basic contraction
-		[]input{
-			{"a", [][]int{{100}}},
-			{"ab", [][]int{{101}}},
-			{"aab", [][]int{{101}, {101}}},
-			{"abc", [][]int{{102}}},
-			{"b", [][]int{{200}}},
-			{"c", [][]int{{300}}},
-			{"d", [][]int{{400}}},
-		},
-		[]check{
-			{"a", 1, ColElems{w(100)}},
-			{"aa", 1, ColElems{w(100)}},
-			{"aac", 1, ColElems{w(100)}},
-			{"d", 1, ColElems{w(400)}},
-			{"ab", 2, ColElems{w(101)}},
-			{"abb", 2, ColElems{w(101)}},
-			{"aab", 3, ColElems{w(101), w(101)}},
-			{"aaba", 3, ColElems{w(101), w(101)}},
-			{"abc", 3, ColElems{w(102)}},
-			{"abcd", 3, ColElems{w(102)}},
-		},
-	},
-	{ // test discontinuous contraction
-		append(mods, []input{
-			// modifiers; secondary weight equals ccc
-			{"\u0316", [][]int{{0, 220}}},
-			{"\u0317", [][]int{{0, 220}, {0, 220}}},
-			{"\u302D", [][]int{{0, 222}}},
-			{"\u302E", [][]int{{0, 225}}}, // used as starter
-			{"\u302F", [][]int{{0, 224}}}, // used as starter
-			{"\u18A9", [][]int{{0, 228}}},
-			{"\u0300", [][]int{{0, 230}}},
-			{"\u0301", [][]int{{0, 230}}},
-			{"\u0315", [][]int{{0, 232}}},
-			{"\u031A", [][]int{{0, 232}}},
-			{"\u035C", [][]int{{0, 233}}},
-			{"\u035F", [][]int{{0, 233}}},
-			{"\u035D", [][]int{{0, 234}}},
-			{"\u035E", [][]int{{0, 234}}},
-			{"\u0345", [][]int{{0, 240}}},
-
-			// starters
-			{"a", [][]int{{100}}},
-			{"b", [][]int{{200}}},
-			{"c", [][]int{{300}}},
-			{"\u03B1", [][]int{{900}}},
-			{"\x01", [][]int{{0, 0, 0, 0}}},
-
-			// contractions
-			{"a\u0300", [][]int{{101}}},
-			{"a\u0301", [][]int{{102}}},
-			{"a\u035E", [][]int{{110}}},
-			{"a\u035Eb\u035E", [][]int{{115}}},
-			{"ac\u035Eaca\u035E", [][]int{{116}}},
-			{"a\u035Db\u035D", [][]int{{117}}},
-			{"a\u0301\u035Db", [][]int{{120}}},
-			{"a\u0301\u035F", [][]int{{121}}},
-			{"a\u0301\u035Fb", [][]int{{119}}},
-			{"\u03B1\u0345", [][]int{{901}, {902}}},
-			{"\u302E\u302F", [][]int{{0, 131}, {0, 131}}},
-			{"\u302F\u18A9", [][]int{{0, 130}}},
-		}...),
-		[]check{
-			{"a\x01\u0300", 1, ColElems{w(100)}},
-			{"ab", 1, ColElems{w(100)}},                              // closing segment
-			{"a\u0316\u0300b", 5, ColElems{w(101), w(0, 220)}},       // closing segment
-			{"a\u0316\u0300", 5, ColElems{w(101), w(0, 220)}},        // no closing segment
-			{"a\u0316\u0300\u035Cb", 5, ColElems{w(101), w(0, 220)}}, // completes before segment end
-			{"a\u0316\u0300\u035C", 5, ColElems{w(101), w(0, 220)}},  // completes before segment end
-
-			{"a\u0316\u0301b", 5, ColElems{w(102), w(0, 220)}},       // closing segment
-			{"a\u0316\u0301", 5, ColElems{w(102), w(0, 220)}},        // no closing segment
-			{"a\u0316\u0301\u035Cb", 5, ColElems{w(102), w(0, 220)}}, // completes before segment end
-			{"a\u0316\u0301\u035C", 5, ColElems{w(102), w(0, 220)}},  // completes before segment end
-
-			// match blocked by modifier with same ccc
-			{"a\u0301\u0315\u031A\u035Fb", 3, ColElems{w(102)}},
-
-			// multiple gaps
-			{"a\u0301\u035Db", 6, ColElems{w(120)}},
-			{"a\u0301\u035F", 5, ColElems{w(121)}},
-			{"a\u0301\u035Fb", 6, ColElems{w(119)}},
-			{"a\u0316\u0301\u035F", 7, ColElems{w(121), w(0, 220)}},
-			{"a\u0301\u0315\u035Fb", 7, ColElems{w(121), w(0, 232)}},
-			{"a\u0316\u0301\u0315\u035Db", 5, ColElems{w(102), w(0, 220)}},
-			{"a\u0316\u0301\u0315\u035F", 9, ColElems{w(121), w(0, 220), w(0, 232)}},
-			{"a\u0316\u0301\u0315\u035Fb", 9, ColElems{w(121), w(0, 220), w(0, 232)}},
-			{"a\u0316\u0301\u0315\u035F\u035D", 9, ColElems{w(121), w(0, 220), w(0, 232)}},
-			{"a\u0316\u0301\u0315\u035F\u035Db", 9, ColElems{w(121), w(0, 220), w(0, 232)}},
-
-			// handling of segment overflow
-			{ // just fits within segment
-				"a" + string(modSeq[:30]) + "\u0301",
-				3 + len(string(modSeq[:30])),
-				append(ColElems{w(102)}, modW[:30]...),
-			},
-			{"a" + string(modSeq[:31]) + "\u0301", 1, ColElems{w(100)}}, // overflow
-			{"a" + string(modSeq) + "\u0301", 1, ColElems{w(100)}},
-			{ // just fits within segment with two interstitial runes
-				"a" + string(modSeq[:28]) + "\u0301\u0315\u035F",
-				7 + len(string(modSeq[:28])),
-				append(append(ColElems{w(121)}, modW[:28]...), w(0, 232)),
-			},
-			{ // second half does not fit within segment
-				"a" + string(modSeq[:29]) + "\u0301\u0315\u035F",
-				3 + len(string(modSeq[:29])),
-				append(ColElems{w(102)}, modW[:29]...),
-			},
-
-			// discontinuity can only occur in last normalization segment
-			{"a\u035Eb\u035E", 6, ColElems{w(115)}},
-			{"a\u0316\u035Eb\u035E", 5, ColElems{w(110), w(0, 220)}},
-			{"a\u035Db\u035D", 6, ColElems{w(117)}},
-			{"a\u0316\u035Db\u035D", 1, ColElems{w(100)}},
-			{"a\u035Eb\u0316\u035E", 8, ColElems{w(115), w(0, 220)}},
-			{"a\u035Db\u0316\u035D", 8, ColElems{w(117), w(0, 220)}},
-			{"ac\u035Eaca\u035E", 9, ColElems{w(116)}},
-			{"a\u0316c\u035Eaca\u035E", 1, ColElems{w(100)}},
-			{"ac\u035Eac\u0316a\u035E", 1, ColElems{w(100)}},
-
-			// expanding contraction
-			{"\u03B1\u0345", 4, ColElems{w(901), w(902)}},
-
-			// Theoretical possibilities
-			// contraction within a gap
-			{"a\u302F\u18A9\u0301", 9, ColElems{w(102), w(0, 130)}},
-			// expansion within a gap
-			{"a\u0317\u0301", 5, ColElems{w(102), w(0, 220), w(0, 220)}},
-			// repeating CCC blocks last modifier
-			{"a\u302E\u302F\u0301", 1, ColElems{w(100)}},
-			// The trailing combining characters (with lower CCC) should block the first one.
-			// TODO: make the following pass.
-			// {"a\u035E\u0316\u0316", 1, ColElems{w(100)}},
-			{"a\u035F\u035Eb", 5, ColElems{w(110), w(0, 233)}},
-			// Last combiner should match after normalization.
-			// TODO: make the following pass.
-			// {"a\u035D\u0301", 3, ColElems{w(102), w(0, 234)}},
-			// The first combiner is blocking the second one as they have the same CCC.
-			{"a\u035D\u035Eb", 1, ColElems{w(100)}},
-		},
-	},
-}
-
-func TestAppendNext(t *testing.T) {
-	for i, tt := range appendNextTests {
-		c, err := makeTable(tt.in)
-		if err != nil {
-			t.Errorf("%d: error creating table: %v", i, err)
-			continue
-		}
-		for j, chk := range tt.chk {
-			ws, n := c.t.AppendNext(nil, []byte(chk.in))
-			if n != chk.n {
-				t.Errorf("%d:%d: bytes consumed was %d; want %d", i, j, n, chk.n)
-			}
-			out := convertFromWeights(chk.out)
-			if len(ws) != len(out) {
-				t.Errorf("%d:%d: len(ws) was %d; want %d (%X vs %X)\n%X", i, j, len(ws), len(out), ws, out, chk.in)
-				continue
-			}
-			for k, w := range ws {
-				w, _ = colltab.MakeElem(w.Primary(), w.Secondary(), int(w.Tertiary()), 0)
-				if w != out[k] {
-					t.Errorf("%d:%d: Weights %d was %X; want %X", i, j, k, w, out[k])
-				}
-			}
-		}
-	}
-}
diff --git a/vendor/golang.org/x/text/doc.go b/vendor/golang.org/x/text/doc.go
deleted file mode 100644
index a48e2843..00000000
--- a/vendor/golang.org/x/text/doc.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:generate go run gen.go
-
-// text is a repository of text-related packages related to internationalization
-// (i18n) and localization (l10n), such as character encodings, text
-// transformations, and locale-specific text handling.
-package text
-
-// TODO: more documentation on general concepts, such as Transformers, use
-// of normalization, etc.
diff --git a/vendor/golang.org/x/text/gen.go b/vendor/golang.org/x/text/gen.go
deleted file mode 100644
index 757fefb7..00000000
--- a/vendor/golang.org/x/text/gen.go
+++ /dev/null
@@ -1,319 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-// gen runs go generate on Unicode- and CLDR-related package in the text
-// repositories, taking into account dependencies and versions.
-package main
-
-import (
-	"bytes"
-	"flag"
-	"fmt"
-	"go/build"
-	"go/format"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path"
-	"path/filepath"
-	"regexp"
-	"runtime"
-	"strings"
-	"sync"
-	"unicode"
-
-	"golang.org/x/text/collate"
-	"golang.org/x/text/internal/gen"
-	"golang.org/x/text/language"
-)
-
-var (
-	verbose     = flag.Bool("v", false, "verbose output")
-	force       = flag.Bool("force", false, "ignore failing dependencies")
-	doCore      = flag.Bool("core", false, "force an update to core")
-	excludeList = flag.String("exclude", "",
-		"comma-separated list of packages to exclude")
-
-	// The user can specify a selection of packages to build on the command line.
-	args []string
-)
-
-func exclude(pkg string) bool {
-	if len(args) > 0 {
-		return !contains(args, pkg)
-	}
-	return contains(strings.Split(*excludeList, ","), pkg)
-}
-
-// TODO:
-// - Better version handling.
-// - Generate tables for the core unicode package?
-// - Add generation for encodings. This requires some retooling here and there.
-// - Running repo-wide "long" tests.
-
-var vprintf = fmt.Printf
-
-func main() {
-	gen.Init()
-	args = flag.Args()
-	if !*verbose {
-		// Set vprintf to a no-op.
-		vprintf = func(string, ...interface{}) (int, error) { return 0, nil }
-	}
-
-	// TODO: create temporary cache directory to load files and create and set
-	// a "cache" option if the user did not specify the UNICODE_DIR environment
-	// variable. This will prevent duplicate downloads and also will enable long
-	// tests, which really need to be run after each generated package.
-
-	updateCore := *doCore
-	if gen.UnicodeVersion() != unicode.Version {
-		fmt.Printf("Requested Unicode version %s; core unicode version is %s.\n",
-			gen.UnicodeVersion(),
-			unicode.Version)
-		c := collate.New(language.Und, collate.Numeric)
-		if c.CompareString(gen.UnicodeVersion(), unicode.Version) < 0 && !*force {
-			os.Exit(2)
-		}
-		updateCore = true
-		goroot := os.Getenv("GOROOT")
-		appendToFile(
-			filepath.Join(goroot, "api", "except.txt"),
-			fmt.Sprintf("pkg unicode, const Version = %q\n", unicode.Version),
-		)
-		const lines = `pkg unicode, const Version = %q
-// TODO: add a new line of the following form for each new script and property.
-pkg unicode, var <new script or property> *RangeTable
-`
-		appendToFile(
-			filepath.Join(goroot, "api", "next.txt"),
-			fmt.Sprintf(lines, gen.UnicodeVersion()),
-		)
-	}
-
-	var unicode = &dependency{}
-	if updateCore {
-		fmt.Printf("Updating core to version %s...\n", gen.UnicodeVersion())
-		unicode = generate("unicode")
-
-		// Test some users of the unicode packages, especially the ones that
-		// keep a mirrored table. These may need to be corrected by hand.
-		generate("regexp", unicode)
-		generate("strconv", unicode) // mimics Unicode table
-		generate("strings", unicode)
-		generate("testing", unicode) // mimics Unicode table
-	}
-
-	var (
-		cldr       = generate("./unicode/cldr", unicode)
-		language   = generate("./language", cldr)
-		internal   = generate("./internal", unicode, language)
-		norm       = generate("./unicode/norm", unicode)
-		rangetable = generate("./unicode/rangetable", unicode)
-		cases      = generate("./cases", unicode, norm, language, rangetable)
-		width      = generate("./width", unicode)
-		bidi       = generate("./unicode/bidi", unicode, norm, rangetable)
-		mib        = generate("./encoding/internal/identifier", unicode)
-		number     = generate("./internal/number", unicode, cldr, language, internal)
-		_          = generate("./encoding/htmlindex", unicode, language, mib)
-		_          = generate("./encoding/ianaindex", unicode, language, mib)
-		_          = generate("./secure/precis", unicode, norm, rangetable, cases, width, bidi)
-		_          = generate("./internal/cldrtree", language)
-		_          = generate("./currency", unicode, cldr, language, internal, number)
-		_          = generate("./feature/plural", unicode, cldr, language, internal, number)
-		_          = generate("./internal/export/idna", unicode, bidi, norm)
-		_          = generate("./language/display", unicode, cldr, language, internal, number)
-		_          = generate("./collate", unicode, norm, cldr, language, rangetable)
-		_          = generate("./search", unicode, norm, cldr, language, rangetable)
-	)
-	all.Wait()
-
-	// Copy exported packages to the destination golang.org repo.
-	copyExported("golang.org/x/net/idna")
-
-	if updateCore {
-		copyVendored()
-	}
-
-	if hasErrors {
-		fmt.Println("FAIL")
-		os.Exit(1)
-	}
-	vprintf("SUCCESS\n")
-}
-
-func appendToFile(file, text string) {
-	fmt.Println("Augmenting", file)
-	w, err := os.OpenFile(file, os.O_APPEND|os.O_WRONLY, 0600)
-	if err != nil {
-		fmt.Println("Failed to open file:", err)
-		os.Exit(1)
-	}
-	defer w.Close()
-	if _, err := w.WriteString(text); err != nil {
-		fmt.Println("Failed to write to file:", err)
-		os.Exit(1)
-	}
-}
-
-var (
-	all       sync.WaitGroup
-	hasErrors bool
-)
-
-type dependency struct {
-	sync.WaitGroup
-	hasErrors bool
-}
-
-func generate(pkg string, deps ...*dependency) *dependency {
-	var wg dependency
-	if exclude(pkg) {
-		return &wg
-	}
-	wg.Add(1)
-	all.Add(1)
-	go func() {
-		defer wg.Done()
-		defer all.Done()
-		// Wait for dependencies to finish.
-		for _, d := range deps {
-			d.Wait()
-			if d.hasErrors && !*force {
-				fmt.Printf("--- ABORT: %s\n", pkg)
-				wg.hasErrors = true
-				return
-			}
-		}
-		vprintf("=== GENERATE %s\n", pkg)
-		args := []string{"generate"}
-		if *verbose {
-			args = append(args, "-v")
-		}
-		args = append(args, pkg)
-		cmd := exec.Command(filepath.Join(runtime.GOROOT(), "bin", "go"), args...)
-		w := &bytes.Buffer{}
-		cmd.Stderr = w
-		cmd.Stdout = w
-		if err := cmd.Run(); err != nil {
-			fmt.Printf("--- FAIL: %s:\n\t%v\n\tError: %v\n", pkg, indent(w), err)
-			hasErrors = true
-			wg.hasErrors = true
-			return
-		}
-
-		vprintf("=== TEST %s\n", pkg)
-		args[0] = "test"
-		cmd = exec.Command(filepath.Join(runtime.GOROOT(), "bin", "go"), args...)
-		wt := &bytes.Buffer{}
-		cmd.Stderr = wt
-		cmd.Stdout = wt
-		if err := cmd.Run(); err != nil {
-			fmt.Printf("--- FAIL: %s:\n\t%v\n\tError: %v\n", pkg, indent(wt), err)
-			hasErrors = true
-			wg.hasErrors = true
-			return
-		}
-		vprintf("--- SUCCESS: %s\n\t%v\n", pkg, indent(w))
-		fmt.Print(wt.String())
-	}()
-	return &wg
-}
-
-// copyExported copies a package in x/text/internal/export to the
-// destination repository.
-func copyExported(p string) {
-	copyPackage(
-		filepath.Join("internal", "export", path.Base(p)),
-		filepath.Join("..", filepath.FromSlash(p[len("golang.org/x"):])),
-		"golang.org/x/text/internal/export/"+path.Base(p),
-		p)
-}
-
-// copyVendored copies packages used by Go core into the vendored directory.
-func copyVendored() {
-	root := filepath.Join(build.Default.GOROOT, filepath.FromSlash("src/vendor/golang_org/x"))
-
-	err := filepath.Walk(root, func(dir string, info os.FileInfo, err error) error {
-		if err != nil || !info.IsDir() || root == dir {
-			return err
-		}
-		src := dir[len(root)+1:]
-		const slash = string(filepath.Separator)
-		if c := strings.Split(src, slash); c[0] == "text" {
-			// Copy a text repo package from its normal location.
-			src = strings.Join(c[1:], slash)
-		} else {
-			// Copy the vendored package if it exists in the export directory.
-			src = filepath.Join("internal", "export", filepath.Base(src))
-		}
-		copyPackage(src, dir, "golang.org", "golang_org")
-		return nil
-	})
-	if err != nil {
-		fmt.Printf("Seeding directory %s has failed %v:", root, err)
-		os.Exit(1)
-	}
-}
-
-// goGenRE is used to remove go:generate lines.
-var goGenRE = regexp.MustCompile("//go:generate[^\n]*\n")
-
-// copyPackage copies relevant files from a directory in x/text to the
-// destination package directory. The destination package is assumed to have
-// the same name. For each copied file go:generate lines are removed and
-// and package comments are rewritten to the new path.
-func copyPackage(dirSrc, dirDst, search, replace string) {
-	err := filepath.Walk(dirSrc, func(file string, info os.FileInfo, err error) error {
-		base := filepath.Base(file)
-		if err != nil || info.IsDir() ||
-			!strings.HasSuffix(base, ".go") ||
-			strings.HasSuffix(base, "_test.go") ||
-			// Don't process subdirectories.
-			filepath.Dir(file) != dirSrc {
-			return nil
-		}
-		b, err := ioutil.ReadFile(file)
-		if err != nil || bytes.Contains(b, []byte("\n// +build ignore")) {
-			return err
-		}
-		// Fix paths.
-		b = bytes.Replace(b, []byte(search), []byte(replace), -1)
-		// Remove go:generate lines.
-		b = goGenRE.ReplaceAllLiteral(b, nil)
-		comment := "// Code generated by running \"go generate\" in golang.org/x/text. DO NOT EDIT.\n\n"
-		if *doCore {
-			comment = "// Code generated by running \"go run gen.go -core\" in golang.org/x/text. DO NOT EDIT.\n\n"
-		}
-		if !bytes.HasPrefix(b, []byte(comment)) {
-			b = append([]byte(comment), b...)
-		}
-		if b, err = format.Source(b); err != nil {
-			fmt.Println("Failed to format file:", err)
-			os.Exit(1)
-		}
-		file = filepath.Join(dirDst, base)
-		vprintf("=== COPY %s\n", file)
-		return ioutil.WriteFile(file, b, 0666)
-	})
-	if err != nil {
-		fmt.Println("Copying exported files failed:", err)
-		os.Exit(1)
-	}
-}
-
-func contains(a []string, s string) bool {
-	for _, e := range a {
-		if s == e {
-			return true
-		}
-	}
-	return false
-}
-
-func indent(b *bytes.Buffer) string {
-	return strings.Replace(strings.TrimSpace(b.String()), "\n", "\n\t", -1)
-}
diff --git a/vendor/golang.org/x/text/internal/colltab/collate_test.go b/vendor/golang.org/x/text/internal/colltab/collate_test.go
deleted file mode 100644
index 580c85c2..00000000
--- a/vendor/golang.org/x/text/internal/colltab/collate_test.go
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package colltab_test
-
-// This file contains tests which need to import package collate, which causes
-// an import cycle when done within package colltab itself.
-
-import (
-	"bytes"
-	"testing"
-	"unicode"
-
-	"golang.org/x/text/collate"
-	"golang.org/x/text/language"
-	"golang.org/x/text/unicode/rangetable"
-)
-
-// assigned is used to only test runes that are inside the scope of the Unicode
-// version used to generation the collation table.
-var assigned = rangetable.Assigned(collate.UnicodeVersion)
-
-func TestNonDigits(t *testing.T) {
-	c := collate.New(language.English, collate.Loose, collate.Numeric)
-
-	// Verify that all non-digit numbers sort outside of the number range.
-	for r, hi := rune(unicode.N.R16[0].Lo), rune(unicode.N.R32[0].Hi); r <= hi; r++ {
-		if unicode.In(r, unicode.Nd) || !unicode.In(r, assigned) {
-			continue
-		}
-		if a := string(r); c.CompareString(a, "0") != -1 && c.CompareString(a, "999999") != 1 {
-			t.Errorf("%+q non-digit number is collated as digit", a)
-		}
-	}
-}
-
-func TestNumericCompare(t *testing.T) {
-	c := collate.New(language.English, collate.Loose, collate.Numeric)
-
-	// Iterate over all digits.
-	for _, r16 := range unicode.Nd.R16 {
-		testDigitCompare(t, c, rune(r16.Lo), rune(r16.Hi))
-	}
-	for _, r32 := range unicode.Nd.R32 {
-		testDigitCompare(t, c, rune(r32.Lo), rune(r32.Hi))
-	}
-}
-
-func testDigitCompare(t *testing.T, c *collate.Collator, zero, nine rune) {
-	if !unicode.In(zero, assigned) {
-		return
-	}
-	n := int(nine - zero + 1)
-	if n%10 != 0 {
-		t.Fatalf("len([%+q, %+q]) = %d; want a multiple of 10", zero, nine, n)
-	}
-	for _, tt := range []struct {
-		prefix string
-		b      [11]string
-	}{
-		{
-			prefix: "",
-			b: [11]string{
-				"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10",
-			},
-		},
-		{
-			prefix: "1",
-			b: [11]string{
-				"10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20",
-			},
-		},
-		{
-			prefix: "0",
-			b: [11]string{
-				"00", "01", "02", "03", "04", "05", "06", "07", "08", "09", "10",
-			},
-		},
-		{
-			prefix: "00",
-			b: [11]string{
-				"000", "001", "002", "003", "004", "005", "006", "007", "008", "009", "010",
-			},
-		},
-		{
-			prefix: "9",
-			b: [11]string{
-				"90", "91", "92", "93", "94", "95", "96", "97", "98", "99", "100",
-			},
-		},
-	} {
-		for k := 0; k <= n; k++ {
-			i := k % 10
-			a := tt.prefix + string(zero+rune(i))
-			for j, b := range tt.b {
-				want := 0
-				switch {
-				case i < j:
-					want = -1
-				case i > j:
-					want = 1
-				}
-				got := c.CompareString(a, b)
-				if got != want {
-					t.Errorf("Compare(%+q, %+q) = %d; want %d", a, b, got, want)
-					return
-				}
-			}
-		}
-	}
-}
-
-func BenchmarkNumericWeighter(b *testing.B) {
-	c := collate.New(language.English, collate.Numeric)
-	input := bytes.Repeat([]byte("Testing, testing 123..."), 100)
-	b.SetBytes(int64(2 * len(input)))
-	for i := 0; i < b.N; i++ {
-		c.Compare(input, input)
-	}
-}
diff --git a/vendor/golang.org/x/text/internal/colltab/collelem_test.go b/vendor/golang.org/x/text/internal/colltab/collelem_test.go
deleted file mode 100644
index f131ecc3..00000000
--- a/vendor/golang.org/x/text/internal/colltab/collelem_test.go
+++ /dev/null
@@ -1,183 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package colltab
-
-import (
-	"fmt"
-	"testing"
-	"unicode"
-)
-
-func (e Elem) String() string {
-	q := ""
-	if v := e.Quaternary(); v == MaxQuaternary {
-		q = "max"
-	} else {
-		q = fmt.Sprint(v)
-	}
-	return fmt.Sprintf("[%d, %d, %d, %s]",
-		e.Primary(),
-		e.Secondary(),
-		e.Tertiary(),
-		q)
-}
-
-type ceTest struct {
-	f   func(inout []int) (Elem, ceType)
-	arg []int
-}
-
-func makeCE(weights []int) Elem {
-	ce, _ := MakeElem(weights[0], weights[1], weights[2], uint8(weights[3]))
-	return ce
-}
-
-var defaultValues = []int{0, defaultSecondary, defaultTertiary, 0}
-
-func e(w ...int) Elem {
-	return makeCE(append(w, defaultValues[len(w):]...))
-}
-
-func makeContractIndex(index, n, offset int) Elem {
-	const (
-		contractID            = 0xC0000000
-		maxNBits              = 4
-		maxTrieIndexBits      = 12
-		maxContractOffsetBits = 13
-	)
-	ce := Elem(contractID)
-	ce += Elem(offset << (maxNBits + maxTrieIndexBits))
-	ce += Elem(index << maxNBits)
-	ce += Elem(n)
-	return ce
-}
-
-func makeExpandIndex(index int) Elem {
-	const expandID = 0xE0000000
-	return expandID + Elem(index)
-}
-
-func makeDecompose(t1, t2 int) Elem {
-	const decompID = 0xF0000000
-	return Elem(t2<<8+t1) + decompID
-}
-
-func normalCE(inout []int) (ce Elem, t ceType) {
-	ce = makeCE(inout)
-	inout[0] = ce.Primary()
-	inout[1] = ce.Secondary()
-	inout[2] = int(ce.Tertiary())
-	inout[3] = int(ce.CCC())
-	return ce, ceNormal
-}
-
-func expandCE(inout []int) (ce Elem, t ceType) {
-	ce = makeExpandIndex(inout[0])
-	inout[0] = splitExpandIndex(ce)
-	return ce, ceExpansionIndex
-}
-
-func contractCE(inout []int) (ce Elem, t ceType) {
-	ce = makeContractIndex(inout[0], inout[1], inout[2])
-	i, n, o := splitContractIndex(ce)
-	inout[0], inout[1], inout[2] = i, n, o
-	return ce, ceContractionIndex
-}
-
-func decompCE(inout []int) (ce Elem, t ceType) {
-	ce = makeDecompose(inout[0], inout[1])
-	t1, t2 := splitDecompose(ce)
-	inout[0], inout[1] = int(t1), int(t2)
-	return ce, ceDecompose
-}
-
-var ceTests = []ceTest{
-	{normalCE, []int{0, 0, 0, 0}},
-	{normalCE, []int{0, 30, 3, 0}},
-	{normalCE, []int{0, 30, 3, 0xFF}},
-	{normalCE, []int{100, defaultSecondary, defaultTertiary, 0}},
-	{normalCE, []int{100, defaultSecondary, defaultTertiary, 0xFF}},
-	{normalCE, []int{100, defaultSecondary, 3, 0}},
-	{normalCE, []int{0x123, defaultSecondary, 8, 0xFF}},
-
-	{contractCE, []int{0, 0, 0}},
-	{contractCE, []int{1, 1, 1}},
-	{contractCE, []int{1, (1 << maxNBits) - 1, 1}},
-	{contractCE, []int{(1 << maxTrieIndexBits) - 1, 1, 1}},
-	{contractCE, []int{1, 1, (1 << maxContractOffsetBits) - 1}},
-
-	{expandCE, []int{0}},
-	{expandCE, []int{5}},
-	{expandCE, []int{(1 << maxExpandIndexBits) - 1}},
-
-	{decompCE, []int{0, 0}},
-	{decompCE, []int{1, 1}},
-	{decompCE, []int{0x1F, 0x1F}},
-}
-
-func TestColElem(t *testing.T) {
-	for i, tt := range ceTests {
-		inout := make([]int, len(tt.arg))
-		copy(inout, tt.arg)
-		ce, typ := tt.f(inout)
-		if ce.ctype() != typ {
-			t.Errorf("%d: type is %d; want %d (ColElem: %X)", i, ce.ctype(), typ, ce)
-		}
-		for j, a := range tt.arg {
-			if inout[j] != a {
-				t.Errorf("%d: argument %d is %X; want %X (ColElem: %X)", i, j, inout[j], a, ce)
-			}
-		}
-	}
-}
-
-type implicitTest struct {
-	r rune
-	p int
-}
-
-var implicitTests = []implicitTest{
-	{0x33FF, 0x533FF},
-	{0x3400, 0x23400},
-	{0x4DC0, 0x54DC0},
-	{0x4DFF, 0x54DFF},
-	{0x4E00, 0x14E00},
-	{0x9FCB, 0x19FCB},
-	{0xA000, 0x5A000},
-	{0xF8FF, 0x5F8FF},
-	{0xF900, 0x1F900},
-	{0xFA23, 0x1FA23},
-	{0xFAD9, 0x1FAD9},
-	{0xFB00, 0x5FB00},
-	{0x20000, 0x40000},
-	{0x2B81C, 0x4B81C},
-	{unicode.MaxRune, 0x15FFFF}, // maximum primary value
-}
-
-func TestImplicit(t *testing.T) {
-	for _, tt := range implicitTests {
-		if p := implicitPrimary(tt.r); p != tt.p {
-			t.Errorf("%U: was %X; want %X", tt.r, p, tt.p)
-		}
-	}
-}
-
-func TestUpdateTertiary(t *testing.T) {
-	tests := []struct {
-		in, out Elem
-		t       uint8
-	}{
-		{0x4000FE20, 0x0000FE8A, 0x0A},
-		{0x4000FE21, 0x0000FEAA, 0x0A},
-		{0x0000FE8B, 0x0000FE83, 0x03},
-		{0x82FF0188, 0x9BFF0188, 0x1B},
-		{0xAFF0CC02, 0xAFF0CC1B, 0x1B},
-	}
-	for i, tt := range tests {
-		if out := tt.in.updateTertiary(tt.t); out != tt.out {
-			t.Errorf("%d: was %X; want %X", i, out, tt.out)
-		}
-	}
-}
diff --git a/vendor/golang.org/x/text/internal/colltab/colltab_test.go b/vendor/golang.org/x/text/internal/colltab/colltab_test.go
deleted file mode 100644
index c403ac34..00000000
--- a/vendor/golang.org/x/text/internal/colltab/colltab_test.go
+++ /dev/null
@@ -1,64 +0,0 @@
-package colltab
-
-import (
-	"testing"
-
-	"golang.org/x/text/language"
-)
-
-func TestMatchLang(t *testing.T) {
-	tags := []language.Tag{
-		0:  language.Und,
-		1:  language.MustParse("bs"),
-		2:  language.German,
-		3:  language.English,
-		4:  language.AmericanEnglish,
-		5:  language.MustParse("en-US-u-va-posix"),
-		6:  language.Portuguese,
-		7:  language.Serbian,
-		8:  language.MustParse("sr-Latn"),
-		9:  language.Chinese,
-		10: language.MustParse("zh-u-co-stroke"),
-		11: language.MustParse("zh-Hant-u-co-pinyin"),
-		12: language.TraditionalChinese,
-	}
-	for i, tc := range []struct {
-		x int
-		t language.Tag
-	}{
-		{0, language.Und},
-		{0, language.Persian}, // Default to first element when no match.
-		{3, language.English},
-		{4, language.AmericanEnglish},
-		{5, language.MustParse("en-US-u-va-posix")},   // Ext. variant match.
-		{4, language.MustParse("en-US-u-va-noposix")}, // Ext. variant mismatch.
-		{3, language.MustParse("en-UK-u-va-noposix")}, // Ext. variant mismatch.
-		{7, language.Serbian},
-		{0, language.Croatian},             // Don't match to close language!
-		{0, language.MustParse("gsw")},     // Don't match to close language!
-		{1, language.MustParse("bs-Cyrl")}, // Odd, but correct.
-		{1, language.MustParse("bs-Latn")}, // Estimated script drops.
-		{8, language.MustParse("sr-Latn")},
-		{9, language.Chinese},
-		{9, language.SimplifiedChinese},
-		{12, language.TraditionalChinese},
-		{11, language.MustParse("zh-Hant-u-co-pinyin")},
-		// TODO: should this be 12? Either inherited value (10) or default is
-		// fine in this case, though. Other locales are not affected.
-		{10, language.MustParse("zh-Hant-u-co-stroke")},
-		// There is no "phonebk" sorting order for zh-Hant, so use default.
-		{12, language.MustParse("zh-Hant-u-co-phonebk")},
-		{10, language.MustParse("zh-u-co-stroke")},
-		{12, language.MustParse("und-TW")},     // Infer script and language.
-		{12, language.MustParse("und-HK")},     // Infer script and language.
-		{6, language.MustParse("und-BR")},      // Infer script and language.
-		{6, language.MustParse("und-PT")},      // Infer script and language.
-		{2, language.MustParse("und-Latn-DE")}, // Infer language.
-		{0, language.MustParse("und-Jpan-BR")}, // Infers "ja", so no match.
-		{0, language.MustParse("zu")},          // No match past index.
-	} {
-		if x := MatchLang(tc.t, tags); x != tc.x {
-			t.Errorf("%d: MatchLang(%q, tags) = %d; want %d", i, tc.t, x, tc.x)
-		}
-	}
-}
diff --git a/vendor/golang.org/x/text/internal/colltab/contract_test.go b/vendor/golang.org/x/text/internal/colltab/contract_test.go
deleted file mode 100644
index ce2871dd..00000000
--- a/vendor/golang.org/x/text/internal/colltab/contract_test.go
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package colltab
-
-import (
-	"testing"
-)
-
-type lookupStrings struct {
-	str    string
-	offset int
-	n      int // bytes consumed from input
-}
-
-type LookupTest struct {
-	lookup []lookupStrings
-	n      int
-	tries  ContractTrieSet
-}
-
-var lookupTests = []LookupTest{{
-	[]lookupStrings{
-		{"abc", 1, 3},
-		{"a", 0, 0},
-		{"b", 0, 0},
-		{"c", 0, 0},
-		{"d", 0, 0},
-	},
-	1,
-	ContractTrieSet{
-		{'a', 0, 1, 0xFF},
-		{'b', 0, 1, 0xFF},
-		{'c', 'c', 0, 1},
-	},
-}, {
-	[]lookupStrings{
-		{"abc", 1, 3},
-		{"abd", 2, 3},
-		{"abe", 3, 3},
-		{"a", 0, 0},
-		{"ab", 0, 0},
-		{"d", 0, 0},
-		{"f", 0, 0},
-	},
-	1,
-	ContractTrieSet{
-		{'a', 0, 1, 0xFF},
-		{'b', 0, 1, 0xFF},
-		{'c', 'e', 0, 1},
-	},
-}, {
-	[]lookupStrings{
-		{"abc", 1, 3},
-		{"ab", 2, 2},
-		{"a", 3, 1},
-		{"abcd", 1, 3},
-		{"abe", 2, 2},
-	},
-	1,
-	ContractTrieSet{
-		{'a', 0, 1, 3},
-		{'b', 0, 1, 2},
-		{'c', 'c', 0, 1},
-	},
-}, {
-	[]lookupStrings{
-		{"abc", 1, 3},
-		{"abd", 2, 3},
-		{"ab", 3, 2},
-		{"ac", 4, 2},
-		{"a", 5, 1},
-		{"b", 6, 1},
-		{"ba", 6, 1},
-	},
-	2,
-	ContractTrieSet{
-		{'b', 'b', 0, 6},
-		{'a', 0, 2, 5},
-		{'c', 'c', 0, 4},
-		{'b', 0, 1, 3},
-		{'c', 'd', 0, 1},
-	},
-}, {
-	[]lookupStrings{
-		{"bcde", 2, 4},
-		{"bc", 7, 2},
-		{"ab", 6, 2},
-		{"bcd", 5, 3},
-		{"abcd", 1, 4},
-		{"abc", 4, 3},
-		{"bcdf", 3, 4},
-	},
-	2,
-	ContractTrieSet{
-		{'b', 3, 1, 0xFF},
-		{'a', 0, 1, 0xFF},
-		{'b', 0, 1, 6},
-		{'c', 0, 1, 4},
-		{'d', 'd', 0, 1},
-		{'c', 0, 1, 7},
-		{'d', 0, 1, 5},
-		{'e', 'f', 0, 2},
-	},
-}}
-
-func lookup(c *ContractTrieSet, nnode int, s []uint8) (i, n int) {
-	scan := c.scanner(0, nnode, s)
-	scan.scan(0)
-	return scan.result()
-}
-
-func TestLookupContraction(t *testing.T) {
-	for i, tt := range lookupTests {
-		cts := ContractTrieSet(tt.tries)
-		for j, lu := range tt.lookup {
-			str := lu.str
-			for _, s := range []string{str, str + "X"} {
-				const msg = `%d:%d: %s of "%s" %v; want %v`
-				offset, n := lookup(&cts, tt.n, []byte(s))
-				if offset != lu.offset {
-					t.Errorf(msg, i, j, "offset", s, offset, lu.offset)
-				}
-				if n != lu.n {
-					t.Errorf(msg, i, j, "bytes consumed", s, n, len(str))
-				}
-			}
-		}
-	}
-}
diff --git a/vendor/golang.org/x/text/internal/colltab/iter_test.go b/vendor/golang.org/x/text/internal/colltab/iter_test.go
deleted file mode 100644
index 5783534c..00000000
--- a/vendor/golang.org/x/text/internal/colltab/iter_test.go
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package colltab
-
-import (
-	"testing"
-)
-
-func TestDoNorm(t *testing.T) {
-	const div = -1 // The insertion point of the next block.
-	tests := []struct {
-		in, out []int
-	}{{
-		in:  []int{4, div, 3},
-		out: []int{3, 4},
-	}, {
-		in:  []int{4, div, 3, 3, 3},
-		out: []int{3, 3, 3, 4},
-	}, {
-		in:  []int{0, 4, div, 3},
-		out: []int{0, 3, 4},
-	}, {
-		in:  []int{0, 0, 4, 5, div, 3, 3},
-		out: []int{0, 0, 3, 3, 4, 5},
-	}, {
-		in:  []int{0, 0, 1, 4, 5, div, 3, 3},
-		out: []int{0, 0, 1, 3, 3, 4, 5},
-	}, {
-		in:  []int{0, 0, 1, 4, 5, div, 4, 4},
-		out: []int{0, 0, 1, 4, 4, 4, 5},
-	},
-	}
-	for j, tt := range tests {
-		i := Iter{}
-		var w, p int
-		for k, cc := range tt.in {
-
-			if cc == div {
-				w = 100
-				p = k
-				continue
-			}
-			i.Elems = append(i.Elems, makeCE([]int{w, defaultSecondary, 2, cc}))
-		}
-		i.doNorm(p, i.Elems[p].CCC())
-		if len(i.Elems) != len(tt.out) {
-			t.Errorf("%d: length was %d; want %d", j, len(i.Elems), len(tt.out))
-		}
-		prevCCC := uint8(0)
-		for k, ce := range i.Elems {
-			if int(ce.CCC()) != tt.out[k] {
-				t.Errorf("%d:%d: unexpected CCC. Was %d; want %d", j, k, ce.CCC(), tt.out[k])
-			}
-			if k > 0 && ce.CCC() == prevCCC && i.Elems[k-1].Primary() > ce.Primary() {
-				t.Errorf("%d:%d: normalization crossed across CCC boundary.", j, k)
-			}
-		}
-	}
-
-	// Combining rune overflow is tested in search/pattern_test.go.
-}
diff --git a/vendor/golang.org/x/text/internal/colltab/numeric_test.go b/vendor/golang.org/x/text/internal/colltab/numeric_test.go
deleted file mode 100644
index e9406ae3..00000000
--- a/vendor/golang.org/x/text/internal/colltab/numeric_test.go
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package colltab
-
-import (
-	"reflect"
-	"strings"
-	"testing"
-
-	"golang.org/x/text/internal/testtext"
-)
-
-const (
-	digSec  = defaultSecondary
-	digTert = defaultTertiary
-)
-
-var tPlus3 = e(0, 50, digTert+3)
-
-// numWeighter is a testWeighter used for testing numericWeighter.
-var numWeighter = testWeighter{
-	"0": p(100),
-	"０": []Elem{e(100, digSec, digTert+1)}, // U+FF10 FULLWIDTH DIGIT ZERO
-	"₀": []Elem{e(100, digSec, digTert+5)}, // U+2080 SUBSCRIPT ZERO
-
-	"1": p(101),
-	// Allow non-primary collation elements to be inserted.
-	"١": append(p(101), tPlus3), // U+0661 ARABIC-INDIC DIGIT ONE
-	// Allow varying tertiary weight if the number is Nd.
-	"１": []Elem{e(101, digSec, digTert+1)}, // U+FF11 FULLWIDTH DIGIT ONE
-	"2": p(102),
-	// Allow non-primary collation elements to be inserted.
-	"٢": append(p(102), tPlus3), // U+0662 ARABIC-INDIC DIGIT TWO
-	// Varying tertiary weights should be ignored.
-	"２": []Elem{e(102, digSec, digTert+3)}, // U+FF12 FULLWIDTH DIGIT TWO
-	"3": p(103),
-	"4": p(104),
-	"5": p(105),
-	"6": p(106),
-	"7": p(107),
-	// Weights must be strictly monotonically increasing, but do not need to be
-	// consecutive.
-	"8": p(118),
-	"9": p(119),
-	// Allow non-primary collation elements to be inserted.
-	"٩": append(p(119), tPlus3), // U+0669 ARABIC-INDIC DIGIT NINE
-	// Varying tertiary weights should be ignored.
-	"９": []Elem{e(119, digSec, digTert+1)}, // U+FF19 FULLWIDTH DIGIT NINE
-	"₉": []Elem{e(119, digSec, digTert+5)}, // U+2089 SUBSCRIPT NINE
-
-	"a": p(5),
-	"b": p(6),
-	"c": p(8, 2),
-
-	"klm": p(99),
-
-	"nop": p(121),
-
-	"x": p(200),
-	"y": p(201),
-}
-
-func p(w ...int) (elems []Elem) {
-	for _, x := range w {
-		e, _ := MakeElem(x, digSec, digTert, 0)
-		elems = append(elems, e)
-	}
-	return elems
-}
-
-func TestNumericAppendNext(t *testing.T) {
-	for _, tt := range []struct {
-		in string
-		w  []Elem
-	}{
-		{"a", p(5)},
-		{"klm", p(99)},
-		{"aa", p(5, 5)},
-		{"1", p(120, 1, 101)},
-		{"0", p(120, 0)},
-		{"01", p(120, 1, 101)},
-		{"0001", p(120, 1, 101)},
-		{"10", p(120, 2, 101, 100)},
-		{"99", p(120, 2, 119, 119)},
-		{"9999", p(120, 4, 119, 119, 119, 119)},
-		{"1a", p(120, 1, 101, 5)},
-		{"0b", p(120, 0, 6)},
-		{"01c", p(120, 1, 101, 8, 2)},
-		{"10x", p(120, 2, 101, 100, 200)},
-		{"99y", p(120, 2, 119, 119, 201)},
-		{"9999nop", p(120, 4, 119, 119, 119, 119, 121)},
-
-		// Allow follow-up collation elements if they have a zero non-primary.
-		{"١٢٩", []Elem{e(120), e(3), e(101), tPlus3, e(102), tPlus3, e(119), tPlus3}},
-		{
-			"１２９",
-			[]Elem{
-				e(120), e(3),
-				e(101, digSec, digTert+1),
-				e(102, digSec, digTert+3),
-				e(119, digSec, digTert+1),
-			},
-		},
-
-		// Ensure AppendNext* adds to the given buffer.
-		{"a10", p(5, 120, 2, 101, 100)},
-	} {
-		nw := NewNumericWeighter(numWeighter)
-
-		b := []byte(tt.in)
-		got := []Elem(nil)
-		for n, sz := 0, 0; n < len(b); {
-			got, sz = nw.AppendNext(got, b[n:])
-			n += sz
-		}
-		if !reflect.DeepEqual(got, tt.w) {
-			t.Errorf("AppendNext(%q) =\n%v; want\n%v", tt.in, got, tt.w)
-		}
-
-		got = nil
-		for n, sz := 0, 0; n < len(tt.in); {
-			got, sz = nw.AppendNextString(got, tt.in[n:])
-			n += sz
-		}
-		if !reflect.DeepEqual(got, tt.w) {
-			t.Errorf("AppendNextString(%q) =\n%v; want\n%v", tt.in, got, tt.w)
-		}
-	}
-}
-
-func TestNumericOverflow(t *testing.T) {
-	manyDigits := strings.Repeat("9", maxDigits+1) + "a"
-
-	nw := NewNumericWeighter(numWeighter)
-
-	got, n := nw.AppendNextString(nil, manyDigits)
-
-	if n != maxDigits {
-		t.Errorf("n: got %d; want %d", n, maxDigits)
-	}
-
-	if got[1].Primary() != maxDigits {
-		t.Errorf("primary(e[1]): got %d; want %d", n, maxDigits)
-	}
-}
-
-func TestNumericWeighterAlloc(t *testing.T) {
-	buf := make([]Elem, 100)
-	w := NewNumericWeighter(numWeighter)
-	s := "1234567890a"
-
-	nNormal := testtext.AllocsPerRun(3, func() { numWeighter.AppendNextString(buf, s) })
-	nNumeric := testtext.AllocsPerRun(3, func() { w.AppendNextString(buf, s) })
-	if n := nNumeric - nNormal; n > 0 {
-		t.Errorf("got %f; want 0", n)
-	}
-}
diff --git a/vendor/golang.org/x/text/internal/colltab/trie_test.go b/vendor/golang.org/x/text/internal/colltab/trie_test.go
deleted file mode 100644
index b056a811..00000000
--- a/vendor/golang.org/x/text/internal/colltab/trie_test.go
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package colltab
-
-import (
-	"testing"
-)
-
-// We take the smallest, largest and an arbitrary value for each
-// of the UTF-8 sequence lengths.
-var testRunes = []rune{
-	0x01, 0x0C, 0x7F, // 1-byte sequences
-	0x80, 0x100, 0x7FF, // 2-byte sequences
-	0x800, 0x999, 0xFFFF, // 3-byte sequences
-	0x10000, 0x10101, 0x10FFFF, // 4-byte sequences
-	0x200, 0x201, 0x202, 0x210, 0x215, // five entries in one sparse block
-}
-
-// Test cases for illegal runes.
-type trietest struct {
-	size  int
-	bytes []byte
-}
-
-var tests = []trietest{
-	// illegal runes
-	{1, []byte{0x80}},
-	{1, []byte{0xFF}},
-	{1, []byte{t2, tx - 1}},
-	{1, []byte{t2, t2}},
-	{2, []byte{t3, tx, tx - 1}},
-	{2, []byte{t3, tx, t2}},
-	{1, []byte{t3, tx - 1, tx}},
-	{3, []byte{t4, tx, tx, tx - 1}},
-	{3, []byte{t4, tx, tx, t2}},
-	{1, []byte{t4, t2, tx, tx - 1}},
-	{2, []byte{t4, tx, t2, tx - 1}},
-
-	// short runes
-	{0, []byte{t2}},
-	{0, []byte{t3, tx}},
-	{0, []byte{t4, tx, tx}},
-
-	// we only support UTF-8 up to utf8.UTFMax bytes (4 bytes)
-	{1, []byte{t5, tx, tx, tx, tx}},
-	{1, []byte{t6, tx, tx, tx, tx, tx}},
-}
-
-func TestLookupTrie(t *testing.T) {
-	for i, r := range testRunes {
-		b := []byte(string(r))
-		v, sz := testTrie.lookup(b)
-		if int(v) != i {
-			t.Errorf("lookup(%U): found value %#x, expected %#x", r, v, i)
-		}
-		if sz != len(b) {
-			t.Errorf("lookup(%U): found size %d, expected %d", r, sz, len(b))
-		}
-	}
-	for i, tt := range tests {
-		v, sz := testTrie.lookup(tt.bytes)
-		if int(v) != 0 {
-			t.Errorf("lookup of illegal rune, case %d: found value %#x, expected 0", i, v)
-		}
-		if sz != tt.size {
-			t.Errorf("lookup of illegal rune, case %d: found size %d, expected %d", i, sz, tt.size)
-		}
-	}
-}
-
-// test data is taken from exp/collate/locale/build/trie_test.go
-var testValues = [832]uint32{
-	0x000c: 0x00000001,
-	0x007f: 0x00000002,
-	0x00c0: 0x00000003,
-	0x0100: 0x00000004,
-	0x0140: 0x0000000c, 0x0141: 0x0000000d, 0x0142: 0x0000000e,
-	0x0150: 0x0000000f,
-	0x0155: 0x00000010,
-	0x01bf: 0x00000005,
-	0x01c0: 0x00000006,
-	0x0219: 0x00000007,
-	0x027f: 0x00000008,
-	0x0280: 0x00000009,
-	0x02c1: 0x0000000a,
-	0x033f: 0x0000000b,
-}
-
-var testLookup = [640]uint16{
-	0x0e0: 0x05, 0x0e6: 0x06,
-	0x13f: 0x07,
-	0x140: 0x08, 0x144: 0x09,
-	0x190: 0x03,
-	0x1ff: 0x0a,
-	0x20f: 0x05,
-	0x242: 0x01, 0x244: 0x02,
-	0x248: 0x03,
-	0x25f: 0x04,
-	0x260: 0x01,
-	0x26f: 0x02,
-	0x270: 0x04, 0x274: 0x06,
-}
-
-var testTrie = Trie{testLookup[6*blockSize:], testValues[:], testLookup[:], testValues[:]}
diff --git a/vendor/golang.org/x/text/internal/colltab/weighter_test.go b/vendor/golang.org/x/text/internal/colltab/weighter_test.go
deleted file mode 100644
index b5f8487b..00000000
--- a/vendor/golang.org/x/text/internal/colltab/weighter_test.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package colltab
-
-// testWeighter is a simple Weighter that returns weights from a user-defined map.
-type testWeighter map[string][]Elem
-
-func (t testWeighter) Start(int, []byte) int       { return 0 }
-func (t testWeighter) StartString(int, string) int { return 0 }
-func (t testWeighter) Domain() []string            { return nil }
-func (t testWeighter) Top() uint32                 { return 0 }
-
-// maxContractBytes is the maximum length of any key in the map.
-const maxContractBytes = 10
-
-func (t testWeighter) AppendNext(buf []Elem, s []byte) ([]Elem, int) {
-	n := len(s)
-	if n > maxContractBytes {
-		n = maxContractBytes
-	}
-	for i := n; i > 0; i-- {
-		if e, ok := t[string(s[:i])]; ok {
-			return append(buf, e...), i
-		}
-	}
-	panic("incomplete testWeighter: could not find " + string(s))
-}
-
-func (t testWeighter) AppendNextString(buf []Elem, s string) ([]Elem, int) {
-	n := len(s)
-	if n > maxContractBytes {
-		n = maxContractBytes
-	}
-	for i := n; i > 0; i-- {
-		if e, ok := t[s[:i]]; ok {
-			return append(buf, e...), i
-		}
-	}
-	panic("incomplete testWeighter: could not find " + s)
-}
diff --git a/vendor/golang.org/x/text/internal/gen.go b/vendor/golang.org/x/text/internal/gen.go
deleted file mode 100644
index 1d678af5..00000000
--- a/vendor/golang.org/x/text/internal/gen.go
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-package main
-
-import (
-	"log"
-
-	"golang.org/x/text/internal/gen"
-	"golang.org/x/text/language"
-	"golang.org/x/text/unicode/cldr"
-)
-
-func main() {
-	r := gen.OpenCLDRCoreZip()
-	defer r.Close()
-
-	d := &cldr.Decoder{}
-	data, err := d.DecodeZip(r)
-	if err != nil {
-		log.Fatalf("DecodeZip: %v", err)
-	}
-
-	w := gen.NewCodeWriter()
-	defer w.WriteGoFile("tables.go", "internal")
-
-	// Create parents table.
-	parents := make([]uint16, language.NumCompactTags)
-	for _, loc := range data.Locales() {
-		tag := language.MustParse(loc)
-		index, ok := language.CompactIndex(tag)
-		if !ok {
-			continue
-		}
-		parentIndex := 0 // und
-		for p := tag.Parent(); p != language.Und; p = p.Parent() {
-			if x, ok := language.CompactIndex(p); ok {
-				parentIndex = x
-				break
-			}
-		}
-		parents[index] = uint16(parentIndex)
-	}
-
-	w.WriteComment(`
-	Parent maps a compact index of a tag to the compact index of the parent of
-	this tag.`)
-	w.WriteVar("Parent", parents)
-}
diff --git a/vendor/golang.org/x/text/internal/gen_test.go b/vendor/golang.org/x/text/internal/gen_test.go
deleted file mode 100644
index a2e1981a..00000000
--- a/vendor/golang.org/x/text/internal/gen_test.go
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package internal
-
-import (
-	"testing"
-
-	"golang.org/x/text/language"
-)
-
-func TestParents(t *testing.T) {
-	testCases := []struct {
-		tag, parent string
-	}{
-		{"af", "und"},
-		{"en", "und"},
-		{"en-001", "en"},
-		{"en-AU", "en-001"},
-		{"en-US", "en"},
-		{"en-US-u-va-posix", "en-US"},
-		{"ca-ES-valencia", "ca-ES"},
-	}
-	for _, tc := range testCases {
-		tag, ok := language.CompactIndex(language.MustParse(tc.tag))
-		if !ok {
-			t.Fatalf("Could not get index of flag %s", tc.tag)
-		}
-		want, ok := language.CompactIndex(language.MustParse(tc.parent))
-		if !ok {
-			t.Fatalf("Could not get index of parent %s of tag %s", tc.parent, tc.tag)
-		}
-		if got := int(Parent[tag]); got != want {
-			t.Errorf("Parent[%s] = %d; want %d (%s)", tc.tag, got, want, tc.parent)
-		}
-	}
-}
diff --git a/vendor/golang.org/x/text/internal/internal.go b/vendor/golang.org/x/text/internal/internal.go
deleted file mode 100644
index eac83285..00000000
--- a/vendor/golang.org/x/text/internal/internal.go
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:generate go run gen.go
-
-// Package internal contains non-exported functionality that are used by
-// packages in the text repository.
-package internal // import "golang.org/x/text/internal"
-
-import (
-	"sort"
-
-	"golang.org/x/text/language"
-)
-
-// SortTags sorts tags in place.
-func SortTags(tags []language.Tag) {
-	sort.Sort(sorter(tags))
-}
-
-type sorter []language.Tag
-
-func (s sorter) Len() int {
-	return len(s)
-}
-
-func (s sorter) Swap(i, j int) {
-	s[i], s[j] = s[j], s[i]
-}
-
-func (s sorter) Less(i, j int) bool {
-	return s[i].String() < s[j].String()
-}
-
-// UniqueTags sorts and filters duplicate tags in place and returns a slice with
-// only unique tags.
-func UniqueTags(tags []language.Tag) []language.Tag {
-	if len(tags) <= 1 {
-		return tags
-	}
-	SortTags(tags)
-	k := 0
-	for i := 1; i < len(tags); i++ {
-		if tags[k].String() < tags[i].String() {
-			k++
-			tags[k] = tags[i]
-		}
-	}
-	return tags[:k+1]
-}
diff --git a/vendor/golang.org/x/text/internal/internal_test.go b/vendor/golang.org/x/text/internal/internal_test.go
deleted file mode 100644
index ce1b9a38..00000000
--- a/vendor/golang.org/x/text/internal/internal_test.go
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package internal
-
-import (
-	"fmt"
-	"strings"
-	"testing"
-
-	"golang.org/x/text/language"
-)
-
-func TestUnique(t *testing.T) {
-	testCases := []struct {
-		in, want string
-	}{
-		{"", "[]"},
-		{"en", "[en]"},
-		{"en en", "[en]"},
-		{"en en en", "[en]"},
-		{"en-u-cu-eur en", "[en en-u-cu-eur]"},
-		{"nl en", "[en nl]"},
-		{"pt-Pt pt", "[pt pt-PT]"},
-	}
-	for _, tc := range testCases {
-		tags := []language.Tag{}
-		for _, s := range strings.Split(tc.in, " ") {
-			if s != "" {
-				tags = append(tags, language.MustParse(s))
-			}
-		}
-		if got := fmt.Sprint(UniqueTags(tags)); got != tc.want {
-			t.Errorf("Unique(%s) = %s; want %s", tc.in, got, tc.want)
-		}
-	}
-}
diff --git a/vendor/golang.org/x/text/internal/match.go b/vendor/golang.org/x/text/internal/match.go
deleted file mode 100644
index a67fcaca..00000000
--- a/vendor/golang.org/x/text/internal/match.go
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package internal
-
-// This file contains matchers that implement CLDR inheritance.
-//
-//     See http://unicode.org/reports/tr35/#Locale_Inheritance.
-//
-// Some of the inheritance described in this document is already handled by
-// the cldr package.
-
-import (
-	"golang.org/x/text/language"
-)
-
-// TODO: consider if (some of the) matching algorithm needs to be public after
-// getting some feel about what is generic and what is specific.
-
-// NewInheritanceMatcher returns a matcher that matches based on the inheritance
-// chain.
-//
-// The matcher uses canonicalization and the parent relationship to find a
-// match. The resulting match will always be either Und or a language with the
-// same language and script as the requested language. It will not match
-// languages for which there is understood to be mutual or one-directional
-// intelligibility.
-//
-// A Match will indicate an Exact match if the language matches after
-// canonicalization and High if the matched tag is a parent.
-func NewInheritanceMatcher(t []language.Tag) *InheritanceMatcher {
-	tags := &InheritanceMatcher{make(map[language.Tag]int)}
-	for i, tag := range t {
-		ct, err := language.All.Canonicalize(tag)
-		if err != nil {
-			ct = tag
-		}
-		tags.index[ct] = i
-	}
-	return tags
-}
-
-type InheritanceMatcher struct {
-	index map[language.Tag]int
-}
-
-func (m InheritanceMatcher) Match(want ...language.Tag) (language.Tag, int, language.Confidence) {
-	for _, t := range want {
-		ct, err := language.All.Canonicalize(t)
-		if err != nil {
-			ct = t
-		}
-		conf := language.Exact
-		for {
-			if index, ok := m.index[ct]; ok {
-				return ct, index, conf
-			}
-			if ct == language.Und {
-				break
-			}
-			ct = ct.Parent()
-			conf = language.High
-		}
-	}
-	return language.Und, 0, language.No
-}
diff --git a/vendor/golang.org/x/text/internal/match_test.go b/vendor/golang.org/x/text/internal/match_test.go
deleted file mode 100644
index 8a3fe657..00000000
--- a/vendor/golang.org/x/text/internal/match_test.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package internal
-
-import (
-	"strings"
-	"testing"
-
-	"golang.org/x/text/language"
-)
-
-func TestInheritanceMatcher(t *testing.T) {
-	for i, tt := range []struct {
-		haveTags string
-		wantTags string
-		match    string
-		conf     language.Confidence
-	}{
-		{"und,en,en-US", "en-US", "en-US", language.Exact}, // most specific match
-		{"zh-Hant,zh", "zh-TW", "zh-Hant", language.High},  // zh-TW implies Hant.
-		{"und,zh", "zh-TW", "und", language.High},          // zh-TW does not match zh.
-		{"zh", "zh-TW", "und", language.No},                // zh-TW does not match zh.
-		{"iw,en,nl", "he", "he", language.Exact},           // matches after canonicalization
-		{"he,en,nl", "iw", "he", language.Exact},           // matches after canonicalization
-		// Prefer first match over more specific match for various reasons:
-		// a) consistency of user interface is more important than an exact match,
-		// b) _if_ und is specified, it should be considered a correct and useful match,
-		// Note that a call to this Match will almost always be with a single tag.
-		{"und,en,en-US", "he,en-US", "und", language.High},
-	} {
-		have := parseTags(tt.haveTags)
-		m := NewInheritanceMatcher(have)
-		tag, index, conf := m.Match(parseTags(tt.wantTags)...)
-		want := language.Raw.Make(tt.match)
-		if tag != want {
-			t.Errorf("%d:tag: got %q; want %q", i, tag, want)
-		}
-		if conf != language.No {
-			if got, _ := language.All.Canonicalize(have[index]); got != want {
-				t.Errorf("%d:index: got %q; want %q ", i, got, want)
-			}
-		}
-		if conf != tt.conf {
-			t.Errorf("%d:conf: got %v; want %v", i, conf, tt.conf)
-		}
-	}
-}
-
-func parseTags(list string) (out []language.Tag) {
-	for _, s := range strings.Split(list, ",") {
-		out = append(out, language.Raw.Make(strings.TrimSpace(s)))
-	}
-	return out
-}
diff --git a/vendor/golang.org/x/text/internal/tables.go b/vendor/golang.org/x/text/internal/tables.go
deleted file mode 100644
index 85991d3d..00000000
--- a/vendor/golang.org/x/text/internal/tables.go
+++ /dev/null
@@ -1,118 +0,0 @@
-// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
-
-package internal
-
-// Parent maps a compact index of a tag to the compact index of the parent of
-// this tag.
-var Parent = []uint16{ // 768 elements
-	// Entry 0 - 3F
-	0x0000, 0x0053, 0x00e8, 0x0000, 0x0003, 0x0003, 0x0000, 0x0006,
-	0x0000, 0x0008, 0x0000, 0x000a, 0x0000, 0x000c, 0x000c, 0x000c,
-	0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c,
-	0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c,
-	0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c, 0x000c,
-	0x000c, 0x0000, 0x0000, 0x002a, 0x0000, 0x002c, 0x0000, 0x002e,
-	0x0000, 0x0000, 0x0031, 0x0030, 0x0030, 0x0000, 0x0035, 0x0000,
-	0x0037, 0x0000, 0x0039, 0x0000, 0x003b, 0x0000, 0x003d, 0x0000,
-	// Entry 40 - 7F
-	0x0000, 0x0040, 0x0000, 0x0042, 0x0042, 0x0000, 0x0045, 0x0045,
-	0x0000, 0x0048, 0x0000, 0x004a, 0x0000, 0x0000, 0x004d, 0x004c,
-	0x004c, 0x0000, 0x0051, 0x0051, 0x0051, 0x0051, 0x0000, 0x0056,
-	0x0056, 0x0000, 0x0059, 0x0000, 0x005b, 0x0000, 0x005d, 0x0000,
-	0x005f, 0x005f, 0x0000, 0x0062, 0x0000, 0x0064, 0x0000, 0x0066,
-	0x0000, 0x0068, 0x0068, 0x0000, 0x006b, 0x0000, 0x006d, 0x006d,
-	0x006d, 0x006d, 0x006d, 0x006d, 0x006d, 0x0000, 0x0075, 0x0000,
-	0x0077, 0x0000, 0x0079, 0x0000, 0x0000, 0x007c, 0x0000, 0x007e,
-	// Entry 80 - BF
-	0x0000, 0x0080, 0x0000, 0x0082, 0x0082, 0x0000, 0x0085, 0x0085,
-	0x0000, 0x0088, 0x0089, 0x0089, 0x0089, 0x0088, 0x008a, 0x0089,
-	0x0089, 0x0089, 0x0088, 0x0089, 0x0089, 0x0089, 0x0089, 0x0089,
-	0x0089, 0x008a, 0x0089, 0x0089, 0x0089, 0x0089, 0x008a, 0x0089,
-	0x008a, 0x0089, 0x0089, 0x008a, 0x0089, 0x0089, 0x0089, 0x0089,
-	0x0089, 0x0089, 0x0089, 0x0089, 0x0089, 0x0088, 0x0089, 0x0089,
-	0x0089, 0x0089, 0x0089, 0x0089, 0x0089, 0x0089, 0x0089, 0x0089,
-	0x0089, 0x0089, 0x0089, 0x0089, 0x0089, 0x0089, 0x0089, 0x0088,
-	// Entry C0 - FF
-	0x0089, 0x0088, 0x0089, 0x0089, 0x0089, 0x0089, 0x0089, 0x0089,
-	0x0089, 0x0089, 0x008a, 0x0089, 0x0089, 0x0089, 0x0089, 0x0089,
-	0x0089, 0x0089, 0x0088, 0x0089, 0x0089, 0x0089, 0x0089, 0x0089,
-	0x008a, 0x0089, 0x0089, 0x008a, 0x0089, 0x0089, 0x0089, 0x0089,
-	0x0089, 0x0089, 0x0089, 0x0089, 0x0089, 0x0089, 0x0089, 0x0088,
-	0x0088, 0x0089, 0x0089, 0x0088, 0x0089, 0x0089, 0x0089, 0x0089,
-	0x0089, 0x0000, 0x00f1, 0x0000, 0x00f3, 0x00f4, 0x00f4, 0x00f4,
-	0x00f4, 0x00f4, 0x00f4, 0x00f4, 0x00f4, 0x00f4, 0x00f3, 0x00f4,
-	// Entry 100 - 13F
-	0x00f3, 0x00f3, 0x00f4, 0x00f4, 0x00f3, 0x00f4, 0x00f4, 0x00f4,
-	0x00f4, 0x00f3, 0x00f4, 0x00f4, 0x00f4, 0x00f4, 0x00f4, 0x00f4,
-	0x0000, 0x0110, 0x0000, 0x0112, 0x0000, 0x0114, 0x0000, 0x0116,
-	0x0116, 0x0000, 0x0119, 0x0119, 0x0119, 0x0119, 0x0000, 0x011e,
-	0x0000, 0x0120, 0x0000, 0x0122, 0x0122, 0x0000, 0x0125, 0x0125,
-	0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125,
-	0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125,
-	0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125,
-	// Entry 140 - 17F
-	0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125,
-	0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125, 0x0125,
-	0x0125, 0x0125, 0x0125, 0x0125, 0x0000, 0x0154, 0x0000, 0x0156,
-	0x0000, 0x0158, 0x0000, 0x015a, 0x0000, 0x015c, 0x0000, 0x015e,
-	0x015e, 0x015e, 0x0000, 0x0162, 0x0000, 0x0000, 0x0165, 0x0000,
-	0x0167, 0x0000, 0x0169, 0x0169, 0x0169, 0x0000, 0x016d, 0x0000,
-	0x016f, 0x0000, 0x0171, 0x0000, 0x0173, 0x0173, 0x0000, 0x0176,
-	0x0000, 0x0178, 0x0000, 0x017a, 0x0000, 0x017c, 0x0000, 0x017e,
-	// Entry 180 - 1BF
-	0x0000, 0x0180, 0x0000, 0x0000, 0x0183, 0x0000, 0x0185, 0x0185,
-	0x0185, 0x0185, 0x0000, 0x0000, 0x018b, 0x0000, 0x0000, 0x018e,
-	0x0000, 0x0190, 0x0000, 0x0000, 0x0193, 0x0000, 0x0195, 0x0000,
-	0x0000, 0x0198, 0x0000, 0x0000, 0x019b, 0x0000, 0x019d, 0x0000,
-	0x019f, 0x0000, 0x01a1, 0x0000, 0x01a3, 0x0000, 0x01a5, 0x0000,
-	0x01a7, 0x0000, 0x01a9, 0x0000, 0x01ab, 0x0000, 0x01ad, 0x0000,
-	0x01af, 0x01af, 0x0000, 0x01b2, 0x0000, 0x01b4, 0x0000, 0x01b6,
-	0x0000, 0x01b8, 0x0000, 0x01ba, 0x0000, 0x0000, 0x01bd, 0x0000,
-	// Entry 1C0 - 1FF
-	0x01bf, 0x0000, 0x01c1, 0x0000, 0x01c3, 0x0000, 0x01c5, 0x0000,
-	0x01c7, 0x0000, 0x01c9, 0x01c9, 0x01c9, 0x01c9, 0x0000, 0x01ce,
-	0x0000, 0x01d0, 0x01d0, 0x0000, 0x01d3, 0x0000, 0x01d5, 0x0000,
-	0x01d7, 0x0000, 0x01d9, 0x0000, 0x01db, 0x0000, 0x01dd, 0x01dd,
-	0x0000, 0x01e0, 0x0000, 0x01e2, 0x0000, 0x01e4, 0x0000, 0x01e6,
-	0x0000, 0x01e8, 0x0000, 0x01ea, 0x0000, 0x01ec, 0x0000, 0x01ee,
-	0x0000, 0x01f0, 0x0000, 0x01f2, 0x01f2, 0x01f2, 0x0000, 0x01f6,
-	0x0000, 0x01f8, 0x0000, 0x01fa, 0x0000, 0x01fc, 0x0000, 0x0000,
-	// Entry 200 - 23F
-	0x01ff, 0x0000, 0x0201, 0x0201, 0x0000, 0x0204, 0x0000, 0x0206,
-	0x0206, 0x0000, 0x0209, 0x0209, 0x0000, 0x020c, 0x020c, 0x020c,
-	0x020c, 0x020c, 0x020c, 0x020c, 0x0000, 0x0214, 0x0000, 0x0216,
-	0x0000, 0x0218, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x021e,
-	0x0000, 0x0000, 0x0221, 0x0000, 0x0223, 0x0223, 0x0000, 0x0226,
-	0x0000, 0x0228, 0x0228, 0x0000, 0x0000, 0x022c, 0x022b, 0x022b,
-	0x0000, 0x0000, 0x0231, 0x0000, 0x0233, 0x0000, 0x0235, 0x0000,
-	0x0241, 0x0237, 0x0241, 0x0241, 0x0241, 0x0241, 0x0241, 0x0241,
-	// Entry 240 - 27F
-	0x0241, 0x0237, 0x0241, 0x0241, 0x0000, 0x0244, 0x0244, 0x0244,
-	0x0000, 0x0248, 0x0000, 0x024a, 0x0000, 0x024c, 0x024c, 0x0000,
-	0x024f, 0x0000, 0x0251, 0x0251, 0x0251, 0x0251, 0x0251, 0x0251,
-	0x0000, 0x0258, 0x0000, 0x025a, 0x0000, 0x025c, 0x0000, 0x025e,
-	0x0000, 0x0260, 0x0000, 0x0262, 0x0000, 0x0000, 0x0265, 0x0265,
-	0x0265, 0x0000, 0x0269, 0x0000, 0x026b, 0x0000, 0x026d, 0x0000,
-	0x0000, 0x0270, 0x026f, 0x026f, 0x0000, 0x0274, 0x0000, 0x0276,
-	0x0000, 0x0278, 0x0000, 0x0000, 0x0000, 0x0000, 0x027d, 0x0000,
-	// Entry 280 - 2BF
-	0x0000, 0x0280, 0x0000, 0x0282, 0x0282, 0x0282, 0x0282, 0x0000,
-	0x0287, 0x0287, 0x0287, 0x0000, 0x028b, 0x028b, 0x028b, 0x028b,
-	0x028b, 0x0000, 0x0291, 0x0291, 0x0291, 0x0291, 0x0000, 0x0000,
-	0x0000, 0x0000, 0x0299, 0x0299, 0x0299, 0x0000, 0x029d, 0x029d,
-	0x029d, 0x029d, 0x0000, 0x0000, 0x02a3, 0x02a3, 0x02a3, 0x02a3,
-	0x0000, 0x02a8, 0x0000, 0x02aa, 0x02aa, 0x0000, 0x02ad, 0x0000,
-	0x02af, 0x0000, 0x02b1, 0x02b1, 0x0000, 0x0000, 0x02b5, 0x0000,
-	0x0000, 0x02b8, 0x0000, 0x02ba, 0x02ba, 0x0000, 0x0000, 0x02be,
-	// Entry 2C0 - 2FF
-	0x0000, 0x02c0, 0x0000, 0x02c2, 0x0000, 0x02c4, 0x0000, 0x02c6,
-	0x0000, 0x02c8, 0x02c8, 0x0000, 0x0000, 0x02cc, 0x0000, 0x02ce,
-	0x02cb, 0x02cb, 0x0000, 0x0000, 0x02d3, 0x02d2, 0x02d2, 0x0000,
-	0x0000, 0x02d8, 0x0000, 0x02da, 0x0000, 0x02dc, 0x0000, 0x0000,
-	0x02df, 0x0000, 0x02e1, 0x0000, 0x0000, 0x02e4, 0x0000, 0x02e6,
-	0x0000, 0x02e8, 0x0000, 0x02ea, 0x02ea, 0x0000, 0x0000, 0x02ee,
-	0x02ed, 0x02ed, 0x0000, 0x02f2, 0x0000, 0x02f4, 0x02f4, 0x02f4,
-	0x02f4, 0x02f4, 0x0000, 0x02fa, 0x02fb, 0x02fa, 0x0000, 0x02fe,
-} // Size: 1560 bytes
-
-// Total table size 1560 bytes (1KiB); checksum: 4897681C
diff --git a/vendor/golang.org/x/text/internal/tag/tag_test.go b/vendor/golang.org/x/text/internal/tag/tag_test.go
deleted file mode 100644
index da174a24..00000000
--- a/vendor/golang.org/x/text/internal/tag/tag_test.go
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package tag
-
-import (
-	"strings"
-	"testing"
-)
-
-var strdata = []string{
-	"aa  ",
-	"aaa ",
-	"aaaa",
-	"aaab",
-	"aab ",
-	"ab  ",
-	"ba  ",
-	"xxxx",
-	"\xff\xff\xff\xff",
-}
-
-var testCases = map[string]int{
-	"a":    0,
-	"aa":   0,
-	"aaa":  1,
-	"aa ":  0,
-	"aaaa": 2,
-	"aaab": 3,
-	"b":    6,
-	"ba":   6,
-	"    ": -1,
-	"aaax": -1,
-	"bbbb": -1,
-	"zzzz": -1,
-}
-
-func TestIndex(t *testing.T) {
-	index := Index(strings.Join(strdata, ""))
-	for k, v := range testCases {
-		if i := index.Index([]byte(k)); i != v {
-			t.Errorf("%s: got %d; want %d", k, i, v)
-		}
-	}
-}
-
-func TestFixCase(t *testing.T) {
-	tests := []string{
-		"aaaa", "AbCD", "abcd",
-		"Zzzz", "AbCD", "Abcd",
-		"Zzzz", "AbC", "",
-		"XXX", "ab ", "",
-		"XXX", "usd", "USD",
-		"cmn", "AB ", "",
-		"gsw", "CMN", "cmn",
-	}
-	for tc := tests; len(tc) > 0; tc = tc[3:] {
-		b := []byte(tc[1])
-		if !FixCase(tc[0], b) {
-			b = nil
-		}
-		if string(b) != tc[2] {
-			t.Errorf("FixCase(%q, %q) = %q; want %q", tc[0], tc[1], b, tc[2])
-		}
-	}
-}
diff --git a/vendor/golang.org/x/text/internal/triegen/data_test.go b/vendor/golang.org/x/text/internal/triegen/data_test.go
deleted file mode 100644
index 91de547a..00000000
--- a/vendor/golang.org/x/text/internal/triegen/data_test.go
+++ /dev/null
@@ -1,875 +0,0 @@
-// This file is generated with "go test -tags generate". DO NOT EDIT!
-// +build !generate
-
-package triegen_test
-
-// lookup returns the trie value for the first UTF-8 encoding in s and
-// the width in bytes of this encoding. The size will be 0 if s does not
-// hold enough bytes to complete the encoding. len(s) must be greater than 0.
-func (t *randTrie) lookup(s []byte) (v uint8, sz int) {
-	c0 := s[0]
-	switch {
-	case c0 < 0x80: // is ASCII
-		return randValues[c0], 1
-	case c0 < 0xC2:
-		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
-	case c0 < 0xE0: // 2-byte UTF-8
-		if len(s) < 2 {
-			return 0, 0
-		}
-		i := randIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c1), 2
-	case c0 < 0xF0: // 3-byte UTF-8
-		if len(s) < 3 {
-			return 0, 0
-		}
-		i := randIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = randIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c2), 3
-	case c0 < 0xF8: // 4-byte UTF-8
-		if len(s) < 4 {
-			return 0, 0
-		}
-		i := randIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = randIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		o = uint32(i)<<6 + uint32(c2)
-		i = randIndex[o]
-		c3 := s[3]
-		if c3 < 0x80 || 0xC0 <= c3 {
-			return 0, 3 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c3), 4
-	}
-	// Illegal rune
-	return 0, 1
-}
-
-// lookupUnsafe returns the trie value for the first UTF-8 encoding in s.
-// s must start with a full and valid UTF-8 encoded rune.
-func (t *randTrie) lookupUnsafe(s []byte) uint8 {
-	c0 := s[0]
-	if c0 < 0x80 { // is ASCII
-		return randValues[c0]
-	}
-	i := randIndex[c0]
-	if c0 < 0xE0 { // 2-byte UTF-8
-		return t.lookupValue(uint32(i), s[1])
-	}
-	i = randIndex[uint32(i)<<6+uint32(s[1])]
-	if c0 < 0xF0 { // 3-byte UTF-8
-		return t.lookupValue(uint32(i), s[2])
-	}
-	i = randIndex[uint32(i)<<6+uint32(s[2])]
-	if c0 < 0xF8 { // 4-byte UTF-8
-		return t.lookupValue(uint32(i), s[3])
-	}
-	return 0
-}
-
-// lookupString returns the trie value for the first UTF-8 encoding in s and
-// the width in bytes of this encoding. The size will be 0 if s does not
-// hold enough bytes to complete the encoding. len(s) must be greater than 0.
-func (t *randTrie) lookupString(s string) (v uint8, sz int) {
-	c0 := s[0]
-	switch {
-	case c0 < 0x80: // is ASCII
-		return randValues[c0], 1
-	case c0 < 0xC2:
-		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
-	case c0 < 0xE0: // 2-byte UTF-8
-		if len(s) < 2 {
-			return 0, 0
-		}
-		i := randIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c1), 2
-	case c0 < 0xF0: // 3-byte UTF-8
-		if len(s) < 3 {
-			return 0, 0
-		}
-		i := randIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = randIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c2), 3
-	case c0 < 0xF8: // 4-byte UTF-8
-		if len(s) < 4 {
-			return 0, 0
-		}
-		i := randIndex[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = randIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		o = uint32(i)<<6 + uint32(c2)
-		i = randIndex[o]
-		c3 := s[3]
-		if c3 < 0x80 || 0xC0 <= c3 {
-			return 0, 3 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c3), 4
-	}
-	// Illegal rune
-	return 0, 1
-}
-
-// lookupStringUnsafe returns the trie value for the first UTF-8 encoding in s.
-// s must start with a full and valid UTF-8 encoded rune.
-func (t *randTrie) lookupStringUnsafe(s string) uint8 {
-	c0 := s[0]
-	if c0 < 0x80 { // is ASCII
-		return randValues[c0]
-	}
-	i := randIndex[c0]
-	if c0 < 0xE0 { // 2-byte UTF-8
-		return t.lookupValue(uint32(i), s[1])
-	}
-	i = randIndex[uint32(i)<<6+uint32(s[1])]
-	if c0 < 0xF0 { // 3-byte UTF-8
-		return t.lookupValue(uint32(i), s[2])
-	}
-	i = randIndex[uint32(i)<<6+uint32(s[2])]
-	if c0 < 0xF8 { // 4-byte UTF-8
-		return t.lookupValue(uint32(i), s[3])
-	}
-	return 0
-}
-
-// randTrie. Total size: 9280 bytes (9.06 KiB). Checksum: 6debd324a8debb8f.
-type randTrie struct{}
-
-func newRandTrie(i int) *randTrie {
-	return &randTrie{}
-}
-
-// lookupValue determines the type of block n and looks up the value for b.
-func (t *randTrie) lookupValue(n uint32, b byte) uint8 {
-	switch {
-	default:
-		return uint8(randValues[n<<6+uint32(b)])
-	}
-}
-
-// randValues: 56 blocks, 3584 entries, 3584 bytes
-// The third block is the zero block.
-var randValues = [3584]uint8{
-	// Block 0x0, offset 0x0
-	// Block 0x1, offset 0x40
-	// Block 0x2, offset 0x80
-	// Block 0x3, offset 0xc0
-	0xc9: 0x0001,
-	// Block 0x4, offset 0x100
-	0x100: 0x0001,
-	// Block 0x5, offset 0x140
-	0x155: 0x0001,
-	// Block 0x6, offset 0x180
-	0x196: 0x0001,
-	// Block 0x7, offset 0x1c0
-	0x1ef: 0x0001,
-	// Block 0x8, offset 0x200
-	0x206: 0x0001,
-	// Block 0x9, offset 0x240
-	0x258: 0x0001,
-	// Block 0xa, offset 0x280
-	0x288: 0x0001,
-	// Block 0xb, offset 0x2c0
-	0x2f2: 0x0001,
-	// Block 0xc, offset 0x300
-	0x304: 0x0001,
-	// Block 0xd, offset 0x340
-	0x34b: 0x0001,
-	// Block 0xe, offset 0x380
-	0x3ba: 0x0001,
-	// Block 0xf, offset 0x3c0
-	0x3f5: 0x0001,
-	// Block 0x10, offset 0x400
-	0x41d: 0x0001,
-	// Block 0x11, offset 0x440
-	0x442: 0x0001,
-	// Block 0x12, offset 0x480
-	0x4bb: 0x0001,
-	// Block 0x13, offset 0x4c0
-	0x4e9: 0x0001,
-	// Block 0x14, offset 0x500
-	0x53e: 0x0001,
-	// Block 0x15, offset 0x540
-	0x55f: 0x0001,
-	// Block 0x16, offset 0x580
-	0x5b7: 0x0001,
-	// Block 0x17, offset 0x5c0
-	0x5d9: 0x0001,
-	// Block 0x18, offset 0x600
-	0x60e: 0x0001,
-	// Block 0x19, offset 0x640
-	0x652: 0x0001,
-	// Block 0x1a, offset 0x680
-	0x68f: 0x0001,
-	// Block 0x1b, offset 0x6c0
-	0x6dc: 0x0001,
-	// Block 0x1c, offset 0x700
-	0x703: 0x0001,
-	// Block 0x1d, offset 0x740
-	0x741: 0x0001,
-	// Block 0x1e, offset 0x780
-	0x79b: 0x0001,
-	// Block 0x1f, offset 0x7c0
-	0x7f1: 0x0001,
-	// Block 0x20, offset 0x800
-	0x833: 0x0001,
-	// Block 0x21, offset 0x840
-	0x853: 0x0001,
-	// Block 0x22, offset 0x880
-	0x8a2: 0x0001,
-	// Block 0x23, offset 0x8c0
-	0x8f8: 0x0001,
-	// Block 0x24, offset 0x900
-	0x917: 0x0001,
-	// Block 0x25, offset 0x940
-	0x945: 0x0001,
-	// Block 0x26, offset 0x980
-	0x99e: 0x0001,
-	// Block 0x27, offset 0x9c0
-	0x9fd: 0x0001,
-	// Block 0x28, offset 0xa00
-	0xa0d: 0x0001,
-	// Block 0x29, offset 0xa40
-	0xa66: 0x0001,
-	// Block 0x2a, offset 0xa80
-	0xaab: 0x0001,
-	// Block 0x2b, offset 0xac0
-	0xaea: 0x0001,
-	// Block 0x2c, offset 0xb00
-	0xb2d: 0x0001,
-	// Block 0x2d, offset 0xb40
-	0xb54: 0x0001,
-	// Block 0x2e, offset 0xb80
-	0xb90: 0x0001,
-	// Block 0x2f, offset 0xbc0
-	0xbe5: 0x0001,
-	// Block 0x30, offset 0xc00
-	0xc28: 0x0001,
-	// Block 0x31, offset 0xc40
-	0xc7c: 0x0001,
-	// Block 0x32, offset 0xc80
-	0xcbf: 0x0001,
-	// Block 0x33, offset 0xcc0
-	0xcc7: 0x0001,
-	// Block 0x34, offset 0xd00
-	0xd34: 0x0001,
-	// Block 0x35, offset 0xd40
-	0xd61: 0x0001,
-	// Block 0x36, offset 0xd80
-	0xdb9: 0x0001,
-	// Block 0x37, offset 0xdc0
-	0xdda: 0x0001,
-}
-
-// randIndex: 89 blocks, 5696 entries, 5696 bytes
-// Block 0 is the zero block.
-var randIndex = [5696]uint8{
-	// Block 0x0, offset 0x0
-	// Block 0x1, offset 0x40
-	// Block 0x2, offset 0x80
-	// Block 0x3, offset 0xc0
-	0xe1: 0x02, 0xe3: 0x03, 0xe4: 0x04,
-	0xea: 0x05, 0xeb: 0x06, 0xec: 0x07,
-	0xf0: 0x10, 0xf1: 0x24, 0xf2: 0x3d, 0xf3: 0x4f, 0xf4: 0x56,
-	// Block 0x4, offset 0x100
-	0x107: 0x01,
-	// Block 0x5, offset 0x140
-	0x16c: 0x02,
-	// Block 0x6, offset 0x180
-	0x19c: 0x03,
-	0x1ae: 0x04,
-	// Block 0x7, offset 0x1c0
-	0x1d8: 0x05,
-	0x1f7: 0x06,
-	// Block 0x8, offset 0x200
-	0x20c: 0x07,
-	// Block 0x9, offset 0x240
-	0x24a: 0x08,
-	// Block 0xa, offset 0x280
-	0x2b6: 0x09,
-	// Block 0xb, offset 0x2c0
-	0x2d5: 0x0a,
-	// Block 0xc, offset 0x300
-	0x31a: 0x0b,
-	// Block 0xd, offset 0x340
-	0x373: 0x0c,
-	// Block 0xe, offset 0x380
-	0x38b: 0x0d,
-	// Block 0xf, offset 0x3c0
-	0x3f0: 0x0e,
-	// Block 0x10, offset 0x400
-	0x433: 0x0f,
-	// Block 0x11, offset 0x440
-	0x45d: 0x10,
-	// Block 0x12, offset 0x480
-	0x491: 0x08, 0x494: 0x09, 0x497: 0x0a,
-	0x49b: 0x0b, 0x49c: 0x0c,
-	0x4a1: 0x0d,
-	0x4ad: 0x0e,
-	0x4ba: 0x0f,
-	// Block 0x13, offset 0x4c0
-	0x4c1: 0x11,
-	// Block 0x14, offset 0x500
-	0x531: 0x12,
-	// Block 0x15, offset 0x540
-	0x546: 0x13,
-	// Block 0x16, offset 0x580
-	0x5ab: 0x14,
-	// Block 0x17, offset 0x5c0
-	0x5d4: 0x11,
-	0x5fe: 0x11,
-	// Block 0x18, offset 0x600
-	0x618: 0x0a,
-	// Block 0x19, offset 0x640
-	0x65b: 0x15,
-	// Block 0x1a, offset 0x680
-	0x6a0: 0x16,
-	// Block 0x1b, offset 0x6c0
-	0x6d2: 0x17,
-	0x6f6: 0x18,
-	// Block 0x1c, offset 0x700
-	0x711: 0x19,
-	// Block 0x1d, offset 0x740
-	0x768: 0x1a,
-	// Block 0x1e, offset 0x780
-	0x783: 0x1b,
-	// Block 0x1f, offset 0x7c0
-	0x7f9: 0x1c,
-	// Block 0x20, offset 0x800
-	0x831: 0x1d,
-	// Block 0x21, offset 0x840
-	0x85e: 0x1e,
-	// Block 0x22, offset 0x880
-	0x898: 0x1f,
-	// Block 0x23, offset 0x8c0
-	0x8c7: 0x18,
-	0x8d5: 0x14,
-	0x8f7: 0x20,
-	0x8fe: 0x1f,
-	// Block 0x24, offset 0x900
-	0x905: 0x21,
-	// Block 0x25, offset 0x940
-	0x966: 0x03,
-	// Block 0x26, offset 0x980
-	0x981: 0x07, 0x983: 0x11,
-	0x989: 0x12, 0x98a: 0x13, 0x98e: 0x14, 0x98f: 0x15,
-	0x992: 0x16, 0x995: 0x17, 0x996: 0x18,
-	0x998: 0x19, 0x999: 0x1a, 0x99b: 0x1b, 0x99f: 0x1c,
-	0x9a3: 0x1d,
-	0x9ad: 0x1e, 0x9af: 0x1f,
-	0x9b0: 0x20, 0x9b1: 0x21,
-	0x9b8: 0x22, 0x9bd: 0x23,
-	// Block 0x27, offset 0x9c0
-	0x9cd: 0x22,
-	// Block 0x28, offset 0xa00
-	0xa0c: 0x08,
-	// Block 0x29, offset 0xa40
-	0xa6f: 0x1c,
-	// Block 0x2a, offset 0xa80
-	0xa90: 0x1a,
-	0xaaf: 0x23,
-	// Block 0x2b, offset 0xac0
-	0xae3: 0x19,
-	0xae8: 0x24,
-	0xafc: 0x25,
-	// Block 0x2c, offset 0xb00
-	0xb13: 0x26,
-	// Block 0x2d, offset 0xb40
-	0xb67: 0x1c,
-	// Block 0x2e, offset 0xb80
-	0xb8f: 0x0b,
-	// Block 0x2f, offset 0xbc0
-	0xbcb: 0x27,
-	0xbe7: 0x26,
-	// Block 0x30, offset 0xc00
-	0xc34: 0x16,
-	// Block 0x31, offset 0xc40
-	0xc62: 0x03,
-	// Block 0x32, offset 0xc80
-	0xcbb: 0x12,
-	// Block 0x33, offset 0xcc0
-	0xcdf: 0x09,
-	// Block 0x34, offset 0xd00
-	0xd34: 0x0a,
-	// Block 0x35, offset 0xd40
-	0xd41: 0x1e,
-	// Block 0x36, offset 0xd80
-	0xd83: 0x28,
-	// Block 0x37, offset 0xdc0
-	0xdc0: 0x15,
-	// Block 0x38, offset 0xe00
-	0xe1a: 0x15,
-	// Block 0x39, offset 0xe40
-	0xe65: 0x29,
-	// Block 0x3a, offset 0xe80
-	0xe86: 0x1f,
-	// Block 0x3b, offset 0xec0
-	0xeec: 0x18,
-	// Block 0x3c, offset 0xf00
-	0xf28: 0x2a,
-	// Block 0x3d, offset 0xf40
-	0xf53: 0x08,
-	// Block 0x3e, offset 0xf80
-	0xfa2: 0x2b,
-	0xfaa: 0x17,
-	// Block 0x3f, offset 0xfc0
-	0xfc0: 0x25, 0xfc2: 0x26,
-	0xfc9: 0x27, 0xfcd: 0x28, 0xfce: 0x29,
-	0xfd5: 0x2a,
-	0xfd8: 0x2b, 0xfd9: 0x2c, 0xfdf: 0x2d,
-	0xfe1: 0x2e, 0xfe2: 0x2f, 0xfe3: 0x30, 0xfe6: 0x31,
-	0xfe9: 0x32, 0xfec: 0x33, 0xfed: 0x34, 0xfef: 0x35,
-	0xff1: 0x36, 0xff2: 0x37, 0xff3: 0x38, 0xff4: 0x39,
-	0xffa: 0x3a, 0xffc: 0x3b, 0xffe: 0x3c,
-	// Block 0x40, offset 0x1000
-	0x102c: 0x2c,
-	// Block 0x41, offset 0x1040
-	0x1074: 0x2c,
-	// Block 0x42, offset 0x1080
-	0x108c: 0x08,
-	0x10a0: 0x2d,
-	// Block 0x43, offset 0x10c0
-	0x10e8: 0x10,
-	// Block 0x44, offset 0x1100
-	0x110f: 0x13,
-	// Block 0x45, offset 0x1140
-	0x114b: 0x2e,
-	// Block 0x46, offset 0x1180
-	0x118b: 0x23,
-	0x119d: 0x0c,
-	// Block 0x47, offset 0x11c0
-	0x11c3: 0x12,
-	0x11f9: 0x0f,
-	// Block 0x48, offset 0x1200
-	0x121e: 0x1b,
-	// Block 0x49, offset 0x1240
-	0x1270: 0x2f,
-	// Block 0x4a, offset 0x1280
-	0x128a: 0x1b,
-	0x12a7: 0x02,
-	// Block 0x4b, offset 0x12c0
-	0x12fb: 0x14,
-	// Block 0x4c, offset 0x1300
-	0x1333: 0x30,
-	// Block 0x4d, offset 0x1340
-	0x134d: 0x31,
-	// Block 0x4e, offset 0x1380
-	0x138e: 0x15,
-	// Block 0x4f, offset 0x13c0
-	0x13f4: 0x32,
-	// Block 0x50, offset 0x1400
-	0x141b: 0x33,
-	// Block 0x51, offset 0x1440
-	0x1448: 0x3e, 0x1449: 0x3f, 0x144a: 0x40, 0x144f: 0x41,
-	0x1459: 0x42, 0x145c: 0x43, 0x145e: 0x44, 0x145f: 0x45,
-	0x1468: 0x46, 0x1469: 0x47, 0x146c: 0x48, 0x146d: 0x49, 0x146e: 0x4a,
-	0x1472: 0x4b, 0x1473: 0x4c,
-	0x1479: 0x4d, 0x147b: 0x4e,
-	// Block 0x52, offset 0x1480
-	0x1480: 0x34,
-	0x1499: 0x11,
-	0x14b6: 0x2c,
-	// Block 0x53, offset 0x14c0
-	0x14e4: 0x0d,
-	// Block 0x54, offset 0x1500
-	0x1527: 0x08,
-	// Block 0x55, offset 0x1540
-	0x1555: 0x2b,
-	// Block 0x56, offset 0x1580
-	0x15b2: 0x35,
-	// Block 0x57, offset 0x15c0
-	0x15f2: 0x1c, 0x15f4: 0x29,
-	// Block 0x58, offset 0x1600
-	0x1600: 0x50, 0x1603: 0x51,
-	0x1608: 0x52, 0x160a: 0x53, 0x160d: 0x54, 0x160e: 0x55,
-}
-
-// lookup returns the trie value for the first UTF-8 encoding in s and
-// the width in bytes of this encoding. The size will be 0 if s does not
-// hold enough bytes to complete the encoding. len(s) must be greater than 0.
-func (t *multiTrie) lookup(s []byte) (v uint64, sz int) {
-	c0 := s[0]
-	switch {
-	case c0 < 0x80: // is ASCII
-		return t.ascii[c0], 1
-	case c0 < 0xC2:
-		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
-	case c0 < 0xE0: // 2-byte UTF-8
-		if len(s) < 2 {
-			return 0, 0
-		}
-		i := t.utf8Start[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c1), 2
-	case c0 < 0xF0: // 3-byte UTF-8
-		if len(s) < 3 {
-			return 0, 0
-		}
-		i := t.utf8Start[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = multiIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c2), 3
-	case c0 < 0xF8: // 4-byte UTF-8
-		if len(s) < 4 {
-			return 0, 0
-		}
-		i := t.utf8Start[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = multiIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		o = uint32(i)<<6 + uint32(c2)
-		i = multiIndex[o]
-		c3 := s[3]
-		if c3 < 0x80 || 0xC0 <= c3 {
-			return 0, 3 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c3), 4
-	}
-	// Illegal rune
-	return 0, 1
-}
-
-// lookupUnsafe returns the trie value for the first UTF-8 encoding in s.
-// s must start with a full and valid UTF-8 encoded rune.
-func (t *multiTrie) lookupUnsafe(s []byte) uint64 {
-	c0 := s[0]
-	if c0 < 0x80 { // is ASCII
-		return t.ascii[c0]
-	}
-	i := t.utf8Start[c0]
-	if c0 < 0xE0 { // 2-byte UTF-8
-		return t.lookupValue(uint32(i), s[1])
-	}
-	i = multiIndex[uint32(i)<<6+uint32(s[1])]
-	if c0 < 0xF0 { // 3-byte UTF-8
-		return t.lookupValue(uint32(i), s[2])
-	}
-	i = multiIndex[uint32(i)<<6+uint32(s[2])]
-	if c0 < 0xF8 { // 4-byte UTF-8
-		return t.lookupValue(uint32(i), s[3])
-	}
-	return 0
-}
-
-// lookupString returns the trie value for the first UTF-8 encoding in s and
-// the width in bytes of this encoding. The size will be 0 if s does not
-// hold enough bytes to complete the encoding. len(s) must be greater than 0.
-func (t *multiTrie) lookupString(s string) (v uint64, sz int) {
-	c0 := s[0]
-	switch {
-	case c0 < 0x80: // is ASCII
-		return t.ascii[c0], 1
-	case c0 < 0xC2:
-		return 0, 1 // Illegal UTF-8: not a starter, not ASCII.
-	case c0 < 0xE0: // 2-byte UTF-8
-		if len(s) < 2 {
-			return 0, 0
-		}
-		i := t.utf8Start[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c1), 2
-	case c0 < 0xF0: // 3-byte UTF-8
-		if len(s) < 3 {
-			return 0, 0
-		}
-		i := t.utf8Start[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = multiIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c2), 3
-	case c0 < 0xF8: // 4-byte UTF-8
-		if len(s) < 4 {
-			return 0, 0
-		}
-		i := t.utf8Start[c0]
-		c1 := s[1]
-		if c1 < 0x80 || 0xC0 <= c1 {
-			return 0, 1 // Illegal UTF-8: not a continuation byte.
-		}
-		o := uint32(i)<<6 + uint32(c1)
-		i = multiIndex[o]
-		c2 := s[2]
-		if c2 < 0x80 || 0xC0 <= c2 {
-			return 0, 2 // Illegal UTF-8: not a continuation byte.
-		}
-		o = uint32(i)<<6 + uint32(c2)
-		i = multiIndex[o]
-		c3 := s[3]
-		if c3 < 0x80 || 0xC0 <= c3 {
-			return 0, 3 // Illegal UTF-8: not a continuation byte.
-		}
-		return t.lookupValue(uint32(i), c3), 4
-	}
-	// Illegal rune
-	return 0, 1
-}
-
-// lookupStringUnsafe returns the trie value for the first UTF-8 encoding in s.
-// s must start with a full and valid UTF-8 encoded rune.
-func (t *multiTrie) lookupStringUnsafe(s string) uint64 {
-	c0 := s[0]
-	if c0 < 0x80 { // is ASCII
-		return t.ascii[c0]
-	}
-	i := t.utf8Start[c0]
-	if c0 < 0xE0 { // 2-byte UTF-8
-		return t.lookupValue(uint32(i), s[1])
-	}
-	i = multiIndex[uint32(i)<<6+uint32(s[1])]
-	if c0 < 0xF0 { // 3-byte UTF-8
-		return t.lookupValue(uint32(i), s[2])
-	}
-	i = multiIndex[uint32(i)<<6+uint32(s[2])]
-	if c0 < 0xF8 { // 4-byte UTF-8
-		return t.lookupValue(uint32(i), s[3])
-	}
-	return 0
-}
-
-// multiTrie. Total size: 18250 bytes (17.82 KiB). Checksum: a69a609d8696aa5e.
-type multiTrie struct {
-	ascii     []uint64 // index for ASCII bytes
-	utf8Start []uint8  // index for UTF-8 bytes >= 0xC0
-}
-
-func newMultiTrie(i int) *multiTrie {
-	h := multiTrieHandles[i]
-	return &multiTrie{multiValues[uint32(h.ascii)<<6:], multiIndex[uint32(h.multi)<<6:]}
-}
-
-type multiTrieHandle struct {
-	ascii, multi uint8
-}
-
-// multiTrieHandles: 5 handles, 10 bytes
-var multiTrieHandles = [5]multiTrieHandle{
-	{0, 0},   // 8c1e77823143d35c: all
-	{0, 23},  // 8fb58ff8243b45b0: ASCII only
-	{0, 23},  // 8fb58ff8243b45b0: ASCII only 2
-	{0, 24},  // 2ccc43994f11046f: BMP only
-	{30, 25}, // ce448591bdcb4733: No BMP
-}
-
-// lookupValue determines the type of block n and looks up the value for b.
-func (t *multiTrie) lookupValue(n uint32, b byte) uint64 {
-	switch {
-	default:
-		return uint64(multiValues[n<<6+uint32(b)])
-	}
-}
-
-// multiValues: 32 blocks, 2048 entries, 16384 bytes
-// The third block is the zero block.
-var multiValues = [2048]uint64{
-	// Block 0x0, offset 0x0
-	0x03: 0x6e361699800b9fb8, 0x04: 0x52d3935a34f6f0b, 0x05: 0x2948319393e7ef10,
-	0x07: 0x20f03b006704f663, 0x08: 0x6c15c0732bb2495f, 0x09: 0xe54e2c59d953551,
-	0x0f: 0x33d8a825807d8037, 0x10: 0x6ecd93cb12168b92, 0x11: 0x6a81c9c0ce86e884,
-	0x1f: 0xa03e77aac8be79b, 0x20: 0x28591d0e7e486efa, 0x21: 0x716fa3bc398dec8,
-	0x3f: 0x4fd3bcfa72bce8b0,
-	// Block 0x1, offset 0x40
-	0x40: 0x3cbaef3db8ba5f12, 0x41: 0x2d262347c1f56357,
-	0x7f: 0x782caa2d25a418a9,
-	// Block 0x2, offset 0x80
-	// Block 0x3, offset 0xc0
-	0xc0: 0x6bbd1f937b1ff5d2, 0xc1: 0x732e23088d2eb8a4,
-	// Block 0x4, offset 0x100
-	0x13f: 0x56f8c4c82f5962dc,
-	// Block 0x5, offset 0x140
-	0x140: 0x57dc4544729a5da2, 0x141: 0x2f62f9cd307ffa0d,
-	// Block 0x6, offset 0x180
-	0x1bf: 0x7bf4d0ebf302a088,
-	// Block 0x7, offset 0x1c0
-	0x1c0: 0x1f0d67f249e59931, 0x1c1: 0x3011def73aa550c7,
-	// Block 0x8, offset 0x200
-	0x23f: 0x5de81c1dff6bf29d,
-	// Block 0x9, offset 0x240
-	0x240: 0x752c035737b825e8, 0x241: 0x1e793399081e3bb3,
-	// Block 0xa, offset 0x280
-	0x2bf: 0x6a28f01979cbf059,
-	// Block 0xb, offset 0x2c0
-	0x2c0: 0x373a4b0f2cbd4c74, 0x2c1: 0x4fd2c288683b767c,
-	// Block 0xc, offset 0x300
-	0x33f: 0x5a10ffa9e29184fb,
-	// Block 0xd, offset 0x340
-	0x340: 0x700f9bdb53fff6a5, 0x341: 0xcde93df0427eb79,
-	// Block 0xe, offset 0x380
-	0x3bf: 0x74071288fff39c76,
-	// Block 0xf, offset 0x3c0
-	0x3c0: 0x481fc2f510e5268a, 0x3c1: 0x7565c28164204849,
-	// Block 0x10, offset 0x400
-	0x43f: 0x5676a62fd49c6bec,
-	// Block 0x11, offset 0x440
-	0x440: 0x2f2d15776cbafc6b, 0x441: 0x4c55e8dc0ff11a3f,
-	// Block 0x12, offset 0x480
-	0x4bf: 0x69d6f0fe711fafc9,
-	// Block 0x13, offset 0x4c0
-	0x4c0: 0x33181de28cfb062d, 0x4c1: 0x2ef3adc6bb2f2d02,
-	// Block 0x14, offset 0x500
-	0x53f: 0xe03b31814c95f8b,
-	// Block 0x15, offset 0x540
-	0x540: 0x3bf6dc9a1c115603, 0x541: 0x6984ec9b7f51f7fc,
-	// Block 0x16, offset 0x580
-	0x5bf: 0x3c02ea92fb168559,
-	// Block 0x17, offset 0x5c0
-	0x5c0: 0x1badfe42e7629494, 0x5c1: 0x6dc4a554005f7645,
-	// Block 0x18, offset 0x600
-	0x63f: 0x3bb2ed2a72748f4b,
-	// Block 0x19, offset 0x640
-	0x640: 0x291354cd6767ec10, 0x641: 0x2c3a4715e3c070d6,
-	// Block 0x1a, offset 0x680
-	0x6bf: 0x352711cfb7236418,
-	// Block 0x1b, offset 0x6c0
-	0x6c0: 0x3a59d34fb8bceda, 0x6c1: 0x5e90d8ebedd64fa1,
-	// Block 0x1c, offset 0x700
-	0x73f: 0x7191a77b28d23110,
-	// Block 0x1d, offset 0x740
-	0x740: 0x4ca7f0c1623423d8, 0x741: 0x4f7156d996e2d0de,
-	// Block 0x1e, offset 0x780
-	// Block 0x1f, offset 0x7c0
-}
-
-// multiIndex: 29 blocks, 1856 entries, 1856 bytes
-// Block 0 is the zero block.
-var multiIndex = [1856]uint8{
-	// Block 0x0, offset 0x0
-	// Block 0x1, offset 0x40
-	// Block 0x2, offset 0x80
-	// Block 0x3, offset 0xc0
-	0xc2: 0x01, 0xc3: 0x02, 0xc4: 0x03, 0xc7: 0x04,
-	0xc8: 0x05, 0xcf: 0x06,
-	0xd0: 0x07,
-	0xdf: 0x08,
-	0xe0: 0x02, 0xe1: 0x03, 0xe2: 0x04, 0xe3: 0x05, 0xe4: 0x06, 0xe7: 0x07,
-	0xe8: 0x08, 0xef: 0x09,
-	0xf0: 0x0e, 0xf1: 0x11, 0xf2: 0x13, 0xf3: 0x15, 0xf4: 0x17,
-	// Block 0x4, offset 0x100
-	0x120: 0x09,
-	0x13f: 0x0a,
-	// Block 0x5, offset 0x140
-	0x140: 0x0b,
-	0x17f: 0x0c,
-	// Block 0x6, offset 0x180
-	0x180: 0x0d,
-	// Block 0x7, offset 0x1c0
-	0x1ff: 0x0e,
-	// Block 0x8, offset 0x200
-	0x200: 0x0f,
-	// Block 0x9, offset 0x240
-	0x27f: 0x10,
-	// Block 0xa, offset 0x280
-	0x280: 0x11,
-	// Block 0xb, offset 0x2c0
-	0x2ff: 0x12,
-	// Block 0xc, offset 0x300
-	0x300: 0x13,
-	// Block 0xd, offset 0x340
-	0x37f: 0x14,
-	// Block 0xe, offset 0x380
-	0x380: 0x15,
-	// Block 0xf, offset 0x3c0
-	0x3ff: 0x16,
-	// Block 0x10, offset 0x400
-	0x410: 0x0a,
-	0x41f: 0x0b,
-	0x420: 0x0c,
-	0x43f: 0x0d,
-	// Block 0x11, offset 0x440
-	0x440: 0x17,
-	// Block 0x12, offset 0x480
-	0x4bf: 0x18,
-	// Block 0x13, offset 0x4c0
-	0x4c0: 0x0f,
-	0x4ff: 0x10,
-	// Block 0x14, offset 0x500
-	0x500: 0x19,
-	// Block 0x15, offset 0x540
-	0x540: 0x12,
-	// Block 0x16, offset 0x580
-	0x5bf: 0x1a,
-	// Block 0x17, offset 0x5c0
-	0x5ff: 0x14,
-	// Block 0x18, offset 0x600
-	0x600: 0x1b,
-	// Block 0x19, offset 0x640
-	0x640: 0x16,
-	// Block 0x1a, offset 0x680
-	// Block 0x1b, offset 0x6c0
-	0x6c2: 0x01, 0x6c3: 0x02, 0x6c4: 0x03, 0x6c7: 0x04,
-	0x6c8: 0x05, 0x6cf: 0x06,
-	0x6d0: 0x07,
-	0x6df: 0x08,
-	0x6e0: 0x02, 0x6e1: 0x03, 0x6e2: 0x04, 0x6e3: 0x05, 0x6e4: 0x06, 0x6e7: 0x07,
-	0x6e8: 0x08, 0x6ef: 0x09,
-	// Block 0x1c, offset 0x700
-	0x730: 0x0e, 0x731: 0x11, 0x732: 0x13, 0x733: 0x15, 0x734: 0x17,
-}
diff --git a/vendor/golang.org/x/text/internal/triegen/example_compact_test.go b/vendor/golang.org/x/text/internal/triegen/example_compact_test.go
deleted file mode 100644
index 7cf604ca..00000000
--- a/vendor/golang.org/x/text/internal/triegen/example_compact_test.go
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package triegen_test
-
-import (
-	"fmt"
-	"io"
-	"io/ioutil"
-
-	"golang.org/x/text/internal/triegen"
-)
-
-func ExampleCompacter() {
-	t := triegen.NewTrie("root")
-	for r := rune(0); r < 10000; r += 64 {
-		t.Insert(r, 0x9015BADA55^uint64(r))
-	}
-	sz, _ := t.Gen(ioutil.Discard)
-
-	fmt.Printf("Size normal:    %5d\n", sz)
-
-	var c myCompacter
-	sz, _ = t.Gen(ioutil.Discard, triegen.Compact(&c))
-
-	fmt.Printf("Size compacted: %5d\n", sz)
-
-	// Output:
-	// Size normal:    81344
-	// Size compacted:  3224
-}
-
-// A myCompacter accepts a block if only the first value is given.
-type myCompacter []uint64
-
-func (c *myCompacter) Size(values []uint64) (sz int, ok bool) {
-	for _, v := range values[1:] {
-		if v != 0 {
-			return 0, false
-		}
-	}
-	return 8, true // the size of a uint64
-}
-
-func (c *myCompacter) Store(v []uint64) uint32 {
-	x := uint32(len(*c))
-	*c = append(*c, v[0])
-	return x
-}
-
-func (c *myCompacter) Print(w io.Writer) error {
-	fmt.Fprintln(w, "var firstValue = []uint64{")
-	for _, v := range *c {
-		fmt.Fprintf(w, "\t%#x,\n", v)
-	}
-	fmt.Fprintln(w, "}")
-	return nil
-}
-
-func (c *myCompacter) Handler() string {
-	return "getFirstValue"
-
-	// Where getFirstValue is included along with the generated code:
-	// func getFirstValue(n uint32, b byte) uint64 {
-	//     if b == 0x80 { // the first continuation byte
-	//         return firstValue[n]
-	//     }
-	//     return 0
-	//  }
-}
diff --git a/vendor/golang.org/x/text/internal/triegen/example_test.go b/vendor/golang.org/x/text/internal/triegen/example_test.go
deleted file mode 100644
index 557a152e..00000000
--- a/vendor/golang.org/x/text/internal/triegen/example_test.go
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package triegen_test
-
-import (
-	"fmt"
-	"io/ioutil"
-	"math/rand"
-	"unicode"
-
-	"golang.org/x/text/internal/triegen"
-)
-
-const seed = 0x12345
-
-var genWriter = ioutil.Discard
-
-func randomRunes() map[rune]uint8 {
-	rnd := rand.New(rand.NewSource(seed))
-	m := map[rune]uint8{}
-	for len(m) < 100 {
-		// Only set our random rune if it is a valid Unicode code point.
-		if r := rune(rnd.Int31n(unicode.MaxRune + 1)); []rune(string(r))[0] == r {
-			m[r] = 1
-		}
-	}
-	return m
-}
-
-// Example_build shows how to build a simple trie. It assigns the value 1 to
-// 100 random runes generated by randomRunes.
-func Example_build() {
-	t := triegen.NewTrie("rand")
-
-	for r, _ := range randomRunes() {
-		t.Insert(r, 1)
-	}
-	sz, err := t.Gen(genWriter)
-
-	fmt.Printf("Trie size: %d bytes\n", sz)
-	fmt.Printf("Error:     %v\n", err)
-
-	// Output:
-	// Trie size: 9280 bytes
-	// Error:     <nil>
-}
-
-// Example_lookup demonstrates how to use the trie generated by Example_build.
-func Example_lookup() {
-	trie := newRandTrie(0)
-
-	// The same set of runes used by Example_build.
-	runes := randomRunes()
-
-	// Verify the right value is returned for all runes.
-	for r := rune(0); r <= unicode.MaxRune; r++ {
-		// Note that the return type of lookup is uint8.
-		if v, _ := trie.lookupString(string(r)); v != runes[r] {
-			fmt.Println("FAILURE")
-			return
-		}
-	}
-	fmt.Println("SUCCESS")
-
-	// Output:
-	// SUCCESS
-}
-
-// runeValues generates some random values for a set of interesting runes.
-func runeValues() map[rune]uint64 {
-	rnd := rand.New(rand.NewSource(seed))
-	m := map[rune]uint64{}
-	for p := 4; p <= unicode.MaxRune; p <<= 1 {
-		for d := -1; d <= 1; d++ {
-			m[rune(p+d)] = uint64(rnd.Int63())
-		}
-	}
-	return m
-}
-
-// ExampleGen_build demonstrates the creation of multiple tries sharing common
-// blocks. ExampleGen_lookup demonstrates how to use the generated tries.
-func ExampleGen_build() {
-	var tries []*triegen.Trie
-
-	rv := runeValues()
-	for _, c := range []struct {
-		include func(rune) bool
-		name    string
-	}{
-		{func(r rune) bool { return true }, "all"},
-		{func(r rune) bool { return r < 0x80 }, "ASCII only"},
-		{func(r rune) bool { return r < 0x80 }, "ASCII only 2"},
-		{func(r rune) bool { return r <= 0xFFFF }, "BMP only"},
-		{func(r rune) bool { return r > 0xFFFF }, "No BMP"},
-	} {
-		t := triegen.NewTrie(c.name)
-		tries = append(tries, t)
-
-		for r, v := range rv {
-			if c.include(r) {
-				t.Insert(r, v)
-			}
-		}
-	}
-	sz, err := triegen.Gen(genWriter, "multi", tries)
-
-	fmt.Printf("Trie size: %d bytes\n", sz)
-	fmt.Printf("Error:     %v\n", err)
-
-	// Output:
-	// Trie size: 18250 bytes
-	// Error:     <nil>
-}
-
-// ExampleGen_lookup shows how to look up values in the trie generated by
-// ExampleGen_build.
-func ExampleGen_lookup() {
-	rv := runeValues()
-	for i, include := range []func(rune) bool{
-		func(r rune) bool { return true },        // all
-		func(r rune) bool { return r < 0x80 },    // ASCII only
-		func(r rune) bool { return r < 0x80 },    // ASCII only 2
-		func(r rune) bool { return r <= 0xFFFF }, // BMP only
-		func(r rune) bool { return r > 0xFFFF },  // No BMP
-	} {
-		t := newMultiTrie(i)
-
-		for r := rune(0); r <= unicode.MaxRune; r++ {
-			x := uint64(0)
-			if include(r) {
-				x = rv[r]
-			}
-			// As we convert from a valid rune, we know it is safe to use
-			// lookupStringUnsafe.
-			if v := t.lookupStringUnsafe(string(r)); x != v {
-				fmt.Println("FAILURE")
-				return
-			}
-		}
-	}
-	fmt.Println("SUCCESS")
-
-	// Output:
-	// SUCCESS
-}
diff --git a/vendor/golang.org/x/text/internal/triegen/gen_test.go b/vendor/golang.org/x/text/internal/triegen/gen_test.go
deleted file mode 100644
index 831627d7..00000000
--- a/vendor/golang.org/x/text/internal/triegen/gen_test.go
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build generate
-
-package triegen_test
-
-// The code in this file generates captures and writes the tries generated in
-// the examples to data_test.go. To invoke it, run:
-// 		go test -tags=generate
-//
-// Making the generation code a "test" allows us to link in the necessary test
-// code.
-
-import (
-	"log"
-	"os"
-	"os/exec"
-)
-
-func init() {
-	const tmpfile = "tmpout"
-	const dstfile = "data_test.go"
-
-	f, err := os.Create(tmpfile)
-	if err != nil {
-		log.Fatalf("Could not create output file: %v", err)
-	}
-	defer os.Remove(tmpfile)
-	defer f.Close()
-
-	// We exit before this function returns, regardless of success or failure,
-	// so there's no need to save (and later restore) the existing genWriter
-	// value.
-	genWriter = f
-
-	f.Write([]byte(header))
-
-	Example_build()
-	ExampleGen_build()
-
-	if err := exec.Command("gofmt", "-w", tmpfile).Run(); err != nil {
-		log.Fatal(err)
-	}
-	os.Remove(dstfile)
-	os.Rename(tmpfile, dstfile)
-
-	os.Exit(0)
-}
-
-const header = `// This file is generated with "go test -tags generate". DO NOT EDIT!
-// +build !generate
-
-package triegen_test
-`
-
-// Stubs for generated tries. These are needed as we exclude data_test.go if
-// the generate flag is set. This will clearly make the tests fail, but that
-// is okay. It allows us to bootstrap.
-
-type trie struct{}
-
-func (t *trie) lookupString(string) (uint8, int) { return 0, 1 }
-func (t *trie) lookupStringUnsafe(string) uint64 { return 0 }
-
-func newRandTrie(i int) *trie  { return &trie{} }
-func newMultiTrie(i int) *trie { return &trie{} }
diff --git a/vendor/golang.org/x/text/internal/ucd/example_test.go b/vendor/golang.org/x/text/internal/ucd/example_test.go
deleted file mode 100644
index 338a50d1..00000000
--- a/vendor/golang.org/x/text/internal/ucd/example_test.go
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ucd_test
-
-import (
-	"fmt"
-	"strings"
-
-	"golang.org/x/text/internal/ucd"
-)
-
-func Example() {
-	// Read rune-by-rune from UnicodeData.
-	var count int
-	p := ucd.New(strings.NewReader(unicodeData))
-	for p.Next() {
-		count++
-		if lower := p.Runes(ucd.SimpleLowercaseMapping); lower != nil {
-			fmt.Printf("lower(%U) -> %U\n", p.Rune(0), lower[0])
-		}
-	}
-	if err := p.Err(); err != nil {
-		fmt.Println(err)
-	}
-	fmt.Println("Number of runes visited:", count)
-
-	// Read raw ranges from Scripts.
-	p = ucd.New(strings.NewReader(scripts), ucd.KeepRanges)
-	for p.Next() {
-		start, end := p.Range(0)
-		fmt.Printf("%04X..%04X: %s\n", start, end, p.String(1))
-	}
-	if err := p.Err(); err != nil {
-		fmt.Println(err)
-	}
-
-	// Output:
-	// lower(U+00C0) -> U+00E0
-	// lower(U+00C1) -> U+00E1
-	// lower(U+00C2) -> U+00E2
-	// lower(U+00C3) -> U+00E3
-	// lower(U+00C4) -> U+00E4
-	// Number of runes visited: 6594
-	// 0000..001F: Common
-	// 0020..0020: Common
-	// 0021..0023: Common
-	// 0024..0024: Common
-}
-
-// Excerpt from UnicodeData.txt
-const unicodeData = `
-00B9;SUPERSCRIPT ONE;No;0;EN;<super> 0031;;1;1;N;SUPERSCRIPT DIGIT ONE;;;;
-00BA;MASCULINE ORDINAL INDICATOR;Lo;0;L;<super> 006F;;;;N;;;;;
-00BB;RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK;Pf;0;ON;;;;;Y;RIGHT POINTING GUILLEMET;;;;
-00BC;VULGAR FRACTION ONE QUARTER;No;0;ON;<fraction> 0031 2044 0034;;;1/4;N;FRACTION ONE QUARTER;;;;
-00BD;VULGAR FRACTION ONE HALF;No;0;ON;<fraction> 0031 2044 0032;;;1/2;N;FRACTION ONE HALF;;;;
-00BE;VULGAR FRACTION THREE QUARTERS;No;0;ON;<fraction> 0033 2044 0034;;;3/4;N;FRACTION THREE QUARTERS;;;;
-00BF;INVERTED QUESTION MARK;Po;0;ON;;;;;N;;;;;
-00C0;LATIN CAPITAL LETTER A WITH GRAVE;Lu;0;L;0041 0300;;;;N;LATIN CAPITAL LETTER A GRAVE;;;00E0;
-00C1;LATIN CAPITAL LETTER A WITH ACUTE;Lu;0;L;0041 0301;;;;N;LATIN CAPITAL LETTER A ACUTE;;;00E1;
-00C2;LATIN CAPITAL LETTER A WITH CIRCUMFLEX;Lu;0;L;0041 0302;;;;N;LATIN CAPITAL LETTER A CIRCUMFLEX;;;00E2;
-00C3;LATIN CAPITAL LETTER A WITH TILDE;Lu;0;L;0041 0303;;;;N;LATIN CAPITAL LETTER A TILDE;;;00E3;
-00C4;LATIN CAPITAL LETTER A WITH DIAERESIS;Lu;0;L;0041 0308;;;;N;LATIN CAPITAL LETTER A DIAERESIS;;;00E4;
-
-# A legacy rune range.
-3400;<CJK Ideograph Extension A, First>;Lo;0;L;;;;;N;;;;;
-4DB5;<CJK Ideograph Extension A, Last>;Lo;0;L;;;;;N;;;;;
-`
-
-// Excerpt from Scripts.txt
-const scripts = `
-# Property:	Script
-# ================================================
-
-0000..001F    ; Common # Cc  [32] <control-0000>..<control-001F>
-0020          ; Common # Zs       SPACE
-0021..0023    ; Common # Po   [3] EXCLAMATION MARK..NUMBER SIGN
-0024          ; Common # Sc       DOLLAR SIGN
-`
diff --git a/vendor/golang.org/x/text/internal/ucd/ucd_test.go b/vendor/golang.org/x/text/internal/ucd/ucd_test.go
deleted file mode 100644
index 11a6542e..00000000
--- a/vendor/golang.org/x/text/internal/ucd/ucd_test.go
+++ /dev/null
@@ -1,105 +0,0 @@
-package ucd
-
-import (
-	"strings"
-	"testing"
-)
-
-const file = `
-# Comments should be skipped
-# rune;  bool;  uint; int; float; runes; # Y
-0..0005; Y;     0;    2;      -5.25 ;  0 1 2 3 4 5;
-6..0007; Yes  ; 6;    1;     -4.25  ;  0006 0007;
-8;       T ;    8 ;   0 ;-3.25  ;;# T
-9;       True  ;9  ;  -1;-2.25  ;  0009;
-
-# more comments to be ignored
-@Part0  
-
-A;       N;   10  ;   -2;  -1.25; ;# N
-B;       No;   11 ;   -3;  -0.25; 
-C;        False;12;   -4;   0.75;
-D;        ;13;-5;1.75;
-
-@Part1   # Another part. 
-# We test part comments get removed by not commenting the the next line.
-E..10FFFF; F;   14  ; -6;   2.75;
-`
-
-var want = []struct {
-	start, end rune
-}{
-	{0x00, 0x05},
-	{0x06, 0x07},
-	{0x08, 0x08},
-	{0x09, 0x09},
-	{0x0A, 0x0A},
-	{0x0B, 0x0B},
-	{0x0C, 0x0C},
-	{0x0D, 0x0D},
-	{0x0E, 0x10FFFF},
-}
-
-func TestGetters(t *testing.T) {
-	parts := [][2]string{
-		{"Part0", ""},
-		{"Part1", "Another part."},
-	}
-	handler := func(p *Parser) {
-		if len(parts) == 0 {
-			t.Error("Part handler invoked too many times.")
-			return
-		}
-		want := parts[0]
-		parts = parts[1:]
-		if got0, got1 := p.String(0), p.Comment(); got0 != want[0] || got1 != want[1] {
-			t.Errorf(`part: got %q, %q; want %q"`, got0, got1, want)
-		}
-	}
-
-	p := New(strings.NewReader(file), KeepRanges, Part(handler))
-	for i := 0; p.Next(); i++ {
-		start, end := p.Range(0)
-		w := want[i]
-		if start != w.start || end != w.end {
-			t.Fatalf("%d:Range(0); got %#x..%#x; want %#x..%#x", i, start, end, w.start, w.end)
-		}
-		if w.start == w.end && p.Rune(0) != w.start {
-			t.Errorf("%d:Range(0).start: got %U; want %U", i, p.Rune(0), w.start)
-		}
-		if got, want := p.Bool(1), w.start <= 9; got != want {
-			t.Errorf("%d:Bool(1): got %v; want %v", i, got, want)
-		}
-		if got := p.Rune(4); got != 0 || p.Err() == nil {
-			t.Errorf("%d:Rune(%q): got no error; want error", i, p.String(1))
-		}
-		p.err = nil
-		if got := p.Uint(2); rune(got) != start {
-			t.Errorf("%d:Uint(2): got %v; want %v", i, got, start)
-		}
-		if got, want := p.Int(3), 2-i; got != want {
-			t.Errorf("%d:Int(3): got %v; want %v", i, got, want)
-		}
-		if got, want := p.Float(4), -5.25+float64(i); got != want {
-			t.Errorf("%d:Int(3): got %v; want %v", i, got, want)
-		}
-		if got := p.Runes(5); got == nil {
-			if p.String(5) != "" {
-				t.Errorf("%d:Runes(5): expected non-empty list", i)
-			}
-		} else {
-			if got[0] != start || got[len(got)-1] != end {
-				t.Errorf("%d:Runes(5): got %#x; want %#x..%#x", i, got, start, end)
-			}
-		}
-		if got := p.Comment(); got != "" && got != p.String(1) {
-			t.Errorf("%d:Comment(): got %v; want %v", i, got, p.String(1))
-		}
-	}
-	if err := p.Err(); err != nil {
-		t.Errorf("Parser error: %v", err)
-	}
-	if len(parts) != 0 {
-		t.Errorf("expected %d more invocations of part handler", len(parts))
-	}
-}
diff --git a/vendor/golang.org/x/text/language/coverage_test.go b/vendor/golang.org/x/text/language/coverage_test.go
deleted file mode 100644
index 8e08e5ca..00000000
--- a/vendor/golang.org/x/text/language/coverage_test.go
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package language
-
-import (
-	"fmt"
-	"reflect"
-	"testing"
-)
-
-func TestSupported(t *testing.T) {
-	// To prove the results are correct for a type, we test that the number of
-	// results is identical to the number of results on record, that all results
-	// are distinct and that all results are valid.
-	tests := map[string]int{
-		"BaseLanguages": numLanguages,
-		"Scripts":       numScripts,
-		"Regions":       numRegions,
-		"Tags":          0,
-	}
-	sup := reflect.ValueOf(Supported)
-	for name, num := range tests {
-		v := sup.MethodByName(name).Call(nil)[0]
-		if n := v.Len(); n != num {
-			t.Errorf("len(%s()) was %d; want %d", name, n, num)
-		}
-		dup := make(map[string]bool)
-		for i := 0; i < v.Len(); i++ {
-			x := v.Index(i).Interface()
-			// An invalid value will either cause a crash or result in a
-			// duplicate when passed to Sprint.
-			s := fmt.Sprint(x)
-			if dup[s] {
-				t.Errorf("%s: duplicate entry %q", name, s)
-			}
-			dup[s] = true
-		}
-		if len(dup) != v.Len() {
-			t.Errorf("%s: # unique entries was %d; want %d", name, len(dup), v.Len())
-		}
-	}
-}
-
-func TestNewCoverage(t *testing.T) {
-	bases := []Base{Base{0}, Base{3}, Base{7}}
-	scripts := []Script{Script{11}, Script{17}, Script{23}}
-	regions := []Region{Region{101}, Region{103}, Region{107}}
-	tags := []Tag{Make("pt"), Make("en"), Make("en-GB"), Make("en-US"), Make("pt-PT")}
-	fbases := func() []Base { return bases }
-	fscripts := func() []Script { return scripts }
-	fregions := func() []Region { return regions }
-	ftags := func() []Tag { return tags }
-
-	tests := []struct {
-		desc    string
-		list    []interface{}
-		bases   []Base
-		scripts []Script
-		regions []Region
-		tags    []Tag
-	}{
-		{
-			desc: "empty",
-		},
-		{
-			desc:  "bases",
-			list:  []interface{}{bases},
-			bases: bases,
-		},
-		{
-			desc:    "scripts",
-			list:    []interface{}{scripts},
-			scripts: scripts,
-		},
-		{
-			desc:    "regions",
-			list:    []interface{}{regions},
-			regions: regions,
-		},
-		{
-			desc:  "bases derives from tags",
-			list:  []interface{}{tags},
-			bases: []Base{Base{_en}, Base{_pt}},
-			tags:  tags,
-		},
-		{
-			desc:  "tags and bases",
-			list:  []interface{}{tags, bases},
-			bases: bases,
-			tags:  tags,
-		},
-		{
-			desc:    "fully specified",
-			list:    []interface{}{tags, bases, scripts, regions},
-			bases:   bases,
-			scripts: scripts,
-			regions: regions,
-			tags:    tags,
-		},
-		{
-			desc:  "bases func",
-			list:  []interface{}{fbases},
-			bases: bases,
-		},
-		{
-			desc:    "scripts func",
-			list:    []interface{}{fscripts},
-			scripts: scripts,
-		},
-		{
-			desc:    "regions func",
-			list:    []interface{}{fregions},
-			regions: regions,
-		},
-		{
-			desc:  "tags func",
-			list:  []interface{}{ftags},
-			bases: []Base{Base{_en}, Base{_pt}},
-			tags:  tags,
-		},
-		{
-			desc:  "tags and bases",
-			list:  []interface{}{ftags, fbases},
-			bases: bases,
-			tags:  tags,
-		},
-		{
-			desc:    "fully specified",
-			list:    []interface{}{ftags, fbases, fscripts, fregions},
-			bases:   bases,
-			scripts: scripts,
-			regions: regions,
-			tags:    tags,
-		},
-	}
-
-	for i, tt := range tests {
-		l := NewCoverage(tt.list...)
-		if a := l.BaseLanguages(); !reflect.DeepEqual(a, tt.bases) {
-			t.Errorf("%d:%s: BaseLanguages was %v; want %v", i, tt.desc, a, tt.bases)
-		}
-		if a := l.Scripts(); !reflect.DeepEqual(a, tt.scripts) {
-			t.Errorf("%d:%s: Scripts was %v; want %v", i, tt.desc, a, tt.scripts)
-		}
-		if a := l.Regions(); !reflect.DeepEqual(a, tt.regions) {
-			t.Errorf("%d:%s: Regions was %v; want %v", i, tt.desc, a, tt.regions)
-		}
-		if a := l.Tags(); !reflect.DeepEqual(a, tt.tags) {
-			t.Errorf("%d:%s: Tags was %v; want %v", i, tt.desc, a, tt.tags)
-		}
-	}
-}
diff --git a/vendor/golang.org/x/text/language/examples_test.go b/vendor/golang.org/x/text/language/examples_test.go
deleted file mode 100644
index d5e8176d..00000000
--- a/vendor/golang.org/x/text/language/examples_test.go
+++ /dev/null
@@ -1,413 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package language_test
-
-import (
-	"fmt"
-	"net/http"
-
-	"golang.org/x/text/language"
-)
-
-func ExampleCanonType() {
-	p := func(id string) {
-		fmt.Printf("Default(%s) -> %s\n", id, language.Make(id))
-		fmt.Printf("BCP47(%s) -> %s\n", id, language.BCP47.Make(id))
-		fmt.Printf("Macro(%s) -> %s\n", id, language.Macro.Make(id))
-		fmt.Printf("All(%s) -> %s\n", id, language.All.Make(id))
-	}
-	p("en-Latn")
-	p("sh")
-	p("zh-cmn")
-	p("bjd")
-	p("iw-Latn-fonipa-u-cu-usd")
-	// Output:
-	// Default(en-Latn) -> en-Latn
-	// BCP47(en-Latn) -> en
-	// Macro(en-Latn) -> en-Latn
-	// All(en-Latn) -> en
-	// Default(sh) -> sr-Latn
-	// BCP47(sh) -> sh
-	// Macro(sh) -> sh
-	// All(sh) -> sr-Latn
-	// Default(zh-cmn) -> cmn
-	// BCP47(zh-cmn) -> cmn
-	// Macro(zh-cmn) -> zh
-	// All(zh-cmn) -> zh
-	// Default(bjd) -> drl
-	// BCP47(bjd) -> drl
-	// Macro(bjd) -> bjd
-	// All(bjd) -> drl
-	// Default(iw-Latn-fonipa-u-cu-usd) -> he-Latn-fonipa-u-cu-usd
-	// BCP47(iw-Latn-fonipa-u-cu-usd) -> he-Latn-fonipa-u-cu-usd
-	// Macro(iw-Latn-fonipa-u-cu-usd) -> iw-Latn-fonipa-u-cu-usd
-	// All(iw-Latn-fonipa-u-cu-usd) -> he-Latn-fonipa-u-cu-usd
-}
-
-func ExampleTag_Base() {
-	fmt.Println(language.Make("und").Base())
-	fmt.Println(language.Make("und-US").Base())
-	fmt.Println(language.Make("und-NL").Base())
-	fmt.Println(language.Make("und-419").Base()) // Latin America
-	fmt.Println(language.Make("und-ZZ").Base())
-	// Output:
-	// en Low
-	// en High
-	// nl High
-	// es Low
-	// en Low
-}
-
-func ExampleTag_Script() {
-	en := language.Make("en")
-	sr := language.Make("sr")
-	sr_Latn := language.Make("sr_Latn")
-	fmt.Println(en.Script())
-	fmt.Println(sr.Script())
-	// Was a script explicitly specified?
-	_, c := sr.Script()
-	fmt.Println(c == language.Exact)
-	_, c = sr_Latn.Script()
-	fmt.Println(c == language.Exact)
-	// Output:
-	// Latn High
-	// Cyrl Low
-	// false
-	// true
-}
-
-func ExampleTag_Region() {
-	ru := language.Make("ru")
-	en := language.Make("en")
-	fmt.Println(ru.Region())
-	fmt.Println(en.Region())
-	// Output:
-	// RU Low
-	// US Low
-}
-
-func ExampleRegion_TLD() {
-	us := language.MustParseRegion("US")
-	gb := language.MustParseRegion("GB")
-	uk := language.MustParseRegion("UK")
-	bu := language.MustParseRegion("BU")
-
-	fmt.Println(us.TLD())
-	fmt.Println(gb.TLD())
-	fmt.Println(uk.TLD())
-	fmt.Println(bu.TLD())
-
-	fmt.Println(us.Canonicalize().TLD())
-	fmt.Println(gb.Canonicalize().TLD())
-	fmt.Println(uk.Canonicalize().TLD())
-	fmt.Println(bu.Canonicalize().TLD())
-	// Output:
-	// US <nil>
-	// UK <nil>
-	// UK <nil>
-	// ZZ language: region is not a valid ccTLD
-	// US <nil>
-	// UK <nil>
-	// UK <nil>
-	// MM <nil>
-}
-
-func ExampleCompose() {
-	nl, _ := language.ParseBase("nl")
-	us, _ := language.ParseRegion("US")
-	de := language.Make("de-1901-u-co-phonebk")
-	jp := language.Make("ja-JP")
-	fi := language.Make("fi-x-ing")
-
-	u, _ := language.ParseExtension("u-nu-arabic")
-	x, _ := language.ParseExtension("x-piglatin")
-
-	// Combine a base language and region.
-	fmt.Println(language.Compose(nl, us))
-	// Combine a base language and extension.
-	fmt.Println(language.Compose(nl, x))
-	// Replace the region.
-	fmt.Println(language.Compose(jp, us))
-	// Combine several tags.
-	fmt.Println(language.Compose(us, nl, u))
-
-	// Replace the base language of a tag.
-	fmt.Println(language.Compose(de, nl))
-	fmt.Println(language.Compose(de, nl, u))
-	// Remove the base language.
-	fmt.Println(language.Compose(de, language.Base{}))
-	// Remove all variants.
-	fmt.Println(language.Compose(de, []language.Variant{}))
-	// Remove all extensions.
-	fmt.Println(language.Compose(de, []language.Extension{}))
-	fmt.Println(language.Compose(fi, []language.Extension{}))
-	// Remove all variants and extensions.
-	fmt.Println(language.Compose(de.Raw()))
-
-	// An error is gobbled or returned if non-nil.
-	fmt.Println(language.Compose(language.ParseRegion("ZA")))
-	fmt.Println(language.Compose(language.ParseRegion("HH")))
-
-	// Compose uses the same Default canonicalization as Make.
-	fmt.Println(language.Compose(language.Raw.Parse("en-Latn-UK")))
-
-	// Call compose on a different CanonType for different results.
-	fmt.Println(language.All.Compose(language.Raw.Parse("en-Latn-UK")))
-
-	// Output:
-	// nl-US <nil>
-	// nl-x-piglatin <nil>
-	// ja-US <nil>
-	// nl-US-u-nu-arabic <nil>
-	// nl-1901-u-co-phonebk <nil>
-	// nl-1901-u-nu-arabic <nil>
-	// und-1901-u-co-phonebk <nil>
-	// de-u-co-phonebk <nil>
-	// de-1901 <nil>
-	// fi <nil>
-	// de <nil>
-	// und-ZA <nil>
-	// und language: subtag "HH" is well-formed but unknown
-	// en-Latn-GB <nil>
-	// en-GB <nil>
-}
-
-func ExampleParse_errors() {
-	for _, s := range []string{"Foo", "Bar", "Foobar"} {
-		_, err := language.Parse(s)
-		if err != nil {
-			if inv, ok := err.(language.ValueError); ok {
-				fmt.Println(inv.Subtag())
-			} else {
-				fmt.Println(s)
-			}
-		}
-	}
-	for _, s := range []string{"en", "aa-Uuuu", "AC", "ac-u"} {
-		_, err := language.Parse(s)
-		switch e := err.(type) {
-		case language.ValueError:
-			fmt.Printf("%s: culprit %q\n", s, e.Subtag())
-		case nil:
-			// No error.
-		default:
-			// A syntax error.
-			fmt.Printf("%s: ill-formed\n", s)
-		}
-	}
-	// Output:
-	// foo
-	// Foobar
-	// aa-Uuuu: culprit "Uuuu"
-	// AC: culprit "ac"
-	// ac-u: ill-formed
-}
-
-func ExampleParent() {
-	p := func(tag string) {
-		fmt.Printf("parent(%v): %v\n", tag, language.Make(tag).Parent())
-	}
-	p("zh-CN")
-
-	// Australian English inherits from World English.
-	p("en-AU")
-
-	// If the tag has a different maximized script from its parent, a tag with
-	// this maximized script is inserted. This allows different language tags
-	// which have the same base language and script in common to inherit from
-	// a common set of settings.
-	p("zh-HK")
-
-	// If the maximized script of the parent is not identical, CLDR will skip
-	// inheriting from it, as it means there will not be many entries in common
-	// and inheriting from it is nonsensical.
-	p("zh-Hant")
-
-	// The parent of a tag with variants and extensions is the tag with all
-	// variants and extensions removed.
-	p("de-1994-u-co-phonebk")
-
-	// Remove default script.
-	p("de-Latn-LU")
-
-	// Output:
-	// parent(zh-CN): zh
-	// parent(en-AU): en-001
-	// parent(zh-HK): zh-Hant
-	// parent(zh-Hant): und
-	// parent(de-1994-u-co-phonebk): de
-	// parent(de-Latn-LU): de
-}
-
-// ExampleMatcher_bestMatch gives some examples of getting the best match of
-// a set of tags to any of the tags of given set.
-func ExampleMatcher() {
-	// This is the set of tags from which we want to pick the best match. These
-	// can be, for example, the supported languages for some package.
-	tags := []language.Tag{
-		language.English,
-		language.BritishEnglish,
-		language.French,
-		language.Afrikaans,
-		language.BrazilianPortuguese,
-		language.EuropeanPortuguese,
-		language.Croatian,
-		language.SimplifiedChinese,
-		language.Raw.Make("iw-IL"),
-		language.Raw.Make("iw"),
-		language.Raw.Make("he"),
-	}
-	m := language.NewMatcher(tags)
-
-	// A simple match.
-	fmt.Println(m.Match(language.Make("fr")))
-
-	// Australian English is closer to British than American English.
-	fmt.Println(m.Match(language.Make("en-AU")))
-
-	// Default to the first tag passed to the Matcher if there is no match.
-	fmt.Println(m.Match(language.Make("ar")))
-
-	// Get the default tag.
-	fmt.Println(m.Match())
-
-	fmt.Println("----")
-
-	// Someone specifying sr-Latn is probably fine with getting Croatian.
-	fmt.Println(m.Match(language.Make("sr-Latn")))
-
-	// We match SimplifiedChinese, but with Low confidence.
-	fmt.Println(m.Match(language.TraditionalChinese))
-
-	// Serbian in Latin script is a closer match to Croatian than Traditional
-	// Chinese to Simplified Chinese.
-	fmt.Println(m.Match(language.TraditionalChinese, language.Make("sr-Latn")))
-
-	fmt.Println("----")
-
-	// In case a multiple variants of a language are available, the most spoken
-	// variant is typically returned.
-	fmt.Println(m.Match(language.Portuguese))
-
-	// Pick the first value passed to Match in case of a tie.
-	fmt.Println(m.Match(language.Dutch, language.Make("fr-BE"), language.Make("af-NA")))
-	fmt.Println(m.Match(language.Dutch, language.Make("af-NA"), language.Make("fr-BE")))
-
-	fmt.Println("----")
-
-	// If a Matcher is initialized with a language and it's deprecated version,
-	// it will distinguish between them.
-	fmt.Println(m.Match(language.Raw.Make("iw")))
-
-	// However, for non-exact matches, it will treat deprecated versions as
-	// equivalent and consider other factors first.
-	fmt.Println(m.Match(language.Raw.Make("he-IL")))
-
-	fmt.Println("----")
-
-	// User settings passed to the Unicode extension are ignored for matching
-	// and preserved in the returned tag.
-	fmt.Println(m.Match(language.Make("de-u-co-phonebk"), language.Make("fr-u-cu-frf")))
-
-	// Even if the matching language is different.
-	fmt.Println(m.Match(language.Make("de-u-co-phonebk"), language.Make("br-u-cu-frf")))
-
-	// If there is no matching language, the options of the first preferred tag are used.
-	fmt.Println(m.Match(language.Make("de-u-co-phonebk")))
-
-	// Output:
-	// fr 2 Exact
-	// en-GB 1 High
-	// en 0 No
-	// en 0 No
-	// ----
-	// hr 6 High
-	// zh-Hans 7 Low
-	// hr 6 High
-	// ----
-	// pt-BR 4 High
-	// fr 2 High
-	// af 3 High
-	// ----
-	// iw 9 Exact
-	// he 10 Exact
-	// ----
-	// fr-u-cu-frf 2 Exact
-	// fr-u-cu-frf 2 High
-	// en-u-co-phonebk 0 No
-
-	// TODO: "he" should be "he-u-rg-IL High"
-}
-
-func ExampleMatchStrings() {
-	// languages supported by this service:
-	matcher := language.NewMatcher([]language.Tag{
-		language.English, language.Dutch, language.German,
-	})
-
-	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
-		lang, _ := r.Cookie("lang")
-		tag, _ := language.MatchStrings(matcher, lang.String(), r.Header.Get("Accept-Language"))
-
-		fmt.Println("User language:", tag)
-	})
-}
-
-func ExampleComprehends() {
-	// Various levels of comprehensibility.
-	fmt.Println(language.Comprehends(language.English, language.English))
-	fmt.Println(language.Comprehends(language.AmericanEnglish, language.BritishEnglish))
-
-	// An explicit Und results in no match.
-	fmt.Println(language.Comprehends(language.English, language.Und))
-
-	fmt.Println("----")
-
-	// There is usually no mutual comprehensibility between different scripts.
-	fmt.Println(language.Comprehends(language.Make("en-Dsrt"), language.English))
-
-	// One exception is for Traditional versus Simplified Chinese, albeit with
-	// a low confidence.
-	fmt.Println(language.Comprehends(language.TraditionalChinese, language.SimplifiedChinese))
-
-	fmt.Println("----")
-
-	// A Swiss German speaker will often understand High German.
-	fmt.Println(language.Comprehends(language.Make("gsw"), language.Make("de")))
-
-	// The converse is not generally the case.
-	fmt.Println(language.Comprehends(language.Make("de"), language.Make("gsw")))
-
-	// Output:
-	// Exact
-	// High
-	// No
-	// ----
-	// No
-	// Low
-	// ----
-	// High
-	// No
-}
-
-func ExampleTag_values() {
-	us := language.MustParseRegion("US")
-	en := language.MustParseBase("en")
-
-	lang, _, region := language.AmericanEnglish.Raw()
-	fmt.Println(lang == en, region == us)
-
-	lang, _, region = language.BritishEnglish.Raw()
-	fmt.Println(lang == en, region == us)
-
-	// Tags can be compared for exact equivalence using '=='.
-	en_us, _ := language.Compose(en, us)
-	fmt.Println(en_us == language.AmericanEnglish)
-
-	// Output:
-	// true true
-	// true false
-	// true
-}
diff --git a/vendor/golang.org/x/text/language/httpexample_test.go b/vendor/golang.org/x/text/language/httpexample_test.go
deleted file mode 100644
index 40d0663c..00000000
--- a/vendor/golang.org/x/text/language/httpexample_test.go
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package language_test
-
-import (
-	"fmt"
-	"net/http"
-	"strings"
-
-	"golang.org/x/text/language"
-)
-
-// matcher is a language.Matcher configured for all supported languages.
-var matcher = language.NewMatcher([]language.Tag{
-	language.BritishEnglish,
-	language.Norwegian,
-	language.German,
-})
-
-// handler is a http.HandlerFunc.
-func handler(w http.ResponseWriter, r *http.Request) {
-	t, q, err := language.ParseAcceptLanguage(r.Header.Get("Accept-Language"))
-	// We ignore the error: the default language will be selected for t == nil.
-	tag, _, _ := matcher.Match(t...)
-	fmt.Printf("%5v (t: %6v; q: %3v; err: %v)\n", tag, t, q, err)
-}
-
-func ExampleParseAcceptLanguage() {
-	for _, al := range []string{
-		"nn;q=0.3, en-us;q=0.8, en,",
-		"gsw, en;q=0.7, en-US;q=0.8",
-		"gsw, nl, da",
-		"invalid",
-	} {
-		// Create dummy request with Accept-Language set and pass it to handler.
-		r, _ := http.NewRequest("GET", "example.com", strings.NewReader("Hello"))
-		r.Header.Set("Accept-Language", al)
-		handler(nil, r)
-	}
-
-	// Output:
-	// en-GB (t: [    en  en-US     nn]; q: [  1 0.8 0.3]; err: <nil>)
-	// en-GB (t: [   gsw  en-US     en]; q: [  1 0.8 0.7]; err: <nil>)
-	//    de (t: [   gsw     nl     da]; q: [  1   1   1]; err: <nil>)
-	// en-GB (t: []; q: []; err: language: tag is not well-formed)
-}
diff --git a/vendor/golang.org/x/text/language/language_test.go b/vendor/golang.org/x/text/language/language_test.go
deleted file mode 100644
index 9e42d15d..00000000
--- a/vendor/golang.org/x/text/language/language_test.go
+++ /dev/null
@@ -1,911 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package language
-
-import (
-	"reflect"
-	"testing"
-
-	"golang.org/x/text/internal/testtext"
-)
-
-func TestTagSize(t *testing.T) {
-	id := Tag{}
-	typ := reflect.TypeOf(id)
-	if typ.Size() > 24 {
-		t.Errorf("size of Tag was %d; want 24", typ.Size())
-	}
-}
-
-func TestIsRoot(t *testing.T) {
-	loc := Tag{}
-	if !loc.IsRoot() {
-		t.Errorf("unspecified should be root.")
-	}
-	for i, tt := range parseTests() {
-		loc, _ := Parse(tt.in)
-		undef := tt.lang == "und" && tt.script == "" && tt.region == "" && tt.ext == ""
-		if loc.IsRoot() != undef {
-			t.Errorf("%d: was %v; want %v", i, loc.IsRoot(), undef)
-		}
-	}
-}
-
-func TestEquality(t *testing.T) {
-	for i, tt := range parseTests()[48:49] {
-		s := tt.in
-		tag := Make(s)
-		t1 := Make(tag.String())
-		if tag != t1 {
-			t.Errorf("%d:%s: equality test 1 failed\n got: %#v\nwant: %#v)", i, s, t1, tag)
-		}
-		t2, _ := Compose(tag)
-		if tag != t2 {
-			t.Errorf("%d:%s: equality test 2 failed\n got: %#v\nwant: %#v", i, s, t2, tag)
-		}
-	}
-}
-
-func TestMakeString(t *testing.T) {
-	tests := []struct{ in, out string }{
-		{"und", "und"},
-		{"und", "und-CW"},
-		{"nl", "nl-NL"},
-		{"de-1901", "nl-1901"},
-		{"de-1901", "de-Arab-1901"},
-		{"x-a-b", "de-Arab-x-a-b"},
-		{"x-a-b", "x-a-b"},
-	}
-	for i, tt := range tests {
-		id, _ := Parse(tt.in)
-		mod, _ := Parse(tt.out)
-		id.setTagsFrom(mod)
-		for j := 0; j < 2; j++ {
-			id.remakeString()
-			if str := id.String(); str != tt.out {
-				t.Errorf("%d:%d: found %s; want %s", i, j, id.String(), tt.out)
-			}
-		}
-		// The bytes to string conversion as used in remakeString
-		// occasionally measures as more than one alloc, breaking this test.
-		// To alleviate this we set the number of runs to more than 1.
-		if n := testtext.AllocsPerRun(8, id.remakeString); n > 1 {
-			t.Errorf("%d: # allocs got %.1f; want <= 1", i, n)
-		}
-	}
-}
-
-func TestCompactIndex(t *testing.T) {
-	tests := []struct {
-		tag   string
-		index int
-		ok    bool
-	}{
-		// TODO: these values will change with each CLDR update. This issue
-		// will be solved if we decide to fix the indexes.
-		{"und", 0, true},
-		{"ca-ES-valencia", 1, true},
-		{"ca-ES-valencia-u-va-posix", 0, false},
-		{"ca-ES-valencia-u-co-phonebk", 1, true},
-		{"ca-ES-valencia-u-co-phonebk-va-posix", 0, false},
-		{"x-klingon", 0, false},
-		{"en-US", 232, true},
-		{"en-US-u-va-posix", 2, true},
-		{"en", 136, true},
-		{"en-u-co-phonebk", 136, true},
-		{"en-001", 137, true},
-		{"sh", 0, false}, // We don't normalize.
-	}
-	for _, tt := range tests {
-		x, ok := CompactIndex(Raw.MustParse(tt.tag))
-		if x != tt.index || ok != tt.ok {
-			t.Errorf("%s: got %d, %v; want %d %v", tt.tag, x, ok, tt.index, tt.ok)
-		}
-	}
-}
-
-func TestMarshal(t *testing.T) {
-	testCases := []string{
-		// TODO: these values will change with each CLDR update. This issue
-		// will be solved if we decide to fix the indexes.
-		"und",
-		"ca-ES-valencia",
-		"ca-ES-valencia-u-va-posix",
-		"ca-ES-valencia-u-co-phonebk",
-		"ca-ES-valencia-u-co-phonebk-va-posix",
-		"x-klingon",
-		"en-US",
-		"en-US-u-va-posix",
-		"en",
-		"en-u-co-phonebk",
-		"en-001",
-		"sh",
-	}
-	for _, tc := range testCases {
-		var tag Tag
-		err := tag.UnmarshalText([]byte(tc))
-		if err != nil {
-			t.Errorf("UnmarshalText(%q): unexpected error: %v", tc, err)
-		}
-		b, err := tag.MarshalText()
-		if err != nil {
-			t.Errorf("MarshalText(%q): unexpected error: %v", tc, err)
-		}
-		if got := string(b); got != tc {
-			t.Errorf("%s: got %q; want %q", tc, got, tc)
-		}
-	}
-}
-
-func TestBase(t *testing.T) {
-	tests := []struct {
-		loc, lang string
-		conf      Confidence
-	}{
-		{"und", "en", Low},
-		{"x-abc", "und", No},
-		{"en", "en", Exact},
-		{"und-Cyrl", "ru", High},
-		// If a region is not included, the official language should be English.
-		{"und-US", "en", High},
-		// TODO: not-explicitly listed scripts should probably be und, No
-		// Modify addTags to return info on how the match was derived.
-		// {"und-Aghb", "und", No},
-	}
-	for i, tt := range tests {
-		loc, _ := Parse(tt.loc)
-		lang, conf := loc.Base()
-		if lang.String() != tt.lang {
-			t.Errorf("%d: language was %s; want %s", i, lang, tt.lang)
-		}
-		if conf != tt.conf {
-			t.Errorf("%d: confidence was %d; want %d", i, conf, tt.conf)
-		}
-	}
-}
-
-func TestParseBase(t *testing.T) {
-	tests := []struct {
-		in  string
-		out string
-		ok  bool
-	}{
-		{"en", "en", true},
-		{"EN", "en", true},
-		{"nld", "nl", true},
-		{"dut", "dut", true},  // bibliographic
-		{"aaj", "und", false}, // unknown
-		{"qaa", "qaa", true},
-		{"a", "und", false},
-		{"", "und", false},
-		{"aaaa", "und", false},
-	}
-	for i, tt := range tests {
-		x, err := ParseBase(tt.in)
-		if x.String() != tt.out || err == nil != tt.ok {
-			t.Errorf("%d:%s: was %s, %v; want %s, %v", i, tt.in, x, err == nil, tt.out, tt.ok)
-		}
-		if y, _, _ := Raw.Make(tt.out).Raw(); x != y {
-			t.Errorf("%d:%s: tag was %s; want %s", i, tt.in, x, y)
-		}
-	}
-}
-
-func TestScript(t *testing.T) {
-	tests := []struct {
-		loc, scr string
-		conf     Confidence
-	}{
-		{"und", "Latn", Low},
-		{"en-Latn", "Latn", Exact},
-		{"en", "Latn", High},
-		{"sr", "Cyrl", Low},
-		{"kk", "Cyrl", High},
-		{"kk-CN", "Arab", Low},
-		{"cmn", "Hans", Low},
-		{"ru", "Cyrl", High},
-		{"ru-RU", "Cyrl", High},
-		{"yue", "Hant", Low},
-		{"x-abc", "Zzzz", Low},
-		{"und-zyyy", "Zyyy", Exact},
-	}
-	for i, tt := range tests {
-		loc, _ := Parse(tt.loc)
-		sc, conf := loc.Script()
-		if sc.String() != tt.scr {
-			t.Errorf("%d:%s: script was %s; want %s", i, tt.loc, sc, tt.scr)
-		}
-		if conf != tt.conf {
-			t.Errorf("%d:%s: confidence was %d; want %d", i, tt.loc, conf, tt.conf)
-		}
-	}
-}
-
-func TestParseScript(t *testing.T) {
-	tests := []struct {
-		in  string
-		out string
-		ok  bool
-	}{
-		{"Latn", "Latn", true},
-		{"zzzz", "Zzzz", true},
-		{"zyyy", "Zyyy", true},
-		{"Latm", "Zzzz", false},
-		{"Zzz", "Zzzz", false},
-		{"", "Zzzz", false},
-		{"Zzzxx", "Zzzz", false},
-	}
-	for i, tt := range tests {
-		x, err := ParseScript(tt.in)
-		if x.String() != tt.out || err == nil != tt.ok {
-			t.Errorf("%d:%s: was %s, %v; want %s, %v", i, tt.in, x, err == nil, tt.out, tt.ok)
-		}
-		if err == nil {
-			if _, y, _ := Raw.Make("und-" + tt.out).Raw(); x != y {
-				t.Errorf("%d:%s: tag was %s; want %s", i, tt.in, x, y)
-			}
-		}
-	}
-}
-
-func TestRegion(t *testing.T) {
-	tests := []struct {
-		loc, reg string
-		conf     Confidence
-	}{
-		{"und", "US", Low},
-		{"en", "US", Low},
-		{"zh-Hant", "TW", Low},
-		{"en-US", "US", Exact},
-		{"cmn", "CN", Low},
-		{"ru", "RU", Low},
-		{"yue", "HK", Low},
-		{"x-abc", "ZZ", Low},
-	}
-	for i, tt := range tests {
-		loc, _ := Raw.Parse(tt.loc)
-		reg, conf := loc.Region()
-		if reg.String() != tt.reg {
-			t.Errorf("%d:%s: region was %s; want %s", i, tt.loc, reg, tt.reg)
-		}
-		if conf != tt.conf {
-			t.Errorf("%d:%s: confidence was %d; want %d", i, tt.loc, conf, tt.conf)
-		}
-	}
-}
-
-func TestEncodeM49(t *testing.T) {
-	tests := []struct {
-		m49  int
-		code string
-		ok   bool
-	}{
-		{1, "001", true},
-		{840, "US", true},
-		{899, "ZZ", false},
-	}
-	for i, tt := range tests {
-		if r, err := EncodeM49(tt.m49); r.String() != tt.code || err == nil != tt.ok {
-			t.Errorf("%d:%d: was %s, %v; want %s, %v", i, tt.m49, r, err == nil, tt.code, tt.ok)
-		}
-	}
-	for i := 1; i <= 1000; i++ {
-		if r, err := EncodeM49(i); err == nil && r.M49() == 0 {
-			t.Errorf("%d has no error, but maps to undefined region", i)
-		}
-	}
-}
-
-func TestParseRegion(t *testing.T) {
-	tests := []struct {
-		in  string
-		out string
-		ok  bool
-	}{
-		{"001", "001", true},
-		{"840", "US", true},
-		{"899", "ZZ", false},
-		{"USA", "US", true},
-		{"US", "US", true},
-		{"BC", "ZZ", false},
-		{"C", "ZZ", false},
-		{"CCCC", "ZZ", false},
-		{"01", "ZZ", false},
-	}
-	for i, tt := range tests {
-		r, err := ParseRegion(tt.in)
-		if r.String() != tt.out || err == nil != tt.ok {
-			t.Errorf("%d:%s: was %s, %v; want %s, %v", i, tt.in, r, err == nil, tt.out, tt.ok)
-		}
-		if err == nil {
-			if _, _, y := Raw.Make("und-" + tt.out).Raw(); r != y {
-				t.Errorf("%d:%s: tag was %s; want %s", i, tt.in, r, y)
-			}
-		}
-	}
-}
-
-func TestIsCountry(t *testing.T) {
-	tests := []struct {
-		reg     string
-		country bool
-	}{
-		{"US", true},
-		{"001", false},
-		{"958", false},
-		{"419", false},
-		{"203", true},
-		{"020", true},
-		{"900", false},
-		{"999", false},
-		{"QO", false},
-		{"EU", false},
-		{"AA", false},
-		{"XK", true},
-	}
-	for i, tt := range tests {
-		reg, _ := getRegionID([]byte(tt.reg))
-		r := Region{reg}
-		if r.IsCountry() != tt.country {
-			t.Errorf("%d: IsCountry(%s) was %v; want %v", i, tt.reg, r.IsCountry(), tt.country)
-		}
-	}
-}
-
-func TestIsGroup(t *testing.T) {
-	tests := []struct {
-		reg   string
-		group bool
-	}{
-		{"US", false},
-		{"001", true},
-		{"958", false},
-		{"419", true},
-		{"203", false},
-		{"020", false},
-		{"900", false},
-		{"999", false},
-		{"QO", true},
-		{"EU", true},
-		{"AA", false},
-		{"XK", false},
-	}
-	for i, tt := range tests {
-		reg, _ := getRegionID([]byte(tt.reg))
-		r := Region{reg}
-		if r.IsGroup() != tt.group {
-			t.Errorf("%d: IsGroup(%s) was %v; want %v", i, tt.reg, r.IsGroup(), tt.group)
-		}
-	}
-}
-
-func TestContains(t *testing.T) {
-	tests := []struct {
-		enclosing, contained string
-		contains             bool
-	}{
-		// A region contains itself.
-		{"US", "US", true},
-		{"001", "001", true},
-
-		// Direct containment.
-		{"001", "002", true},
-		{"039", "XK", true},
-		{"150", "XK", true},
-		{"EU", "AT", true},
-		{"QO", "AQ", true},
-
-		// Indirect containemnt.
-		{"001", "US", true},
-		{"001", "419", true},
-		{"001", "013", true},
-
-		// No containment.
-		{"US", "001", false},
-		{"155", "EU", false},
-	}
-	for i, tt := range tests {
-		enc, _ := getRegionID([]byte(tt.enclosing))
-		con, _ := getRegionID([]byte(tt.contained))
-		r := Region{enc}
-		if got := r.Contains(Region{con}); got != tt.contains {
-			t.Errorf("%d: %s.Contains(%s) was %v; want %v", i, tt.enclosing, tt.contained, got, tt.contains)
-		}
-	}
-}
-
-func TestRegionCanonicalize(t *testing.T) {
-	for i, tt := range []struct{ in, out string }{
-		{"UK", "GB"},
-		{"TP", "TL"},
-		{"QU", "EU"},
-		{"SU", "SU"},
-		{"VD", "VN"},
-		{"DD", "DE"},
-	} {
-		r := MustParseRegion(tt.in)
-		want := MustParseRegion(tt.out)
-		if got := r.Canonicalize(); got != want {
-			t.Errorf("%d: got %v; want %v", i, got, want)
-		}
-	}
-}
-
-func TestRegionTLD(t *testing.T) {
-	for _, tt := range []struct {
-		in, out string
-		ok      bool
-	}{
-		{"EH", "EH", true},
-		{"FR", "FR", true},
-		{"TL", "TL", true},
-
-		// In ccTLD before in ISO.
-		{"GG", "GG", true},
-
-		// Non-standard assignment of ccTLD to ISO code.
-		{"GB", "UK", true},
-
-		// Exceptionally reserved in ISO and valid ccTLD.
-		{"UK", "UK", true},
-		{"AC", "AC", true},
-		{"EU", "EU", true},
-		{"SU", "SU", true},
-
-		// Exceptionally reserved in ISO and invalid ccTLD.
-		{"CP", "ZZ", false},
-		{"DG", "ZZ", false},
-		{"EA", "ZZ", false},
-		{"FX", "ZZ", false},
-		{"IC", "ZZ", false},
-		{"TA", "ZZ", false},
-
-		// Transitionally reserved in ISO (e.g. deprecated) but valid ccTLD as
-		// it is still being phased out.
-		{"AN", "AN", true},
-		{"TP", "TP", true},
-
-		// Transitionally reserved in ISO (e.g. deprecated) and invalid ccTLD.
-		// Defined in package language as it has a mapping in CLDR.
-		{"BU", "ZZ", false},
-		{"CS", "ZZ", false},
-		{"NT", "ZZ", false},
-		{"YU", "ZZ", false},
-		{"ZR", "ZZ", false},
-		// Not defined in package: SF.
-
-		// Indeterminately reserved in ISO.
-		// Defined in package language as it has a legacy mapping in CLDR.
-		{"DY", "ZZ", false},
-		{"RH", "ZZ", false},
-		{"VD", "ZZ", false},
-		// Not defined in package: EW, FL, JA, LF, PI, RA, RB, RC, RI, RL, RM,
-		// RN, RP, WG, WL, WV, and YV.
-
-		// Not assigned in ISO, but legacy definitions in CLDR.
-		{"DD", "ZZ", false},
-		{"YD", "ZZ", false},
-
-		// Normal mappings but somewhat special status in ccTLD.
-		{"BL", "BL", true},
-		{"MF", "MF", true},
-		{"BV", "BV", true},
-		{"SJ", "SJ", true},
-
-		// Have values when normalized, but not as is.
-		{"QU", "ZZ", false},
-
-		// ISO Private Use.
-		{"AA", "ZZ", false},
-		{"QM", "ZZ", false},
-		{"QO", "ZZ", false},
-		{"XA", "ZZ", false},
-		{"XK", "ZZ", false}, // Sometimes used for Kosovo, but invalid ccTLD.
-	} {
-		if tt.in == "" {
-			continue
-		}
-
-		r := MustParseRegion(tt.in)
-		var want Region
-		if tt.out != "ZZ" {
-			want = MustParseRegion(tt.out)
-		}
-		tld, err := r.TLD()
-		if got := err == nil; got != tt.ok {
-			t.Errorf("error(%v): got %v; want %v", r, got, tt.ok)
-		}
-		if tld != want {
-			t.Errorf("TLD(%v): got %v; want %v", r, tld, want)
-		}
-	}
-}
-
-func TestCanonicalize(t *testing.T) {
-	// TODO: do a full test using CLDR data in a separate regression test.
-	tests := []struct {
-		in, out string
-		option  CanonType
-	}{
-		{"en-Latn", "en", SuppressScript},
-		{"sr-Cyrl", "sr-Cyrl", SuppressScript},
-		{"sh", "sr-Latn", Legacy},
-		{"sh-HR", "sr-Latn-HR", Legacy},
-		{"sh-Cyrl-HR", "sr-Cyrl-HR", Legacy},
-		{"tl", "fil", Legacy},
-		{"no", "no", Legacy},
-		{"no", "nb", Legacy | CLDR},
-		{"cmn", "cmn", Legacy},
-		{"cmn", "zh", Macro},
-		{"cmn-u-co-stroke", "zh-u-co-stroke", Macro},
-		{"yue", "yue", Macro},
-		{"nb", "no", Macro},
-		{"nb", "nb", Macro | CLDR},
-		{"no", "no", Macro},
-		{"no", "no", Macro | CLDR},
-		{"iw", "he", DeprecatedBase},
-		{"iw", "he", Deprecated | CLDR},
-		{"mo", "ro-MD", Deprecated}, // Adopted by CLDR as of version 25.
-		{"alb", "sq", Legacy},       // bibliographic
-		{"dut", "nl", Legacy},       // bibliographic
-		// As of CLDR 25, mo is no longer considered a legacy mapping.
-		{"mo", "mo", Legacy | CLDR},
-		{"und-AN", "und-AN", Deprecated},
-		{"und-YD", "und-YE", DeprecatedRegion},
-		{"und-YD", "und-YD", DeprecatedBase},
-		{"und-Qaai", "und-Zinh", DeprecatedScript},
-		{"und-Qaai", "und-Qaai", DeprecatedBase},
-		{"drh", "mn", All}, // drh -> khk -> mn
-	}
-	for i, tt := range tests {
-		in, _ := Raw.Parse(tt.in)
-		in, _ = tt.option.Canonicalize(in)
-		if in.String() != tt.out {
-			t.Errorf("%d:%s: was %s; want %s", i, tt.in, in.String(), tt.out)
-		}
-		if int(in.pVariant) > int(in.pExt) || int(in.pExt) > len(in.str) {
-			t.Errorf("%d:%s:offsets %d <= %d <= %d must be true", i, tt.in, in.pVariant, in.pExt, len(in.str))
-		}
-	}
-	// Test idempotence.
-	for _, base := range Supported.BaseLanguages() {
-		tag, _ := Raw.Compose(base)
-		got, _ := All.Canonicalize(tag)
-		want, _ := All.Canonicalize(got)
-		if got != want {
-			t.Errorf("idem(%s): got %s; want %s", tag, got, want)
-		}
-	}
-}
-
-func TestTypeForKey(t *testing.T) {
-	tests := []struct{ key, in, out string }{
-		{"co", "en", ""},
-		{"co", "en-u-abc", ""},
-		{"co", "en-u-co-phonebk", "phonebk"},
-		{"co", "en-u-co-phonebk-cu-aud", "phonebk"},
-		{"co", "x-foo-u-co-phonebk", ""},
-		{"nu", "en-u-co-phonebk-nu-arabic", "arabic"},
-		{"kc", "cmn-u-co-stroke", ""},
-	}
-	for _, tt := range tests {
-		if v := Make(tt.in).TypeForKey(tt.key); v != tt.out {
-			t.Errorf("%q[%q]: was %q; want %q", tt.in, tt.key, v, tt.out)
-		}
-	}
-}
-
-func TestSetTypeForKey(t *testing.T) {
-	tests := []struct {
-		key, value, in, out string
-		err                 bool
-	}{
-		// replace existing value
-		{"co", "pinyin", "en-u-co-phonebk", "en-u-co-pinyin", false},
-		{"co", "pinyin", "en-u-co-phonebk-cu-xau", "en-u-co-pinyin-cu-xau", false},
-		{"co", "pinyin", "en-u-co-phonebk-v-xx", "en-u-co-pinyin-v-xx", false},
-		{"co", "pinyin", "en-u-co-phonebk-x-x", "en-u-co-pinyin-x-x", false},
-		{"nu", "arabic", "en-u-co-phonebk-nu-vaai", "en-u-co-phonebk-nu-arabic", false},
-		// add to existing -u extension
-		{"co", "pinyin", "en-u-ca-gregory", "en-u-ca-gregory-co-pinyin", false},
-		{"co", "pinyin", "en-u-ca-gregory-nu-vaai", "en-u-ca-gregory-co-pinyin-nu-vaai", false},
-		{"co", "pinyin", "en-u-ca-gregory-v-va", "en-u-ca-gregory-co-pinyin-v-va", false},
-		{"co", "pinyin", "en-u-ca-gregory-x-a", "en-u-ca-gregory-co-pinyin-x-a", false},
-		{"ca", "gregory", "en-u-co-pinyin", "en-u-ca-gregory-co-pinyin", false},
-		// remove pair
-		{"co", "", "en-u-co-phonebk", "en", false},
-		{"co", "", "en-u-ca-gregory-co-phonebk", "en-u-ca-gregory", false},
-		{"co", "", "en-u-co-phonebk-nu-arabic", "en-u-nu-arabic", false},
-		{"co", "", "en", "en", false},
-		// add -u extension
-		{"co", "pinyin", "en", "en-u-co-pinyin", false},
-		{"co", "pinyin", "und", "und-u-co-pinyin", false},
-		{"co", "pinyin", "en-a-aaa", "en-a-aaa-u-co-pinyin", false},
-		{"co", "pinyin", "en-x-aaa", "en-u-co-pinyin-x-aaa", false},
-		{"co", "pinyin", "en-v-aa", "en-u-co-pinyin-v-aa", false},
-		{"co", "pinyin", "en-a-aaa-x-x", "en-a-aaa-u-co-pinyin-x-x", false},
-		{"co", "pinyin", "en-a-aaa-v-va", "en-a-aaa-u-co-pinyin-v-va", false},
-		// error on invalid values
-		{"co", "pinyinxxx", "en", "en", true},
-		{"co", "piny.n", "en", "en", true},
-		{"co", "pinyinxxx", "en-a-aaa", "en-a-aaa", true},
-		{"co", "pinyinxxx", "en-u-aaa", "en-u-aaa", true},
-		{"co", "pinyinxxx", "en-u-aaa-co-pinyin", "en-u-aaa-co-pinyin", true},
-		{"co", "pinyi.", "en-u-aaa-co-pinyin", "en-u-aaa-co-pinyin", true},
-		{"col", "pinyin", "en", "en", true},
-		{"co", "cu", "en", "en", true},
-		// error when setting on a private use tag
-		{"co", "phonebook", "x-foo", "x-foo", true},
-	}
-	for i, tt := range tests {
-		tag := Make(tt.in)
-		if v, err := tag.SetTypeForKey(tt.key, tt.value); v.String() != tt.out {
-			t.Errorf("%d:%q[%q]=%q: was %q; want %q", i, tt.in, tt.key, tt.value, v, tt.out)
-		} else if (err != nil) != tt.err {
-			t.Errorf("%d:%q[%q]=%q: error was %v; want %v", i, tt.in, tt.key, tt.value, err != nil, tt.err)
-		} else if val := v.TypeForKey(tt.key); err == nil && val != tt.value {
-			t.Errorf("%d:%q[%q]==%q: was %v; want %v", i, tt.out, tt.key, tt.value, val, tt.value)
-		}
-		if len(tag.String()) <= 3 {
-			// Simulate a tag for which the string has not been set.
-			tag.str, tag.pExt, tag.pVariant = "", 0, 0
-			if tag, err := tag.SetTypeForKey(tt.key, tt.value); err == nil {
-				if val := tag.TypeForKey(tt.key); err == nil && val != tt.value {
-					t.Errorf("%d:%q[%q]==%q: was %v; want %v", i, tt.out, tt.key, tt.value, val, tt.value)
-				}
-			}
-		}
-	}
-}
-
-func TestFindKeyAndType(t *testing.T) {
-	// out is either the matched type in case of a match or the original
-	// string up till the insertion point.
-	tests := []struct {
-		key     string
-		hasExt  bool
-		in, out string
-	}{
-		// Don't search past a private use extension.
-		{"co", false, "en-x-foo-u-co-pinyin", "en"},
-		{"co", false, "x-foo-u-co-pinyin", ""},
-		{"co", false, "en-s-fff-x-foo", "en-s-fff"},
-		// Insertion points in absence of -u extension.
-		{"cu", false, "en", ""}, // t.str is ""
-		{"cu", false, "en-v-va", "en"},
-		{"cu", false, "en-a-va", "en-a-va"},
-		{"cu", false, "en-a-va-v-va", "en-a-va"},
-		{"cu", false, "en-x-a", "en"},
-		// Tags with the -u extension.
-		{"co", true, "en-u-co-standard", "standard"},
-		{"co", true, "yue-u-co-pinyin", "pinyin"},
-		{"co", true, "en-u-co-abc", "abc"},
-		{"co", true, "en-u-co-abc-def", "abc-def"},
-		{"co", true, "en-u-co-abc-def-x-foo", "abc-def"},
-		{"co", true, "en-u-co-standard-nu-arab", "standard"},
-		{"co", true, "yue-u-co-pinyin-nu-arab", "pinyin"},
-		// Insertion points.
-		{"cu", true, "en-u-co-standard", "en-u-co-standard"},
-		{"cu", true, "yue-u-co-pinyin-x-foo", "yue-u-co-pinyin"},
-		{"cu", true, "en-u-co-abc", "en-u-co-abc"},
-		{"cu", true, "en-u-nu-arabic", "en-u"},
-		{"cu", true, "en-u-co-abc-def-nu-arabic", "en-u-co-abc-def"},
-	}
-	for i, tt := range tests {
-		start, end, hasExt := Make(tt.in).findTypeForKey(tt.key)
-		if start != end {
-			res := tt.in[start:end]
-			if res != tt.out {
-				t.Errorf("%d:%s: was %q; want %q", i, tt.in, res, tt.out)
-			}
-		} else {
-			if hasExt != tt.hasExt {
-				t.Errorf("%d:%s: hasExt was %v; want %v", i, tt.in, hasExt, tt.hasExt)
-				continue
-			}
-			if tt.in[:start] != tt.out {
-				t.Errorf("%d:%s: insertion point was %q; want %q", i, tt.in, tt.in[:start], tt.out)
-			}
-		}
-	}
-}
-
-func TestParent(t *testing.T) {
-	tests := []struct{ in, out string }{
-		// Strip variants and extensions first
-		{"de-u-co-phonebk", "de"},
-		{"de-1994", "de"},
-		{"de-Latn-1994", "de"}, // remove superfluous script.
-
-		// Ensure the canonical Tag for an entry is in the chain for base-script
-		// pairs.
-		{"zh-Hans", "zh"},
-
-		// Skip the script if it is the maximized version. CLDR files for the
-		// skipped tag are always empty.
-		{"zh-Hans-TW", "zh"},
-		{"zh-Hans-CN", "zh"},
-
-		// Insert the script if the maximized script is not the same as the
-		// maximized script of the base language.
-		{"zh-TW", "zh-Hant"},
-		{"zh-HK", "zh-Hant"},
-		{"zh-Hant-TW", "zh-Hant"},
-		{"zh-Hant-HK", "zh-Hant"},
-
-		// Non-default script skips to und.
-		// CLDR
-		{"az-Cyrl", "und"},
-		{"bs-Cyrl", "und"},
-		{"en-Dsrt", "und"},
-		{"ha-Arab", "und"},
-		{"mn-Mong", "und"},
-		{"pa-Arab", "und"},
-		{"shi-Latn", "und"},
-		{"sr-Latn", "und"},
-		{"uz-Arab", "und"},
-		{"uz-Cyrl", "und"},
-		{"vai-Latn", "und"},
-		{"zh-Hant", "und"},
-		// extra
-		{"nl-Cyrl", "und"},
-
-		// World english inherits from en-001.
-		{"en-150", "en-001"},
-		{"en-AU", "en-001"},
-		{"en-BE", "en-001"},
-		{"en-GG", "en-001"},
-		{"en-GI", "en-001"},
-		{"en-HK", "en-001"},
-		{"en-IE", "en-001"},
-		{"en-IM", "en-001"},
-		{"en-IN", "en-001"},
-		{"en-JE", "en-001"},
-		{"en-MT", "en-001"},
-		{"en-NZ", "en-001"},
-		{"en-PK", "en-001"},
-		{"en-SG", "en-001"},
-
-		// Spanish in Latin-American countries have es-419 as parent.
-		{"es-AR", "es-419"},
-		{"es-BO", "es-419"},
-		{"es-CL", "es-419"},
-		{"es-CO", "es-419"},
-		{"es-CR", "es-419"},
-		{"es-CU", "es-419"},
-		{"es-DO", "es-419"},
-		{"es-EC", "es-419"},
-		{"es-GT", "es-419"},
-		{"es-HN", "es-419"},
-		{"es-MX", "es-419"},
-		{"es-NI", "es-419"},
-		{"es-PA", "es-419"},
-		{"es-PE", "es-419"},
-		{"es-PR", "es-419"},
-		{"es-PY", "es-419"},
-		{"es-SV", "es-419"},
-		{"es-US", "es-419"},
-		{"es-UY", "es-419"},
-		{"es-VE", "es-419"},
-		// exceptions (according to CLDR)
-		{"es-CW", "es"},
-
-		// Inherit from pt-PT, instead of pt for these countries.
-		{"pt-AO", "pt-PT"},
-		{"pt-CV", "pt-PT"},
-		{"pt-GW", "pt-PT"},
-		{"pt-MO", "pt-PT"},
-		{"pt-MZ", "pt-PT"},
-		{"pt-ST", "pt-PT"},
-		{"pt-TL", "pt-PT"},
-	}
-	for _, tt := range tests {
-		tag := Raw.MustParse(tt.in)
-		if p := Raw.MustParse(tt.out); p != tag.Parent() {
-			t.Errorf("%s: was %v; want %v", tt.in, tag.Parent(), p)
-		}
-	}
-}
-
-var (
-	// Tags without error that don't need to be changed.
-	benchBasic = []string{
-		"en",
-		"en-Latn",
-		"en-GB",
-		"za",
-		"zh-Hant",
-		"zh",
-		"zh-HK",
-		"ar-MK",
-		"en-CA",
-		"fr-CA",
-		"fr-CH",
-		"fr",
-		"lv",
-		"he-IT",
-		"tlh",
-		"ja",
-		"ja-Jpan",
-		"ja-Jpan-JP",
-		"de-1996",
-		"de-CH",
-		"sr",
-		"sr-Latn",
-	}
-	// Tags with extensions, not changes required.
-	benchExt = []string{
-		"x-a-b-c-d",
-		"x-aa-bbbb-cccccccc-d",
-		"en-x_cc-b-bbb-a-aaa",
-		"en-c_cc-b-bbb-a-aaa-x-x",
-		"en-u-co-phonebk",
-		"en-Cyrl-u-co-phonebk",
-		"en-US-u-co-phonebk-cu-xau",
-		"en-nedix-u-co-phonebk",
-		"en-t-t0-abcd",
-		"en-t-nl-latn",
-		"en-t-t0-abcd-x-a",
-	}
-	// Change, but not memory allocation required.
-	benchSimpleChange = []string{
-		"EN",
-		"i-klingon",
-		"en-latn",
-		"zh-cmn-Hans-CN",
-		"iw-NL",
-	}
-	// Change and memory allocation required.
-	benchChangeAlloc = []string{
-		"en-c_cc-b-bbb-a-aaa",
-		"en-u-cu-xua-co-phonebk",
-		"en-u-cu-xua-co-phonebk-a-cd",
-		"en-u-def-abc-cu-xua-co-phonebk",
-		"en-t-en-Cyrl-NL-1994",
-		"en-t-en-Cyrl-NL-1994-t0-abc-def",
-	}
-	// Tags that result in errors.
-	benchErr = []string{
-		// IllFormed
-		"x_A.-B-C_D",
-		"en-u-cu-co-phonebk",
-		"en-u-cu-xau-co",
-		"en-t-nl-abcd",
-		// Invalid
-		"xx",
-		"nl-Uuuu",
-		"nl-QB",
-	}
-	benchChange = append(benchSimpleChange, benchChangeAlloc...)
-	benchAll    = append(append(append(benchBasic, benchExt...), benchChange...), benchErr...)
-)
-
-func doParse(b *testing.B, tag []string) {
-	for i := 0; i < b.N; i++ {
-		// Use the modulo instead of looping over all tags so that we get a somewhat
-		// meaningful ns/op.
-		Parse(tag[i%len(tag)])
-	}
-}
-
-func BenchmarkParse(b *testing.B) {
-	doParse(b, benchAll)
-}
-
-func BenchmarkParseBasic(b *testing.B) {
-	doParse(b, benchBasic)
-}
-
-func BenchmarkParseError(b *testing.B) {
-	doParse(b, benchErr)
-}
-
-func BenchmarkParseSimpleChange(b *testing.B) {
-	doParse(b, benchSimpleChange)
-}
-
-func BenchmarkParseChangeAlloc(b *testing.B) {
-	doParse(b, benchChangeAlloc)
-}
diff --git a/vendor/golang.org/x/text/language/lookup_test.go b/vendor/golang.org/x/text/language/lookup_test.go
deleted file mode 100644
index 9833830c..00000000
--- a/vendor/golang.org/x/text/language/lookup_test.go
+++ /dev/null
@@ -1,457 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package language
-
-import (
-	"testing"
-
-	"golang.org/x/text/internal/tag"
-)
-
-func b(s string) []byte {
-	return []byte(s)
-}
-
-func TestLangID(t *testing.T) {
-	tests := []struct {
-		id, bcp47, iso3, norm string
-		err                   error
-	}{
-		{id: "", bcp47: "und", iso3: "und", err: errSyntax},
-		{id: "  ", bcp47: "und", iso3: "und", err: errSyntax},
-		{id: "   ", bcp47: "und", iso3: "und", err: errSyntax},
-		{id: "    ", bcp47: "und", iso3: "und", err: errSyntax},
-		{id: "xxx", bcp47: "und", iso3: "und", err: mkErrInvalid([]byte("xxx"))},
-		{id: "und", bcp47: "und", iso3: "und"},
-		{id: "aju", bcp47: "aju", iso3: "aju", norm: "jrb"},
-		{id: "jrb", bcp47: "jrb", iso3: "jrb"},
-		{id: "es", bcp47: "es", iso3: "spa"},
-		{id: "spa", bcp47: "es", iso3: "spa"},
-		{id: "ji", bcp47: "ji", iso3: "yid-", norm: "yi"},
-		{id: "jw", bcp47: "jw", iso3: "jav-", norm: "jv"},
-		{id: "ar", bcp47: "ar", iso3: "ara"},
-		{id: "kw", bcp47: "kw", iso3: "cor"},
-		{id: "arb", bcp47: "arb", iso3: "arb", norm: "ar"},
-		{id: "ar", bcp47: "ar", iso3: "ara"},
-		{id: "kur", bcp47: "ku", iso3: "kur"},
-		{id: "nl", bcp47: "nl", iso3: "nld"},
-		{id: "NL", bcp47: "nl", iso3: "nld"},
-		{id: "gsw", bcp47: "gsw", iso3: "gsw"},
-		{id: "gSW", bcp47: "gsw", iso3: "gsw"},
-		{id: "und", bcp47: "und", iso3: "und"},
-		{id: "sh", bcp47: "sh", iso3: "hbs", norm: "sr"},
-		{id: "hbs", bcp47: "sh", iso3: "hbs", norm: "sr"},
-		{id: "no", bcp47: "no", iso3: "nor", norm: "no"},
-		{id: "nor", bcp47: "no", iso3: "nor", norm: "no"},
-		{id: "cmn", bcp47: "cmn", iso3: "cmn", norm: "zh"},
-	}
-	for i, tt := range tests {
-		want, err := getLangID(b(tt.id))
-		if err != tt.err {
-			t.Errorf("%d:err(%s): found %q; want %q", i, tt.id, err, tt.err)
-		}
-		if err != nil {
-			continue
-		}
-		if id, _ := getLangISO2(b(tt.bcp47)); len(tt.bcp47) == 2 && want != id {
-			t.Errorf("%d:getISO2(%s): found %v; want %v", i, tt.bcp47, id, want)
-		}
-		if len(tt.iso3) == 3 {
-			if id, _ := getLangISO3(b(tt.iso3)); want != id {
-				t.Errorf("%d:getISO3(%s): found %q; want %q", i, tt.iso3, id, want)
-			}
-			if id, _ := getLangID(b(tt.iso3)); want != id {
-				t.Errorf("%d:getID3(%s): found %v; want %v", i, tt.iso3, id, want)
-			}
-		}
-		norm := want
-		if tt.norm != "" {
-			norm, _ = getLangID(b(tt.norm))
-		}
-		id, _ := normLang(want)
-		if id != norm {
-			t.Errorf("%d:norm(%s): found %v; want %v", i, tt.id, id, norm)
-		}
-		if id := want.String(); tt.bcp47 != id {
-			t.Errorf("%d:String(): found %s; want %s", i, id, tt.bcp47)
-		}
-		if id := want.ISO3(); tt.iso3[:3] != id {
-			t.Errorf("%d:iso3(): found %s; want %s", i, id, tt.iso3[:3])
-		}
-	}
-}
-
-func TestGrandfathered(t *testing.T) {
-	for _, tt := range []struct{ in, out string }{
-		{"art-lojban", "jbo"},
-		{"i-ami", "ami"},
-		{"i-bnn", "bnn"},
-		{"i-hak", "hak"},
-		{"i-klingon", "tlh"},
-		{"i-lux", "lb"},
-		{"i-navajo", "nv"},
-		{"i-pwn", "pwn"},
-		{"i-tao", "tao"},
-		{"i-tay", "tay"},
-		{"i-tsu", "tsu"},
-		{"no-bok", "nb"},
-		{"no-nyn", "nn"},
-		{"sgn-BE-FR", "sfb"},
-		{"sgn-BE-NL", "vgt"},
-		{"sgn-CH-DE", "sgg"},
-		{"sgn-ch-de", "sgg"},
-		{"zh-guoyu", "cmn"},
-		{"zh-hakka", "hak"},
-		{"zh-min-nan", "nan"},
-		{"zh-xiang", "hsn"},
-
-		// Grandfathered tags with no modern replacement will be converted as follows:
-		{"cel-gaulish", "xtg-x-cel-gaulish"},
-		{"en-GB-oed", "en-GB-oxendict"},
-		{"en-gb-oed", "en-GB-oxendict"},
-		{"i-default", "en-x-i-default"},
-		{"i-enochian", "und-x-i-enochian"},
-		{"i-mingo", "see-x-i-mingo"},
-		{"zh-min", "nan-x-zh-min"},
-
-		{"root", "und"},
-		{"en_US_POSIX", "en-US-u-va-posix"},
-		{"en_us_posix", "en-US-u-va-posix"},
-		{"en-us-posix", "en-US-u-va-posix"},
-	} {
-		got := Raw.Make(tt.in)
-		want := Raw.MustParse(tt.out)
-		if got != want {
-			t.Errorf("%s: got %q; want %q", tt.in, got, want)
-		}
-	}
-}
-
-func TestRegionID(t *testing.T) {
-	tests := []struct {
-		in, out string
-	}{
-		{"_  ", ""},
-		{"_000", ""},
-		{"419", "419"},
-		{"AA", "AA"},
-		{"ATF", "TF"},
-		{"HV", "HV"},
-		{"CT", "CT"},
-		{"DY", "DY"},
-		{"IC", "IC"},
-		{"FQ", "FQ"},
-		{"JT", "JT"},
-		{"ZZ", "ZZ"},
-		{"EU", "EU"},
-		{"QO", "QO"},
-		{"FX", "FX"},
-	}
-	for i, tt := range tests {
-		if tt.in[0] == '_' {
-			id := tt.in[1:]
-			if _, err := getRegionID(b(id)); err == nil {
-				t.Errorf("%d:err(%s): found nil; want error", i, id)
-			}
-			continue
-		}
-		want, _ := getRegionID(b(tt.in))
-		if s := want.String(); s != tt.out {
-			t.Errorf("%d:%s: found %q; want %q", i, tt.in, s, tt.out)
-		}
-		if len(tt.in) == 2 {
-			want, _ := getRegionISO2(b(tt.in))
-			if s := want.String(); s != tt.out {
-				t.Errorf("%d:getISO2(%s): found %q; want %q", i, tt.in, s, tt.out)
-			}
-		}
-	}
-}
-
-func TestRegionType(t *testing.T) {
-	for _, tt := range []struct {
-		r string
-		t byte
-	}{
-		{"NL", bcp47Region | ccTLD},
-		{"EU", bcp47Region | ccTLD}, // exceptionally reserved
-		{"AN", bcp47Region | ccTLD}, // transitionally reserved
-
-		{"DD", bcp47Region}, // deleted in ISO, deprecated in BCP 47
-		{"NT", bcp47Region}, // transitionally reserved, deprecated in BCP 47
-
-		{"XA", iso3166UserAssigned | bcp47Region},
-		{"ZZ", iso3166UserAssigned | bcp47Region},
-		{"AA", iso3166UserAssigned | bcp47Region},
-		{"QO", iso3166UserAssigned | bcp47Region},
-		{"QM", iso3166UserAssigned | bcp47Region},
-		{"XK", iso3166UserAssigned | bcp47Region},
-
-		{"CT", 0}, // deleted in ISO, not in BCP 47, canonicalized in CLDR
-	} {
-		r := MustParseRegion(tt.r)
-		if tp := r.typ(); tp != tt.t {
-			t.Errorf("Type(%s): got %x; want %x", tt.r, tp, tt.t)
-		}
-	}
-}
-
-func TestRegionISO3(t *testing.T) {
-	tests := []struct {
-		from, iso3, to string
-	}{
-		{"  ", "ZZZ", "ZZ"},
-		{"000", "ZZZ", "ZZ"},
-		{"AA", "AAA", ""},
-		{"CT", "CTE", ""},
-		{"DY", "DHY", ""},
-		{"EU", "QUU", ""},
-		{"HV", "HVO", ""},
-		{"IC", "ZZZ", "ZZ"},
-		{"JT", "JTN", ""},
-		{"PZ", "PCZ", ""},
-		{"QU", "QUU", "EU"},
-		{"QO", "QOO", ""},
-		{"YD", "YMD", ""},
-		{"FQ", "ATF", "TF"},
-		{"TF", "ATF", ""},
-		{"FX", "FXX", ""},
-		{"ZZ", "ZZZ", ""},
-		{"419", "ZZZ", "ZZ"},
-	}
-	for _, tt := range tests {
-		r, _ := getRegionID(b(tt.from))
-		if s := r.ISO3(); s != tt.iso3 {
-			t.Errorf("iso3(%q): found %q; want %q", tt.from, s, tt.iso3)
-		}
-		if tt.iso3 == "" {
-			continue
-		}
-		want := tt.to
-		if tt.to == "" {
-			want = tt.from
-		}
-		r, _ = getRegionID(b(want))
-		if id, _ := getRegionISO3(b(tt.iso3)); id != r {
-			t.Errorf("%s: found %q; want %q", tt.iso3, id, want)
-		}
-	}
-}
-
-func TestRegionM49(t *testing.T) {
-	fromTests := []struct {
-		m49 int
-		id  string
-	}{
-		{0, ""},
-		{-1, ""},
-		{1000, ""},
-		{10000, ""},
-
-		{001, "001"},
-		{104, "MM"},
-		{180, "CD"},
-		{230, "ET"},
-		{231, "ET"},
-		{249, "FX"},
-		{250, "FR"},
-		{276, "DE"},
-		{278, "DD"},
-		{280, "DE"},
-		{419, "419"},
-		{626, "TL"},
-		{736, "SD"},
-		{840, "US"},
-		{854, "BF"},
-		{891, "CS"},
-		{899, ""},
-		{958, "AA"},
-		{966, "QT"},
-		{967, "EU"},
-		{999, "ZZ"},
-	}
-	for _, tt := range fromTests {
-		id, err := getRegionM49(tt.m49)
-		if want, have := err != nil, tt.id == ""; want != have {
-			t.Errorf("error(%d): have %v; want %v", tt.m49, have, want)
-			continue
-		}
-		r, _ := getRegionID(b(tt.id))
-		if r != id {
-			t.Errorf("region(%d): have %s; want %s", tt.m49, id, r)
-		}
-	}
-
-	toTests := []struct {
-		m49 int
-		id  string
-	}{
-		{0, "000"},
-		{0, "IC"}, // Some codes don't have an ID
-
-		{001, "001"},
-		{104, "MM"},
-		{104, "BU"},
-		{180, "CD"},
-		{180, "ZR"},
-		{231, "ET"},
-		{250, "FR"},
-		{249, "FX"},
-		{276, "DE"},
-		{278, "DD"},
-		{419, "419"},
-		{626, "TL"},
-		{626, "TP"},
-		{729, "SD"},
-		{826, "GB"},
-		{840, "US"},
-		{854, "BF"},
-		{891, "YU"},
-		{891, "CS"},
-		{958, "AA"},
-		{966, "QT"},
-		{967, "EU"},
-		{967, "QU"},
-		{999, "ZZ"},
-		// For codes that don't have an M49 code use the replacement value,
-		// if available.
-		{854, "HV"}, // maps to Burkino Faso
-	}
-	for _, tt := range toTests {
-		r, _ := getRegionID(b(tt.id))
-		if r.M49() != tt.m49 {
-			t.Errorf("m49(%q): have %d; want %d", tt.id, r.M49(), tt.m49)
-		}
-	}
-}
-
-func TestRegionDeprecation(t *testing.T) {
-	tests := []struct{ in, out string }{
-		{"BU", "MM"},
-		{"BUR", "MM"},
-		{"CT", "KI"},
-		{"DD", "DE"},
-		{"DDR", "DE"},
-		{"DY", "BJ"},
-		{"FX", "FR"},
-		{"HV", "BF"},
-		{"JT", "UM"},
-		{"MI", "UM"},
-		{"NH", "VU"},
-		{"NQ", "AQ"},
-		{"PU", "UM"},
-		{"PZ", "PA"},
-		{"QU", "EU"},
-		{"RH", "ZW"},
-		{"TP", "TL"},
-		{"UK", "GB"},
-		{"VD", "VN"},
-		{"WK", "UM"},
-		{"YD", "YE"},
-		{"NL", "NL"},
-	}
-	for _, tt := range tests {
-		rIn, _ := getRegionID([]byte(tt.in))
-		rOut, _ := getRegionISO2([]byte(tt.out))
-		r := normRegion(rIn)
-		if rOut == rIn && r != 0 {
-			t.Errorf("%s: was %q; want %q", tt.in, r, tt.in)
-		}
-		if rOut != rIn && r != rOut {
-			t.Errorf("%s: was %q; want %q", tt.in, r, tt.out)
-		}
-
-	}
-}
-
-func TestGetScriptID(t *testing.T) {
-	idx := tag.Index("0000BbbbDdddEeeeZzzz\xff\xff\xff\xff")
-	tests := []struct {
-		in  string
-		out scriptID
-	}{
-		{"    ", 0},
-		{"      ", 0},
-		{"  ", 0},
-		{"", 0},
-		{"Aaaa", 0},
-		{"Bbbb", 1},
-		{"Dddd", 2},
-		{"dddd", 2},
-		{"dDDD", 2},
-		{"Eeee", 3},
-		{"Zzzz", 4},
-	}
-	for i, tt := range tests {
-		if id, err := getScriptID(idx, b(tt.in)); id != tt.out {
-			t.Errorf("%d:%s: found %d; want %d", i, tt.in, id, tt.out)
-		} else if id == 0 && err == nil {
-			t.Errorf("%d:%s: no error; expected one", i, tt.in)
-		}
-	}
-}
-
-func TestIsPrivateUse(t *testing.T) {
-	type test struct {
-		s       string
-		private bool
-	}
-	tests := []test{
-		{"en", false},
-		{"und", false},
-		{"pzn", false},
-		{"qaa", true},
-		{"qtz", true},
-		{"qua", false},
-	}
-	for i, tt := range tests {
-		x, _ := getLangID([]byte(tt.s))
-		if b := x.IsPrivateUse(); b != tt.private {
-			t.Errorf("%d: langID.IsPrivateUse(%s) was %v; want %v", i, tt.s, b, tt.private)
-		}
-	}
-	tests = []test{
-		{"001", false},
-		{"419", false},
-		{"899", false},
-		{"900", false},
-		{"957", false},
-		{"958", true},
-		{"AA", true},
-		{"AC", false},
-		{"EU", false}, // CLDR grouping, exceptionally reserved in ISO.
-		{"QU", true},  // Canonicalizes to EU, User-assigned in ISO.
-		{"QO", true},  // CLDR grouping, User-assigned in ISO.
-		{"QA", false},
-		{"QM", true},
-		{"QZ", true},
-		{"XA", true},
-		{"XK", true}, // Assigned to Kosovo in CLDR, User-assigned in ISO.
-		{"XZ", true},
-		{"ZW", false},
-		{"ZZ", true},
-	}
-	for i, tt := range tests {
-		x, _ := getRegionID([]byte(tt.s))
-		if b := x.IsPrivateUse(); b != tt.private {
-			t.Errorf("%d: regionID.IsPrivateUse(%s) was %v; want %v", i, tt.s, b, tt.private)
-		}
-	}
-	tests = []test{
-		{"Latn", false},
-		{"Laaa", false}, // invalid
-		{"Qaaa", true},
-		{"Qabx", true},
-		{"Qaby", false},
-		{"Zyyy", false},
-		{"Zzzz", false},
-	}
-	for i, tt := range tests {
-		x, _ := getScriptID(script, []byte(tt.s))
-		if b := x.IsPrivateUse(); b != tt.private {
-			t.Errorf("%d: scriptID.IsPrivateUse(%s) was %v; want %v", i, tt.s, b, tt.private)
-		}
-	}
-}
diff --git a/vendor/golang.org/x/text/language/match_test.go b/vendor/golang.org/x/text/language/match_test.go
deleted file mode 100644
index 8b60b07a..00000000
--- a/vendor/golang.org/x/text/language/match_test.go
+++ /dev/null
@@ -1,505 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package language
-
-import (
-	"bytes"
-	"flag"
-	"fmt"
-	"os"
-	"path"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"golang.org/x/text/internal/testtext"
-	"golang.org/x/text/internal/ucd"
-)
-
-var verbose = flag.Bool("verbose", false, "set to true to print the internal tables of matchers")
-
-func TestCompliance(t *testing.T) {
-	filepath.Walk("testdata", func(file string, info os.FileInfo, err error) error {
-		if info.IsDir() {
-			return nil
-		}
-		r, err := os.Open(file)
-		if err != nil {
-			t.Fatal(err)
-		}
-		ucd.Parse(r, func(p *ucd.Parser) {
-			name := strings.Replace(path.Join(p.String(0), p.String(1)), " ", "", -1)
-			if skip[name] {
-				return
-			}
-			t.Run(info.Name()+"/"+name, func(t *testing.T) {
-				supported := makeTagList(p.String(0))
-				desired := makeTagList(p.String(1))
-				gotCombined, index, conf := NewMatcher(supported).Match(desired...)
-
-				gotMatch := supported[index]
-				wantMatch := mk(p.String(2))
-				if gotMatch != wantMatch {
-					t.Fatalf("match: got %q; want %q (%v)", gotMatch, wantMatch, conf)
-				}
-				wantCombined, err := Raw.Parse(p.String(3))
-				if err == nil && gotCombined != wantCombined {
-					t.Errorf("combined: got %q; want %q (%v)", gotCombined, wantCombined, conf)
-				}
-			})
-		})
-		return nil
-	})
-}
-
-var skip = map[string]bool{
-	// TODO: bugs
-	// Honor the wildcard match. This may only be useful to select non-exact
-	// stuff.
-	"mul,af/nl": true, // match: got "af"; want "mul"
-
-	// TODO: include other extensions.
-	// combined: got "en-GB-u-ca-buddhist-nu-arab"; want "en-GB-fonipa-t-m0-iso-i0-pinyin-u-ca-buddhist-nu-arab"
-	"und,en-GB-u-sd-gbsct/en-fonipa-u-nu-Arab-ca-buddhist-t-m0-iso-i0-pinyin": true,
-
-	// Inconsistencies with Mark Davis' implementation where it is not clear
-	// which is better.
-
-	// Inconsistencies in combined. I think the Go approach is more appropriate.
-	// We could use -u-rg- and -u-va- as alternative.
-	"und,fr/fr-BE-fonipa":              true, // combined: got "fr"; want "fr-BE-fonipa"
-	"und,fr-CA/fr-BE-fonipa":           true, // combined: got "fr-CA"; want "fr-BE-fonipa"
-	"und,fr-fonupa/fr-BE-fonipa":       true, // combined: got "fr-fonupa"; want "fr-BE-fonipa"
-	"und,no/nn-BE-fonipa":              true, // combined: got "no"; want "no-BE-fonipa"
-	"50,und,fr-CA-fonupa/fr-BE-fonipa": true, // combined: got "fr-CA-fonupa"; want "fr-BE-fonipa"
-
-	// The initial number is a threshold. As we don't use scoring, we will not
-	// implement this.
-	"50,und,fr-Cyrl-CA-fonupa/fr-BE-fonipa": true,
-	// match: got "und"; want "fr-Cyrl-CA-fonupa"
-	// combined: got "und"; want "fr-Cyrl-BE-fonipa"
-
-	// Other interesting cases to test:
-	// - Should same language or same script have the preference if there is
-	//   usually no understanding of the other script?
-	// - More specific region in desired may replace enclosing supported.
-}
-
-func makeTagList(s string) (tags []Tag) {
-	for _, s := range strings.Split(s, ",") {
-		tags = append(tags, mk(strings.TrimSpace(s)))
-	}
-	return tags
-}
-
-func TestMatchStrings(t *testing.T) {
-	testCases := []struct {
-		supported string
-		desired   string // strings separted by |
-		tag       string
-		index     int
-	}{{
-		supported: "en",
-		desired:   "",
-		tag:       "en",
-		index:     0,
-	}, {
-		supported: "en",
-		desired:   "nl",
-		tag:       "en",
-		index:     0,
-	}, {
-		supported: "en,nl",
-		desired:   "nl",
-		tag:       "nl",
-		index:     1,
-	}, {
-		supported: "en,nl",
-		desired:   "nl|en",
-		tag:       "nl",
-		index:     1,
-	}, {
-		supported: "en-GB,nl",
-		desired:   "en ; q=0.1,nl",
-		tag:       "nl",
-		index:     1,
-	}, {
-		supported: "en-GB,nl",
-		desired:   "en;q=0.005 | dk; q=0.1,nl ",
-		tag:       "en-GB",
-		index:     0,
-	}, {
-		// do not match faulty tags with und
-		supported: "en,und",
-		desired:   "|en",
-		tag:       "en",
-		index:     0,
-	}}
-	for _, tc := range testCases {
-		t.Run(path.Join(tc.supported, tc.desired), func(t *testing.T) {
-			m := NewMatcher(makeTagList(tc.supported))
-			tag, index := MatchStrings(m, strings.Split(tc.desired, "|")...)
-			if tag.String() != tc.tag || index != tc.index {
-				t.Errorf("got %v, %d; want %v, %d", tag, index, tc.tag, tc.index)
-			}
-		})
-	}
-}
-
-func TestAddLikelySubtags(t *testing.T) {
-	tests := []struct{ in, out string }{
-		{"aa", "aa-Latn-ET"},
-		{"aa-Latn", "aa-Latn-ET"},
-		{"aa-Arab", "aa-Arab-ET"},
-		{"aa-Arab-ER", "aa-Arab-ER"},
-		{"kk", "kk-Cyrl-KZ"},
-		{"kk-CN", "kk-Arab-CN"},
-		{"cmn", "cmn"},
-		{"zh-AU", "zh-Hant-AU"},
-		{"zh-VN", "zh-Hant-VN"},
-		{"zh-SG", "zh-Hans-SG"},
-		{"zh-Hant", "zh-Hant-TW"},
-		{"zh-Hani", "zh-Hani-CN"},
-		{"und-Hani", "zh-Hani-CN"},
-		{"und", "en-Latn-US"},
-		{"und-GB", "en-Latn-GB"},
-		{"und-CW", "pap-Latn-CW"},
-		{"und-YT", "fr-Latn-YT"},
-		{"und-Arab", "ar-Arab-EG"},
-		{"und-AM", "hy-Armn-AM"},
-		{"und-TW", "zh-Hant-TW"},
-		{"und-002", "en-Latn-NG"},
-		{"und-Latn-002", "en-Latn-NG"},
-		{"en-Latn-002", "en-Latn-NG"},
-		{"en-002", "en-Latn-NG"},
-		{"en-001", "en-Latn-US"},
-		{"und-003", "en-Latn-US"},
-		{"und-GB", "en-Latn-GB"},
-		{"Latn-001", "en-Latn-US"},
-		{"en-001", "en-Latn-US"},
-		{"es-419", "es-Latn-419"},
-		{"he-145", "he-Hebr-IL"},
-		{"ky-145", "ky-Latn-TR"},
-		{"kk", "kk-Cyrl-KZ"},
-		// Don't specialize duplicate and ambiguous matches.
-		{"kk-034", "kk-Arab-034"}, // Matches IR and AF. Both are Arab.
-		{"ku-145", "ku-Latn-TR"},  // Matches IQ, TR, and LB, but kk -> TR.
-		{"und-Arab-CC", "ms-Arab-CC"},
-		{"und-Arab-GB", "ks-Arab-GB"},
-		{"und-Hans-CC", "zh-Hans-CC"},
-		{"und-CC", "en-Latn-CC"},
-		{"sr", "sr-Cyrl-RS"},
-		{"sr-151", "sr-Latn-151"}, // Matches RO and RU.
-		// We would like addLikelySubtags to generate the same results if the input
-		// only changes by adding tags that would otherwise have been added
-		// by the expansion.
-		// In other words:
-		//     und-AA -> xx-Scrp-AA   implies und-Scrp-AA -> xx-Scrp-AA
-		//     und-AA -> xx-Scrp-AA   implies xx-AA -> xx-Scrp-AA
-		//     und-Scrp -> xx-Scrp-AA implies und-Scrp-AA -> xx-Scrp-AA
-		//     und-Scrp -> xx-Scrp-AA implies xx-Scrp -> xx-Scrp-AA
-		//     xx -> xx-Scrp-AA       implies xx-Scrp -> xx-Scrp-AA
-		//     xx -> xx-Scrp-AA       implies xx-AA -> xx-Scrp-AA
-		//
-		// The algorithm specified in
-		//   http://unicode.org/reports/tr35/tr35-9.html#Supplemental_Data,
-		// Section C.10, does not handle the first case. For example,
-		// the CLDR data contains an entry und-BJ -> fr-Latn-BJ, but not
-		// there is no rule for und-Latn-BJ.  According to spec, und-Latn-BJ
-		// would expand to en-Latn-BJ, violating the aforementioned principle.
-		// We deviate from the spec by letting und-Scrp-AA expand to xx-Scrp-AA
-		// if a rule of the form und-AA -> xx-Scrp-AA is defined.
-		// Note that as of version 23, CLDR has some explicitly specified
-		// entries that do not conform to these rules. The implementation
-		// will not correct these explicit inconsistencies. A later versions of CLDR
-		// is supposed to fix this.
-		{"und-Latn-BJ", "fr-Latn-BJ"},
-		{"und-Bugi-ID", "bug-Bugi-ID"},
-		// regions, scripts and languages without definitions
-		{"und-Arab-AA", "ar-Arab-AA"},
-		{"und-Afak-RE", "fr-Afak-RE"},
-		{"und-Arab-GB", "ks-Arab-GB"},
-		{"abp-Arab-GB", "abp-Arab-GB"},
-		// script has preference over region
-		{"und-Arab-NL", "ar-Arab-NL"},
-		{"zza", "zza-Latn-TR"},
-		// preserve variants and extensions
-		{"de-1901", "de-Latn-DE-1901"},
-		{"de-x-abc", "de-Latn-DE-x-abc"},
-		{"de-1901-x-abc", "de-Latn-DE-1901-x-abc"},
-		{"x-abc", "x-abc"}, // TODO: is this the desired behavior?
-	}
-	for i, tt := range tests {
-		in, _ := Parse(tt.in)
-		out, _ := Parse(tt.out)
-		in, _ = in.addLikelySubtags()
-		if in.String() != out.String() {
-			t.Errorf("%d: add(%s) was %s; want %s", i, tt.in, in, tt.out)
-		}
-	}
-}
-func TestMinimize(t *testing.T) {
-	tests := []struct{ in, out string }{
-		{"aa", "aa"},
-		{"aa-Latn", "aa"},
-		{"aa-Latn-ET", "aa"},
-		{"aa-ET", "aa"},
-		{"aa-Arab", "aa-Arab"},
-		{"aa-Arab-ER", "aa-Arab-ER"},
-		{"aa-Arab-ET", "aa-Arab"},
-		{"und", "und"},
-		{"und-Latn", "und"},
-		{"und-Latn-US", "und"},
-		{"en-Latn-US", "en"},
-		{"cmn", "cmn"},
-		{"cmn-Hans", "cmn-Hans"},
-		{"cmn-Hant", "cmn-Hant"},
-		{"zh-AU", "zh-AU"},
-		{"zh-VN", "zh-VN"},
-		{"zh-SG", "zh-SG"},
-		{"zh-Hant", "zh-Hant"},
-		{"zh-Hant-TW", "zh-TW"},
-		{"zh-Hans", "zh"},
-		{"zh-Hani", "zh-Hani"},
-		{"und-Hans", "und-Hans"},
-		{"und-Hani", "und-Hani"},
-
-		{"und-CW", "und-CW"},
-		{"und-YT", "und-YT"},
-		{"und-Arab", "und-Arab"},
-		{"und-AM", "und-AM"},
-		{"und-Arab-CC", "und-Arab-CC"},
-		{"und-CC", "und-CC"},
-		{"und-Latn-BJ", "und-BJ"},
-		{"und-Bugi-ID", "und-Bugi"},
-		{"bug-Bugi-ID", "bug-Bugi"},
-		// regions, scripts and languages without definitions
-		{"und-Arab-AA", "und-Arab-AA"},
-		// preserve variants and extensions
-		{"de-Latn-1901", "de-1901"},
-		{"de-Latn-x-abc", "de-x-abc"},
-		{"de-DE-1901-x-abc", "de-1901-x-abc"},
-		{"x-abc", "x-abc"}, // TODO: is this the desired behavior?
-	}
-	for i, tt := range tests {
-		in, _ := Parse(tt.in)
-		out, _ := Parse(tt.out)
-		min, _ := in.minimize()
-		if min.String() != out.String() {
-			t.Errorf("%d: min(%s) was %s; want %s", i, tt.in, min, tt.out)
-		}
-		max, _ := min.addLikelySubtags()
-		if x, _ := in.addLikelySubtags(); x.String() != max.String() {
-			t.Errorf("%d: max(min(%s)) = %s; want %s", i, tt.in, max, x)
-		}
-	}
-}
-
-func TestRegionGroups(t *testing.T) {
-	testCases := []struct {
-		a, b     string
-		distance uint8
-	}{
-		{"zh-TW", "zh-HK", 5},
-		{"zh-MO", "zh-HK", 4},
-		{"es-ES", "es-AR", 5},
-		{"es-ES", "es", 4},
-		{"es-419", "es-MX", 4},
-		{"es-AR", "es-MX", 4},
-		{"es-ES", "es-MX", 5},
-		{"es-PT", "es-MX", 5},
-	}
-	for _, tc := range testCases {
-		a := MustParse(tc.a)
-		aScript, _ := a.Script()
-		b := MustParse(tc.b)
-		bScript, _ := b.Script()
-
-		if aScript != bScript {
-			t.Errorf("scripts differ: %q vs %q", aScript, bScript)
-			continue
-		}
-		d, _ := regionGroupDist(a.region, b.region, aScript.scriptID, a.lang)
-		if d != tc.distance {
-			t.Errorf("got %q; want %q", d, tc.distance)
-		}
-	}
-}
-
-func TestIsParadigmLocale(t *testing.T) {
-	testCases := map[string]bool{
-		"en-US":  true,
-		"en-GB":  true,
-		"en-VI":  false,
-		"es-GB":  false,
-		"es-ES":  true,
-		"es-419": true,
-	}
-	for str, want := range testCases {
-		tag := Make(str)
-		got := isParadigmLocale(tag.lang, tag.region)
-		if got != want {
-			t.Errorf("isPL(%q) = %v; want %v", str, got, want)
-		}
-	}
-}
-
-// Implementation of String methods for various types for debugging purposes.
-
-func (m *matcher) String() string {
-	w := &bytes.Buffer{}
-	fmt.Fprintln(w, "Default:", m.default_)
-	for tag, h := range m.index {
-		fmt.Fprintf(w, "  %s: %v\n", tag, h)
-	}
-	return w.String()
-}
-
-func (h *matchHeader) String() string {
-	w := &bytes.Buffer{}
-	fmt.Fprint(w, "haveTag: ")
-	for _, h := range h.haveTags {
-		fmt.Fprintf(w, "%v, ", h)
-	}
-	return w.String()
-}
-
-func (t haveTag) String() string {
-	return fmt.Sprintf("%v:%d:%v:%v-%v|%v", t.tag, t.index, t.conf, t.maxRegion, t.maxScript, t.altScript)
-}
-
-func TestBestMatchAlloc(t *testing.T) {
-	m := NewMatcher(makeTagList("en sr nl"))
-	// Go allocates when creating a list of tags from a single tag!
-	list := []Tag{English}
-	avg := testtext.AllocsPerRun(1, func() {
-		m.Match(list...)
-	})
-	if avg > 0 {
-		t.Errorf("got %f; want 0", avg)
-	}
-}
-
-var benchHave = []Tag{
-	mk("en"),
-	mk("en-GB"),
-	mk("za"),
-	mk("zh-Hant"),
-	mk("zh-Hans-CN"),
-	mk("zh"),
-	mk("zh-HK"),
-	mk("ar-MK"),
-	mk("en-CA"),
-	mk("fr-CA"),
-	mk("fr-US"),
-	mk("fr-CH"),
-	mk("fr"),
-	mk("lt"),
-	mk("lv"),
-	mk("iw"),
-	mk("iw-NL"),
-	mk("he"),
-	mk("he-IT"),
-	mk("tlh"),
-	mk("ja"),
-	mk("ja-Jpan"),
-	mk("ja-Jpan-JP"),
-	mk("de"),
-	mk("de-CH"),
-	mk("de-AT"),
-	mk("de-DE"),
-	mk("sr"),
-	mk("sr-Latn"),
-	mk("sr-Cyrl"),
-	mk("sr-ME"),
-}
-
-var benchWant = [][]Tag{
-	[]Tag{
-		mk("en"),
-	},
-	[]Tag{
-		mk("en-AU"),
-		mk("de-HK"),
-		mk("nl"),
-		mk("fy"),
-		mk("lv"),
-	},
-	[]Tag{
-		mk("en-AU"),
-		mk("de-HK"),
-		mk("nl"),
-		mk("fy"),
-	},
-	[]Tag{
-		mk("ja-Hant"),
-		mk("da-HK"),
-		mk("nl"),
-		mk("zh-TW"),
-	},
-	[]Tag{
-		mk("ja-Hant"),
-		mk("da-HK"),
-		mk("nl"),
-		mk("hr"),
-	},
-}
-
-func BenchmarkMatch(b *testing.B) {
-	m := newMatcher(benchHave, nil)
-	for i := 0; i < b.N; i++ {
-		for _, want := range benchWant {
-			m.getBest(want...)
-		}
-	}
-}
-
-func BenchmarkMatchExact(b *testing.B) {
-	want := mk("en")
-	m := newMatcher(benchHave, nil)
-	for i := 0; i < b.N; i++ {
-		m.getBest(want)
-	}
-}
-
-func BenchmarkMatchAltLanguagePresent(b *testing.B) {
-	want := mk("hr")
-	m := newMatcher(benchHave, nil)
-	for i := 0; i < b.N; i++ {
-		m.getBest(want)
-	}
-}
-
-func BenchmarkMatchAltLanguageNotPresent(b *testing.B) {
-	want := mk("nn")
-	m := newMatcher(benchHave, nil)
-	for i := 0; i < b.N; i++ {
-		m.getBest(want)
-	}
-}
-
-func BenchmarkMatchAltScriptPresent(b *testing.B) {
-	want := mk("zh-Hant-CN")
-	m := newMatcher(benchHave, nil)
-	for i := 0; i < b.N; i++ {
-		m.getBest(want)
-	}
-}
-
-func BenchmarkMatchAltScriptNotPresent(b *testing.B) {
-	want := mk("fr-Cyrl")
-	m := newMatcher(benchHave, nil)
-	for i := 0; i < b.N; i++ {
-		m.getBest(want)
-	}
-}
-
-func BenchmarkMatchLimitedExact(b *testing.B) {
-	want := []Tag{mk("he-NL"), mk("iw-NL")}
-	m := newMatcher(benchHave, nil)
-	for i := 0; i < b.N; i++ {
-		m.getBest(want...)
-	}
-}
diff --git a/vendor/golang.org/x/text/language/parse_test.go b/vendor/golang.org/x/text/language/parse_test.go
deleted file mode 100644
index 9b40eb44..00000000
--- a/vendor/golang.org/x/text/language/parse_test.go
+++ /dev/null
@@ -1,517 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package language
-
-import (
-	"bytes"
-	"strings"
-	"testing"
-
-	"golang.org/x/text/internal/tag"
-)
-
-type scanTest struct {
-	ok  bool // true if scanning does not result in an error
-	in  string
-	tok []string // the expected tokens
-}
-
-var tests = []scanTest{
-	{true, "", []string{}},
-	{true, "1", []string{"1"}},
-	{true, "en", []string{"en"}},
-	{true, "root", []string{"root"}},
-	{true, "maxchars", []string{"maxchars"}},
-	{false, "bad/", []string{}},
-	{false, "morethan8", []string{}},
-	{false, "-", []string{}},
-	{false, "----", []string{}},
-	{false, "_", []string{}},
-	{true, "en-US", []string{"en", "US"}},
-	{true, "en_US", []string{"en", "US"}},
-	{false, "en-US-", []string{"en", "US"}},
-	{false, "en-US--", []string{"en", "US"}},
-	{false, "en-US---", []string{"en", "US"}},
-	{false, "en--US", []string{"en", "US"}},
-	{false, "-en-US", []string{"en", "US"}},
-	{false, "-en--US-", []string{"en", "US"}},
-	{false, "-en--US-", []string{"en", "US"}},
-	{false, "en-.-US", []string{"en", "US"}},
-	{false, ".-en--US-.", []string{"en", "US"}},
-	{false, "en-u.-US", []string{"en", "US"}},
-	{true, "en-u1-US", []string{"en", "u1", "US"}},
-	{true, "maxchar1_maxchar2-maxchar3", []string{"maxchar1", "maxchar2", "maxchar3"}},
-	{false, "moreThan8-moreThan8-e", []string{"e"}},
-}
-
-func TestScan(t *testing.T) {
-	for i, tt := range tests {
-		scan := makeScannerString(tt.in)
-		for j := 0; !scan.done; j++ {
-			if j >= len(tt.tok) {
-				t.Errorf("%d: extra token %q", i, scan.token)
-			} else if tag.Compare(tt.tok[j], scan.token) != 0 {
-				t.Errorf("%d: token %d: found %q; want %q", i, j, scan.token, tt.tok[j])
-				break
-			}
-			scan.scan()
-		}
-		if s := strings.Join(tt.tok, "-"); tag.Compare(s, bytes.Replace(scan.b, b("_"), b("-"), -1)) != 0 {
-			t.Errorf("%d: input: found %q; want %q", i, scan.b, s)
-		}
-		if (scan.err == nil) != tt.ok {
-			t.Errorf("%d: ok: found %v; want %v", i, scan.err == nil, tt.ok)
-		}
-	}
-}
-
-func TestAcceptMinSize(t *testing.T) {
-	for i, tt := range tests {
-		// count number of successive tokens with a minimum size.
-		for sz := 1; sz <= 8; sz++ {
-			scan := makeScannerString(tt.in)
-			scan.end, scan.next = 0, 0
-			end := scan.acceptMinSize(sz)
-			n := 0
-			for i := 0; i < len(tt.tok) && len(tt.tok[i]) >= sz; i++ {
-				n += len(tt.tok[i])
-				if i > 0 {
-					n++
-				}
-			}
-			if end != n {
-				t.Errorf("%d:%d: found len %d; want %d", i, sz, end, n)
-			}
-		}
-	}
-}
-
-type parseTest struct {
-	i                    int // the index of this test
-	in                   string
-	lang, script, region string
-	variants, ext        string
-	extList              []string // only used when more than one extension is present
-	invalid              bool
-	rewrite              bool // special rewrite not handled by parseTag
-	changed              bool // string needed to be reformatted
-}
-
-func parseTests() []parseTest {
-	tests := []parseTest{
-		{in: "root", lang: "und"},
-		{in: "und", lang: "und"},
-		{in: "en", lang: "en"},
-		{in: "xy", lang: "und", invalid: true},
-		{in: "en-ZY", lang: "en", invalid: true},
-		{in: "gsw", lang: "gsw"},
-		{in: "sr_Latn", lang: "sr", script: "Latn"},
-		{in: "af-Arab", lang: "af", script: "Arab"},
-		{in: "nl-BE", lang: "nl", region: "BE"},
-		{in: "es-419", lang: "es", region: "419"},
-		{in: "und-001", lang: "und", region: "001"},
-		{in: "de-latn-be", lang: "de", script: "Latn", region: "BE"},
-		// Variants
-		{in: "de-1901", lang: "de", variants: "1901"},
-		// Accept with unsuppressed script.
-		{in: "de-Latn-1901", lang: "de", script: "Latn", variants: "1901"},
-		// Specialized.
-		{in: "sl-rozaj", lang: "sl", variants: "rozaj"},
-		{in: "sl-rozaj-lipaw", lang: "sl", variants: "rozaj-lipaw"},
-		{in: "sl-rozaj-biske", lang: "sl", variants: "rozaj-biske"},
-		{in: "sl-rozaj-biske-1994", lang: "sl", variants: "rozaj-biske-1994"},
-		{in: "sl-rozaj-1994", lang: "sl", variants: "rozaj-1994"},
-		// Maximum number of variants while adhering to prefix rules.
-		{in: "sl-rozaj-biske-1994-alalc97-fonipa-fonupa-fonxsamp", lang: "sl", variants: "rozaj-biske-1994-alalc97-fonipa-fonupa-fonxsamp"},
-
-		// Sorting.
-		{in: "sl-1994-biske-rozaj", lang: "sl", variants: "rozaj-biske-1994", changed: true},
-		{in: "sl-rozaj-biske-1994-alalc97-fonupa-fonipa-fonxsamp", lang: "sl", variants: "rozaj-biske-1994-alalc97-fonipa-fonupa-fonxsamp", changed: true},
-		{in: "nl-fonxsamp-alalc97-fonipa-fonupa", lang: "nl", variants: "alalc97-fonipa-fonupa-fonxsamp", changed: true},
-
-		// Duplicates variants are removed, but not an error.
-		{in: "nl-fonupa-fonupa", lang: "nl", variants: "fonupa"},
-
-		// Variants that do not have correct prefixes. We still accept these.
-		{in: "de-Cyrl-1901", lang: "de", script: "Cyrl", variants: "1901"},
-		{in: "sl-rozaj-lipaw-1994", lang: "sl", variants: "rozaj-lipaw-1994"},
-		{in: "sl-1994-biske-rozaj-1994-biske-rozaj", lang: "sl", variants: "rozaj-biske-1994", changed: true},
-		{in: "de-Cyrl-1901", lang: "de", script: "Cyrl", variants: "1901"},
-
-		// Invalid variant.
-		{in: "de-1902", lang: "de", variants: "", invalid: true},
-
-		{in: "EN_CYRL", lang: "en", script: "Cyrl"},
-		// private use and extensions
-		{in: "x-a-b-c-d", ext: "x-a-b-c-d"},
-		{in: "x_A.-B-C_D", ext: "x-b-c-d", invalid: true, changed: true},
-		{in: "x-aa-bbbb-cccccccc-d", ext: "x-aa-bbbb-cccccccc-d"},
-		{in: "en-c_cc-b-bbb-a-aaa", lang: "en", changed: true, extList: []string{"a-aaa", "b-bbb", "c-cc"}},
-		{in: "en-x_cc-b-bbb-a-aaa", lang: "en", ext: "x-cc-b-bbb-a-aaa", changed: true},
-		{in: "en-c_cc-b-bbb-a-aaa-x-x", lang: "en", changed: true, extList: []string{"a-aaa", "b-bbb", "c-cc", "x-x"}},
-		{in: "en-v-c", lang: "en", ext: "", invalid: true},
-		{in: "en-v-abcdefghi", lang: "en", ext: "", invalid: true},
-		{in: "en-v-abc-x", lang: "en", ext: "v-abc", invalid: true},
-		{in: "en-v-abc-x-", lang: "en", ext: "v-abc", invalid: true},
-		{in: "en-v-abc-w-x-xx", lang: "en", extList: []string{"v-abc", "x-xx"}, invalid: true, changed: true},
-		{in: "en-v-abc-w-y-yx", lang: "en", extList: []string{"v-abc", "y-yx"}, invalid: true, changed: true},
-		{in: "en-v-c-abc", lang: "en", ext: "c-abc", invalid: true, changed: true},
-		{in: "en-v-w-abc", lang: "en", ext: "w-abc", invalid: true, changed: true},
-		{in: "en-v-x-abc", lang: "en", ext: "x-abc", invalid: true, changed: true},
-		{in: "en-v-x-a", lang: "en", ext: "x-a", invalid: true, changed: true},
-		{in: "en-9-aa-0-aa-z-bb-x-a", lang: "en", extList: []string{"0-aa", "9-aa", "z-bb", "x-a"}, changed: true},
-		{in: "en-u-c", lang: "en", ext: "", invalid: true},
-		{in: "en-u-co-phonebk", lang: "en", ext: "u-co-phonebk"},
-		{in: "en-u-co-phonebk-ca", lang: "en", ext: "u-co-phonebk", invalid: true},
-		{in: "en-u-nu-arabic-co-phonebk-ca", lang: "en", ext: "u-co-phonebk-nu-arabic", invalid: true, changed: true},
-		{in: "en-u-nu-arabic-co-phonebk-ca-x", lang: "en", ext: "u-co-phonebk-nu-arabic", invalid: true, changed: true},
-		{in: "en-u-nu-arabic-co-phonebk-ca-s", lang: "en", ext: "u-co-phonebk-nu-arabic", invalid: true, changed: true},
-		{in: "en-u-nu-arabic-co-phonebk-ca-a12345678", lang: "en", ext: "u-co-phonebk-nu-arabic", invalid: true, changed: true},
-		{in: "en-u-co-phonebook", lang: "en", ext: "", invalid: true},
-		{in: "en-u-co-phonebook-cu-xau", lang: "en", ext: "u-cu-xau", invalid: true, changed: true},
-		{in: "en-Cyrl-u-co-phonebk", lang: "en", script: "Cyrl", ext: "u-co-phonebk"},
-		{in: "en-US-u-co-phonebk", lang: "en", region: "US", ext: "u-co-phonebk"},
-		{in: "en-US-u-co-phonebk-cu-xau", lang: "en", region: "US", ext: "u-co-phonebk-cu-xau"},
-		{in: "en-scotland-u-co-phonebk", lang: "en", variants: "scotland", ext: "u-co-phonebk"},
-		{in: "en-u-cu-xua-co-phonebk", lang: "en", ext: "u-co-phonebk-cu-xua", changed: true},
-		{in: "en-u-def-abc-cu-xua-co-phonebk", lang: "en", ext: "u-abc-def-co-phonebk-cu-xua", changed: true},
-		{in: "en-u-def-abc", lang: "en", ext: "u-abc-def", changed: true},
-		{in: "en-u-cu-xua-co-phonebk-a-cd", lang: "en", extList: []string{"a-cd", "u-co-phonebk-cu-xua"}, changed: true},
-		// Invalid "u" extension. Drop invalid parts.
-		{in: "en-u-cu-co-phonebk", lang: "en", extList: []string{"u-co-phonebk"}, invalid: true, changed: true},
-		{in: "en-u-cu-xau-co", lang: "en", extList: []string{"u-cu-xau"}, invalid: true},
-		// We allow duplicate keys as the LDML spec does not explicitly prohibit it.
-		// TODO: Consider eliminating duplicates and returning an error.
-		{in: "en-u-cu-xau-co-phonebk-cu-xau", lang: "en", ext: "u-co-phonebk-cu-xau-cu-xau", changed: true},
-		{in: "en-t-en-Cyrl-NL-fonipa", lang: "en", ext: "t-en-cyrl-nl-fonipa", changed: true},
-		{in: "en-t-en-Cyrl-NL-fonipa-t0-abc-def", lang: "en", ext: "t-en-cyrl-nl-fonipa-t0-abc-def", changed: true},
-		{in: "en-t-t0-abcd", lang: "en", ext: "t-t0-abcd"},
-		// Not necessary to have changed here.
-		{in: "en-t-nl-abcd", lang: "en", ext: "t-nl", invalid: true},
-		{in: "en-t-nl-latn", lang: "en", ext: "t-nl-latn"},
-		{in: "en-t-t0-abcd-x-a", lang: "en", extList: []string{"t-t0-abcd", "x-a"}},
-		// invalid
-		{in: "", lang: "und", invalid: true},
-		{in: "-", lang: "und", invalid: true},
-		{in: "x", lang: "und", invalid: true},
-		{in: "x-", lang: "und", invalid: true},
-		{in: "x--", lang: "und", invalid: true},
-		{in: "a-a-b-c-d", lang: "und", invalid: true},
-		{in: "en-", lang: "en", invalid: true},
-		{in: "enne-", lang: "und", invalid: true},
-		{in: "en.", lang: "und", invalid: true},
-		{in: "en.-latn", lang: "und", invalid: true},
-		{in: "en.-en", lang: "en", invalid: true},
-		{in: "x-a-tooManyChars-c-d", ext: "x-a-c-d", invalid: true, changed: true},
-		{in: "a-tooManyChars-c-d", lang: "und", invalid: true},
-		// TODO: check key-value validity
-		// { in: "en-u-cu-xd", lang: "en", ext: "u-cu-xd", invalid: true },
-		{in: "en-t-abcd", lang: "en", invalid: true},
-		{in: "en-Latn-US-en", lang: "en", script: "Latn", region: "US", invalid: true},
-		// rewrites (more tests in TestGrandfathered)
-		{in: "zh-min-nan", lang: "nan"},
-		{in: "zh-yue", lang: "yue"},
-		{in: "zh-xiang", lang: "hsn", rewrite: true},
-		{in: "zh-guoyu", lang: "cmn", rewrite: true},
-		{in: "iw", lang: "iw"},
-		{in: "sgn-BE-FR", lang: "sfb", rewrite: true},
-		{in: "i-klingon", lang: "tlh", rewrite: true},
-	}
-	for i, tt := range tests {
-		tests[i].i = i
-		if tt.extList != nil {
-			tests[i].ext = strings.Join(tt.extList, "-")
-		}
-		if tt.ext != "" && tt.extList == nil {
-			tests[i].extList = []string{tt.ext}
-		}
-	}
-	return tests
-}
-
-func TestParseExtensions(t *testing.T) {
-	for i, tt := range parseTests() {
-		if tt.ext == "" || tt.rewrite {
-			continue
-		}
-		scan := makeScannerString(tt.in)
-		if len(scan.b) > 1 && scan.b[1] != '-' {
-			scan.end = nextExtension(string(scan.b), 0)
-			scan.next = scan.end + 1
-			scan.scan()
-		}
-		start := scan.start
-		scan.toLower(start, len(scan.b))
-		parseExtensions(&scan)
-		ext := string(scan.b[start:])
-		if ext != tt.ext {
-			t.Errorf("%d(%s): ext was %v; want %v", i, tt.in, ext, tt.ext)
-		}
-		if changed := !strings.HasPrefix(tt.in[start:], ext); changed != tt.changed {
-			t.Errorf("%d(%s): changed was %v; want %v", i, tt.in, changed, tt.changed)
-		}
-	}
-}
-
-// partChecks runs checks for each part by calling the function returned by f.
-func partChecks(t *testing.T, f func(*parseTest) (Tag, bool)) {
-	for i, tt := range parseTests() {
-		tag, skip := f(&tt)
-		if skip {
-			continue
-		}
-		if l, _ := getLangID(b(tt.lang)); l != tag.lang {
-			t.Errorf("%d: lang was %q; want %q", i, tag.lang, l)
-		}
-		if sc, _ := getScriptID(script, b(tt.script)); sc != tag.script {
-			t.Errorf("%d: script was %q; want %q", i, tag.script, sc)
-		}
-		if r, _ := getRegionID(b(tt.region)); r != tag.region {
-			t.Errorf("%d: region was %q; want %q", i, tag.region, r)
-		}
-		if tag.str == "" {
-			continue
-		}
-		p := int(tag.pVariant)
-		if p < int(tag.pExt) {
-			p++
-		}
-		if s, g := tag.str[p:tag.pExt], tt.variants; s != g {
-			t.Errorf("%d: variants was %q; want %q", i, s, g)
-		}
-		p = int(tag.pExt)
-		if p > 0 && p < len(tag.str) {
-			p++
-		}
-		if s, g := (tag.str)[p:], tt.ext; s != g {
-			t.Errorf("%d: extensions were %q; want %q", i, s, g)
-		}
-	}
-}
-
-func TestParseTag(t *testing.T) {
-	partChecks(t, func(tt *parseTest) (id Tag, skip bool) {
-		if strings.HasPrefix(tt.in, "x-") || tt.rewrite {
-			return Tag{}, true
-		}
-		scan := makeScannerString(tt.in)
-		id, end := parseTag(&scan)
-		id.str = string(scan.b[:end])
-		tt.ext = ""
-		tt.extList = []string{}
-		return id, false
-	})
-}
-
-func TestParse(t *testing.T) {
-	partChecks(t, func(tt *parseTest) (id Tag, skip bool) {
-		id, err := Raw.Parse(tt.in)
-		ext := ""
-		if id.str != "" {
-			if strings.HasPrefix(id.str, "x-") {
-				ext = id.str
-			} else if int(id.pExt) < len(id.str) && id.pExt > 0 {
-				ext = id.str[id.pExt+1:]
-			}
-		}
-		if tag, _ := Raw.Parse(id.String()); tag.String() != id.String() {
-			t.Errorf("%d:%s: reparse was %q; want %q", tt.i, tt.in, id.String(), tag.String())
-		}
-		if ext != tt.ext {
-			t.Errorf("%d:%s: ext was %q; want %q", tt.i, tt.in, ext, tt.ext)
-		}
-		changed := id.str != "" && !strings.HasPrefix(tt.in, id.str)
-		if changed != tt.changed {
-			t.Errorf("%d:%s: changed was %v; want %v", tt.i, tt.in, changed, tt.changed)
-		}
-		if (err != nil) != tt.invalid {
-			t.Errorf("%d:%s: invalid was %v; want %v. Error: %v", tt.i, tt.in, err != nil, tt.invalid, err)
-		}
-		return id, false
-	})
-}
-
-func TestErrors(t *testing.T) {
-	mkInvalid := func(s string) error {
-		return mkErrInvalid([]byte(s))
-	}
-	tests := []struct {
-		in  string
-		out error
-	}{
-		// invalid subtags.
-		{"ac", mkInvalid("ac")},
-		{"AC", mkInvalid("ac")},
-		{"aa-Uuuu", mkInvalid("Uuuu")},
-		{"aa-AB", mkInvalid("AB")},
-		// ill-formed wins over invalid.
-		{"ac-u", errSyntax},
-		{"ac-u-ca", errSyntax},
-		{"ac-u-ca-co-pinyin", errSyntax},
-		{"noob", errSyntax},
-	}
-	for _, tt := range tests {
-		_, err := Parse(tt.in)
-		if err != tt.out {
-			t.Errorf("%s: was %q; want %q", tt.in, err, tt.out)
-		}
-	}
-}
-
-func TestCompose1(t *testing.T) {
-	partChecks(t, func(tt *parseTest) (id Tag, skip bool) {
-		l, _ := ParseBase(tt.lang)
-		s, _ := ParseScript(tt.script)
-		r, _ := ParseRegion(tt.region)
-		v := []Variant{}
-		for _, x := range strings.Split(tt.variants, "-") {
-			p, _ := ParseVariant(x)
-			v = append(v, p)
-		}
-		e := []Extension{}
-		for _, x := range tt.extList {
-			p, _ := ParseExtension(x)
-			e = append(e, p)
-		}
-		id, _ = Raw.Compose(l, s, r, v, e)
-		return id, false
-	})
-}
-
-func TestCompose2(t *testing.T) {
-	partChecks(t, func(tt *parseTest) (id Tag, skip bool) {
-		l, _ := ParseBase(tt.lang)
-		s, _ := ParseScript(tt.script)
-		r, _ := ParseRegion(tt.region)
-		p := []interface{}{l, s, r, s, r, l}
-		for _, x := range strings.Split(tt.variants, "-") {
-			v, _ := ParseVariant(x)
-			p = append(p, v)
-		}
-		for _, x := range tt.extList {
-			e, _ := ParseExtension(x)
-			p = append(p, e)
-		}
-		id, _ = Raw.Compose(p...)
-		return id, false
-	})
-}
-
-func TestCompose3(t *testing.T) {
-	partChecks(t, func(tt *parseTest) (id Tag, skip bool) {
-		id, _ = Raw.Parse(tt.in)
-		id, _ = Raw.Compose(id)
-		return id, false
-	})
-}
-
-func mk(s string) Tag {
-	return Raw.Make(s)
-}
-
-func TestParseAcceptLanguage(t *testing.T) {
-	type res struct {
-		t Tag
-		q float32
-	}
-	en := []res{{mk("en"), 1.0}}
-	tests := []struct {
-		out []res
-		in  string
-		ok  bool
-	}{
-		{en, "en", true},
-		{en, "   en", true},
-		{en, "en   ", true},
-		{en, "  en  ", true},
-		{en, "en,", true},
-		{en, ",en", true},
-		{en, ",,,en,,,", true},
-		{en, ",en;q=1", true},
-
-		// We allow an empty input, contrary to spec.
-		{nil, "", true},
-		{[]res{{mk("aa"), 1}}, "aa;", true}, // allow unspecified weight
-
-		// errors
-		{nil, ";", false},
-		{nil, "$", false},
-		{nil, "e;", false},
-		{nil, "x;", false},
-		{nil, "x", false},
-		{nil, "ac", false}, // non-existing language
-		{nil, "aa;q", false},
-		{nil, "aa;q=", false},
-		{nil, "aa;q=.", false},
-
-		// odd fallbacks
-		{
-			[]res{{mk("en"), 0.1}},
-			" english ;q=.1",
-			true,
-		},
-		{
-			[]res{{mk("it"), 1.0}, {mk("de"), 1.0}, {mk("fr"), 1.0}},
-			" italian, deutsch, french",
-			true,
-		},
-
-		// lists
-		{
-			[]res{{mk("en"), 0.1}},
-			"en;q=.1",
-			true,
-		},
-		{
-			[]res{{mk("mul"), 1.0}},
-			"*",
-			true,
-		},
-		{
-			[]res{{mk("en"), 1.0}, {mk("de"), 1.0}},
-			"en,de",
-			true,
-		},
-		{
-			[]res{{mk("en"), 1.0}, {mk("de"), .5}},
-			"en,de;q=0.5",
-			true,
-		},
-		{
-			[]res{{mk("de"), 0.8}, {mk("en"), 0.5}},
-			"  en ;   q    =   0.5    ,  , de;q=0.8",
-			true,
-		},
-		{
-			[]res{{mk("en"), 1.0}, {mk("de"), 1.0}, {mk("fr"), 1.0}, {mk("tlh"), 1.0}},
-			"en,de,fr,i-klingon",
-			true,
-		},
-		// sorting
-		{
-			[]res{{mk("tlh"), 0.4}, {mk("de"), 0.2}, {mk("fr"), 0.2}, {mk("en"), 0.1}},
-			"en;q=0.1,de;q=0.2,fr;q=0.2,i-klingon;q=0.4",
-			true,
-		},
-		// dropping
-		{
-			[]res{{mk("fr"), 0.2}, {mk("en"), 0.1}},
-			"en;q=0.1,de;q=0,fr;q=0.2,i-klingon;q=0.0",
-			true,
-		},
-	}
-	for i, tt := range tests {
-		tags, qs, e := ParseAcceptLanguage(tt.in)
-		if e == nil != tt.ok {
-			t.Errorf("%d:%s:err: was %v; want %v", i, tt.in, e == nil, tt.ok)
-		}
-		for j, tag := range tags {
-			if out := tt.out[j]; !tag.equalTags(out.t) || qs[j] != out.q {
-				t.Errorf("%d:%s: was %s, %1f; want %s, %1f", i, tt.in, tag, qs[j], out.t, out.q)
-				break
-			}
-		}
-	}
-}
diff --git a/vendor/golang.org/x/text/secure/bidirule/bench_test.go b/vendor/golang.org/x/text/secure/bidirule/bench_test.go
deleted file mode 100644
index 2db922bf..00000000
--- a/vendor/golang.org/x/text/secure/bidirule/bench_test.go
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bidirule
-
-import (
-	"testing"
-
-	"golang.org/x/text/internal/testtext"
-)
-
-var benchData = []struct{ name, data string }{
-	{"ascii", "Scheveningen"},
-	{"arabic", "دبي"},
-	{"hangul", "다음과"},
-}
-
-func doBench(b *testing.B, fn func(b *testing.B, data string)) {
-	for _, d := range benchData {
-		testtext.Bench(b, d.name, func(b *testing.B) { fn(b, d.data) })
-	}
-}
-
-func BenchmarkSpan(b *testing.B) {
-	r := New()
-	doBench(b, func(b *testing.B, str string) {
-		b.SetBytes(int64(len(str)))
-		data := []byte(str)
-		for i := 0; i < b.N; i++ {
-			r.Reset()
-			r.Span(data, true)
-		}
-	})
-}
-
-func BenchmarkDirectionASCII(b *testing.B) {
-	doBench(b, func(b *testing.B, str string) {
-		b.SetBytes(int64(len(str)))
-		data := []byte(str)
-		for i := 0; i < b.N; i++ {
-			Direction(data)
-		}
-	})
-}
-
-func BenchmarkDirectionStringASCII(b *testing.B) {
-	doBench(b, func(b *testing.B, str string) {
-		b.SetBytes(int64(len(str)))
-		for i := 0; i < b.N; i++ {
-			DirectionString(str)
-		}
-	})
-}
diff --git a/vendor/golang.org/x/text/secure/bidirule/bidirule10.0.0_test.go b/vendor/golang.org/x/text/secure/bidirule/bidirule10.0.0_test.go
deleted file mode 100644
index 06ec5f5d..00000000
--- a/vendor/golang.org/x/text/secure/bidirule/bidirule10.0.0_test.go
+++ /dev/null
@@ -1,694 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.10
-
-package bidirule
-
-import (
-	"golang.org/x/text/transform"
-	"golang.org/x/text/unicode/bidi"
-)
-
-var testCases = [][]ruleTest{
-	// Go-specific rules.
-	// Invalid UTF-8 is invalid.
-	0: []ruleTest{{
-		in:  "",
-		dir: bidi.LeftToRight,
-	}, {
-		in:  "\x80",
-		dir: bidi.LeftToRight,
-		err: ErrInvalid,
-		n:   0,
-	}, {
-		in:  "\xcc",
-		dir: bidi.LeftToRight,
-		err: ErrInvalid,
-		n:   0,
-	}, {
-		in:  "abc\x80",
-		dir: bidi.LeftToRight,
-		err: ErrInvalid,
-		n:   3,
-	}, {
-		in:  "abc\xcc",
-		dir: bidi.LeftToRight,
-		err: ErrInvalid,
-		n:   3,
-	}, {
-		in:  "abc\xccdef",
-		dir: bidi.LeftToRight,
-		err: ErrInvalid,
-		n:   3,
-	}, {
-		in:  "\xccdef",
-		dir: bidi.LeftToRight,
-		err: ErrInvalid,
-		n:   0,
-	}, {
-		in:  strR + "\x80",
-		dir: bidi.RightToLeft,
-		err: ErrInvalid,
-		n:   len(strR),
-	}, {
-		in:  strR + "\xcc",
-		dir: bidi.RightToLeft,
-		err: ErrInvalid,
-		n:   len(strR),
-	}, {
-		in:  strAL + "\xcc" + strR,
-		dir: bidi.RightToLeft,
-		err: ErrInvalid,
-		n:   len(strAL),
-	}, {
-		in:  "\xcc" + strR,
-		dir: bidi.RightToLeft,
-		err: ErrInvalid,
-		n:   0,
-	}},
-
-	// Rule 2.1: The first character must be a character with Bidi property L,
-	// R, or AL.  If it has the R or AL property, it is an RTL label; if it has
-	// the L property, it is an LTR label.
-	1: []ruleTest{{
-		in:  strL,
-		dir: bidi.LeftToRight,
-	}, {
-		in:  strR,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strAL,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strAN,
-		dir: bidi.RightToLeft,
-		err: ErrInvalid,
-	}, {
-		in:  strEN,
-		dir: bidi.LeftToRight,
-		err: ErrInvalid,
-		n:   len(strEN),
-	}, {
-		in:  strES,
-		dir: bidi.LeftToRight,
-		err: ErrInvalid,
-		n:   len(strES),
-	}, {
-		in:  strET,
-		dir: bidi.LeftToRight,
-		err: ErrInvalid,
-		n:   len(strET),
-	}, {
-		in:  strCS,
-		dir: bidi.LeftToRight,
-		err: ErrInvalid,
-		n:   len(strCS),
-	}, {
-		in:  strNSM,
-		dir: bidi.LeftToRight,
-		err: ErrInvalid,
-		n:   len(strNSM),
-	}, {
-		in:  strBN,
-		dir: bidi.LeftToRight,
-		err: ErrInvalid,
-		n:   len(strBN),
-	}, {
-		in:  strB,
-		dir: bidi.LeftToRight,
-		err: ErrInvalid,
-		n:   len(strB),
-	}, {
-		in:  strS,
-		dir: bidi.LeftToRight,
-		err: ErrInvalid,
-		n:   len(strS),
-	}, {
-		in:  strWS,
-		dir: bidi.LeftToRight,
-		err: ErrInvalid,
-		n:   len(strWS),
-	}, {
-		in:  strON,
-		dir: bidi.LeftToRight,
-		err: ErrInvalid,
-		n:   len(strON),
-	}, {
-		in:  strEN + strR,
-		dir: bidi.RightToLeft,
-		err: ErrInvalid,
-		n:   3,
-	}, {
-		in:  strES + strR,
-		dir: bidi.RightToLeft,
-		err: ErrInvalid,
-		n:   2,
-	}, {
-		in:  strET + strR,
-		dir: bidi.RightToLeft,
-		err: ErrInvalid,
-		n:   1,
-	}, {
-		in:  strCS + strR,
-		dir: bidi.RightToLeft,
-		err: ErrInvalid,
-		n:   1,
-	}, {
-		in:  strNSM + strR,
-		dir: bidi.RightToLeft,
-		err: ErrInvalid,
-		n:   2,
-	}, {
-		in:  strBN + strR,
-		dir: bidi.RightToLeft,
-		err: ErrInvalid,
-		n:   3,
-	}, {
-		in:  strB + strR,
-		dir: bidi.RightToLeft,
-		err: ErrInvalid,
-		n:   3,
-	}, {
-		in:  strS + strR,
-		dir: bidi.RightToLeft,
-		err: ErrInvalid,
-		n:   1,
-	}, {
-		in:  strWS + strR,
-		dir: bidi.RightToLeft,
-		err: ErrInvalid,
-		n:   1,
-	}, {
-		in:  strON + strR,
-		dir: bidi.RightToLeft,
-		err: ErrInvalid,
-		n:   1,
-	}},
-
-	// Rule 2.2: In an RTL label, only characters with the Bidi properties R,
-	// AL, AN, EN, ES, CS, ET, ON, BN, or NSM are allowed.
-	2: []ruleTest{{
-		in:  strR + strR + strAL,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strR + strAL + strR,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strR + strAN + strAL,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strR + strEN + strR,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strR + strES + strR,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strR + strCS + strR,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strR + strET + strAL,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strR + strON + strR,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strR + strBN + strR,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strR + strNSM + strAL,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strR + strL + strR,
-		dir: bidi.RightToLeft,
-		n:   len(strR),
-		err: ErrInvalid,
-	}, {
-		in:  strR + strB + strR,
-		dir: bidi.RightToLeft,
-		n:   len(strR),
-		err: ErrInvalid,
-	}, {
-		in:  strR + strS + strAL,
-		dir: bidi.RightToLeft,
-		n:   len(strR),
-		err: ErrInvalid,
-	}, {
-		in:  strR + strWS + strAL,
-		dir: bidi.RightToLeft,
-		n:   len(strR),
-		err: ErrInvalid,
-	}, {
-		in:  strAL + strR + strAL,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strAL + strAL + strR,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strAL + strAN + strAL,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strAL + strEN + strR,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strAL + strES + strR,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strAL + strCS + strR,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strAL + strET + strAL,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strAL + strON + strR,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strAL + strBN + strR,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strAL + strNSM + strAL,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strAL + strL + strR,
-		dir: bidi.RightToLeft,
-		n:   len(strAL),
-		err: ErrInvalid,
-	}, {
-		in:  strAL + strB + strR,
-		dir: bidi.RightToLeft,
-		n:   len(strAL),
-		err: ErrInvalid,
-	}, {
-		in:  strAL + strS + strAL,
-		dir: bidi.RightToLeft,
-		n:   len(strAL),
-		err: ErrInvalid,
-	}, {
-		in:  strAL + strWS + strAL,
-		dir: bidi.RightToLeft,
-		n:   len(strAL),
-		err: ErrInvalid,
-	}},
-
-	// Rule 2.3: In an RTL label, the end of the label must be a character with
-	// Bidi property R, AL, EN, or AN, followed by zero or more characters with
-	// Bidi property NSM.
-	3: []ruleTest{{
-		in:  strR + strNSM,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strR + strR,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strR + strAL + strNSM,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strR + strEN + strNSM + strNSM,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strR + strAN,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strR + strES + strNSM,
-		dir: bidi.RightToLeft,
-		n:   len(strR + strES + strNSM),
-		err: ErrInvalid,
-	}, {
-		in:  strR + strCS + strNSM + strNSM,
-		dir: bidi.RightToLeft,
-		n:   len(strR + strCS + strNSM + strNSM),
-		err: ErrInvalid,
-	}, {
-		in:  strR + strET,
-		dir: bidi.RightToLeft,
-		n:   len(strR + strET),
-		err: ErrInvalid,
-	}, {
-		in:  strR + strON + strNSM,
-		dir: bidi.RightToLeft,
-		n:   len(strR + strON + strNSM),
-		err: ErrInvalid,
-	}, {
-		in:  strR + strBN + strNSM + strNSM,
-		dir: bidi.RightToLeft,
-		n:   len(strR + strBN + strNSM + strNSM),
-		err: ErrInvalid,
-	}, {
-		in:  strR + strL + strNSM,
-		dir: bidi.RightToLeft,
-		n:   len(strR),
-		err: ErrInvalid,
-	}, {
-		in:  strR + strB + strNSM + strNSM,
-		dir: bidi.RightToLeft,
-		n:   len(strR),
-		err: ErrInvalid,
-	}, {
-		in:  strR + strS,
-		dir: bidi.RightToLeft,
-		n:   len(strR),
-		err: ErrInvalid,
-	}, {
-		in:  strR + strWS,
-		dir: bidi.RightToLeft,
-		n:   len(strR),
-		err: ErrInvalid,
-	}, {
-		in:  strAL + strNSM,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strAL + strR,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strAL + strAL + strNSM,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strAL + strEN + strNSM + strNSM,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strAL + strAN,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strAL + strES + strNSM,
-		dir: bidi.RightToLeft,
-		n:   len(strAL + strES + strNSM),
-		err: ErrInvalid,
-	}, {
-		in:  strAL + strCS + strNSM + strNSM,
-		dir: bidi.RightToLeft,
-		n:   len(strAL + strCS + strNSM + strNSM),
-		err: ErrInvalid,
-	}, {
-		in:  strAL + strET,
-		dir: bidi.RightToLeft,
-		n:   len(strAL + strET),
-		err: ErrInvalid,
-	}, {
-		in:  strAL + strON + strNSM,
-		dir: bidi.RightToLeft,
-		n:   len(strAL + strON + strNSM),
-		err: ErrInvalid,
-	}, {
-		in:  strAL + strBN + strNSM + strNSM,
-		dir: bidi.RightToLeft,
-		n:   len(strAL + strBN + strNSM + strNSM),
-		err: ErrInvalid,
-	}, {
-		in:  strAL + strL + strNSM,
-		dir: bidi.RightToLeft,
-		n:   len(strAL),
-		err: ErrInvalid,
-	}, {
-		in:  strAL + strB + strNSM + strNSM,
-		dir: bidi.RightToLeft,
-		n:   len(strAL),
-		err: ErrInvalid,
-	}, {
-		in:  strAL + strS,
-		dir: bidi.RightToLeft,
-		n:   len(strAL),
-		err: ErrInvalid,
-	}, {
-		in:  strAL + strWS,
-		dir: bidi.RightToLeft,
-		n:   len(strAL),
-		err: ErrInvalid,
-	}},
-
-	// Rule 2.4: In an RTL label, if an EN is present, no AN may be present,
-	// and vice versa.
-	4: []ruleTest{{
-		in:  strR + strEN + strAN,
-		dir: bidi.RightToLeft,
-		n:   len(strR + strEN),
-		err: ErrInvalid,
-	}, {
-		in:  strR + strAN + strEN + strNSM,
-		dir: bidi.RightToLeft,
-		n:   len(strR + strAN),
-		err: ErrInvalid,
-	}, {
-		in:  strAL + strEN + strAN,
-		dir: bidi.RightToLeft,
-		n:   len(strAL + strEN),
-		err: ErrInvalid,
-	}, {
-		in:  strAL + strAN + strEN + strNSM,
-		dir: bidi.RightToLeft,
-		n:   len(strAL + strAN),
-		err: ErrInvalid,
-	}},
-
-	// Rule 2.5: In an LTR label, only characters with the Bidi properties L,
-	// EN, ES, CS, ET, ON, BN, or NSM are allowed.
-	5: []ruleTest{{
-		in:  strL + strL + strL,
-		dir: bidi.LeftToRight,
-	}, {
-		in:  strL + strEN + strL,
-		dir: bidi.LeftToRight,
-	}, {
-		in:  strL + strES + strL,
-		dir: bidi.LeftToRight,
-	}, {
-		in:  strL + strCS + strL,
-		dir: bidi.LeftToRight,
-	}, {
-		in:  strL + strET + strL,
-		dir: bidi.LeftToRight,
-	}, {
-		in:  strL + strON + strL,
-		dir: bidi.LeftToRight,
-	}, {
-		in:  strL + strBN + strL,
-		dir: bidi.LeftToRight,
-	}, {
-		in:  strL + strNSM + strL,
-		dir: bidi.LeftToRight,
-	}, {
-		in:  strL + strR + strL,
-		dir: bidi.RightToLeft,
-		n:   len(strL),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strAL + strL,
-		dir: bidi.RightToLeft,
-		n:   len(strL),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strAN + strL,
-		dir: bidi.RightToLeft,
-		n:   len(strL),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strB + strL,
-		dir: bidi.LeftToRight,
-		n:   len(strL + strB + strL),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strB + strL + strR,
-		dir: bidi.RightToLeft,
-		n:   len(strL + strB + strL),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strS + strL,
-		dir: bidi.LeftToRight,
-		n:   len(strL + strS + strL),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strS + strL + strR,
-		dir: bidi.RightToLeft,
-		n:   len(strL + strS + strL),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strWS + strL,
-		dir: bidi.LeftToRight,
-		n:   len(strL + strWS + strL),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strWS + strL + strR,
-		dir: bidi.RightToLeft,
-		n:   len(strL + strWS + strL),
-		err: ErrInvalid,
-	}},
-
-	// Rule 2.6: In an LTR label, the end of the label must be a character with
-	// Bidi property L or EN, followed by zero or more characters with Bidi
-	// property NSM.
-	6: []ruleTest{{
-		in:  strL,
-		dir: bidi.LeftToRight,
-	}, {
-		in:  strL + strNSM,
-		dir: bidi.LeftToRight,
-	}, {
-		in:  strL + strNSM + strNSM,
-		dir: bidi.LeftToRight,
-	}, {
-		in:  strL + strEN,
-		dir: bidi.LeftToRight,
-	}, {
-		in:  strL + strEN + strNSM,
-		dir: bidi.LeftToRight,
-	}, {
-		in:  strL + strEN + strNSM + strNSM,
-		dir: bidi.LeftToRight,
-	}, {
-		in:  strL + strES,
-		dir: bidi.LeftToRight,
-		n:   len(strL + strES),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strES + strR,
-		dir: bidi.RightToLeft,
-		n:   len(strL + strES),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strCS,
-		dir: bidi.LeftToRight,
-		n:   len(strL + strCS),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strCS + strR,
-		dir: bidi.RightToLeft,
-		n:   len(strL + strCS),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strET,
-		dir: bidi.LeftToRight,
-		n:   len(strL + strET),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strET + strR,
-		dir: bidi.RightToLeft,
-		n:   len(strL + strET),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strON,
-		dir: bidi.LeftToRight,
-		n:   len(strL + strON),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strON + strR,
-		dir: bidi.RightToLeft,
-		n:   len(strL + strON),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strBN,
-		dir: bidi.LeftToRight,
-		n:   len(strL + strBN),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strBN + strR,
-		dir: bidi.RightToLeft,
-		n:   len(strL + strBN),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strR,
-		dir: bidi.RightToLeft,
-		n:   len(strL),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strAL,
-		dir: bidi.RightToLeft,
-		n:   len(strL),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strAN,
-		dir: bidi.RightToLeft,
-		n:   len(strL),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strB,
-		dir: bidi.LeftToRight,
-		n:   len(strL + strB),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strB + strR,
-		dir: bidi.RightToLeft,
-		n:   len(strL + strB),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strS,
-		dir: bidi.LeftToRight,
-		n:   len(strL + strS),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strS + strR,
-		dir: bidi.RightToLeft,
-		n:   len(strL + strS),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strWS,
-		dir: bidi.LeftToRight,
-		n:   len(strL + strWS),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strWS + strR,
-		dir: bidi.RightToLeft,
-		n:   len(strL + strWS),
-		err: ErrInvalid,
-	}},
-
-	// Incremental processing.
-	9: []ruleTest{{
-		in:  "e\u0301", // é
-		dir: bidi.LeftToRight,
-
-		pSrc: 2,
-		nSrc: 1,
-		err0: transform.ErrShortSrc,
-	}, {
-		in:  "e\u1000f", // é
-		dir: bidi.LeftToRight,
-
-		pSrc: 3,
-		nSrc: 1,
-		err0: transform.ErrShortSrc,
-	}, {
-		// Remain invalid once invalid.
-		in:  strR + "ab",
-		dir: bidi.RightToLeft,
-		n:   len(strR),
-		err: ErrInvalid,
-
-		pSrc: len(strR) + 1,
-		nSrc: len(strR),
-		err0: ErrInvalid,
-	}, {
-		// Short destination
-		in:  "abcdefghij",
-		dir: bidi.LeftToRight,
-
-		pSrc:  10,
-		szDst: 5,
-		nSrc:  5,
-		err0:  transform.ErrShortDst,
-	}, {
-		in:  "\U000102f7",
-		dir: bidi.LeftToRight,
-		n:   len("\U000102f7"),
-		err: ErrInvalid,
-	}, {
-		// Short destination splitting input rune
-		in:  "e\u0301",
-		dir: bidi.LeftToRight,
-
-		pSrc:  3,
-		szDst: 2,
-		nSrc:  1,
-		err0:  transform.ErrShortDst,
-	}, {
-		// Unicode 10.0.0 IDNA test string.
-		in:  "FAX\u2a77\U0001d186",
-		dir: bidi.LeftToRight,
-		n:   len("FAX\u2a77\U0001d186"),
-		err: ErrInvalid,
-	}, {
-		in:  "\x80\u0660",
-		dir: bidi.RightToLeft,
-		n:   0,
-		err: ErrInvalid,
-	}},
-}
diff --git a/vendor/golang.org/x/text/secure/bidirule/bidirule9.0.0_test.go b/vendor/golang.org/x/text/secure/bidirule/bidirule9.0.0_test.go
deleted file mode 100644
index 008874ed..00000000
--- a/vendor/golang.org/x/text/secure/bidirule/bidirule9.0.0_test.go
+++ /dev/null
@@ -1,668 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !go1.10
-
-package bidirule
-
-import (
-	"golang.org/x/text/transform"
-	"golang.org/x/text/unicode/bidi"
-)
-
-var testCases = [][]ruleTest{
-	// Go-specific rules.
-	// Invalid UTF-8 is invalid.
-	0: []ruleTest{{
-		in:  "",
-		dir: bidi.LeftToRight,
-	}, {
-		in:  "\x80",
-		dir: bidi.LeftToRight,
-		err: ErrInvalid,
-		n:   0,
-	}, {
-		in:  "\xcc",
-		dir: bidi.LeftToRight,
-		err: ErrInvalid,
-		n:   0,
-	}, {
-		in:  "abc\x80",
-		dir: bidi.LeftToRight,
-		err: ErrInvalid,
-		n:   3,
-	}, {
-		in:  "abc\xcc",
-		dir: bidi.LeftToRight,
-		err: ErrInvalid,
-		n:   3,
-	}, {
-		in:  "abc\xccdef",
-		dir: bidi.LeftToRight,
-		err: ErrInvalid,
-		n:   3,
-	}, {
-		in:  "\xccdef",
-		dir: bidi.LeftToRight,
-		err: ErrInvalid,
-		n:   0,
-	}, {
-		in:  strR + "\x80",
-		dir: bidi.RightToLeft,
-		err: ErrInvalid,
-		n:   len(strR),
-	}, {
-		in:  strR + "\xcc",
-		dir: bidi.RightToLeft,
-		err: ErrInvalid,
-		n:   len(strR),
-	}, {
-		in:  strAL + "\xcc" + strR,
-		dir: bidi.RightToLeft,
-		err: ErrInvalid,
-		n:   len(strAL),
-	}, {
-		in:  "\xcc" + strR,
-		dir: bidi.RightToLeft,
-		err: ErrInvalid,
-		n:   0,
-	}},
-
-	// Rule 2.1: The first character must be a character with Bidi property L,
-	// R, or AL.  If it has the R or AL property, it is an RTL label; if it has
-	// the L property, it is an LTR label.
-	1: []ruleTest{{
-		in:  strL,
-		dir: bidi.LeftToRight,
-	}, {
-		in:  strR,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strAL,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strAN,
-		dir: bidi.RightToLeft,
-		err: ErrInvalid,
-	}, {
-		in:  strEN,
-		dir: bidi.LeftToRight,
-		err: nil, // not an RTL string
-	}, {
-		in:  strES,
-		dir: bidi.LeftToRight,
-		err: nil, // not an RTL string
-	}, {
-		in:  strET,
-		dir: bidi.LeftToRight,
-		err: nil, // not an RTL string
-	}, {
-		in:  strCS,
-		dir: bidi.LeftToRight,
-		err: nil, // not an RTL string
-	}, {
-		in:  strNSM,
-		dir: bidi.LeftToRight,
-		err: nil, // not an RTL string
-	}, {
-		in:  strBN,
-		dir: bidi.LeftToRight,
-		err: nil, // not an RTL string
-	}, {
-		in:  strB,
-		dir: bidi.LeftToRight,
-		err: nil, // not an RTL string
-	}, {
-		in:  strS,
-		dir: bidi.LeftToRight,
-		err: nil, // not an RTL string
-	}, {
-		in:  strWS,
-		dir: bidi.LeftToRight,
-		err: nil, // not an RTL string
-	}, {
-		in:  strON,
-		dir: bidi.LeftToRight,
-		err: nil, // not an RTL string
-	}, {
-		in:  strEN + strR,
-		dir: bidi.RightToLeft,
-		err: ErrInvalid,
-		n:   3,
-	}, {
-		in:  strES + strR,
-		dir: bidi.RightToLeft,
-		err: ErrInvalid,
-		n:   2,
-	}, {
-		in:  strET + strR,
-		dir: bidi.RightToLeft,
-		err: ErrInvalid,
-		n:   1,
-	}, {
-		in:  strCS + strR,
-		dir: bidi.RightToLeft,
-		err: ErrInvalid,
-		n:   1,
-	}, {
-		in:  strNSM + strR,
-		dir: bidi.RightToLeft,
-		err: ErrInvalid,
-		n:   2,
-	}, {
-		in:  strBN + strR,
-		dir: bidi.RightToLeft,
-		err: ErrInvalid,
-		n:   3,
-	}, {
-		in:  strB + strR,
-		dir: bidi.RightToLeft,
-		err: ErrInvalid,
-		n:   3,
-	}, {
-		in:  strS + strR,
-		dir: bidi.RightToLeft,
-		err: ErrInvalid,
-		n:   1,
-	}, {
-		in:  strWS + strR,
-		dir: bidi.RightToLeft,
-		err: ErrInvalid,
-		n:   1,
-	}, {
-		in:  strON + strR,
-		dir: bidi.RightToLeft,
-		err: ErrInvalid,
-		n:   1,
-	}},
-
-	// Rule 2.2: In an RTL label, only characters with the Bidi properties R,
-	// AL, AN, EN, ES, CS, ET, ON, BN, or NSM are allowed.
-	2: []ruleTest{{
-		in:  strR + strR + strAL,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strR + strAL + strR,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strR + strAN + strAL,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strR + strEN + strR,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strR + strES + strR,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strR + strCS + strR,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strR + strET + strAL,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strR + strON + strR,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strR + strBN + strR,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strR + strNSM + strAL,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strR + strL + strR,
-		dir: bidi.RightToLeft,
-		n:   len(strR),
-		err: ErrInvalid,
-	}, {
-		in:  strR + strB + strR,
-		dir: bidi.RightToLeft,
-		n:   len(strR),
-		err: ErrInvalid,
-	}, {
-		in:  strR + strS + strAL,
-		dir: bidi.RightToLeft,
-		n:   len(strR),
-		err: ErrInvalid,
-	}, {
-		in:  strR + strWS + strAL,
-		dir: bidi.RightToLeft,
-		n:   len(strR),
-		err: ErrInvalid,
-	}, {
-		in:  strAL + strR + strAL,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strAL + strAL + strR,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strAL + strAN + strAL,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strAL + strEN + strR,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strAL + strES + strR,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strAL + strCS + strR,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strAL + strET + strAL,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strAL + strON + strR,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strAL + strBN + strR,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strAL + strNSM + strAL,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strAL + strL + strR,
-		dir: bidi.RightToLeft,
-		n:   len(strAL),
-		err: ErrInvalid,
-	}, {
-		in:  strAL + strB + strR,
-		dir: bidi.RightToLeft,
-		n:   len(strAL),
-		err: ErrInvalid,
-	}, {
-		in:  strAL + strS + strAL,
-		dir: bidi.RightToLeft,
-		n:   len(strAL),
-		err: ErrInvalid,
-	}, {
-		in:  strAL + strWS + strAL,
-		dir: bidi.RightToLeft,
-		n:   len(strAL),
-		err: ErrInvalid,
-	}},
-
-	// Rule 2.3: In an RTL label, the end of the label must be a character with
-	// Bidi property R, AL, EN, or AN, followed by zero or more characters with
-	// Bidi property NSM.
-	3: []ruleTest{{
-		in:  strR + strNSM,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strR + strR,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strR + strAL + strNSM,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strR + strEN + strNSM + strNSM,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strR + strAN,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strR + strES + strNSM,
-		dir: bidi.RightToLeft,
-		n:   len(strR + strES + strNSM),
-		err: ErrInvalid,
-	}, {
-		in:  strR + strCS + strNSM + strNSM,
-		dir: bidi.RightToLeft,
-		n:   len(strR + strCS + strNSM + strNSM),
-		err: ErrInvalid,
-	}, {
-		in:  strR + strET,
-		dir: bidi.RightToLeft,
-		n:   len(strR + strET),
-		err: ErrInvalid,
-	}, {
-		in:  strR + strON + strNSM,
-		dir: bidi.RightToLeft,
-		n:   len(strR + strON + strNSM),
-		err: ErrInvalid,
-	}, {
-		in:  strR + strBN + strNSM + strNSM,
-		dir: bidi.RightToLeft,
-		n:   len(strR + strBN + strNSM + strNSM),
-		err: ErrInvalid,
-	}, {
-		in:  strR + strL + strNSM,
-		dir: bidi.RightToLeft,
-		n:   len(strR),
-		err: ErrInvalid,
-	}, {
-		in:  strR + strB + strNSM + strNSM,
-		dir: bidi.RightToLeft,
-		n:   len(strR),
-		err: ErrInvalid,
-	}, {
-		in:  strR + strS,
-		dir: bidi.RightToLeft,
-		n:   len(strR),
-		err: ErrInvalid,
-	}, {
-		in:  strR + strWS,
-		dir: bidi.RightToLeft,
-		n:   len(strR),
-		err: ErrInvalid,
-	}, {
-		in:  strAL + strNSM,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strAL + strR,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strAL + strAL + strNSM,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strAL + strEN + strNSM + strNSM,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strAL + strAN,
-		dir: bidi.RightToLeft,
-	}, {
-		in:  strAL + strES + strNSM,
-		dir: bidi.RightToLeft,
-		n:   len(strAL + strES + strNSM),
-		err: ErrInvalid,
-	}, {
-		in:  strAL + strCS + strNSM + strNSM,
-		dir: bidi.RightToLeft,
-		n:   len(strAL + strCS + strNSM + strNSM),
-		err: ErrInvalid,
-	}, {
-		in:  strAL + strET,
-		dir: bidi.RightToLeft,
-		n:   len(strAL + strET),
-		err: ErrInvalid,
-	}, {
-		in:  strAL + strON + strNSM,
-		dir: bidi.RightToLeft,
-		n:   len(strAL + strON + strNSM),
-		err: ErrInvalid,
-	}, {
-		in:  strAL + strBN + strNSM + strNSM,
-		dir: bidi.RightToLeft,
-		n:   len(strAL + strBN + strNSM + strNSM),
-		err: ErrInvalid,
-	}, {
-		in:  strAL + strL + strNSM,
-		dir: bidi.RightToLeft,
-		n:   len(strAL),
-		err: ErrInvalid,
-	}, {
-		in:  strAL + strB + strNSM + strNSM,
-		dir: bidi.RightToLeft,
-		n:   len(strAL),
-		err: ErrInvalid,
-	}, {
-		in:  strAL + strS,
-		dir: bidi.RightToLeft,
-		n:   len(strAL),
-		err: ErrInvalid,
-	}, {
-		in:  strAL + strWS,
-		dir: bidi.RightToLeft,
-		n:   len(strAL),
-		err: ErrInvalid,
-	}},
-
-	// Rule 2.4: In an RTL label, if an EN is present, no AN may be present,
-	// and vice versa.
-	4: []ruleTest{{
-		in:  strR + strEN + strAN,
-		dir: bidi.RightToLeft,
-		n:   len(strR + strEN),
-		err: ErrInvalid,
-	}, {
-		in:  strR + strAN + strEN + strNSM,
-		dir: bidi.RightToLeft,
-		n:   len(strR + strAN),
-		err: ErrInvalid,
-	}, {
-		in:  strAL + strEN + strAN,
-		dir: bidi.RightToLeft,
-		n:   len(strAL + strEN),
-		err: ErrInvalid,
-	}, {
-		in:  strAL + strAN + strEN + strNSM,
-		dir: bidi.RightToLeft,
-		n:   len(strAL + strAN),
-		err: ErrInvalid,
-	}},
-
-	// Rule 2.5: In an LTR label, only characters with the Bidi properties L,
-	// EN, ES, CS, ET, ON, BN, or NSM are allowed.
-	5: []ruleTest{{
-		in:  strL + strL + strL,
-		dir: bidi.LeftToRight,
-	}, {
-		in:  strL + strEN + strL,
-		dir: bidi.LeftToRight,
-	}, {
-		in:  strL + strES + strL,
-		dir: bidi.LeftToRight,
-	}, {
-		in:  strL + strCS + strL,
-		dir: bidi.LeftToRight,
-	}, {
-		in:  strL + strET + strL,
-		dir: bidi.LeftToRight,
-	}, {
-		in:  strL + strON + strL,
-		dir: bidi.LeftToRight,
-	}, {
-		in:  strL + strBN + strL,
-		dir: bidi.LeftToRight,
-	}, {
-		in:  strL + strNSM + strL,
-		dir: bidi.LeftToRight,
-	}, {
-		in:  strL + strR + strL,
-		dir: bidi.RightToLeft,
-		n:   len(strL),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strAL + strL,
-		dir: bidi.RightToLeft,
-		n:   len(strL),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strAN + strL,
-		dir: bidi.RightToLeft,
-		n:   len(strL),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strB + strL,
-		dir: bidi.LeftToRight,
-		n:   len(strL + strAN + strL),
-		err: nil,
-	}, {
-		in:  strL + strB + strL + strR,
-		dir: bidi.RightToLeft,
-		n:   len(strL + strB + strL),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strS + strL,
-		dir: bidi.LeftToRight,
-		n:   len(strL + strS + strL),
-		err: nil,
-	}, {
-		in:  strL + strS + strL + strR,
-		dir: bidi.RightToLeft,
-		n:   len(strL + strS + strL),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strWS + strL,
-		dir: bidi.LeftToRight,
-		n:   len(strL + strWS + strL),
-		err: nil,
-	}, {
-		in:  strL + strWS + strL + strR,
-		dir: bidi.RightToLeft,
-		n:   len(strL + strWS + strL),
-		err: ErrInvalid,
-	}},
-
-	// Rule 2.6: In an LTR label, the end of the label must be a character with
-	// Bidi property L or EN, followed by zero or more characters with Bidi
-	// property NSM.
-	6: []ruleTest{{
-		in:  strL,
-		dir: bidi.LeftToRight,
-	}, {
-		in:  strL + strNSM,
-		dir: bidi.LeftToRight,
-	}, {
-		in:  strL + strNSM + strNSM,
-		dir: bidi.LeftToRight,
-	}, {
-		in:  strL + strEN,
-		dir: bidi.LeftToRight,
-	}, {
-		in:  strL + strEN + strNSM,
-		dir: bidi.LeftToRight,
-	}, {
-		in:  strL + strEN + strNSM + strNSM,
-		dir: bidi.LeftToRight,
-	}, {
-		in:  strL + strES,
-		dir: bidi.LeftToRight,
-		n:   len(strL + strES),
-		err: nil,
-	}, {
-		in:  strL + strES + strR,
-		dir: bidi.RightToLeft,
-		n:   len(strL + strES),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strCS,
-		dir: bidi.LeftToRight,
-		n:   len(strL + strCS),
-		err: nil,
-	}, {
-		in:  strL + strCS + strR,
-		dir: bidi.RightToLeft,
-		n:   len(strL + strCS),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strET,
-		dir: bidi.LeftToRight,
-		n:   len(strL + strET),
-		err: nil,
-	}, {
-		in:  strL + strET + strR,
-		dir: bidi.RightToLeft,
-		n:   len(strL + strET),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strON,
-		dir: bidi.LeftToRight,
-		n:   len(strL + strON),
-		err: nil,
-	}, {
-		in:  strL + strON + strR,
-		dir: bidi.RightToLeft,
-		n:   len(strL + strON),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strBN,
-		dir: bidi.LeftToRight,
-		n:   len(strL + strBN),
-		err: nil,
-	}, {
-		in:  strL + strBN + strR,
-		dir: bidi.RightToLeft,
-		n:   len(strL + strBN),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strR,
-		dir: bidi.RightToLeft,
-		n:   len(strL),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strAL,
-		dir: bidi.RightToLeft,
-		n:   len(strL),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strAN,
-		dir: bidi.RightToLeft,
-		n:   len(strL),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strB,
-		dir: bidi.LeftToRight,
-		n:   len(strL + strB),
-		err: nil,
-	}, {
-		in:  strL + strB + strR,
-		dir: bidi.RightToLeft,
-		n:   len(strL + strB),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strB,
-		dir: bidi.LeftToRight,
-		n:   len(strL + strB),
-		err: nil,
-	}, {
-		in:  strL + strB + strR,
-		dir: bidi.RightToLeft,
-		n:   len(strL + strB),
-		err: ErrInvalid,
-	}, {
-		in:  strL + strB,
-		dir: bidi.LeftToRight,
-		n:   len(strL + strB),
-		err: nil,
-	}, {
-		in:  strL + strB + strR,
-		dir: bidi.RightToLeft,
-		n:   len(strL + strB),
-		err: ErrInvalid,
-	}},
-
-	// Incremental processing.
-	9: []ruleTest{{
-		in:  "e\u0301", // é
-		dir: bidi.LeftToRight,
-
-		pSrc: 2,
-		nSrc: 1,
-		err0: transform.ErrShortSrc,
-	}, {
-		in:  "e\u1000f", // é
-		dir: bidi.LeftToRight,
-
-		pSrc: 3,
-		nSrc: 1,
-		err0: transform.ErrShortSrc,
-	}, {
-		// Remain invalid once invalid.
-		in:  strR + "ab",
-		dir: bidi.RightToLeft,
-		n:   len(strR),
-		err: ErrInvalid,
-
-		pSrc: len(strR) + 1,
-		nSrc: len(strR),
-		err0: ErrInvalid,
-	}, {
-		// Short destination
-		in:  "abcdefghij",
-		dir: bidi.LeftToRight,
-
-		pSrc:  10,
-		szDst: 5,
-		nSrc:  5,
-		err0:  transform.ErrShortDst,
-	}, {
-		// Short destination splitting input rune
-		in:  "e\u0301",
-		dir: bidi.LeftToRight,
-
-		pSrc:  3,
-		szDst: 2,
-		nSrc:  1,
-		err0:  transform.ErrShortDst,
-	}},
-}
diff --git a/vendor/golang.org/x/text/secure/bidirule/bidirule_test.go b/vendor/golang.org/x/text/secure/bidirule/bidirule_test.go
deleted file mode 100644
index e8fde338..00000000
--- a/vendor/golang.org/x/text/secure/bidirule/bidirule_test.go
+++ /dev/null
@@ -1,168 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bidirule
-
-import (
-	"fmt"
-	"testing"
-
-	"golang.org/x/text/internal/testtext"
-	"golang.org/x/text/unicode/bidi"
-)
-
-const (
-	strL   = "ABC"    // Left to right - most letters in LTR scripts
-	strR   = "עברית"  // Right to left - most letters in non-Arabic RTL scripts
-	strAL  = "دبي"    // Arabic letters - most letters in the Arabic script
-	strEN  = "123"    // European Number (0-9, and Extended Arabic-Indic numbers)
-	strES  = "+-"     // European Number Separator (+ and -)
-	strET  = "$"      // European Number Terminator (currency symbols, the hash sign, the percent sign and so on)
-	strAN  = "\u0660" // Arabic Number; this encompasses the Arabic-Indic numbers, but not the Extended Arabic-Indic numbers
-	strCS  = ","      // Common Number Separator (. , / : et al)
-	strNSM = "\u0300" // Nonspacing Mark - most combining accents
-	strBN  = "\u200d" // Boundary Neutral - control characters (ZWNJ, ZWJ, and others)
-	strB   = "\u2029" // Paragraph Separator
-	strS   = "\u0009" // Segment Separator
-	strWS  = " "      // Whitespace, including the SPACE character
-	strON  = "@"      // Other Neutrals, including @, &, parentheses, MIDDLE DOT
-)
-
-type ruleTest struct {
-	in  string
-	dir bidi.Direction
-	n   int // position at which the rule fails
-	err error
-
-	// For tests that split the string in two.
-	pSrc  int   // number of source bytes to consume first
-	szDst int   // size of destination buffer
-	nSrc  int   // source bytes consumed and bytes written
-	err0  error // error after first run
-}
-
-func init() {
-	for rule, cases := range testCases {
-		for i, tc := range cases {
-			if tc.err == nil {
-				testCases[rule][i].n = len(tc.in)
-			}
-		}
-	}
-}
-
-func doTests(t *testing.T, fn func(t *testing.T, tc ruleTest)) {
-	for rule, cases := range testCases {
-		for i, tc := range cases {
-			name := fmt.Sprintf("%d/%d:%+q:%s", rule, i, tc.in, tc.in)
-			testtext.Run(t, name, func(t *testing.T) {
-				fn(t, tc)
-			})
-		}
-	}
-}
-
-func TestDirection(t *testing.T) {
-	doTests(t, func(t *testing.T, tc ruleTest) {
-		dir := Direction([]byte(tc.in))
-		if dir != tc.dir {
-			t.Errorf("dir was %v; want %v", dir, tc.dir)
-		}
-	})
-}
-
-func TestDirectionString(t *testing.T) {
-	doTests(t, func(t *testing.T, tc ruleTest) {
-		dir := DirectionString(tc.in)
-		if dir != tc.dir {
-			t.Errorf("dir was %v; want %v", dir, tc.dir)
-		}
-	})
-}
-
-func TestValid(t *testing.T) {
-	doTests(t, func(t *testing.T, tc ruleTest) {
-		got := Valid([]byte(tc.in))
-		want := tc.err == nil
-		if got != want {
-			t.Fatalf("Valid: got %v; want %v", got, want)
-		}
-
-		got = ValidString(tc.in)
-		want = tc.err == nil
-		if got != want {
-			t.Fatalf("Valid: got %v; want %v", got, want)
-		}
-	})
-}
-
-func TestSpan(t *testing.T) {
-	doTests(t, func(t *testing.T, tc ruleTest) {
-		// Skip tests that test for limited destination buffer size.
-		if tc.szDst > 0 {
-			return
-		}
-
-		r := New()
-		src := []byte(tc.in)
-
-		n, err := r.Span(src[:tc.pSrc], tc.pSrc == len(tc.in))
-		if err != tc.err0 {
-			t.Errorf("err0 was %v; want %v", err, tc.err0)
-		}
-		if n != tc.nSrc {
-			t.Fatalf("nSrc was %d; want %d", n, tc.nSrc)
-		}
-
-		n, err = r.Span(src[n:], true)
-		if err != tc.err {
-			t.Errorf("error was %v; want %v", err, tc.err)
-		}
-		if got := n + tc.nSrc; got != tc.n {
-			t.Errorf("n was %d; want %d", got, tc.n)
-		}
-	})
-}
-
-func TestTransform(t *testing.T) {
-	doTests(t, func(t *testing.T, tc ruleTest) {
-		r := New()
-
-		src := []byte(tc.in)
-		dst := make([]byte, len(tc.in))
-		if tc.szDst > 0 {
-			dst = make([]byte, tc.szDst)
-		}
-
-		// First transform operates on a zero-length string for most tests.
-		nDst, nSrc, err := r.Transform(dst, src[:tc.pSrc], tc.pSrc == len(tc.in))
-		if err != tc.err0 {
-			t.Errorf("err0 was %v; want %v", err, tc.err0)
-		}
-		if nDst != nSrc {
-			t.Fatalf("nDst (%d) and nSrc (%d) should match", nDst, nSrc)
-		}
-		if nSrc != tc.nSrc {
-			t.Fatalf("nSrc was %d; want %d", nSrc, tc.nSrc)
-		}
-
-		dst1 := make([]byte, len(tc.in))
-		copy(dst1, dst[:nDst])
-
-		nDst, nSrc, err = r.Transform(dst1[nDst:], src[nSrc:], true)
-		if err != tc.err {
-			t.Errorf("error was %v; want %v", err, tc.err)
-		}
-		if nDst != nSrc {
-			t.Fatalf("nDst (%d) and nSrc (%d) should match", nDst, nSrc)
-		}
-		n := nSrc + tc.nSrc
-		if n != tc.n {
-			t.Fatalf("n was %d; want %d", n, tc.n)
-		}
-		if got, want := string(dst1[:n]), tc.in[:tc.n]; got != want {
-			t.Errorf("got %+q; want %+q", got, want)
-		}
-	})
-}
diff --git a/vendor/golang.org/x/text/secure/doc.go b/vendor/golang.org/x/text/secure/doc.go
deleted file mode 100644
index e531c354..00000000
--- a/vendor/golang.org/x/text/secure/doc.go
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// secure is a repository of text security related packages.
-package secure // import "golang.org/x/text/secure"
diff --git a/vendor/golang.org/x/text/transform/examples_test.go b/vendor/golang.org/x/text/transform/examples_test.go
deleted file mode 100644
index f2e284db..00000000
--- a/vendor/golang.org/x/text/transform/examples_test.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package transform_test
-
-import (
-	"fmt"
-	"unicode"
-
-	"golang.org/x/text/transform"
-	"golang.org/x/text/unicode/norm"
-)
-
-func ExampleRemoveFunc() {
-	input := []byte(`tschüß; до свидания`)
-
-	b := make([]byte, len(input))
-
-	t := transform.RemoveFunc(unicode.IsSpace)
-	n, _, _ := t.Transform(b, input, true)
-	fmt.Println(string(b[:n]))
-
-	t = transform.RemoveFunc(func(r rune) bool {
-		return !unicode.Is(unicode.Latin, r)
-	})
-	n, _, _ = t.Transform(b, input, true)
-	fmt.Println(string(b[:n]))
-
-	n, _, _ = t.Transform(b, norm.NFD.Bytes(input), true)
-	fmt.Println(string(b[:n]))
-
-	// Output:
-	// tschüß;досвидания
-	// tschüß
-	// tschuß
-}
diff --git a/vendor/golang.org/x/text/transform/transform_test.go b/vendor/golang.org/x/text/transform/transform_test.go
deleted file mode 100644
index 771633d1..00000000
--- a/vendor/golang.org/x/text/transform/transform_test.go
+++ /dev/null
@@ -1,1317 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package transform
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"strconv"
-	"strings"
-	"testing"
-	"time"
-	"unicode/utf8"
-
-	"golang.org/x/text/internal/testtext"
-)
-
-type lowerCaseASCII struct{ NopResetter }
-
-func (lowerCaseASCII) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	n := len(src)
-	if n > len(dst) {
-		n, err = len(dst), ErrShortDst
-	}
-	for i, c := range src[:n] {
-		if 'A' <= c && c <= 'Z' {
-			c += 'a' - 'A'
-		}
-		dst[i] = c
-	}
-	return n, n, err
-}
-
-// lowerCaseASCIILookahead lowercases the string and reports ErrShortSrc as long
-// as the input is not atEOF.
-type lowerCaseASCIILookahead struct{ NopResetter }
-
-func (lowerCaseASCIILookahead) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	n := len(src)
-	if n > len(dst) {
-		n, err = len(dst), ErrShortDst
-	}
-	for i, c := range src[:n] {
-		if 'A' <= c && c <= 'Z' {
-			c += 'a' - 'A'
-		}
-		dst[i] = c
-	}
-	if !atEOF {
-		err = ErrShortSrc
-	}
-	return n, n, err
-}
-
-var errYouMentionedX = errors.New("you mentioned X")
-
-type dontMentionX struct{ NopResetter }
-
-func (dontMentionX) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	n := len(src)
-	if n > len(dst) {
-		n, err = len(dst), ErrShortDst
-	}
-	for i, c := range src[:n] {
-		if c == 'X' {
-			return i, i, errYouMentionedX
-		}
-		dst[i] = c
-	}
-	return n, n, err
-}
-
-var errAtEnd = errors.New("error after all text")
-
-type errorAtEnd struct{ NopResetter }
-
-func (errorAtEnd) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	n := copy(dst, src)
-	if n < len(src) {
-		return n, n, ErrShortDst
-	}
-	if atEOF {
-		return n, n, errAtEnd
-	}
-	return n, n, nil
-}
-
-type replaceWithConstant struct {
-	replacement string
-	written     int
-}
-
-func (t *replaceWithConstant) Reset() {
-	t.written = 0
-}
-
-func (t *replaceWithConstant) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	if atEOF {
-		nDst = copy(dst, t.replacement[t.written:])
-		t.written += nDst
-		if t.written < len(t.replacement) {
-			err = ErrShortDst
-		}
-	}
-	return nDst, len(src), err
-}
-
-type addAnXAtTheEnd struct{ NopResetter }
-
-func (addAnXAtTheEnd) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	n := copy(dst, src)
-	if n < len(src) {
-		return n, n, ErrShortDst
-	}
-	if !atEOF {
-		return n, n, nil
-	}
-	if len(dst) == n {
-		return n, n, ErrShortDst
-	}
-	dst[n] = 'X'
-	return n + 1, n, nil
-}
-
-// doublerAtEOF is a strange Transformer that transforms "this" to "tthhiiss",
-// but only if atEOF is true.
-type doublerAtEOF struct{ NopResetter }
-
-func (doublerAtEOF) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	if !atEOF {
-		return 0, 0, ErrShortSrc
-	}
-	for i, c := range src {
-		if 2*i+2 >= len(dst) {
-			return 2 * i, i, ErrShortDst
-		}
-		dst[2*i+0] = c
-		dst[2*i+1] = c
-	}
-	return 2 * len(src), len(src), nil
-}
-
-// rleDecode and rleEncode implement a toy run-length encoding: "aabbbbbbbbbb"
-// is encoded as "2a10b". The decoding is assumed to not contain any numbers.
-
-type rleDecode struct{ NopResetter }
-
-func (rleDecode) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-loop:
-	for len(src) > 0 {
-		n := 0
-		for i, c := range src {
-			if '0' <= c && c <= '9' {
-				n = 10*n + int(c-'0')
-				continue
-			}
-			if i == 0 {
-				return nDst, nSrc, errors.New("rleDecode: bad input")
-			}
-			if n > len(dst) {
-				return nDst, nSrc, ErrShortDst
-			}
-			for j := 0; j < n; j++ {
-				dst[j] = c
-			}
-			dst, src = dst[n:], src[i+1:]
-			nDst, nSrc = nDst+n, nSrc+i+1
-			continue loop
-		}
-		if atEOF {
-			return nDst, nSrc, errors.New("rleDecode: bad input")
-		}
-		return nDst, nSrc, ErrShortSrc
-	}
-	return nDst, nSrc, nil
-}
-
-type rleEncode struct {
-	NopResetter
-
-	// allowStutter means that "xxxxxxxx" can be encoded as "5x3x"
-	// instead of always as "8x".
-	allowStutter bool
-}
-
-func (e rleEncode) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	for len(src) > 0 {
-		n, c0 := len(src), src[0]
-		for i, c := range src[1:] {
-			if c != c0 {
-				n = i + 1
-				break
-			}
-		}
-		if n == len(src) && !atEOF && !e.allowStutter {
-			return nDst, nSrc, ErrShortSrc
-		}
-		s := strconv.Itoa(n)
-		if len(s) >= len(dst) {
-			return nDst, nSrc, ErrShortDst
-		}
-		copy(dst, s)
-		dst[len(s)] = c0
-		dst, src = dst[len(s)+1:], src[n:]
-		nDst, nSrc = nDst+len(s)+1, nSrc+n
-	}
-	return nDst, nSrc, nil
-}
-
-// trickler consumes all input bytes, but writes a single byte at a time to dst.
-type trickler []byte
-
-func (t *trickler) Reset() {
-	*t = nil
-}
-
-func (t *trickler) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	*t = append(*t, src...)
-	if len(*t) == 0 {
-		return 0, 0, nil
-	}
-	if len(dst) == 0 {
-		return 0, len(src), ErrShortDst
-	}
-	dst[0] = (*t)[0]
-	*t = (*t)[1:]
-	if len(*t) > 0 {
-		err = ErrShortDst
-	}
-	return 1, len(src), err
-}
-
-// delayedTrickler is like trickler, but delays writing output to dst. This is
-// highly unlikely to be relevant in practice, but it seems like a good idea
-// to have some tolerance as long as progress can be detected.
-type delayedTrickler []byte
-
-func (t *delayedTrickler) Reset() {
-	*t = nil
-}
-
-func (t *delayedTrickler) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	if len(*t) > 0 && len(dst) > 0 {
-		dst[0] = (*t)[0]
-		*t = (*t)[1:]
-		nDst = 1
-	}
-	*t = append(*t, src...)
-	if len(*t) > 0 {
-		err = ErrShortDst
-	}
-	return nDst, len(src), err
-}
-
-type testCase struct {
-	desc     string
-	t        Transformer
-	src      string
-	dstSize  int
-	srcSize  int
-	ioSize   int
-	wantStr  string
-	wantErr  error
-	wantIter int // number of iterations taken; 0 means we don't care.
-}
-
-func (t testCase) String() string {
-	return tstr(t.t) + "; " + t.desc
-}
-
-func tstr(t Transformer) string {
-	if stringer, ok := t.(fmt.Stringer); ok {
-		return stringer.String()
-	}
-	s := fmt.Sprintf("%T", t)
-	return s[1+strings.Index(s, "."):]
-}
-
-func (c chain) String() string {
-	buf := &bytes.Buffer{}
-	buf.WriteString("Chain(")
-	for i, l := range c.link[:len(c.link)-1] {
-		if i != 0 {
-			fmt.Fprint(buf, ", ")
-		}
-		buf.WriteString(tstr(l.t))
-	}
-	buf.WriteString(")")
-	return buf.String()
-}
-
-var testCases = []testCase{
-	{
-		desc:    "empty",
-		t:       lowerCaseASCII{},
-		src:     "",
-		dstSize: 100,
-		srcSize: 100,
-		wantStr: "",
-	},
-
-	{
-		desc:    "basic",
-		t:       lowerCaseASCII{},
-		src:     "Hello WORLD.",
-		dstSize: 100,
-		srcSize: 100,
-		wantStr: "hello world.",
-	},
-
-	{
-		desc:    "small dst",
-		t:       lowerCaseASCII{},
-		src:     "Hello WORLD.",
-		dstSize: 3,
-		srcSize: 100,
-		wantStr: "hello world.",
-	},
-
-	{
-		desc:    "small src",
-		t:       lowerCaseASCII{},
-		src:     "Hello WORLD.",
-		dstSize: 100,
-		srcSize: 4,
-		wantStr: "hello world.",
-	},
-
-	{
-		desc:    "small buffers",
-		t:       lowerCaseASCII{},
-		src:     "Hello WORLD.",
-		dstSize: 3,
-		srcSize: 4,
-		wantStr: "hello world.",
-	},
-
-	{
-		desc:    "very small buffers",
-		t:       lowerCaseASCII{},
-		src:     "Hello WORLD.",
-		dstSize: 1,
-		srcSize: 1,
-		wantStr: "hello world.",
-	},
-
-	{
-		desc:    "small dst with lookahead",
-		t:       lowerCaseASCIILookahead{},
-		src:     "Hello WORLD.",
-		dstSize: 3,
-		srcSize: 100,
-		wantStr: "hello world.",
-	},
-
-	{
-		desc:    "small src with lookahead",
-		t:       lowerCaseASCIILookahead{},
-		src:     "Hello WORLD.",
-		dstSize: 100,
-		srcSize: 4,
-		wantStr: "hello world.",
-	},
-
-	{
-		desc:    "small buffers with lookahead",
-		t:       lowerCaseASCIILookahead{},
-		src:     "Hello WORLD.",
-		dstSize: 3,
-		srcSize: 4,
-		wantStr: "hello world.",
-	},
-
-	{
-		desc:    "very small buffers with lookahead",
-		t:       lowerCaseASCIILookahead{},
-		src:     "Hello WORLD.",
-		dstSize: 1,
-		srcSize: 2,
-		wantStr: "hello world.",
-	},
-
-	{
-		desc:    "user error",
-		t:       dontMentionX{},
-		src:     "The First Rule of Transform Club: don't mention Mister X, ever.",
-		dstSize: 100,
-		srcSize: 100,
-		wantStr: "The First Rule of Transform Club: don't mention Mister ",
-		wantErr: errYouMentionedX,
-	},
-
-	{
-		desc:    "user error at end",
-		t:       errorAtEnd{},
-		src:     "All goes well until it doesn't.",
-		dstSize: 100,
-		srcSize: 100,
-		wantStr: "All goes well until it doesn't.",
-		wantErr: errAtEnd,
-	},
-
-	{
-		desc:    "user error at end, incremental",
-		t:       errorAtEnd{},
-		src:     "All goes well until it doesn't.",
-		dstSize: 10,
-		srcSize: 10,
-		wantStr: "All goes well until it doesn't.",
-		wantErr: errAtEnd,
-	},
-
-	{
-		desc:    "replace entire non-empty string with one byte",
-		t:       &replaceWithConstant{replacement: "X"},
-		src:     "none of this will be copied",
-		dstSize: 1,
-		srcSize: 10,
-		wantStr: "X",
-	},
-
-	{
-		desc:    "replace entire empty string with one byte",
-		t:       &replaceWithConstant{replacement: "X"},
-		src:     "",
-		dstSize: 1,
-		srcSize: 10,
-		wantStr: "X",
-	},
-
-	{
-		desc:    "replace entire empty string with seven bytes",
-		t:       &replaceWithConstant{replacement: "ABCDEFG"},
-		src:     "",
-		dstSize: 3,
-		srcSize: 10,
-		wantStr: "ABCDEFG",
-	},
-
-	{
-		desc:    "add an X (initialBufSize-1)",
-		t:       addAnXAtTheEnd{},
-		src:     aaa[:initialBufSize-1],
-		dstSize: 10,
-		srcSize: 10,
-		wantStr: aaa[:initialBufSize-1] + "X",
-	},
-
-	{
-		desc:    "add an X (initialBufSize+0)",
-		t:       addAnXAtTheEnd{},
-		src:     aaa[:initialBufSize+0],
-		dstSize: 10,
-		srcSize: 10,
-		wantStr: aaa[:initialBufSize+0] + "X",
-	},
-
-	{
-		desc:    "add an X (initialBufSize+1)",
-		t:       addAnXAtTheEnd{},
-		src:     aaa[:initialBufSize+1],
-		dstSize: 10,
-		srcSize: 10,
-		wantStr: aaa[:initialBufSize+1] + "X",
-	},
-
-	{
-		desc:    "small buffers",
-		t:       dontMentionX{},
-		src:     "The First Rule of Transform Club: don't mention Mister X, ever.",
-		dstSize: 10,
-		srcSize: 10,
-		wantStr: "The First Rule of Transform Club: don't mention Mister ",
-		wantErr: errYouMentionedX,
-	},
-
-	{
-		desc:    "very small buffers",
-		t:       dontMentionX{},
-		src:     "The First Rule of Transform Club: don't mention Mister X, ever.",
-		dstSize: 1,
-		srcSize: 1,
-		wantStr: "The First Rule of Transform Club: don't mention Mister ",
-		wantErr: errYouMentionedX,
-	},
-
-	{
-		desc:    "only transform at EOF",
-		t:       doublerAtEOF{},
-		src:     "this",
-		dstSize: 100,
-		srcSize: 100,
-		wantStr: "tthhiiss",
-	},
-
-	{
-		desc:    "basic",
-		t:       rleDecode{},
-		src:     "1a2b3c10d11e0f1g",
-		dstSize: 100,
-		srcSize: 100,
-		wantStr: "abbcccddddddddddeeeeeeeeeeeg",
-	},
-
-	{
-		desc:    "long",
-		t:       rleDecode{},
-		src:     "12a23b34c45d56e99z",
-		dstSize: 100,
-		srcSize: 100,
-		wantStr: strings.Repeat("a", 12) +
-			strings.Repeat("b", 23) +
-			strings.Repeat("c", 34) +
-			strings.Repeat("d", 45) +
-			strings.Repeat("e", 56) +
-			strings.Repeat("z", 99),
-	},
-
-	{
-		desc:    "tight buffers",
-		t:       rleDecode{},
-		src:     "1a2b3c10d11e0f1g",
-		dstSize: 11,
-		srcSize: 3,
-		wantStr: "abbcccddddddddddeeeeeeeeeeeg",
-	},
-
-	{
-		desc:    "short dst",
-		t:       rleDecode{},
-		src:     "1a2b3c10d11e0f1g",
-		dstSize: 10,
-		srcSize: 3,
-		wantStr: "abbcccdddddddddd",
-		wantErr: ErrShortDst,
-	},
-
-	{
-		desc:    "short src",
-		t:       rleDecode{},
-		src:     "1a2b3c10d11e0f1g",
-		dstSize: 11,
-		srcSize: 2,
-		ioSize:  2,
-		wantStr: "abbccc",
-		wantErr: ErrShortSrc,
-	},
-
-	{
-		desc:    "basic",
-		t:       rleEncode{},
-		src:     "abbcccddddddddddeeeeeeeeeeeg",
-		dstSize: 100,
-		srcSize: 100,
-		wantStr: "1a2b3c10d11e1g",
-	},
-
-	{
-		desc: "long",
-		t:    rleEncode{},
-		src: strings.Repeat("a", 12) +
-			strings.Repeat("b", 23) +
-			strings.Repeat("c", 34) +
-			strings.Repeat("d", 45) +
-			strings.Repeat("e", 56) +
-			strings.Repeat("z", 99),
-		dstSize: 100,
-		srcSize: 100,
-		wantStr: "12a23b34c45d56e99z",
-	},
-
-	{
-		desc:    "tight buffers",
-		t:       rleEncode{},
-		src:     "abbcccddddddddddeeeeeeeeeeeg",
-		dstSize: 3,
-		srcSize: 12,
-		wantStr: "1a2b3c10d11e1g",
-	},
-
-	{
-		desc:    "short dst",
-		t:       rleEncode{},
-		src:     "abbcccddddddddddeeeeeeeeeeeg",
-		dstSize: 2,
-		srcSize: 12,
-		wantStr: "1a2b3c",
-		wantErr: ErrShortDst,
-	},
-
-	{
-		desc:    "short src",
-		t:       rleEncode{},
-		src:     "abbcccddddddddddeeeeeeeeeeeg",
-		dstSize: 3,
-		srcSize: 11,
-		ioSize:  11,
-		wantStr: "1a2b3c10d",
-		wantErr: ErrShortSrc,
-	},
-
-	{
-		desc:    "allowStutter = false",
-		t:       rleEncode{allowStutter: false},
-		src:     "aaaabbbbbbbbccccddddd",
-		dstSize: 10,
-		srcSize: 10,
-		wantStr: "4a8b4c5d",
-	},
-
-	{
-		desc:    "allowStutter = true",
-		t:       rleEncode{allowStutter: true},
-		src:     "aaaabbbbbbbbccccddddd",
-		dstSize: 10,
-		srcSize: 10,
-		ioSize:  10,
-		wantStr: "4a6b2b4c4d1d",
-	},
-
-	{
-		desc:    "trickler",
-		t:       &trickler{},
-		src:     "abcdefghijklm",
-		dstSize: 3,
-		srcSize: 15,
-		wantStr: "abcdefghijklm",
-	},
-
-	{
-		desc:    "delayedTrickler",
-		t:       &delayedTrickler{},
-		src:     "abcdefghijklm",
-		dstSize: 3,
-		srcSize: 15,
-		wantStr: "abcdefghijklm",
-	},
-}
-
-func TestReader(t *testing.T) {
-	for _, tc := range testCases {
-		testtext.Run(t, tc.desc, func(t *testing.T) {
-			r := NewReader(strings.NewReader(tc.src), tc.t)
-			// Differently sized dst and src buffers are not part of the
-			// exported API. We override them manually.
-			r.dst = make([]byte, tc.dstSize)
-			r.src = make([]byte, tc.srcSize)
-			got, err := ioutil.ReadAll(r)
-			str := string(got)
-			if str != tc.wantStr || err != tc.wantErr {
-				t.Errorf("\ngot  %q, %v\nwant %q, %v", str, err, tc.wantStr, tc.wantErr)
-			}
-		})
-	}
-}
-
-func TestWriter(t *testing.T) {
-	tests := append(testCases, chainTests()...)
-	for _, tc := range tests {
-		sizes := []int{1, 2, 3, 4, 5, 10, 100, 1000}
-		if tc.ioSize > 0 {
-			sizes = []int{tc.ioSize}
-		}
-		for _, sz := range sizes {
-			testtext.Run(t, fmt.Sprintf("%s/%d", tc.desc, sz), func(t *testing.T) {
-				bb := &bytes.Buffer{}
-				w := NewWriter(bb, tc.t)
-				// Differently sized dst and src buffers are not part of the
-				// exported API. We override them manually.
-				w.dst = make([]byte, tc.dstSize)
-				w.src = make([]byte, tc.srcSize)
-				src := make([]byte, sz)
-				var err error
-				for b := tc.src; len(b) > 0 && err == nil; {
-					n := copy(src, b)
-					b = b[n:]
-					m := 0
-					m, err = w.Write(src[:n])
-					if m != n && err == nil {
-						t.Errorf("did not consume all bytes %d < %d", m, n)
-					}
-				}
-				if err == nil {
-					err = w.Close()
-				}
-				str := bb.String()
-				if str != tc.wantStr || err != tc.wantErr {
-					t.Errorf("\ngot  %q, %v\nwant %q, %v", str, err, tc.wantStr, tc.wantErr)
-				}
-			})
-		}
-	}
-}
-
-func TestNop(t *testing.T) {
-	testCases := []struct {
-		str     string
-		dstSize int
-		err     error
-	}{
-		{"", 0, nil},
-		{"", 10, nil},
-		{"a", 0, ErrShortDst},
-		{"a", 1, nil},
-		{"a", 10, nil},
-	}
-	for i, tc := range testCases {
-		dst := make([]byte, tc.dstSize)
-		nDst, nSrc, err := Nop.Transform(dst, []byte(tc.str), true)
-		want := tc.str
-		if tc.dstSize < len(want) {
-			want = want[:tc.dstSize]
-		}
-		if got := string(dst[:nDst]); got != want || err != tc.err || nSrc != nDst {
-			t.Errorf("%d:\ngot %q, %d, %v\nwant %q, %d, %v", i, got, nSrc, err, want, nDst, tc.err)
-		}
-	}
-}
-
-func TestDiscard(t *testing.T) {
-	testCases := []struct {
-		str     string
-		dstSize int
-	}{
-		{"", 0},
-		{"", 10},
-		{"a", 0},
-		{"ab", 10},
-	}
-	for i, tc := range testCases {
-		nDst, nSrc, err := Discard.Transform(make([]byte, tc.dstSize), []byte(tc.str), true)
-		if nDst != 0 || nSrc != len(tc.str) || err != nil {
-			t.Errorf("%d:\ngot %q, %d, %v\nwant 0, %d, nil", i, nDst, nSrc, err, len(tc.str))
-		}
-	}
-}
-
-// mkChain creates a Chain transformer. x must be alternating between transformer
-// and bufSize, like T, (sz, T)*
-func mkChain(x ...interface{}) *chain {
-	t := []Transformer{}
-	for i := 0; i < len(x); i += 2 {
-		t = append(t, x[i].(Transformer))
-	}
-	c := Chain(t...).(*chain)
-	for i, j := 1, 1; i < len(x); i, j = i+2, j+1 {
-		c.link[j].b = make([]byte, x[i].(int))
-	}
-	return c
-}
-
-func chainTests() []testCase {
-	return []testCase{
-		{
-			desc:     "nil error",
-			t:        mkChain(rleEncode{}, 100, lowerCaseASCII{}),
-			src:      "ABB",
-			dstSize:  100,
-			srcSize:  100,
-			wantStr:  "1a2b",
-			wantErr:  nil,
-			wantIter: 1,
-		},
-
-		{
-			desc:    "short dst buffer",
-			t:       mkChain(lowerCaseASCII{}, 3, rleDecode{}),
-			src:     "1a2b3c10d11e0f1g",
-			dstSize: 10,
-			srcSize: 3,
-			wantStr: "abbcccdddddddddd",
-			wantErr: ErrShortDst,
-		},
-
-		{
-			desc:    "short internal dst buffer",
-			t:       mkChain(lowerCaseASCII{}, 3, rleDecode{}, 10, Nop),
-			src:     "1a2b3c10d11e0f1g",
-			dstSize: 100,
-			srcSize: 3,
-			wantStr: "abbcccdddddddddd",
-			wantErr: errShortInternal,
-		},
-
-		{
-			desc:    "short internal dst buffer from input",
-			t:       mkChain(rleDecode{}, 10, Nop),
-			src:     "1a2b3c10d11e0f1g",
-			dstSize: 100,
-			srcSize: 3,
-			wantStr: "abbcccdddddddddd",
-			wantErr: errShortInternal,
-		},
-
-		{
-			desc:    "empty short internal dst buffer",
-			t:       mkChain(lowerCaseASCII{}, 3, rleDecode{}, 10, Nop),
-			src:     "4a7b11e0f1g",
-			dstSize: 100,
-			srcSize: 3,
-			wantStr: "aaaabbbbbbb",
-			wantErr: errShortInternal,
-		},
-
-		{
-			desc:    "empty short internal dst buffer from input",
-			t:       mkChain(rleDecode{}, 10, Nop),
-			src:     "4a7b11e0f1g",
-			dstSize: 100,
-			srcSize: 3,
-			wantStr: "aaaabbbbbbb",
-			wantErr: errShortInternal,
-		},
-
-		{
-			desc:     "short internal src buffer after full dst buffer",
-			t:        mkChain(Nop, 5, rleEncode{}, 10, Nop),
-			src:      "cccccddddd",
-			dstSize:  100,
-			srcSize:  100,
-			wantStr:  "",
-			wantErr:  errShortInternal,
-			wantIter: 1,
-		},
-
-		{
-			desc:    "short internal src buffer after short dst buffer; test lastFull",
-			t:       mkChain(rleDecode{}, 5, rleEncode{}, 4, Nop),
-			src:     "2a1b4c6d",
-			dstSize: 100,
-			srcSize: 100,
-			wantStr: "2a1b",
-			wantErr: errShortInternal,
-		},
-
-		{
-			desc:     "short internal src buffer after successful complete fill",
-			t:        mkChain(Nop, 3, rleDecode{}),
-			src:      "123a4b",
-			dstSize:  4,
-			srcSize:  3,
-			wantStr:  "",
-			wantErr:  errShortInternal,
-			wantIter: 1,
-		},
-
-		{
-			desc:    "short internal src buffer after short dst buffer; test lastFull",
-			t:       mkChain(rleDecode{}, 5, rleEncode{}),
-			src:     "2a1b4c6d",
-			dstSize: 4,
-			srcSize: 100,
-			wantStr: "2a1b",
-			wantErr: errShortInternal,
-		},
-
-		{
-			desc:    "short src buffer",
-			t:       mkChain(rleEncode{}, 5, Nop),
-			src:     "abbcccddddeeeee",
-			dstSize: 4,
-			srcSize: 4,
-			ioSize:  4,
-			wantStr: "1a2b3c",
-			wantErr: ErrShortSrc,
-		},
-
-		{
-			desc:     "process all in one go",
-			t:        mkChain(rleEncode{}, 5, Nop),
-			src:      "abbcccddddeeeeeffffff",
-			dstSize:  100,
-			srcSize:  100,
-			wantStr:  "1a2b3c4d5e6f",
-			wantErr:  nil,
-			wantIter: 1,
-		},
-
-		{
-			desc:    "complete processing downstream after error",
-			t:       mkChain(dontMentionX{}, 2, rleDecode{}, 5, Nop),
-			src:     "3a4b5eX",
-			dstSize: 100,
-			srcSize: 100,
-			ioSize:  100,
-			wantStr: "aaabbbbeeeee",
-			wantErr: errYouMentionedX,
-		},
-
-		{
-			desc:    "return downstream fatal errors first (followed by short dst)",
-			t:       mkChain(dontMentionX{}, 8, rleDecode{}, 4, Nop),
-			src:     "3a4b5eX",
-			dstSize: 100,
-			srcSize: 100,
-			ioSize:  100,
-			wantStr: "aaabbbb",
-			wantErr: errShortInternal,
-		},
-
-		{
-			desc:    "return downstream fatal errors first (followed by short src)",
-			t:       mkChain(dontMentionX{}, 5, Nop, 1, rleDecode{}),
-			src:     "1a5bX",
-			dstSize: 100,
-			srcSize: 100,
-			ioSize:  100,
-			wantStr: "",
-			wantErr: errShortInternal,
-		},
-
-		{
-			desc:    "short internal",
-			t:       mkChain(Nop, 11, rleEncode{}, 3, Nop),
-			src:     "abbcccddddddddddeeeeeeeeeeeg",
-			dstSize: 3,
-			srcSize: 100,
-			wantStr: "1a2b3c10d",
-			wantErr: errShortInternal,
-		},
-	}
-}
-
-func doTransform(tc testCase) (res string, iter int, err error) {
-	tc.t.Reset()
-	dst := make([]byte, tc.dstSize)
-	out, in := make([]byte, 0, 2*len(tc.src)), []byte(tc.src)
-	for {
-		iter++
-		src, atEOF := in, true
-		if len(src) > tc.srcSize {
-			src, atEOF = src[:tc.srcSize], false
-		}
-		nDst, nSrc, err := tc.t.Transform(dst, src, atEOF)
-		out = append(out, dst[:nDst]...)
-		in = in[nSrc:]
-		switch {
-		case err == nil && len(in) != 0:
-		case err == ErrShortSrc && nSrc > 0:
-		case err == ErrShortDst && (nDst > 0 || nSrc > 0):
-		default:
-			return string(out), iter, err
-		}
-	}
-}
-
-func TestChain(t *testing.T) {
-	if c, ok := Chain().(nop); !ok {
-		t.Errorf("empty chain: %v; want Nop", c)
-	}
-
-	// Test Chain for a single Transformer.
-	for _, tc := range testCases {
-		tc.t = Chain(tc.t)
-		str, _, err := doTransform(tc)
-		if str != tc.wantStr || err != tc.wantErr {
-			t.Errorf("%s:\ngot  %q, %v\nwant %q, %v", tc, str, err, tc.wantStr, tc.wantErr)
-		}
-	}
-
-	tests := chainTests()
-	sizes := []int{1, 2, 3, 4, 5, 7, 10, 100, 1000}
-	addTest := func(tc testCase, t *chain) {
-		if t.link[0].t != tc.t && tc.wantErr == ErrShortSrc {
-			tc.wantErr = errShortInternal
-		}
-		if t.link[len(t.link)-2].t != tc.t && tc.wantErr == ErrShortDst {
-			tc.wantErr = errShortInternal
-		}
-		tc.t = t
-		tests = append(tests, tc)
-	}
-	for _, tc := range testCases {
-		for _, sz := range sizes {
-			tt := tc
-			tt.dstSize = sz
-			addTest(tt, mkChain(tc.t, tc.dstSize, Nop))
-			addTest(tt, mkChain(tc.t, tc.dstSize, Nop, 2, Nop))
-			addTest(tt, mkChain(Nop, tc.srcSize, tc.t, tc.dstSize, Nop))
-			if sz >= tc.dstSize && (tc.wantErr != ErrShortDst || sz == tc.dstSize) {
-				addTest(tt, mkChain(Nop, tc.srcSize, tc.t))
-				addTest(tt, mkChain(Nop, 100, Nop, tc.srcSize, tc.t))
-			}
-		}
-	}
-	for _, tc := range testCases {
-		tt := tc
-		tt.dstSize = 1
-		tt.wantStr = ""
-		addTest(tt, mkChain(tc.t, tc.dstSize, Discard))
-		addTest(tt, mkChain(Nop, tc.srcSize, tc.t, tc.dstSize, Discard))
-		addTest(tt, mkChain(Nop, tc.srcSize, tc.t, tc.dstSize, Nop, tc.dstSize, Discard))
-	}
-	for _, tc := range testCases {
-		tt := tc
-		tt.dstSize = 100
-		tt.wantStr = strings.Replace(tc.src, "0f", "", -1)
-		// Chain encoders and decoders.
-		if _, ok := tc.t.(rleEncode); ok && tc.wantErr == nil {
-			addTest(tt, mkChain(tc.t, tc.dstSize, Nop, 1000, rleDecode{}))
-			addTest(tt, mkChain(tc.t, tc.dstSize, Nop, tc.dstSize, rleDecode{}))
-			addTest(tt, mkChain(Nop, tc.srcSize, tc.t, tc.dstSize, Nop, 100, rleDecode{}))
-			// decoding needs larger destinations
-			addTest(tt, mkChain(Nop, tc.srcSize, tc.t, tc.dstSize, rleDecode{}, 100, Nop))
-			addTest(tt, mkChain(Nop, tc.srcSize, tc.t, tc.dstSize, Nop, 100, rleDecode{}, 100, Nop))
-		} else if _, ok := tc.t.(rleDecode); ok && tc.wantErr == nil {
-			// The internal buffer size may need to be the sum of the maximum segment
-			// size of the two encoders!
-			addTest(tt, mkChain(tc.t, 2*tc.dstSize, rleEncode{}))
-			addTest(tt, mkChain(tc.t, tc.dstSize, Nop, 101, rleEncode{}))
-			addTest(tt, mkChain(Nop, tc.srcSize, tc.t, tc.dstSize, Nop, 100, rleEncode{}))
-			addTest(tt, mkChain(Nop, tc.srcSize, tc.t, tc.dstSize, Nop, 200, rleEncode{}, 100, Nop))
-		}
-	}
-	for _, tc := range tests {
-		str, iter, err := doTransform(tc)
-		mi := tc.wantIter != 0 && tc.wantIter != iter
-		if str != tc.wantStr || err != tc.wantErr || mi {
-			t.Errorf("%s:\ngot  iter:%d, %q, %v\nwant iter:%d, %q, %v", tc, iter, str, err, tc.wantIter, tc.wantStr, tc.wantErr)
-		}
-		break
-	}
-}
-
-func TestRemoveFunc(t *testing.T) {
-	filter := RemoveFunc(func(r rune) bool {
-		return strings.IndexRune("ab\u0300\u1234,", r) != -1
-	})
-	tests := []testCase{
-		{
-			src:     ",",
-			wantStr: "",
-		},
-
-		{
-			src:     "c",
-			wantStr: "c",
-		},
-
-		{
-			src:     "\u2345",
-			wantStr: "\u2345",
-		},
-
-		{
-			src:     "tschüß",
-			wantStr: "tschüß",
-		},
-
-		{
-			src:     ",до,свидания,",
-			wantStr: "досвидания",
-		},
-
-		{
-			src:     "a\xbd\xb2=\xbc ⌘",
-			wantStr: "\uFFFD\uFFFD=\uFFFD ⌘",
-		},
-
-		{
-			// If we didn't replace illegal bytes with RuneError, the result
-			// would be \u0300 or the code would need to be more complex.
-			src:     "\xcc\u0300\x80",
-			wantStr: "\uFFFD\uFFFD",
-		},
-
-		{
-			src:      "\xcc\u0300\x80",
-			dstSize:  3,
-			wantStr:  "\uFFFD\uFFFD",
-			wantIter: 2,
-		},
-
-		{
-			// Test a long buffer greater than the internal buffer size
-			src:      "hello\xcc\xcc\xccworld",
-			srcSize:  13,
-			wantStr:  "hello\uFFFD\uFFFD\uFFFDworld",
-			wantIter: 1,
-		},
-
-		{
-			src:     "\u2345",
-			dstSize: 2,
-			wantStr: "",
-			wantErr: ErrShortDst,
-		},
-
-		{
-			src:     "\xcc",
-			dstSize: 2,
-			wantStr: "",
-			wantErr: ErrShortDst,
-		},
-
-		{
-			src:     "\u0300",
-			dstSize: 2,
-			srcSize: 1,
-			wantStr: "",
-			wantErr: ErrShortSrc,
-		},
-
-		{
-			t: RemoveFunc(func(r rune) bool {
-				return r == utf8.RuneError
-			}),
-			src:     "\xcc\u0300\x80",
-			wantStr: "\u0300",
-		},
-	}
-
-	for _, tc := range tests {
-		tc.desc = tc.src
-		if tc.t == nil {
-			tc.t = filter
-		}
-		if tc.dstSize == 0 {
-			tc.dstSize = 100
-		}
-		if tc.srcSize == 0 {
-			tc.srcSize = 100
-		}
-		str, iter, err := doTransform(tc)
-		mi := tc.wantIter != 0 && tc.wantIter != iter
-		if str != tc.wantStr || err != tc.wantErr || mi {
-			t.Errorf("%+q:\ngot  iter:%d, %+q, %v\nwant iter:%d, %+q, %v", tc.src, iter, str, err, tc.wantIter, tc.wantStr, tc.wantErr)
-		}
-
-		tc.src = str
-		idem, _, _ := doTransform(tc)
-		if str != idem {
-			t.Errorf("%+q: found %+q; want %+q", tc.src, idem, str)
-		}
-	}
-}
-
-func testString(t *testing.T, f func(Transformer, string) (string, int, error)) {
-	for _, tt := range append(testCases, chainTests()...) {
-		if tt.desc == "allowStutter = true" {
-			// We don't have control over the buffer size, so we eliminate tests
-			// that depend on a specific buffer size being set.
-			continue
-		}
-		if tt.wantErr == ErrShortDst || tt.wantErr == ErrShortSrc {
-			// The result string will be different.
-			continue
-		}
-		testtext.Run(t, tt.desc, func(t *testing.T) {
-			got, n, err := f(tt.t, tt.src)
-			if tt.wantErr != err {
-				t.Errorf("error: got %v; want %v", err, tt.wantErr)
-			}
-			// Check that err == nil implies that n == len(tt.src). Note that vice
-			// versa isn't necessarily true.
-			if err == nil && n != len(tt.src) {
-				t.Errorf("err == nil: got %d bytes, want %d", n, err)
-			}
-			if got != tt.wantStr {
-				t.Errorf("string: got %q; want %q", got, tt.wantStr)
-			}
-		})
-	}
-}
-
-func TestBytes(t *testing.T) {
-	testString(t, func(z Transformer, s string) (string, int, error) {
-		b, n, err := Bytes(z, []byte(s))
-		return string(b), n, err
-	})
-}
-
-func TestAppend(t *testing.T) {
-	// Create a bunch of subtests for different buffer sizes.
-	testCases := [][]byte{
-		nil,
-		make([]byte, 0, 0),
-		make([]byte, 0, 1),
-		make([]byte, 1, 1),
-		make([]byte, 1, 5),
-		make([]byte, 100, 100),
-		make([]byte, 100, 200),
-	}
-	for _, tc := range testCases {
-		testString(t, func(z Transformer, s string) (string, int, error) {
-			b, n, err := Append(z, tc, []byte(s))
-			return string(b[len(tc):]), n, err
-		})
-	}
-}
-
-func TestString(t *testing.T) {
-	testtext.Run(t, "transform", func(t *testing.T) { testString(t, String) })
-
-	// Overrun the internal destination buffer.
-	for i, s := range []string{
-		aaa[:1*initialBufSize-1],
-		aaa[:1*initialBufSize+0],
-		aaa[:1*initialBufSize+1],
-		AAA[:1*initialBufSize-1],
-		AAA[:1*initialBufSize+0],
-		AAA[:1*initialBufSize+1],
-		AAA[:2*initialBufSize-1],
-		AAA[:2*initialBufSize+0],
-		AAA[:2*initialBufSize+1],
-		aaa[:1*initialBufSize-2] + "A",
-		aaa[:1*initialBufSize-1] + "A",
-		aaa[:1*initialBufSize+0] + "A",
-		aaa[:1*initialBufSize+1] + "A",
-	} {
-		testtext.Run(t, fmt.Sprint("dst buffer test using lower/", i), func(t *testing.T) {
-			got, _, _ := String(lowerCaseASCII{}, s)
-			if want := strings.ToLower(s); got != want {
-				t.Errorf("got %s (%d); want %s (%d)", got, len(got), want, len(want))
-			}
-		})
-	}
-
-	// Overrun the internal source buffer.
-	for i, s := range []string{
-		aaa[:1*initialBufSize-1],
-		aaa[:1*initialBufSize+0],
-		aaa[:1*initialBufSize+1],
-		aaa[:2*initialBufSize+1],
-		aaa[:2*initialBufSize+0],
-		aaa[:2*initialBufSize+1],
-	} {
-		testtext.Run(t, fmt.Sprint("src buffer test using rleEncode/", i), func(t *testing.T) {
-			got, _, _ := String(rleEncode{}, s)
-			if want := fmt.Sprintf("%da", len(s)); got != want {
-				t.Errorf("got %s (%d); want %s (%d)", got, len(got), want, len(want))
-			}
-		})
-	}
-
-	// Test allocations for non-changing strings.
-	// Note we still need to allocate a single buffer.
-	for i, s := range []string{
-		"",
-		"123456789",
-		aaa[:initialBufSize-1],
-		aaa[:initialBufSize+0],
-		aaa[:initialBufSize+1],
-		aaa[:10*initialBufSize],
-	} {
-		testtext.Run(t, fmt.Sprint("alloc/", i), func(t *testing.T) {
-			if n := testtext.AllocsPerRun(5, func() { String(&lowerCaseASCIILookahead{}, s) }); n > 1 {
-				t.Errorf("#allocs was %f; want 1", n)
-			}
-		})
-	}
-}
-
-// TestBytesAllocation tests that buffer growth stays limited with the trickler
-// transformer, which behaves oddly but within spec. In case buffer growth is
-// not correctly handled, the test will either panic with a failed allocation or
-// thrash. To ensure the tests terminate under the last condition, we time out
-// after some sufficiently long period of time.
-func TestBytesAllocation(t *testing.T) {
-	done := make(chan bool)
-	go func() {
-		in := bytes.Repeat([]byte{'a'}, 1000)
-		tr := trickler(make([]byte, 1))
-		Bytes(&tr, in)
-		done <- true
-	}()
-	select {
-	case <-done:
-	case <-time.After(3 * time.Second):
-		t.Error("time out, likely due to excessive allocation")
-	}
-}
-
-// TestStringAllocation tests that buffer growth stays limited with the trickler
-// transformer, which behaves oddly but within spec. In case buffer growth is
-// not correctly handled, the test will either panic with a failed allocation or
-// thrash. To ensure the tests terminate under the last condition, we time out
-// after some sufficiently long period of time.
-func TestStringAllocation(t *testing.T) {
-	done := make(chan bool)
-	go func() {
-		tr := trickler(make([]byte, 1))
-		String(&tr, aaa[:1000])
-		done <- true
-	}()
-	select {
-	case <-done:
-	case <-time.After(3 * time.Second):
-		t.Error("time out, likely due to excessive allocation")
-	}
-}
-
-func BenchmarkStringLowerEmpty(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		String(&lowerCaseASCIILookahead{}, "")
-	}
-}
-
-func BenchmarkStringLowerIdentical(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		String(&lowerCaseASCIILookahead{}, aaa[:4096])
-	}
-}
-
-func BenchmarkStringLowerChanged(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		String(&lowerCaseASCIILookahead{}, AAA[:4096])
-	}
-}
-
-var (
-	aaa = strings.Repeat("a", 4096)
-	AAA = strings.Repeat("A", 4096)
-)
diff --git a/vendor/golang.org/x/text/unicode/bidi/core_test.go b/vendor/golang.org/x/text/unicode/bidi/core_test.go
deleted file mode 100644
index f28d386c..00000000
--- a/vendor/golang.org/x/text/unicode/bidi/core_test.go
+++ /dev/null
@@ -1,224 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bidi
-
-import (
-	"flag"
-	"fmt"
-	"log"
-	"strconv"
-	"strings"
-	"testing"
-
-	"golang.org/x/text/internal/gen"
-	"golang.org/x/text/internal/testtext"
-	"golang.org/x/text/internal/ucd"
-	"golang.org/x/text/unicode/norm"
-)
-
-var testLevels = flag.Bool("levels", false, "enable testing of levels")
-
-// TestBidiCore performs the tests in BidiTest.txt.
-// See http://www.unicode.org/Public/UCD/latest/ucd/BidiTest.txt.
-func TestBidiCore(t *testing.T) {
-	testtext.SkipIfNotLong(t)
-
-	r := gen.OpenUCDFile("BidiTest.txt")
-	defer r.Close()
-
-	var wantLevels, wantOrder []string
-	p := ucd.New(r, ucd.Part(func(p *ucd.Parser) {
-		s := strings.Split(p.String(0), ":")
-		switch s[0] {
-		case "Levels":
-			wantLevels = strings.Fields(s[1])
-		case "Reorder":
-			wantOrder = strings.Fields(s[1])
-		default:
-			log.Fatalf("Unknown part %q.", s[0])
-		}
-	}))
-
-	for p.Next() {
-		types := []Class{}
-		for _, s := range p.Strings(0) {
-			types = append(types, bidiClass[s])
-		}
-		// We ignore the bracketing part of the algorithm.
-		pairTypes := make([]bracketType, len(types))
-		pairValues := make([]rune, len(types))
-
-		for i := uint(0); i < 3; i++ {
-			if p.Uint(1)&(1<<i) == 0 {
-				continue
-			}
-			lev := level(int(i) - 1)
-			par := newParagraph(types, pairTypes, pairValues, lev)
-
-			if *testLevels {
-				levels := par.getLevels([]int{len(types)})
-				for i, s := range wantLevels {
-					if s == "x" {
-						continue
-					}
-					l, _ := strconv.ParseUint(s, 10, 8)
-					if level(l)&1 != levels[i]&1 {
-						t.Errorf("%s:%d:levels: got %v; want %v", p.String(0), lev, levels, wantLevels)
-						break
-					}
-				}
-			}
-
-			order := par.getReordering([]int{len(types)})
-			gotOrder := filterOrder(types, order)
-			if got, want := fmt.Sprint(gotOrder), fmt.Sprint(wantOrder); got != want {
-				t.Errorf("%s:%d:order: got %v; want %v\noriginal %v", p.String(0), lev, got, want, order)
-			}
-		}
-	}
-	if err := p.Err(); err != nil {
-		log.Fatal(err)
-	}
-}
-
-var removeClasses = map[Class]bool{
-	LRO: true,
-	RLO: true,
-	RLE: true,
-	LRE: true,
-	PDF: true,
-	BN:  true,
-}
-
-// TestBidiCharacters performs the tests in BidiCharacterTest.txt.
-// See http://www.unicode.org/Public/UCD/latest/ucd/BidiCharacterTest.txt
-func TestBidiCharacters(t *testing.T) {
-	testtext.SkipIfNotLong(t)
-
-	ucd.Parse(gen.OpenUCDFile("BidiCharacterTest.txt"), func(p *ucd.Parser) {
-		var (
-			types      []Class
-			pairTypes  []bracketType
-			pairValues []rune
-			parLevel   level
-
-			wantLevel       = level(p.Int(2))
-			wantLevels      = p.Strings(3)
-			wantVisualOrder = p.Strings(4)
-		)
-
-		switch l := p.Int(1); l {
-		case 0, 1:
-			parLevel = level(l)
-		case 2:
-			parLevel = implicitLevel
-		default:
-			// Spec says to ignore unknown parts.
-		}
-
-		runes := p.Runes(0)
-
-		for _, r := range runes {
-			// Assign the bracket type.
-			if d := norm.NFKD.PropertiesString(string(r)).Decomposition(); d != nil {
-				r = []rune(string(d))[0]
-			}
-			p, _ := LookupRune(r)
-
-			// Assign the class for this rune.
-			types = append(types, p.Class())
-
-			switch {
-			case !p.IsBracket():
-				pairTypes = append(pairTypes, bpNone)
-				pairValues = append(pairValues, 0)
-			case p.IsOpeningBracket():
-				pairTypes = append(pairTypes, bpOpen)
-				pairValues = append(pairValues, r)
-			default:
-				pairTypes = append(pairTypes, bpClose)
-				pairValues = append(pairValues, p.reverseBracket(r))
-			}
-		}
-		par := newParagraph(types, pairTypes, pairValues, parLevel)
-
-		// Test results:
-		if got := par.embeddingLevel; got != wantLevel {
-			t.Errorf("%v:level: got %d; want %d", string(runes), got, wantLevel)
-		}
-
-		if *testLevels {
-			gotLevels := getLevelStrings(types, par.getLevels([]int{len(types)}))
-			if got, want := fmt.Sprint(gotLevels), fmt.Sprint(wantLevels); got != want {
-				t.Errorf("%04X %q:%d: got %v; want %v\nval: %x\npair: %v", runes, string(runes), parLevel, got, want, pairValues, pairTypes)
-			}
-		}
-
-		order := par.getReordering([]int{len(types)})
-		order = filterOrder(types, order)
-		if got, want := fmt.Sprint(order), fmt.Sprint(wantVisualOrder); got != want {
-			t.Errorf("%04X %q:%d: got %v; want %v\ngot order: %s", runes, string(runes), parLevel, got, want, reorder(runes, order))
-		}
-	})
-}
-
-func getLevelStrings(cl []Class, levels []level) []string {
-	var results []string
-	for i, l := range levels {
-		if !removeClasses[cl[i]] {
-			results = append(results, fmt.Sprint(l))
-		} else {
-			results = append(results, "x")
-		}
-	}
-	return results
-}
-
-func filterOrder(cl []Class, order []int) []int {
-	no := []int{}
-	for _, o := range order {
-		if !removeClasses[cl[o]] {
-			no = append(no, o)
-		}
-	}
-	return no
-}
-
-func reorder(r []rune, order []int) string {
-	nr := make([]rune, len(order))
-	for i, o := range order {
-		nr[i] = r[o]
-	}
-	return string(nr)
-}
-
-// bidiClass names and codes taken from class "bc" in
-// http://www.unicode.org/Public/8.0.0/ucd/PropertyValueAliases.txt
-var bidiClass = map[string]Class{
-	"AL":  AL,  // classArabicLetter,
-	"AN":  AN,  // classArabicNumber,
-	"B":   B,   // classParagraphSeparator,
-	"BN":  BN,  // classBoundaryNeutral,
-	"CS":  CS,  // classCommonSeparator,
-	"EN":  EN,  // classEuropeanNumber,
-	"ES":  ES,  // classEuropeanSeparator,
-	"ET":  ET,  // classEuropeanTerminator,
-	"L":   L,   // classLeftToRight,
-	"NSM": NSM, // classNonspacingMark,
-	"ON":  ON,  // classOtherNeutral,
-	"R":   R,   // classRightToLeft,
-	"S":   S,   // classSegmentSeparator,
-	"WS":  WS,  // classWhiteSpace,
-
-	"LRO": LRO, // classLeftToRightOverride,
-	"RLO": RLO, // classRightToLeftOverride,
-	"LRE": LRE, // classLeftToRightEmbedding,
-	"RLE": RLE, // classRightToLeftEmbedding,
-	"PDF": PDF, // classPopDirectionalFormat,
-	"LRI": LRI, // classLeftToRightIsolate,
-	"RLI": RLI, // classRightToLeftIsolate,
-	"FSI": FSI, // classFirstStrongIsolate,
-	"PDI": PDI, // classPopDirectionalIsolate,
-}
diff --git a/vendor/golang.org/x/text/unicode/bidi/ranges_test.go b/vendor/golang.org/x/text/unicode/bidi/ranges_test.go
deleted file mode 100644
index bfaecd50..00000000
--- a/vendor/golang.org/x/text/unicode/bidi/ranges_test.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
-
-package bidi
-
-import (
-	"unicode"
-
-	"golang.org/x/text/internal/gen"
-	"golang.org/x/text/internal/ucd"
-	"golang.org/x/text/unicode/rangetable"
-)
-
-// These tables are hand-extracted from:
-// http://www.unicode.org/Public/8.0.0/ucd/extracted/DerivedBidiClass.txt
-func visitDefaults(fn func(r rune, c Class)) {
-	// first write default values for ranges listed above.
-	visitRunes(fn, AL, []rune{
-		0x0600, 0x07BF, // Arabic
-		0x08A0, 0x08FF, // Arabic Extended-A
-		0xFB50, 0xFDCF, // Arabic Presentation Forms
-		0xFDF0, 0xFDFF,
-		0xFE70, 0xFEFF,
-		0x0001EE00, 0x0001EEFF, // Arabic Mathematical Alpha Symbols
-	})
-	visitRunes(fn, R, []rune{
-		0x0590, 0x05FF, // Hebrew
-		0x07C0, 0x089F, // Nko et al.
-		0xFB1D, 0xFB4F,
-		0x00010800, 0x00010FFF, // Cypriot Syllabary et. al.
-		0x0001E800, 0x0001EDFF,
-		0x0001EF00, 0x0001EFFF,
-	})
-	visitRunes(fn, ET, []rune{ // European Terminator
-		0x20A0, 0x20Cf, // Currency symbols
-	})
-	rangetable.Visit(unicode.Noncharacter_Code_Point, func(r rune) {
-		fn(r, BN) // Boundary Neutral
-	})
-	ucd.Parse(gen.OpenUCDFile("DerivedCoreProperties.txt"), func(p *ucd.Parser) {
-		if p.String(1) == "Default_Ignorable_Code_Point" {
-			fn(p.Rune(0), BN) // Boundary Neutral
-		}
-	})
-}
-
-func visitRunes(fn func(r rune, c Class), c Class, runes []rune) {
-	for i := 0; i < len(runes); i += 2 {
-		lo, hi := runes[i], runes[i+1]
-		for j := lo; j <= hi; j++ {
-			fn(j, c)
-		}
-	}
-}
diff --git a/vendor/golang.org/x/text/unicode/bidi/tables_test.go b/vendor/golang.org/x/text/unicode/bidi/tables_test.go
deleted file mode 100644
index 356a4a58..00000000
--- a/vendor/golang.org/x/text/unicode/bidi/tables_test.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bidi
-
-import (
-	"testing"
-
-	"golang.org/x/text/internal/gen"
-	"golang.org/x/text/internal/testtext"
-	"golang.org/x/text/internal/ucd"
-)
-
-var labels = []string{
-	AL:  "AL",
-	AN:  "AN",
-	B:   "B",
-	BN:  "BN",
-	CS:  "CS",
-	EN:  "EN",
-	ES:  "ES",
-	ET:  "ET",
-	L:   "L",
-	NSM: "NSM",
-	ON:  "ON",
-	R:   "R",
-	S:   "S",
-	WS:  "WS",
-
-	LRO: "LRO",
-	RLO: "RLO",
-	LRE: "LRE",
-	RLE: "RLE",
-	PDF: "PDF",
-	LRI: "LRI",
-	RLI: "RLI",
-	FSI: "FSI",
-	PDI: "PDI",
-}
-
-func TestTables(t *testing.T) {
-	testtext.SkipIfNotLong(t)
-
-	ucd.Parse(gen.OpenUCDFile("BidiBrackets.txt"), func(p *ucd.Parser) {
-		r1 := p.Rune(0)
-		want := p.Rune(1)
-
-		e, _ := LookupRune(r1)
-		if got := e.reverseBracket(r1); got != want {
-			t.Errorf("Reverse(%U) = %U; want %U", r1, got, want)
-		}
-	})
-
-	done := map[rune]bool{}
-	test := func(name string, r rune, want string) {
-		str := string(r)
-		e, _ := LookupString(str)
-		if got := labels[e.Class()]; got != want {
-			t.Errorf("%s:%U: got %s; want %s", name, r, got, want)
-		}
-		if e2, sz := LookupRune(r); e != e2 || sz != len(str) {
-			t.Errorf("LookupRune(%U) = %v, %d; want %v, %d", r, e2, e, sz, len(str))
-		}
-		if e2, sz := Lookup([]byte(str)); e != e2 || sz != len(str) {
-			t.Errorf("Lookup(%U) = %v, %d; want %v, %d", r, e2, e, sz, len(str))
-		}
-		done[r] = true
-	}
-
-	// Insert the derived BiDi properties.
-	ucd.Parse(gen.OpenUCDFile("extracted/DerivedBidiClass.txt"), func(p *ucd.Parser) {
-		r := p.Rune(0)
-		test("derived", r, p.String(1))
-	})
-	visitDefaults(func(r rune, c Class) {
-		if !done[r] {
-			test("default", r, labels[c])
-		}
-	})
-
-}
diff --git a/vendor/golang.org/x/text/unicode/cldr/cldr_test.go b/vendor/golang.org/x/text/unicode/cldr/cldr_test.go
deleted file mode 100644
index 951028d7..00000000
--- a/vendor/golang.org/x/text/unicode/cldr/cldr_test.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package cldr
-
-import "testing"
-
-func TestParseDraft(t *testing.T) {
-	tests := []struct {
-		in    string
-		draft Draft
-		err   bool
-	}{
-		{"unconfirmed", Unconfirmed, false},
-		{"provisional", Provisional, false},
-		{"contributed", Contributed, false},
-		{"approved", Approved, false},
-		{"", Approved, false},
-		{"foo", Approved, true},
-	}
-	for _, tt := range tests {
-		if d, err := ParseDraft(tt.in); d != tt.draft || (err != nil) != tt.err {
-			t.Errorf("%q: was %v, %v; want %v, %v", tt.in, d, err != nil, tt.draft, tt.err)
-		}
-	}
-}
diff --git a/vendor/golang.org/x/text/unicode/cldr/collate_test.go b/vendor/golang.org/x/text/unicode/cldr/collate_test.go
deleted file mode 100644
index f6721639..00000000
--- a/vendor/golang.org/x/text/unicode/cldr/collate_test.go
+++ /dev/null
@@ -1,275 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package cldr
-
-import (
-	"fmt"
-	"strings"
-	"testing"
-)
-
-// A recorder implements the RuleProcessor interface, whereby its methods
-// simply record the invocations.
-type recorder struct {
-	calls []string
-}
-
-func (r *recorder) Reset(anchor string, before int) error {
-	if before > 5 {
-		return fmt.Errorf("before %d > 5", before)
-	}
-	r.calls = append(r.calls, fmt.Sprintf("R:%s-%d", anchor, before))
-	return nil
-}
-
-func (r *recorder) Insert(level int, str, context, extend string) error {
-	s := fmt.Sprintf("O:%d:%s", level, str)
-	if context != "" {
-		s += "|" + context
-	}
-	if extend != "" {
-		s += "/" + extend
-	}
-	r.calls = append(r.calls, s)
-	return nil
-}
-
-func (r *recorder) Index(id string) {
-	r.calls = append(r.calls, fmt.Sprintf("I:%s", id))
-}
-
-func (r *recorder) Error(err error) {
-	r.calls = append(r.calls, fmt.Sprintf("E:%v", err))
-}
-
-func TestRuleProcessor(t *testing.T) {
-	for _, tt := range []struct {
-		desc string
-		in   string
-		out  string
-	}{
-		{desc: "empty"},
-		{desc: "whitespace and comments only",
-			in: `
-
-
-		  		# adsfads
-# adfadf
-		`,
-		},
-		{
-			desc: "reset anchor",
-			in: `
-			& a
-			&b    #
-			&  [    before 3  ]  c
-			& [before 4] d & ee
-			& [first tertiary ignorable]
-			&'g'
-			& 	'h''h'h'h'
-			&'\u0069'  # LATIN SMALL LETTER I
-			`,
-			out: `
-			R:a-0
-			R:b-0
-			R:c-3
-			R:d-4
-			R:ee-0
-			R:<first tertiary ignorable/>-0
-			R:g-0
-			R:hhhh-0
-			R:i-0
-			`,
-		},
-		{
-			desc: "ordering",
-			in: `
-			& 0
-			< 1 <<''2#
-<<<			3'3''33'3#
-			<<<<4
-			= 5 << 6 | s
-			<<<< 7 / z
-			<< 8'' | s / ch
-			`,
-			out: `
-			R:0-0
-			O:1:1
-			O:2:'2
-			O:3:33333
-			O:4:4
-			O:5:5
-			O:2:6|s
-			O:4:7/z
-			O:2:8'|s/ch
-			`,
-		},
-		{
-			desc: "index",
-			in:   "< '\ufdd0'A",
-			out:  "I:A",
-		},
-		{
-			desc: "sequence",
-			in: `
-			& 0
-			<<* 1234
-			<* a-cde-f
-			=* q-q
-			`,
-			out: `
-			R:0-0
-			O:2:1
-			O:2:2
-			O:2:3
-			O:2:4
-			O:1:a
-			O:1:b
-			O:1:c
-			O:1:d
-			O:1:e
-			O:1:f
-			O:5:q
-			`,
-		},
-		{
-			desc: "compact",
-			in:   "&B<t<<<T<s<<<S<e<<<E",
-			out: `
-			R:B-0
-			O:1:t
-			O:3:T
-			O:1:s
-			O:3:S
-			O:1:e
-			O:3:E
-			`,
-		},
-		{
-			desc: "err operator",
-			in:   "a",
-			out:  "E:1: illegal operator 'a'",
-		},
-		{
-			desc: "err line number",
-			in: `& a
-			<< b
-			a`,
-			out: `
-			R:a-0
-			O:2:b
-			E:3: illegal operator 'a'`,
-		},
-		{
-			desc: "err empty anchor",
-			in: " &			",
-			out: "E:1: missing string",
-		},
-		{
-			desc: "err anchor invalid special 1",
-			in: " &	[ foo ",
-			out: "E:1: unmatched bracket",
-		},
-		{
-			desc: "err anchor invalid special 2",
-			in:   "&[",
-			out:  "E:1: unmatched bracket",
-		},
-		{
-			desc: "err anchor invalid before 1",
-			in:   "&[before a]",
-			out:  `E:1: strconv.ParseUint: parsing "a": invalid syntax`,
-		},
-		{
-			desc: "err anchor invalid before 2",
-			in:   "&[before 12]",
-			out:  `E:1: strconv.ParseUint: parsing "12": value out of range`,
-		},
-		{
-			desc: "err anchor invalid before 3",
-			in:   "&[before 2]",
-			out:  "E:1: missing string",
-		},
-		{
-			desc: "err anchor invalid before 4",
-			in:   "&[before 6] a",
-			out:  "E:1: before 6 > 5",
-		},
-		{
-			desc: "err empty order",
-			in:   " < ",
-			out:  "E:1: missing string",
-		},
-		{
-			desc: "err empty identity",
-			in:   " = ",
-			out:  "E:1: missing string",
-		},
-		{
-			desc: "err empty context",
-			in:   " < a |  ",
-			out:  "E:1: missing string after context",
-		},
-		{
-			desc: "err empty extend",
-			in:   " < a /  ",
-			out:  "E:1: missing string after extension",
-		},
-		{
-			desc: "err empty sequence",
-			in:   " <* ",
-			out:  "E:1: empty sequence",
-		},
-		{
-			desc: "err sequence 1",
-			in:   " <* -a",
-			out:  "E:1: range without starter value",
-		},
-		{
-			desc: "err sequence 3",
-			in:   " <* a-a-b",
-			out: `O:1:a
-			E:1: range without starter value
-			`,
-		},
-		{
-			desc: "err sequence 3",
-			in:   " <* b-a",
-			out: `O:1:b
-			E:1: invalid range 'b'-'a'
-			`,
-		},
-		{
-			desc: "err unmatched quote",
-			in:   " < 'b",
-			out: ` E:1: unmatched single quote
-			`,
-		},
-	} {
-		rec := &recorder{}
-		err := Collation{
-			Cr: []*Common{
-				{hidden: hidden{CharData: tt.in}},
-			},
-		}.Process(rec)
-		if err != nil {
-			rec.Error(err)
-		}
-		got := rec.calls
-		want := strings.Split(strings.TrimSpace(tt.out), "\n")
-		if tt.out == "" {
-			want = nil
-		}
-		if len(got) != len(want) {
-			t.Errorf("%s: nResults: got %d; want %d", tt.desc, len(got), len(want))
-			continue
-		}
-		for i, g := range got {
-			if want := strings.TrimSpace(want[i]); g != want {
-				t.Errorf("%s:%d: got %q; want %q", tt.desc, i, g, want)
-			}
-		}
-	}
-}
diff --git a/vendor/golang.org/x/text/unicode/cldr/data_test.go b/vendor/golang.org/x/text/unicode/cldr/data_test.go
deleted file mode 100644
index 16621896..00000000
--- a/vendor/golang.org/x/text/unicode/cldr/data_test.go
+++ /dev/null
@@ -1,186 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package cldr
-
-// This file contains test data.
-
-import (
-	"io"
-	"strings"
-)
-
-type testLoader struct {
-}
-
-func (t testLoader) Len() int {
-	return len(testFiles)
-}
-
-func (t testLoader) Path(i int) string {
-	return testPaths[i]
-}
-
-func (t testLoader) Reader(i int) (io.ReadCloser, error) {
-	return &reader{*strings.NewReader(testFiles[i])}, nil
-}
-
-// reader adds a dummy Close method to strings.Reader so that it
-// satisfies the io.ReadCloser interface.
-type reader struct {
-	strings.Reader
-}
-
-func (r reader) Close() error {
-	return nil
-}
-
-var (
-	testFiles = []string{de_xml, gsw_xml, root_xml}
-	testPaths = []string{
-		"common/main/de.xml",
-		"common/main/gsw.xml",
-		"common/main/root.xml",
-	}
-)
-
-var root_xml = `<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<ldml>
-	<identity>
-		<language type="root"/>
-		<generation date="now"/>
-	</identity>
-	<characters>
-		<exemplarCharacters>[]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[]</exemplarCharacters>
-		<exemplarCharacters type="punctuation">[\- ‐ – — … ' ‘ ‚ &quot; “ „ \&amp; #]</exemplarCharacters>
-		<ellipsis type="final">{0}…</ellipsis>
-		<ellipsis type="initial">…{0}</ellipsis>
-		<moreInformation>?</moreInformation>
-	</characters>
-	<dates>
-		<calendars>
-			<default choice="gregorian"/>
-			<calendar type="buddhist">
-				<months>
-					<alias source="locale" path="../../calendar[@type='gregorian']/months"/>
-				</months>
-			</calendar>
-			<calendar type="chinese">
-				<months>
-					<alias source="locale" path="../../calendar[@type='gregorian']/months"/>
-				</months>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<default choice="format"/>
-					<monthContext type="format">
-						<default choice="wide"/>
-						<monthWidth type="narrow">
-							<alias source="locale" path="../../monthContext[@type='stand-alone']/monthWidth[@type='narrow']"/>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">11</month>
-							<month type="2">22</month>
-							<month type="3">33</month>
-							<month type="4">44</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<alias source="locale" path="../../monthContext[@type='format']/monthWidth[@type='wide']"/>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-		</calendars>
-	</dates>
-</ldml>
-`
-
-var de_xml = `<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<ldml>
-	<identity>
-		<language type="de"/>
-	</identity>
-	<characters>
-		<exemplarCharacters>[a ä b c d e ö p q r s ß t u ü v w x y z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[á à ă]</exemplarCharacters>
-		<exemplarCharacters type="index">[A B C D E F G H Z]</exemplarCharacters>
-		<ellipsis type="final">{0} …</ellipsis>
-		<ellipsis type="initial">… {0}</ellipsis>
-		<moreInformation>?</moreInformation>
-		<stopwords>
-			<stopwordList type="collation" draft="provisional">der die das</stopwordList>
-		</stopwords>
-	</characters>
-	<dates>
-		<calendars>
-			<calendar type="buddhist">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="narrow">
-							<month type="3">BBB</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="3">bbb</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="narrow">
-							<month type="3">M</month>
-							<month type="4">A</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="3">Maerz</month>
-							<month type="4">April</month>
-							<month type="5">Mai</month>
-						</monthWidth>
-					</monthContext>
-					<monthContext type="stand-alone">
-						<monthWidth type="narrow">
-							<month type="3">m</month>
-							<month type="5">m</month>
-						</monthWidth>
-						<monthWidth type="wide">
-							<month type="4">april</month>
-							<month type="5">mai</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-		</calendars>
-	</dates>
-	<posix>
-		<messages>
-			<yesstr>yes:y</yesstr>
-			<nostr>no:n</nostr>
-		</messages>
-	</posix>
-</ldml>
-`
-
-var gsw_xml = `<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<ldml>
-	<identity>
-		<language type="gsw"/>
-	</identity>
-	<posix>
-		<alias source="de" path="//ldml/posix"/>
-	</posix>
-</ldml>
-`
diff --git a/vendor/golang.org/x/text/unicode/cldr/examples_test.go b/vendor/golang.org/x/text/unicode/cldr/examples_test.go
deleted file mode 100644
index 1a69b007..00000000
--- a/vendor/golang.org/x/text/unicode/cldr/examples_test.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package cldr_test
-
-import (
-	"fmt"
-
-	"golang.org/x/text/unicode/cldr"
-)
-
-func ExampleSlice() {
-	var dr *cldr.CLDR // assume this is initialized
-
-	x, _ := dr.LDML("en")
-	cs := x.Collations.Collation
-	// remove all but the default
-	cldr.MakeSlice(&cs).Filter(func(e cldr.Elem) bool {
-		return e.GetCommon().Type != x.Collations.Default()
-	})
-	for i, c := range cs {
-		fmt.Println(i, c.Type)
-	}
-}
diff --git a/vendor/golang.org/x/text/unicode/cldr/resolve_test.go b/vendor/golang.org/x/text/unicode/cldr/resolve_test.go
deleted file mode 100644
index 3d8edaec..00000000
--- a/vendor/golang.org/x/text/unicode/cldr/resolve_test.go
+++ /dev/null
@@ -1,368 +0,0 @@
-package cldr
-
-import (
-	"fmt"
-	"log"
-	"reflect"
-	"testing"
-)
-
-func failOnError(err error) {
-	if err != nil {
-		log.Panic(err)
-	}
-}
-
-func data() *CLDR {
-	d := Decoder{}
-	data, err := d.Decode(testLoader{})
-	failOnError(err)
-	return data
-}
-
-type h struct {
-	A string `xml:"ha,attr"`
-	E string `xml:"he"`
-	D string `xml:",chardata"`
-	X string
-}
-
-type fieldTest struct {
-	Common
-	To  string `xml:"to,attr"`
-	Key string `xml:"key,attr"`
-	E   string `xml:"e"`
-	D   string `xml:",chardata"`
-	X   string
-	h
-}
-
-var testStruct = fieldTest{
-	Common: Common{
-		name: "mapping", // exclude "type" as distinguishing attribute
-		Type: "foo",
-		Alt:  "foo",
-	},
-	To:  "nyc",
-	Key: "k",
-	E:   "E",
-	D:   "D",
-	h: h{
-		A: "A",
-		E: "E",
-		D: "D",
-	},
-}
-
-func TestIter(t *testing.T) {
-	tests := map[string]string{
-		"Type":  "foo",
-		"Alt":   "foo",
-		"To":    "nyc",
-		"A":     "A",
-		"Alias": "<nil>",
-	}
-	k := 0
-	for i := iter(reflect.ValueOf(testStruct)); !i.done(); i.next() {
-		v := i.value()
-		if v.Kind() == reflect.Ptr && v.Elem().Kind() == reflect.String {
-			v = v.Elem()
-		}
-		name := i.field().Name
-		if w, ok := tests[name]; ok {
-			s := fmt.Sprint(v.Interface())
-			if w != s {
-				t.Errorf("value: found %q; want %q", w, s)
-			}
-			delete(tests, name)
-		}
-		k++
-	}
-	if len(tests) != 0 {
-		t.Errorf("missing fields: %v", tests)
-	}
-}
-
-func TestFindField(t *testing.T) {
-	tests := []struct {
-		name, val string
-		exist     bool
-	}{
-		{"type", "foo", true},
-		{"alt", "foo", true},
-		{"to", "nyc", true},
-		{"he", "E", true},
-		{"q", "", false},
-	}
-	vf := reflect.ValueOf(testStruct)
-	for i, tt := range tests {
-		v, err := findField(vf, tt.name)
-		if (err == nil) != tt.exist {
-			t.Errorf("%d: field %q present is %v; want %v", i, tt.name, err == nil, tt.exist)
-		} else if tt.exist {
-			if v.Kind() == reflect.Ptr {
-				if v.IsNil() {
-					continue
-				}
-				v = v.Elem()
-			}
-			if v.String() != tt.val {
-				t.Errorf("%d: found value %q; want %q", i, v.String(), tt.val)
-			}
-		}
-	}
-}
-
-var keyTests = []struct {
-	exclude []string
-	key     string
-}{
-	{[]string{}, "alt=foo;key=k;to=nyc"},
-	{[]string{"type"}, "alt=foo;key=k;to=nyc"},
-	{[]string{"choice"}, "alt=foo;key=k;to=nyc"},
-	{[]string{"alt"}, "key=k;to=nyc"},
-	{[]string{"a"}, "alt=foo;key=k;to=nyc"},
-	{[]string{"to"}, "alt=foo;key=k"},
-	{[]string{"alt", "to"}, "key=k"},
-	{[]string{"alt", "to", "key"}, ""},
-}
-
-func TestAttrKey(t *testing.T) {
-	v := reflect.ValueOf(&testStruct)
-	for i, tt := range keyTests {
-		key := attrKey(v, tt.exclude...)
-		if key != tt.key {
-			t.Errorf("%d: found %q, want %q", i, key, tt.key)
-		}
-	}
-}
-
-func TestKey(t *testing.T) {
-	for i, tt := range keyTests {
-		key := Key(&testStruct, tt.exclude...)
-		if key != tt.key {
-			t.Errorf("%d: found %q, want %q", i, key, tt.key)
-		}
-	}
-}
-
-func testEnclosing(t *testing.T, x *LDML, name string) {
-	eq := func(a, b Elem, i int) {
-		for ; i > 0; i-- {
-			b = b.enclosing()
-		}
-		if a != b {
-			t.Errorf("%s: found path %q, want %q", name, getPath(a), getPath(b))
-		}
-	}
-	eq(x, x, 0)
-	eq(x, x.Identity, 1)
-	eq(x, x.Dates.Calendars, 2)
-	eq(x, x.Dates.Calendars.Calendar[0], 3)
-	eq(x, x.Dates.Calendars.Calendar[1], 3)
-	//eq(x, x.Dates.Calendars.Calendar[0].Months, 4)
-	eq(x, x.Dates.Calendars.Calendar[1].Months, 4)
-}
-
-func TestEnclosing(t *testing.T) {
-	testEnclosing(t, data().RawLDML("de"), "enclosing-raw")
-	de, _ := data().LDML("de")
-	testEnclosing(t, de, "enclosing")
-}
-
-func TestDeepCopy(t *testing.T) {
-	eq := func(have, want string) {
-		if have != want {
-			t.Errorf("found %q; want %q", have, want)
-		}
-	}
-	x, _ := data().LDML("de")
-	vc := deepCopy(reflect.ValueOf(x))
-	c := vc.Interface().(*LDML)
-	linkEnclosing(nil, c)
-	if x == c {
-		t.Errorf("did not copy")
-	}
-
-	eq(c.name, "ldml")
-	eq(c.Dates.name, "dates")
-	testEnclosing(t, c, "deepCopy")
-}
-
-type getTest struct {
-	loc     string
-	path    string
-	field   string // used in combination with length
-	data    string
-	altData string // used for buddhist calendar if value != ""
-	typ     string
-	length  int
-	missing bool
-}
-
-const (
-	budMon = "dates/calendars/calendar[@type='buddhist']/months/"
-	chnMon = "dates/calendars/calendar[@type='chinese']/months/"
-	greMon = "dates/calendars/calendar[@type='gregorian']/months/"
-)
-
-func monthVal(path, context, width string, month int) string {
-	const format = "%s/monthContext[@type='%s']/monthWidth[@type='%s']/month[@type='%d']"
-	return fmt.Sprintf(format, path, context, width, month)
-}
-
-var rootGetTests = []getTest{
-	{loc: "root", path: "identity/language", typ: "root"},
-	{loc: "root", path: "characters/moreInformation", data: "?"},
-	{loc: "root", path: "characters", field: "exemplarCharacters", length: 3},
-	{loc: "root", path: greMon, field: "monthContext", length: 2},
-	{loc: "root", path: greMon + "monthContext[@type='format']/monthWidth[@type='narrow']", field: "month", length: 4},
-	{loc: "root", path: greMon + "monthContext[@type='stand-alone']/monthWidth[@type='wide']", field: "month", length: 4},
-	// unescaping character data
-	{loc: "root", path: "characters/exemplarCharacters[@type='punctuation']", data: `[\- ‐ – — … ' ‘ ‚ " “ „ \& #]`},
-	// default resolution
-	{loc: "root", path: "dates/calendars/calendar", typ: "gregorian"},
-	// alias resolution
-	{loc: "root", path: budMon, field: "monthContext", length: 2},
-	// crossing but non-circular alias resolution
-	{loc: "root", path: budMon + "monthContext[@type='format']/monthWidth[@type='narrow']", field: "month", length: 4},
-	{loc: "root", path: budMon + "monthContext[@type='stand-alone']/monthWidth[@type='wide']", field: "month", length: 4},
-	{loc: "root", path: monthVal(greMon, "format", "wide", 1), data: "11"},
-	{loc: "root", path: monthVal(greMon, "format", "narrow", 2), data: "2"},
-	{loc: "root", path: monthVal(greMon, "stand-alone", "wide", 3), data: "33"},
-	{loc: "root", path: monthVal(greMon, "stand-alone", "narrow", 4), data: "4"},
-	{loc: "root", path: monthVal(budMon, "format", "wide", 1), data: "11"},
-	{loc: "root", path: monthVal(budMon, "format", "narrow", 2), data: "2"},
-	{loc: "root", path: monthVal(budMon, "stand-alone", "wide", 3), data: "33"},
-	{loc: "root", path: monthVal(budMon, "stand-alone", "narrow", 4), data: "4"},
-}
-
-// 19
-var deGetTests = []getTest{
-	{loc: "de", path: "identity/language", typ: "de"},
-	{loc: "de", path: "posix", length: 2},
-	{loc: "de", path: "characters", field: "exemplarCharacters", length: 4},
-	{loc: "de", path: "characters/exemplarCharacters[@type='auxiliary']", data: `[á à ă]`},
-	// identity is a blocking element, so de should not inherit generation from root.
-	{loc: "de", path: "identity/generation", missing: true},
-	// default resolution
-	{loc: "root", path: "dates/calendars/calendar", typ: "gregorian"},
-
-	// absolute path alias resolution
-	{loc: "gsw", path: "posix", field: "messages", length: 1},
-	{loc: "gsw", path: "posix/messages/yesstr", data: "yes:y"},
-}
-
-// 27(greMon) - 52(budMon) - 77(chnMon)
-func calGetTests(s string) []getTest {
-	tests := []getTest{
-		{loc: "de", path: s, length: 2},
-		{loc: "de", path: s + "monthContext[@type='format']/monthWidth[@type='wide']", field: "month", length: 5},
-		{loc: "de", path: monthVal(s, "format", "wide", 1), data: "11"},
-		{loc: "de", path: monthVal(s, "format", "wide", 2), data: "22"},
-		{loc: "de", path: monthVal(s, "format", "wide", 3), data: "Maerz", altData: "bbb"},
-		{loc: "de", path: monthVal(s, "format", "wide", 4), data: "April"},
-		{loc: "de", path: monthVal(s, "format", "wide", 5), data: "Mai"},
-
-		{loc: "de", path: s + "monthContext[@type='format']/monthWidth[@type='narrow']", field: "month", length: 5},
-		{loc: "de", path: monthVal(s, "format", "narrow", 1), data: "1"},
-		{loc: "de", path: monthVal(s, "format", "narrow", 2), data: "2"},
-		{loc: "de", path: monthVal(s, "format", "narrow", 3), data: "M", altData: "BBB"},
-		{loc: "de", path: monthVal(s, "format", "narrow", 4), data: "A"},
-		{loc: "de", path: monthVal(s, "format", "narrow", 5), data: "m"},
-
-		{loc: "de", path: s + "monthContext[@type='stand-alone']/monthWidth[@type='wide']", field: "month", length: 5},
-		{loc: "de", path: monthVal(s, "stand-alone", "wide", 1), data: "11"},
-		{loc: "de", path: monthVal(s, "stand-alone", "wide", 2), data: "22"},
-		{loc: "de", path: monthVal(s, "stand-alone", "wide", 3), data: "Maerz", altData: "bbb"},
-		{loc: "de", path: monthVal(s, "stand-alone", "wide", 4), data: "april"},
-		{loc: "de", path: monthVal(s, "stand-alone", "wide", 5), data: "mai"},
-
-		{loc: "de", path: s + "monthContext[@type='stand-alone']/monthWidth[@type='narrow']", field: "month", length: 5},
-		{loc: "de", path: monthVal(s, "stand-alone", "narrow", 1), data: "1"},
-		{loc: "de", path: monthVal(s, "stand-alone", "narrow", 2), data: "2"},
-		{loc: "de", path: monthVal(s, "stand-alone", "narrow", 3), data: "m"},
-		{loc: "de", path: monthVal(s, "stand-alone", "narrow", 4), data: "4"},
-		{loc: "de", path: monthVal(s, "stand-alone", "narrow", 5), data: "m"},
-	}
-	if s == budMon {
-		for i, t := range tests {
-			if t.altData != "" {
-				tests[i].data = t.altData
-			}
-		}
-	}
-	return tests
-}
-
-var getTests = append(rootGetTests,
-	append(deGetTests,
-		append(calGetTests(greMon),
-			append(calGetTests(budMon),
-				calGetTests(chnMon)...)...)...)...)
-
-func TestPath(t *testing.T) {
-	d := data()
-	for i, tt := range getTests {
-		x, _ := d.LDML(tt.loc)
-		e, err := walkXPath(x, tt.path)
-		if err != nil {
-			if !tt.missing {
-				t.Errorf("%d:error: %v %v", i, err, tt.missing)
-			}
-			continue
-		}
-		if tt.missing {
-			t.Errorf("%d: missing is %v; want %v", i, e == nil, tt.missing)
-			continue
-		}
-		if tt.data != "" && e.GetCommon().Data() != tt.data {
-			t.Errorf("%d: data is %v; want %v", i, e.GetCommon().Data(), tt.data)
-			continue
-		}
-		if tt.typ != "" && e.GetCommon().Type != tt.typ {
-			t.Errorf("%d: type is %v; want %v", i, e.GetCommon().Type, tt.typ)
-			continue
-		}
-		if tt.field != "" {
-			slice, _ := findField(reflect.ValueOf(e), tt.field)
-			if slice.Len() != tt.length {
-				t.Errorf("%d: length is %v; want %v", i, slice.Len(), tt.length)
-				continue
-			}
-		}
-	}
-}
-
-func TestGet(t *testing.T) {
-	d := data()
-	for i, tt := range getTests {
-		x, _ := d.LDML(tt.loc)
-		e, err := Get(x, tt.path)
-		if err != nil {
-			if !tt.missing {
-				t.Errorf("%d:error: %v %v", i, err, tt.missing)
-			}
-			continue
-		}
-		if tt.missing {
-			t.Errorf("%d: missing is %v; want %v", i, e == nil, tt.missing)
-			continue
-		}
-		if tt.data != "" && e.GetCommon().Data() != tt.data {
-			t.Errorf("%d: data is %v; want %v", i, e.GetCommon().Data(), tt.data)
-			continue
-		}
-		if tt.typ != "" && e.GetCommon().Type != tt.typ {
-			t.Errorf("%d: type is %v; want %v", i, e.GetCommon().Type, tt.typ)
-			continue
-		}
-		if tt.field != "" {
-			slice, _ := findField(reflect.ValueOf(e), tt.field)
-			if slice.Len() != tt.length {
-				t.Errorf("%d: length is %v; want %v", i, slice.Len(), tt.length)
-				continue
-			}
-		}
-	}
-}
diff --git a/vendor/golang.org/x/text/unicode/cldr/slice_test.go b/vendor/golang.org/x/text/unicode/cldr/slice_test.go
deleted file mode 100644
index 3d487d3b..00000000
--- a/vendor/golang.org/x/text/unicode/cldr/slice_test.go
+++ /dev/null
@@ -1,175 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package cldr
-
-import (
-	"reflect"
-	"testing"
-)
-
-type testSlice []*Common
-
-func mkElem(alt, typ, ref string) *Common {
-	return &Common{
-		Type:      typ,
-		Reference: ref,
-		Alt:       alt,
-	}
-}
-
-var (
-	testSlice1 = testSlice{
-		mkElem("1", "a", "i.a"),
-		mkElem("1", "b", "i.b"),
-		mkElem("1", "c", "i.c"),
-		mkElem("2", "b", "ii"),
-		mkElem("3", "c", "iii"),
-		mkElem("4", "a", "iv.a"),
-		mkElem("4", "d", "iv.d"),
-	}
-	testSliceE = testSlice{}
-)
-
-func panics(f func()) (panics bool) {
-	defer func() {
-		if err := recover(); err != nil {
-			panics = true
-		}
-	}()
-	f()
-	return panics
-}
-
-func TestMakeSlice(t *testing.T) {
-	foo := 1
-	bar := []int{}
-	tests := []struct {
-		i      interface{}
-		panics bool
-		err    string
-	}{
-		{&foo, true, "should panic when passed a pointer to the wrong type"},
-		{&bar, true, "should panic when slice element of the wrong type"},
-		{testSlice1, true, "should panic when passed a slice"},
-		{&testSlice1, false, "should not panic"},
-	}
-	for i, tt := range tests {
-		if panics(func() { MakeSlice(tt.i) }) != tt.panics {
-			t.Errorf("%d: %s", i, tt.err)
-		}
-	}
-}
-
-var anyOfTests = []struct {
-	sl     testSlice
-	values []string
-	n      int
-}{
-	{testSliceE, []string{}, 0},
-	{testSliceE, []string{"1", "2", "3"}, 0},
-	{testSlice1, []string{}, 0},
-	{testSlice1, []string{"1"}, 3},
-	{testSlice1, []string{"2"}, 1},
-	{testSlice1, []string{"5"}, 0},
-	{testSlice1, []string{"1", "2", "3"}, 5},
-}
-
-func TestSelectAnyOf(t *testing.T) {
-	for i, tt := range anyOfTests {
-		sl := tt.sl
-		s := MakeSlice(&sl)
-		s.SelectAnyOf("alt", tt.values...)
-		if len(sl) != tt.n {
-			t.Errorf("%d: found len == %d; want %d", i, len(sl), tt.n)
-		}
-	}
-	sl := testSlice1
-	s := MakeSlice(&sl)
-	if !panics(func() { s.SelectAnyOf("foo") }) {
-		t.Errorf("should panic on non-existing attribute")
-	}
-}
-
-func TestFilter(t *testing.T) {
-	for i, tt := range anyOfTests {
-		sl := tt.sl
-		s := MakeSlice(&sl)
-		s.Filter(func(e Elem) bool {
-			v, _ := findField(reflect.ValueOf(e), "alt")
-			return in(tt.values, v.String())
-		})
-		if len(sl) != tt.n {
-			t.Errorf("%d: found len == %d; want %d", i, len(sl), tt.n)
-		}
-	}
-}
-
-func TestGroup(t *testing.T) {
-	f := func(excl ...string) func(Elem) string {
-		return func(e Elem) string {
-			return Key(e, excl...)
-		}
-	}
-	tests := []struct {
-		sl   testSlice
-		f    func(Elem) string
-		lens []int
-	}{
-		{testSliceE, f(), []int{}},
-		{testSlice1, f(), []int{1, 1, 1, 1, 1, 1, 1}},
-		{testSlice1, f("type"), []int{3, 1, 1, 2}},
-		{testSlice1, f("alt"), []int{2, 2, 2, 1}},
-		{testSlice1, f("alt", "type"), []int{7}},
-		{testSlice1, f("alt", "type"), []int{7}},
-	}
-	for i, tt := range tests {
-		sl := tt.sl
-		s := MakeSlice(&sl)
-		g := s.Group(tt.f)
-		if len(tt.lens) != len(g) {
-			t.Errorf("%d: found %d; want %d", i, len(g), len(tt.lens))
-			continue
-		}
-		for j, v := range tt.lens {
-			if n := g[j].Value().Len(); n != v {
-				t.Errorf("%d: found %d for length of group %d; want %d", i, n, j, v)
-			}
-		}
-	}
-}
-
-func TestSelectOnePerGroup(t *testing.T) {
-	tests := []struct {
-		sl     testSlice
-		attr   string
-		values []string
-		refs   []string
-	}{
-		{testSliceE, "alt", []string{"1"}, []string{}},
-		{testSliceE, "type", []string{"a"}, []string{}},
-		{testSlice1, "alt", []string{"2", "3", "1"}, []string{"i.a", "ii", "iii"}},
-		{testSlice1, "alt", []string{"1", "4"}, []string{"i.a", "i.b", "i.c", "iv.d"}},
-		{testSlice1, "type", []string{"c", "d"}, []string{"i.c", "iii", "iv.d"}},
-	}
-	for i, tt := range tests {
-		sl := tt.sl
-		s := MakeSlice(&sl)
-		s.SelectOnePerGroup(tt.attr, tt.values)
-		if len(sl) != len(tt.refs) {
-			t.Errorf("%d: found result length %d; want %d", i, len(sl), len(tt.refs))
-			continue
-		}
-		for j, e := range sl {
-			if tt.refs[j] != e.Reference {
-				t.Errorf("%d:%d found %s; want %s", i, j, e.Reference, tt.refs[i])
-			}
-		}
-	}
-	sl := testSlice1
-	s := MakeSlice(&sl)
-	if !panics(func() { s.SelectOnePerGroup("foo", nil) }) {
-		t.Errorf("should panic on non-existing attribute")
-	}
-}
diff --git a/vendor/golang.org/x/text/unicode/doc.go b/vendor/golang.org/x/text/unicode/doc.go
deleted file mode 100644
index e8f1032d..00000000
--- a/vendor/golang.org/x/text/unicode/doc.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// unicode holds packages with implementations of Unicode standards that are
-// mostly used as building blocks for other packages in golang.org/x/text,
-// layout engines, or are otherwise more low-level in nature.
-package unicode
diff --git a/vendor/golang.org/x/text/unicode/norm/composition_test.go b/vendor/golang.org/x/text/unicode/norm/composition_test.go
deleted file mode 100644
index 11684069..00000000
--- a/vendor/golang.org/x/text/unicode/norm/composition_test.go
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package norm
-
-import "testing"
-
-// TestCase is used for most tests.
-type TestCase struct {
-	in  []rune
-	out []rune
-}
-
-func runTests(t *testing.T, name string, fm Form, tests []TestCase) {
-	rb := reorderBuffer{}
-	rb.init(fm, nil)
-	for i, test := range tests {
-		rb.setFlusher(nil, appendFlush)
-		for j, rune := range test.in {
-			b := []byte(string(rune))
-			src := inputBytes(b)
-			info := rb.f.info(src, 0)
-			if j == 0 {
-				rb.ss.first(info)
-			} else {
-				rb.ss.next(info)
-			}
-			if rb.insertFlush(src, 0, info) < 0 {
-				t.Errorf("%s:%d: insert failed for rune %d", name, i, j)
-			}
-		}
-		rb.doFlush()
-		was := string(rb.out)
-		want := string(test.out)
-		if len(was) != len(want) {
-			t.Errorf("%s:%d: length = %d; want %d", name, i, len(was), len(want))
-		}
-		if was != want {
-			k, pfx := pidx(was, want)
-			t.Errorf("%s:%d: \nwas  %s%+q; \nwant %s%+q", name, i, pfx, was[k:], pfx, want[k:])
-		}
-	}
-}
-
-func TestFlush(t *testing.T) {
-	const (
-		hello = "Hello "
-		world = "world!"
-	)
-	buf := make([]byte, maxByteBufferSize)
-	p := copy(buf, hello)
-	out := buf[p:]
-	rb := reorderBuffer{}
-	rb.initString(NFC, world)
-	if i := rb.flushCopy(out); i != 0 {
-		t.Errorf("wrote bytes on flush of empty buffer. (len(out) = %d)", i)
-	}
-
-	for i := range world {
-		// No need to set streamSafe values for this test.
-		rb.insertFlush(rb.src, i, rb.f.info(rb.src, i))
-		n := rb.flushCopy(out)
-		out = out[n:]
-		p += n
-	}
-
-	was := buf[:p]
-	want := hello + world
-	if string(was) != want {
-		t.Errorf(`output after flush was "%s"; want "%s"`, string(was), want)
-	}
-	if rb.nrune != 0 {
-		t.Errorf("non-null size of info buffer (rb.nrune == %d)", rb.nrune)
-	}
-	if rb.nbyte != 0 {
-		t.Errorf("non-null size of byte buffer (rb.nbyte == %d)", rb.nbyte)
-	}
-}
-
-var insertTests = []TestCase{
-	{[]rune{'a'}, []rune{'a'}},
-	{[]rune{0x300}, []rune{0x300}},
-	{[]rune{0x300, 0x316}, []rune{0x316, 0x300}}, // CCC(0x300)==230; CCC(0x316)==220
-	{[]rune{0x316, 0x300}, []rune{0x316, 0x300}},
-	{[]rune{0x41, 0x316, 0x300}, []rune{0x41, 0x316, 0x300}},
-	{[]rune{0x41, 0x300, 0x316}, []rune{0x41, 0x316, 0x300}},
-	{[]rune{0x300, 0x316, 0x41}, []rune{0x316, 0x300, 0x41}},
-	{[]rune{0x41, 0x300, 0x40, 0x316}, []rune{0x41, 0x300, 0x40, 0x316}},
-}
-
-func TestInsert(t *testing.T) {
-	runTests(t, "TestInsert", NFD, insertTests)
-}
-
-var decompositionNFDTest = []TestCase{
-	{[]rune{0xC0}, []rune{0x41, 0x300}},
-	{[]rune{0xAC00}, []rune{0x1100, 0x1161}},
-	{[]rune{0x01C4}, []rune{0x01C4}},
-	{[]rune{0x320E}, []rune{0x320E}},
-	{[]rune("음ẻ과"), []rune{0x110B, 0x1173, 0x11B7, 0x65, 0x309, 0x1100, 0x116A}},
-}
-
-var decompositionNFKDTest = []TestCase{
-	{[]rune{0xC0}, []rune{0x41, 0x300}},
-	{[]rune{0xAC00}, []rune{0x1100, 0x1161}},
-	{[]rune{0x01C4}, []rune{0x44, 0x5A, 0x030C}},
-	{[]rune{0x320E}, []rune{0x28, 0x1100, 0x1161, 0x29}},
-}
-
-func TestDecomposition(t *testing.T) {
-	runTests(t, "TestDecompositionNFD", NFD, decompositionNFDTest)
-	runTests(t, "TestDecompositionNFKD", NFKD, decompositionNFKDTest)
-}
-
-var compositionTest = []TestCase{
-	{[]rune{0x41, 0x300}, []rune{0xC0}},
-	{[]rune{0x41, 0x316}, []rune{0x41, 0x316}},
-	{[]rune{0x41, 0x300, 0x35D}, []rune{0xC0, 0x35D}},
-	{[]rune{0x41, 0x316, 0x300}, []rune{0xC0, 0x316}},
-	// blocking starter
-	{[]rune{0x41, 0x316, 0x40, 0x300}, []rune{0x41, 0x316, 0x40, 0x300}},
-	{[]rune{0x1100, 0x1161}, []rune{0xAC00}},
-	// parenthesized Hangul, alternate between ASCII and Hangul.
-	{[]rune{0x28, 0x1100, 0x1161, 0x29}, []rune{0x28, 0xAC00, 0x29}},
-}
-
-func TestComposition(t *testing.T) {
-	runTests(t, "TestComposition", NFC, compositionTest)
-}
diff --git a/vendor/golang.org/x/text/unicode/norm/data10.0.0_test.go b/vendor/golang.org/x/text/unicode/norm/data10.0.0_test.go
deleted file mode 100644
index 1d0f73dc..00000000
--- a/vendor/golang.org/x/text/unicode/norm/data10.0.0_test.go
+++ /dev/null
@@ -1,7424 +0,0 @@
-// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
-
-// +build go1.10
-
-package norm
-
-const (
-	Yes = iota
-	No
-	Maybe
-)
-
-type formData struct {
-	qc              uint8
-	combinesForward bool
-	decomposition   string
-}
-
-type runeData struct {
-	r      rune
-	ccc    uint8
-	nLead  uint8
-	nTrail uint8
-	f      [2]formData // 0: canonical; 1: compatibility
-}
-
-func f(qc uint8, cf bool, dec string) [2]formData {
-	return [2]formData{{qc, cf, dec}, {qc, cf, dec}}
-}
-
-func g(qc, qck uint8, cf, cfk bool, d, dk string) [2]formData {
-	return [2]formData{{qc, cf, d}, {qck, cfk, dk}}
-}
-
-var testData = []runeData{
-	{0x0, 0, 0, 0, f(Yes, false, "")},
-	{0x3c, 0, 0, 0, f(Yes, true, "")},
-	{0x3f, 0, 0, 0, f(Yes, false, "")},
-	{0x41, 0, 0, 0, f(Yes, true, "")},
-	{0x51, 0, 0, 0, f(Yes, false, "")},
-	{0x52, 0, 0, 0, f(Yes, true, "")},
-	{0x5b, 0, 0, 0, f(Yes, false, "")},
-	{0x61, 0, 0, 0, f(Yes, true, "")},
-	{0x71, 0, 0, 0, f(Yes, false, "")},
-	{0x72, 0, 0, 0, f(Yes, true, "")},
-	{0x7b, 0, 0, 0, f(Yes, false, "")},
-	{0xa0, 0, 0, 0, g(Yes, No, false, false, "", " ")},
-	{0xa1, 0, 0, 0, f(Yes, false, "")},
-	{0xa8, 0, 0, 1, g(Yes, No, true, false, "", " ̈")},
-	{0xa9, 0, 0, 0, f(Yes, false, "")},
-	{0xaa, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0xab, 0, 0, 0, f(Yes, false, "")},
-	{0xaf, 0, 0, 1, g(Yes, No, false, false, "", " ̄")},
-	{0xb0, 0, 0, 0, f(Yes, false, "")},
-	{0xb2, 0, 0, 0, g(Yes, No, false, false, "", "2")},
-	{0xb3, 0, 0, 0, g(Yes, No, false, false, "", "3")},
-	{0xb4, 0, 0, 1, g(Yes, No, false, false, "", " ́")},
-	{0xb5, 0, 0, 0, g(Yes, No, false, false, "", "μ")},
-	{0xb6, 0, 0, 0, f(Yes, false, "")},
-	{0xb8, 0, 0, 1, g(Yes, No, false, false, "", " ̧")},
-	{0xb9, 0, 0, 0, g(Yes, No, false, false, "", "1")},
-	{0xba, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0xbb, 0, 0, 0, f(Yes, false, "")},
-	{0xbc, 0, 0, 0, g(Yes, No, false, false, "", "1⁄4")},
-	{0xbd, 0, 0, 0, g(Yes, No, false, false, "", "1⁄2")},
-	{0xbe, 0, 0, 0, g(Yes, No, false, false, "", "3⁄4")},
-	{0xbf, 0, 0, 0, f(Yes, false, "")},
-	{0xc0, 0, 0, 1, f(Yes, false, "À")},
-	{0xc1, 0, 0, 1, f(Yes, false, "Á")},
-	{0xc2, 0, 0, 1, f(Yes, true, "Â")},
-	{0xc3, 0, 0, 1, f(Yes, false, "Ã")},
-	{0xc4, 0, 0, 1, f(Yes, true, "Ä")},
-	{0xc5, 0, 0, 1, f(Yes, true, "Å")},
-	{0xc6, 0, 0, 0, f(Yes, true, "")},
-	{0xc7, 0, 0, 1, f(Yes, true, "Ç")},
-	{0xc8, 0, 0, 1, f(Yes, false, "È")},
-	{0xc9, 0, 0, 1, f(Yes, false, "É")},
-	{0xca, 0, 0, 1, f(Yes, true, "Ê")},
-	{0xcb, 0, 0, 1, f(Yes, false, "Ë")},
-	{0xcc, 0, 0, 1, f(Yes, false, "Ì")},
-	{0xcd, 0, 0, 1, f(Yes, false, "Í")},
-	{0xce, 0, 0, 1, f(Yes, false, "Î")},
-	{0xcf, 0, 0, 1, f(Yes, true, "Ï")},
-	{0xd0, 0, 0, 0, f(Yes, false, "")},
-	{0xd1, 0, 0, 1, f(Yes, false, "Ñ")},
-	{0xd2, 0, 0, 1, f(Yes, false, "Ò")},
-	{0xd3, 0, 0, 1, f(Yes, false, "Ó")},
-	{0xd4, 0, 0, 1, f(Yes, true, "Ô")},
-	{0xd5, 0, 0, 1, f(Yes, true, "Õ")},
-	{0xd6, 0, 0, 1, f(Yes, true, "Ö")},
-	{0xd7, 0, 0, 0, f(Yes, false, "")},
-	{0xd8, 0, 0, 0, f(Yes, true, "")},
-	{0xd9, 0, 0, 1, f(Yes, false, "Ù")},
-	{0xda, 0, 0, 1, f(Yes, false, "Ú")},
-	{0xdb, 0, 0, 1, f(Yes, false, "Û")},
-	{0xdc, 0, 0, 1, f(Yes, true, "Ü")},
-	{0xdd, 0, 0, 1, f(Yes, false, "Ý")},
-	{0xde, 0, 0, 0, f(Yes, false, "")},
-	{0xe0, 0, 0, 1, f(Yes, false, "à")},
-	{0xe1, 0, 0, 1, f(Yes, false, "á")},
-	{0xe2, 0, 0, 1, f(Yes, true, "â")},
-	{0xe3, 0, 0, 1, f(Yes, false, "ã")},
-	{0xe4, 0, 0, 1, f(Yes, true, "ä")},
-	{0xe5, 0, 0, 1, f(Yes, true, "å")},
-	{0xe6, 0, 0, 0, f(Yes, true, "")},
-	{0xe7, 0, 0, 1, f(Yes, true, "ç")},
-	{0xe8, 0, 0, 1, f(Yes, false, "è")},
-	{0xe9, 0, 0, 1, f(Yes, false, "é")},
-	{0xea, 0, 0, 1, f(Yes, true, "ê")},
-	{0xeb, 0, 0, 1, f(Yes, false, "ë")},
-	{0xec, 0, 0, 1, f(Yes, false, "ì")},
-	{0xed, 0, 0, 1, f(Yes, false, "í")},
-	{0xee, 0, 0, 1, f(Yes, false, "î")},
-	{0xef, 0, 0, 1, f(Yes, true, "ï")},
-	{0xf0, 0, 0, 0, f(Yes, false, "")},
-	{0xf1, 0, 0, 1, f(Yes, false, "ñ")},
-	{0xf2, 0, 0, 1, f(Yes, false, "ò")},
-	{0xf3, 0, 0, 1, f(Yes, false, "ó")},
-	{0xf4, 0, 0, 1, f(Yes, true, "ô")},
-	{0xf5, 0, 0, 1, f(Yes, true, "õ")},
-	{0xf6, 0, 0, 1, f(Yes, true, "ö")},
-	{0xf7, 0, 0, 0, f(Yes, false, "")},
-	{0xf8, 0, 0, 0, f(Yes, true, "")},
-	{0xf9, 0, 0, 1, f(Yes, false, "ù")},
-	{0xfa, 0, 0, 1, f(Yes, false, "ú")},
-	{0xfb, 0, 0, 1, f(Yes, false, "û")},
-	{0xfc, 0, 0, 1, f(Yes, true, "ü")},
-	{0xfd, 0, 0, 1, f(Yes, false, "ý")},
-	{0xfe, 0, 0, 0, f(Yes, false, "")},
-	{0xff, 0, 0, 1, f(Yes, false, "ÿ")},
-	{0x100, 0, 0, 1, f(Yes, false, "Ā")},
-	{0x101, 0, 0, 1, f(Yes, false, "ā")},
-	{0x102, 0, 0, 1, f(Yes, true, "Ă")},
-	{0x103, 0, 0, 1, f(Yes, true, "ă")},
-	{0x104, 0, 0, 1, f(Yes, false, "Ą")},
-	{0x105, 0, 0, 1, f(Yes, false, "ą")},
-	{0x106, 0, 0, 1, f(Yes, false, "Ć")},
-	{0x107, 0, 0, 1, f(Yes, false, "ć")},
-	{0x108, 0, 0, 1, f(Yes, false, "Ĉ")},
-	{0x109, 0, 0, 1, f(Yes, false, "ĉ")},
-	{0x10a, 0, 0, 1, f(Yes, false, "Ċ")},
-	{0x10b, 0, 0, 1, f(Yes, false, "ċ")},
-	{0x10c, 0, 0, 1, f(Yes, false, "Č")},
-	{0x10d, 0, 0, 1, f(Yes, false, "č")},
-	{0x10e, 0, 0, 1, f(Yes, false, "Ď")},
-	{0x10f, 0, 0, 1, f(Yes, false, "ď")},
-	{0x110, 0, 0, 0, f(Yes, false, "")},
-	{0x112, 0, 0, 1, f(Yes, true, "Ē")},
-	{0x113, 0, 0, 1, f(Yes, true, "ē")},
-	{0x114, 0, 0, 1, f(Yes, false, "Ĕ")},
-	{0x115, 0, 0, 1, f(Yes, false, "ĕ")},
-	{0x116, 0, 0, 1, f(Yes, false, "Ė")},
-	{0x117, 0, 0, 1, f(Yes, false, "ė")},
-	{0x118, 0, 0, 1, f(Yes, false, "Ę")},
-	{0x119, 0, 0, 1, f(Yes, false, "ę")},
-	{0x11a, 0, 0, 1, f(Yes, false, "Ě")},
-	{0x11b, 0, 0, 1, f(Yes, false, "ě")},
-	{0x11c, 0, 0, 1, f(Yes, false, "Ĝ")},
-	{0x11d, 0, 0, 1, f(Yes, false, "ĝ")},
-	{0x11e, 0, 0, 1, f(Yes, false, "Ğ")},
-	{0x11f, 0, 0, 1, f(Yes, false, "ğ")},
-	{0x120, 0, 0, 1, f(Yes, false, "Ġ")},
-	{0x121, 0, 0, 1, f(Yes, false, "ġ")},
-	{0x122, 0, 0, 1, f(Yes, false, "Ģ")},
-	{0x123, 0, 0, 1, f(Yes, false, "ģ")},
-	{0x124, 0, 0, 1, f(Yes, false, "Ĥ")},
-	{0x125, 0, 0, 1, f(Yes, false, "ĥ")},
-	{0x126, 0, 0, 0, f(Yes, false, "")},
-	{0x128, 0, 0, 1, f(Yes, false, "Ĩ")},
-	{0x129, 0, 0, 1, f(Yes, false, "ĩ")},
-	{0x12a, 0, 0, 1, f(Yes, false, "Ī")},
-	{0x12b, 0, 0, 1, f(Yes, false, "ī")},
-	{0x12c, 0, 0, 1, f(Yes, false, "Ĭ")},
-	{0x12d, 0, 0, 1, f(Yes, false, "ĭ")},
-	{0x12e, 0, 0, 1, f(Yes, false, "Į")},
-	{0x12f, 0, 0, 1, f(Yes, false, "į")},
-	{0x130, 0, 0, 1, f(Yes, false, "İ")},
-	{0x131, 0, 0, 0, f(Yes, false, "")},
-	{0x132, 0, 0, 0, g(Yes, No, false, false, "", "IJ")},
-	{0x133, 0, 0, 0, g(Yes, No, false, false, "", "ij")},
-	{0x134, 0, 0, 1, f(Yes, false, "Ĵ")},
-	{0x135, 0, 0, 1, f(Yes, false, "ĵ")},
-	{0x136, 0, 0, 1, f(Yes, false, "Ķ")},
-	{0x137, 0, 0, 1, f(Yes, false, "ķ")},
-	{0x138, 0, 0, 0, f(Yes, false, "")},
-	{0x139, 0, 0, 1, f(Yes, false, "Ĺ")},
-	{0x13a, 0, 0, 1, f(Yes, false, "ĺ")},
-	{0x13b, 0, 0, 1, f(Yes, false, "Ļ")},
-	{0x13c, 0, 0, 1, f(Yes, false, "ļ")},
-	{0x13d, 0, 0, 1, f(Yes, false, "Ľ")},
-	{0x13e, 0, 0, 1, f(Yes, false, "ľ")},
-	{0x13f, 0, 0, 0, g(Yes, No, false, false, "", "L·")},
-	{0x140, 0, 0, 0, g(Yes, No, false, false, "", "l·")},
-	{0x141, 0, 0, 0, f(Yes, false, "")},
-	{0x143, 0, 0, 1, f(Yes, false, "Ń")},
-	{0x144, 0, 0, 1, f(Yes, false, "ń")},
-	{0x145, 0, 0, 1, f(Yes, false, "Ņ")},
-	{0x146, 0, 0, 1, f(Yes, false, "ņ")},
-	{0x147, 0, 0, 1, f(Yes, false, "Ň")},
-	{0x148, 0, 0, 1, f(Yes, false, "ň")},
-	{0x149, 0, 0, 0, g(Yes, No, false, false, "", "ʼn")},
-	{0x14a, 0, 0, 0, f(Yes, false, "")},
-	{0x14c, 0, 0, 1, f(Yes, true, "Ō")},
-	{0x14d, 0, 0, 1, f(Yes, true, "ō")},
-	{0x14e, 0, 0, 1, f(Yes, false, "Ŏ")},
-	{0x14f, 0, 0, 1, f(Yes, false, "ŏ")},
-	{0x150, 0, 0, 1, f(Yes, false, "Ő")},
-	{0x151, 0, 0, 1, f(Yes, false, "ő")},
-	{0x152, 0, 0, 0, f(Yes, false, "")},
-	{0x154, 0, 0, 1, f(Yes, false, "Ŕ")},
-	{0x155, 0, 0, 1, f(Yes, false, "ŕ")},
-	{0x156, 0, 0, 1, f(Yes, false, "Ŗ")},
-	{0x157, 0, 0, 1, f(Yes, false, "ŗ")},
-	{0x158, 0, 0, 1, f(Yes, false, "Ř")},
-	{0x159, 0, 0, 1, f(Yes, false, "ř")},
-	{0x15a, 0, 0, 1, f(Yes, true, "Ś")},
-	{0x15b, 0, 0, 1, f(Yes, true, "ś")},
-	{0x15c, 0, 0, 1, f(Yes, false, "Ŝ")},
-	{0x15d, 0, 0, 1, f(Yes, false, "ŝ")},
-	{0x15e, 0, 0, 1, f(Yes, false, "Ş")},
-	{0x15f, 0, 0, 1, f(Yes, false, "ş")},
-	{0x160, 0, 0, 1, f(Yes, true, "Š")},
-	{0x161, 0, 0, 1, f(Yes, true, "š")},
-	{0x162, 0, 0, 1, f(Yes, false, "Ţ")},
-	{0x163, 0, 0, 1, f(Yes, false, "ţ")},
-	{0x164, 0, 0, 1, f(Yes, false, "Ť")},
-	{0x165, 0, 0, 1, f(Yes, false, "ť")},
-	{0x166, 0, 0, 0, f(Yes, false, "")},
-	{0x168, 0, 0, 1, f(Yes, true, "Ũ")},
-	{0x169, 0, 0, 1, f(Yes, true, "ũ")},
-	{0x16a, 0, 0, 1, f(Yes, true, "Ū")},
-	{0x16b, 0, 0, 1, f(Yes, true, "ū")},
-	{0x16c, 0, 0, 1, f(Yes, false, "Ŭ")},
-	{0x16d, 0, 0, 1, f(Yes, false, "ŭ")},
-	{0x16e, 0, 0, 1, f(Yes, false, "Ů")},
-	{0x16f, 0, 0, 1, f(Yes, false, "ů")},
-	{0x170, 0, 0, 1, f(Yes, false, "Ű")},
-	{0x171, 0, 0, 1, f(Yes, false, "ű")},
-	{0x172, 0, 0, 1, f(Yes, false, "Ų")},
-	{0x173, 0, 0, 1, f(Yes, false, "ų")},
-	{0x174, 0, 0, 1, f(Yes, false, "Ŵ")},
-	{0x175, 0, 0, 1, f(Yes, false, "ŵ")},
-	{0x176, 0, 0, 1, f(Yes, false, "Ŷ")},
-	{0x177, 0, 0, 1, f(Yes, false, "ŷ")},
-	{0x178, 0, 0, 1, f(Yes, false, "Ÿ")},
-	{0x179, 0, 0, 1, f(Yes, false, "Ź")},
-	{0x17a, 0, 0, 1, f(Yes, false, "ź")},
-	{0x17b, 0, 0, 1, f(Yes, false, "Ż")},
-	{0x17c, 0, 0, 1, f(Yes, false, "ż")},
-	{0x17d, 0, 0, 1, f(Yes, false, "Ž")},
-	{0x17e, 0, 0, 1, f(Yes, false, "ž")},
-	{0x17f, 0, 0, 0, g(Yes, No, true, false, "", "s")},
-	{0x180, 0, 0, 0, f(Yes, false, "")},
-	{0x1a0, 0, 0, 1, f(Yes, true, "Ơ")},
-	{0x1a1, 0, 0, 1, f(Yes, true, "ơ")},
-	{0x1a2, 0, 0, 0, f(Yes, false, "")},
-	{0x1af, 0, 0, 1, f(Yes, true, "Ư")},
-	{0x1b0, 0, 0, 1, f(Yes, true, "ư")},
-	{0x1b1, 0, 0, 0, f(Yes, false, "")},
-	{0x1b7, 0, 0, 0, f(Yes, true, "")},
-	{0x1b8, 0, 0, 0, f(Yes, false, "")},
-	{0x1c4, 0, 0, 1, g(Yes, No, false, false, "", "DŽ")},
-	{0x1c5, 0, 0, 1, g(Yes, No, false, false, "", "Dž")},
-	{0x1c6, 0, 0, 1, g(Yes, No, false, false, "", "dž")},
-	{0x1c7, 0, 0, 0, g(Yes, No, false, false, "", "LJ")},
-	{0x1c8, 0, 0, 0, g(Yes, No, false, false, "", "Lj")},
-	{0x1c9, 0, 0, 0, g(Yes, No, false, false, "", "lj")},
-	{0x1ca, 0, 0, 0, g(Yes, No, false, false, "", "NJ")},
-	{0x1cb, 0, 0, 0, g(Yes, No, false, false, "", "Nj")},
-	{0x1cc, 0, 0, 0, g(Yes, No, false, false, "", "nj")},
-	{0x1cd, 0, 0, 1, f(Yes, false, "Ǎ")},
-	{0x1ce, 0, 0, 1, f(Yes, false, "ǎ")},
-	{0x1cf, 0, 0, 1, f(Yes, false, "Ǐ")},
-	{0x1d0, 0, 0, 1, f(Yes, false, "ǐ")},
-	{0x1d1, 0, 0, 1, f(Yes, false, "Ǒ")},
-	{0x1d2, 0, 0, 1, f(Yes, false, "ǒ")},
-	{0x1d3, 0, 0, 1, f(Yes, false, "Ǔ")},
-	{0x1d4, 0, 0, 1, f(Yes, false, "ǔ")},
-	{0x1d5, 0, 0, 2, f(Yes, false, "Ǖ")},
-	{0x1d6, 0, 0, 2, f(Yes, false, "ǖ")},
-	{0x1d7, 0, 0, 2, f(Yes, false, "Ǘ")},
-	{0x1d8, 0, 0, 2, f(Yes, false, "ǘ")},
-	{0x1d9, 0, 0, 2, f(Yes, false, "Ǚ")},
-	{0x1da, 0, 0, 2, f(Yes, false, "ǚ")},
-	{0x1db, 0, 0, 2, f(Yes, false, "Ǜ")},
-	{0x1dc, 0, 0, 2, f(Yes, false, "ǜ")},
-	{0x1dd, 0, 0, 0, f(Yes, false, "")},
-	{0x1de, 0, 0, 2, f(Yes, false, "Ǟ")},
-	{0x1df, 0, 0, 2, f(Yes, false, "ǟ")},
-	{0x1e0, 0, 0, 2, f(Yes, false, "Ǡ")},
-	{0x1e1, 0, 0, 2, f(Yes, false, "ǡ")},
-	{0x1e2, 0, 0, 1, f(Yes, false, "Ǣ")},
-	{0x1e3, 0, 0, 1, f(Yes, false, "ǣ")},
-	{0x1e4, 0, 0, 0, f(Yes, false, "")},
-	{0x1e6, 0, 0, 1, f(Yes, false, "Ǧ")},
-	{0x1e7, 0, 0, 1, f(Yes, false, "ǧ")},
-	{0x1e8, 0, 0, 1, f(Yes, false, "Ǩ")},
-	{0x1e9, 0, 0, 1, f(Yes, false, "ǩ")},
-	{0x1ea, 0, 0, 1, f(Yes, true, "Ǫ")},
-	{0x1eb, 0, 0, 1, f(Yes, true, "ǫ")},
-	{0x1ec, 0, 0, 2, f(Yes, false, "Ǭ")},
-	{0x1ed, 0, 0, 2, f(Yes, false, "ǭ")},
-	{0x1ee, 0, 0, 1, f(Yes, false, "Ǯ")},
-	{0x1ef, 0, 0, 1, f(Yes, false, "ǯ")},
-	{0x1f0, 0, 0, 1, f(Yes, false, "ǰ")},
-	{0x1f1, 0, 0, 0, g(Yes, No, false, false, "", "DZ")},
-	{0x1f2, 0, 0, 0, g(Yes, No, false, false, "", "Dz")},
-	{0x1f3, 0, 0, 0, g(Yes, No, false, false, "", "dz")},
-	{0x1f4, 0, 0, 1, f(Yes, false, "Ǵ")},
-	{0x1f5, 0, 0, 1, f(Yes, false, "ǵ")},
-	{0x1f6, 0, 0, 0, f(Yes, false, "")},
-	{0x1f8, 0, 0, 1, f(Yes, false, "Ǹ")},
-	{0x1f9, 0, 0, 1, f(Yes, false, "ǹ")},
-	{0x1fa, 0, 0, 2, f(Yes, false, "Ǻ")},
-	{0x1fb, 0, 0, 2, f(Yes, false, "ǻ")},
-	{0x1fc, 0, 0, 1, f(Yes, false, "Ǽ")},
-	{0x1fd, 0, 0, 1, f(Yes, false, "ǽ")},
-	{0x1fe, 0, 0, 1, f(Yes, false, "Ǿ")},
-	{0x1ff, 0, 0, 1, f(Yes, false, "ǿ")},
-	{0x200, 0, 0, 1, f(Yes, false, "Ȁ")},
-	{0x201, 0, 0, 1, f(Yes, false, "ȁ")},
-	{0x202, 0, 0, 1, f(Yes, false, "Ȃ")},
-	{0x203, 0, 0, 1, f(Yes, false, "ȃ")},
-	{0x204, 0, 0, 1, f(Yes, false, "Ȅ")},
-	{0x205, 0, 0, 1, f(Yes, false, "ȅ")},
-	{0x206, 0, 0, 1, f(Yes, false, "Ȇ")},
-	{0x207, 0, 0, 1, f(Yes, false, "ȇ")},
-	{0x208, 0, 0, 1, f(Yes, false, "Ȉ")},
-	{0x209, 0, 0, 1, f(Yes, false, "ȉ")},
-	{0x20a, 0, 0, 1, f(Yes, false, "Ȋ")},
-	{0x20b, 0, 0, 1, f(Yes, false, "ȋ")},
-	{0x20c, 0, 0, 1, f(Yes, false, "Ȍ")},
-	{0x20d, 0, 0, 1, f(Yes, false, "ȍ")},
-	{0x20e, 0, 0, 1, f(Yes, false, "Ȏ")},
-	{0x20f, 0, 0, 1, f(Yes, false, "ȏ")},
-	{0x210, 0, 0, 1, f(Yes, false, "Ȑ")},
-	{0x211, 0, 0, 1, f(Yes, false, "ȑ")},
-	{0x212, 0, 0, 1, f(Yes, false, "Ȓ")},
-	{0x213, 0, 0, 1, f(Yes, false, "ȓ")},
-	{0x214, 0, 0, 1, f(Yes, false, "Ȕ")},
-	{0x215, 0, 0, 1, f(Yes, false, "ȕ")},
-	{0x216, 0, 0, 1, f(Yes, false, "Ȗ")},
-	{0x217, 0, 0, 1, f(Yes, false, "ȗ")},
-	{0x218, 0, 0, 1, f(Yes, false, "Ș")},
-	{0x219, 0, 0, 1, f(Yes, false, "ș")},
-	{0x21a, 0, 0, 1, f(Yes, false, "Ț")},
-	{0x21b, 0, 0, 1, f(Yes, false, "ț")},
-	{0x21c, 0, 0, 0, f(Yes, false, "")},
-	{0x21e, 0, 0, 1, f(Yes, false, "Ȟ")},
-	{0x21f, 0, 0, 1, f(Yes, false, "ȟ")},
-	{0x220, 0, 0, 0, f(Yes, false, "")},
-	{0x226, 0, 0, 1, f(Yes, true, "Ȧ")},
-	{0x227, 0, 0, 1, f(Yes, true, "ȧ")},
-	{0x228, 0, 0, 1, f(Yes, true, "Ȩ")},
-	{0x229, 0, 0, 1, f(Yes, true, "ȩ")},
-	{0x22a, 0, 0, 2, f(Yes, false, "Ȫ")},
-	{0x22b, 0, 0, 2, f(Yes, false, "ȫ")},
-	{0x22c, 0, 0, 2, f(Yes, false, "Ȭ")},
-	{0x22d, 0, 0, 2, f(Yes, false, "ȭ")},
-	{0x22e, 0, 0, 1, f(Yes, true, "Ȯ")},
-	{0x22f, 0, 0, 1, f(Yes, true, "ȯ")},
-	{0x230, 0, 0, 2, f(Yes, false, "Ȱ")},
-	{0x231, 0, 0, 2, f(Yes, false, "ȱ")},
-	{0x232, 0, 0, 1, f(Yes, false, "Ȳ")},
-	{0x233, 0, 0, 1, f(Yes, false, "ȳ")},
-	{0x234, 0, 0, 0, f(Yes, false, "")},
-	{0x292, 0, 0, 0, f(Yes, true, "")},
-	{0x293, 0, 0, 0, f(Yes, false, "")},
-	{0x2b0, 0, 0, 0, g(Yes, No, false, false, "", "h")},
-	{0x2b1, 0, 0, 0, g(Yes, No, false, false, "", "ɦ")},
-	{0x2b2, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0x2b3, 0, 0, 0, g(Yes, No, false, false, "", "r")},
-	{0x2b4, 0, 0, 0, g(Yes, No, false, false, "", "ɹ")},
-	{0x2b5, 0, 0, 0, g(Yes, No, false, false, "", "ɻ")},
-	{0x2b6, 0, 0, 0, g(Yes, No, false, false, "", "ʁ")},
-	{0x2b7, 0, 0, 0, g(Yes, No, false, false, "", "w")},
-	{0x2b8, 0, 0, 0, g(Yes, No, false, false, "", "y")},
-	{0x2b9, 0, 0, 0, f(Yes, false, "")},
-	{0x2d8, 0, 0, 1, g(Yes, No, false, false, "", " ̆")},
-	{0x2d9, 0, 0, 1, g(Yes, No, false, false, "", " ̇")},
-	{0x2da, 0, 0, 1, g(Yes, No, false, false, "", " ̊")},
-	{0x2db, 0, 0, 1, g(Yes, No, false, false, "", " ̨")},
-	{0x2dc, 0, 0, 1, g(Yes, No, false, false, "", " ̃")},
-	{0x2dd, 0, 0, 1, g(Yes, No, false, false, "", " ̋")},
-	{0x2de, 0, 0, 0, f(Yes, false, "")},
-	{0x2e0, 0, 0, 0, g(Yes, No, false, false, "", "ɣ")},
-	{0x2e1, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x2e2, 0, 0, 0, g(Yes, No, false, false, "", "s")},
-	{0x2e3, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0x2e4, 0, 0, 0, g(Yes, No, false, false, "", "ʕ")},
-	{0x2e5, 0, 0, 0, f(Yes, false, "")},
-	{0x300, 230, 1, 1, f(Maybe, false, "")},
-	{0x305, 230, 1, 1, f(Yes, false, "")},
-	{0x306, 230, 1, 1, f(Maybe, false, "")},
-	{0x30d, 230, 1, 1, f(Yes, false, "")},
-	{0x30f, 230, 1, 1, f(Maybe, false, "")},
-	{0x310, 230, 1, 1, f(Yes, false, "")},
-	{0x311, 230, 1, 1, f(Maybe, false, "")},
-	{0x312, 230, 1, 1, f(Yes, false, "")},
-	{0x313, 230, 1, 1, f(Maybe, false, "")},
-	{0x315, 232, 1, 1, f(Yes, false, "")},
-	{0x316, 220, 1, 1, f(Yes, false, "")},
-	{0x31a, 232, 1, 1, f(Yes, false, "")},
-	{0x31b, 216, 1, 1, f(Maybe, false, "")},
-	{0x31c, 220, 1, 1, f(Yes, false, "")},
-	{0x321, 202, 1, 1, f(Yes, false, "")},
-	{0x323, 220, 1, 1, f(Maybe, false, "")},
-	{0x327, 202, 1, 1, f(Maybe, false, "")},
-	{0x329, 220, 1, 1, f(Yes, false, "")},
-	{0x32d, 220, 1, 1, f(Maybe, false, "")},
-	{0x32f, 220, 1, 1, f(Yes, false, "")},
-	{0x330, 220, 1, 1, f(Maybe, false, "")},
-	{0x332, 220, 1, 1, f(Yes, false, "")},
-	{0x334, 1, 1, 1, f(Yes, false, "")},
-	{0x338, 1, 1, 1, f(Maybe, false, "")},
-	{0x339, 220, 1, 1, f(Yes, false, "")},
-	{0x33d, 230, 1, 1, f(Yes, false, "")},
-	{0x340, 230, 1, 1, f(No, false, "̀")},
-	{0x341, 230, 1, 1, f(No, false, "́")},
-	{0x342, 230, 1, 1, f(Maybe, false, "")},
-	{0x343, 230, 1, 1, f(No, false, "̓")},
-	{0x344, 230, 2, 2, f(No, false, "̈́")},
-	{0x345, 240, 1, 1, f(Maybe, false, "")},
-	{0x346, 230, 1, 1, f(Yes, false, "")},
-	{0x347, 220, 1, 1, f(Yes, false, "")},
-	{0x34a, 230, 1, 1, f(Yes, false, "")},
-	{0x34d, 220, 1, 1, f(Yes, false, "")},
-	{0x34f, 0, 0, 0, f(Yes, false, "")},
-	{0x350, 230, 1, 1, f(Yes, false, "")},
-	{0x353, 220, 1, 1, f(Yes, false, "")},
-	{0x357, 230, 1, 1, f(Yes, false, "")},
-	{0x358, 232, 1, 1, f(Yes, false, "")},
-	{0x359, 220, 1, 1, f(Yes, false, "")},
-	{0x35b, 230, 1, 1, f(Yes, false, "")},
-	{0x35c, 233, 1, 1, f(Yes, false, "")},
-	{0x35d, 234, 1, 1, f(Yes, false, "")},
-	{0x35f, 233, 1, 1, f(Yes, false, "")},
-	{0x360, 234, 1, 1, f(Yes, false, "")},
-	{0x362, 233, 1, 1, f(Yes, false, "")},
-	{0x363, 230, 1, 1, f(Yes, false, "")},
-	{0x370, 0, 0, 0, f(Yes, false, "")},
-	{0x374, 0, 0, 0, f(No, false, "ʹ")},
-	{0x375, 0, 0, 0, f(Yes, false, "")},
-	{0x37a, 0, 0, 1, g(Yes, No, false, false, "", " ͅ")},
-	{0x37b, 0, 0, 0, f(Yes, false, "")},
-	{0x37e, 0, 0, 0, f(No, false, ";")},
-	{0x37f, 0, 0, 0, f(Yes, false, "")},
-	{0x384, 0, 0, 1, g(Yes, No, false, false, "", " ́")},
-	{0x385, 0, 0, 2, g(Yes, No, false, false, "΅", " ̈́")},
-	{0x386, 0, 0, 1, f(Yes, false, "Ά")},
-	{0x387, 0, 0, 0, f(No, false, "·")},
-	{0x388, 0, 0, 1, f(Yes, false, "Έ")},
-	{0x389, 0, 0, 1, f(Yes, false, "Ή")},
-	{0x38a, 0, 0, 1, f(Yes, false, "Ί")},
-	{0x38b, 0, 0, 0, f(Yes, false, "")},
-	{0x38c, 0, 0, 1, f(Yes, false, "Ό")},
-	{0x38d, 0, 0, 0, f(Yes, false, "")},
-	{0x38e, 0, 0, 1, f(Yes, false, "Ύ")},
-	{0x38f, 0, 0, 1, f(Yes, false, "Ώ")},
-	{0x390, 0, 0, 2, f(Yes, false, "ΐ")},
-	{0x391, 0, 0, 0, f(Yes, true, "")},
-	{0x392, 0, 0, 0, f(Yes, false, "")},
-	{0x395, 0, 0, 0, f(Yes, true, "")},
-	{0x396, 0, 0, 0, f(Yes, false, "")},
-	{0x397, 0, 0, 0, f(Yes, true, "")},
-	{0x398, 0, 0, 0, f(Yes, false, "")},
-	{0x399, 0, 0, 0, f(Yes, true, "")},
-	{0x39a, 0, 0, 0, f(Yes, false, "")},
-	{0x39f, 0, 0, 0, f(Yes, true, "")},
-	{0x3a0, 0, 0, 0, f(Yes, false, "")},
-	{0x3a1, 0, 0, 0, f(Yes, true, "")},
-	{0x3a2, 0, 0, 0, f(Yes, false, "")},
-	{0x3a5, 0, 0, 0, f(Yes, true, "")},
-	{0x3a6, 0, 0, 0, f(Yes, false, "")},
-	{0x3a9, 0, 0, 0, f(Yes, true, "")},
-	{0x3aa, 0, 0, 1, f(Yes, false, "Ϊ")},
-	{0x3ab, 0, 0, 1, f(Yes, false, "Ϋ")},
-	{0x3ac, 0, 0, 1, f(Yes, true, "ά")},
-	{0x3ad, 0, 0, 1, f(Yes, false, "έ")},
-	{0x3ae, 0, 0, 1, f(Yes, true, "ή")},
-	{0x3af, 0, 0, 1, f(Yes, false, "ί")},
-	{0x3b0, 0, 0, 2, f(Yes, false, "ΰ")},
-	{0x3b1, 0, 0, 0, f(Yes, true, "")},
-	{0x3b2, 0, 0, 0, f(Yes, false, "")},
-	{0x3b5, 0, 0, 0, f(Yes, true, "")},
-	{0x3b6, 0, 0, 0, f(Yes, false, "")},
-	{0x3b7, 0, 0, 0, f(Yes, true, "")},
-	{0x3b8, 0, 0, 0, f(Yes, false, "")},
-	{0x3b9, 0, 0, 0, f(Yes, true, "")},
-	{0x3ba, 0, 0, 0, f(Yes, false, "")},
-	{0x3bf, 0, 0, 0, f(Yes, true, "")},
-	{0x3c0, 0, 0, 0, f(Yes, false, "")},
-	{0x3c1, 0, 0, 0, f(Yes, true, "")},
-	{0x3c2, 0, 0, 0, f(Yes, false, "")},
-	{0x3c5, 0, 0, 0, f(Yes, true, "")},
-	{0x3c6, 0, 0, 0, f(Yes, false, "")},
-	{0x3c9, 0, 0, 0, f(Yes, true, "")},
-	{0x3ca, 0, 0, 1, f(Yes, true, "ϊ")},
-	{0x3cb, 0, 0, 1, f(Yes, true, "ϋ")},
-	{0x3cc, 0, 0, 1, f(Yes, false, "ό")},
-	{0x3cd, 0, 0, 1, f(Yes, false, "ύ")},
-	{0x3ce, 0, 0, 1, f(Yes, true, "ώ")},
-	{0x3cf, 0, 0, 0, f(Yes, false, "")},
-	{0x3d0, 0, 0, 0, g(Yes, No, false, false, "", "β")},
-	{0x3d1, 0, 0, 0, g(Yes, No, false, false, "", "θ")},
-	{0x3d2, 0, 0, 0, g(Yes, No, true, false, "", "Υ")},
-	{0x3d3, 0, 0, 1, g(Yes, No, false, false, "ϓ", "Ύ")},
-	{0x3d4, 0, 0, 1, g(Yes, No, false, false, "ϔ", "Ϋ")},
-	{0x3d5, 0, 0, 0, g(Yes, No, false, false, "", "φ")},
-	{0x3d6, 0, 0, 0, g(Yes, No, false, false, "", "π")},
-	{0x3d7, 0, 0, 0, f(Yes, false, "")},
-	{0x3f0, 0, 0, 0, g(Yes, No, false, false, "", "κ")},
-	{0x3f1, 0, 0, 0, g(Yes, No, false, false, "", "ρ")},
-	{0x3f2, 0, 0, 0, g(Yes, No, false, false, "", "ς")},
-	{0x3f3, 0, 0, 0, f(Yes, false, "")},
-	{0x3f4, 0, 0, 0, g(Yes, No, false, false, "", "Θ")},
-	{0x3f5, 0, 0, 0, g(Yes, No, false, false, "", "ε")},
-	{0x3f6, 0, 0, 0, f(Yes, false, "")},
-	{0x3f9, 0, 0, 0, g(Yes, No, false, false, "", "Σ")},
-	{0x3fa, 0, 0, 0, f(Yes, false, "")},
-	{0x400, 0, 0, 1, f(Yes, false, "Ѐ")},
-	{0x401, 0, 0, 1, f(Yes, false, "Ё")},
-	{0x402, 0, 0, 0, f(Yes, false, "")},
-	{0x403, 0, 0, 1, f(Yes, false, "Ѓ")},
-	{0x404, 0, 0, 0, f(Yes, false, "")},
-	{0x406, 0, 0, 0, f(Yes, true, "")},
-	{0x407, 0, 0, 1, f(Yes, false, "Ї")},
-	{0x408, 0, 0, 0, f(Yes, false, "")},
-	{0x40c, 0, 0, 1, f(Yes, false, "Ќ")},
-	{0x40d, 0, 0, 1, f(Yes, false, "Ѝ")},
-	{0x40e, 0, 0, 1, f(Yes, false, "Ў")},
-	{0x40f, 0, 0, 0, f(Yes, false, "")},
-	{0x410, 0, 0, 0, f(Yes, true, "")},
-	{0x411, 0, 0, 0, f(Yes, false, "")},
-	{0x413, 0, 0, 0, f(Yes, true, "")},
-	{0x414, 0, 0, 0, f(Yes, false, "")},
-	{0x415, 0, 0, 0, f(Yes, true, "")},
-	{0x419, 0, 0, 1, f(Yes, false, "Й")},
-	{0x41a, 0, 0, 0, f(Yes, true, "")},
-	{0x41b, 0, 0, 0, f(Yes, false, "")},
-	{0x41e, 0, 0, 0, f(Yes, true, "")},
-	{0x41f, 0, 0, 0, f(Yes, false, "")},
-	{0x423, 0, 0, 0, f(Yes, true, "")},
-	{0x424, 0, 0, 0, f(Yes, false, "")},
-	{0x427, 0, 0, 0, f(Yes, true, "")},
-	{0x428, 0, 0, 0, f(Yes, false, "")},
-	{0x42b, 0, 0, 0, f(Yes, true, "")},
-	{0x42c, 0, 0, 0, f(Yes, false, "")},
-	{0x42d, 0, 0, 0, f(Yes, true, "")},
-	{0x42e, 0, 0, 0, f(Yes, false, "")},
-	{0x430, 0, 0, 0, f(Yes, true, "")},
-	{0x431, 0, 0, 0, f(Yes, false, "")},
-	{0x433, 0, 0, 0, f(Yes, true, "")},
-	{0x434, 0, 0, 0, f(Yes, false, "")},
-	{0x435, 0, 0, 0, f(Yes, true, "")},
-	{0x439, 0, 0, 1, f(Yes, false, "й")},
-	{0x43a, 0, 0, 0, f(Yes, true, "")},
-	{0x43b, 0, 0, 0, f(Yes, false, "")},
-	{0x43e, 0, 0, 0, f(Yes, true, "")},
-	{0x43f, 0, 0, 0, f(Yes, false, "")},
-	{0x443, 0, 0, 0, f(Yes, true, "")},
-	{0x444, 0, 0, 0, f(Yes, false, "")},
-	{0x447, 0, 0, 0, f(Yes, true, "")},
-	{0x448, 0, 0, 0, f(Yes, false, "")},
-	{0x44b, 0, 0, 0, f(Yes, true, "")},
-	{0x44c, 0, 0, 0, f(Yes, false, "")},
-	{0x44d, 0, 0, 0, f(Yes, true, "")},
-	{0x44e, 0, 0, 0, f(Yes, false, "")},
-	{0x450, 0, 0, 1, f(Yes, false, "ѐ")},
-	{0x451, 0, 0, 1, f(Yes, false, "ё")},
-	{0x452, 0, 0, 0, f(Yes, false, "")},
-	{0x453, 0, 0, 1, f(Yes, false, "ѓ")},
-	{0x454, 0, 0, 0, f(Yes, false, "")},
-	{0x456, 0, 0, 0, f(Yes, true, "")},
-	{0x457, 0, 0, 1, f(Yes, false, "ї")},
-	{0x458, 0, 0, 0, f(Yes, false, "")},
-	{0x45c, 0, 0, 1, f(Yes, false, "ќ")},
-	{0x45d, 0, 0, 1, f(Yes, false, "ѝ")},
-	{0x45e, 0, 0, 1, f(Yes, false, "ў")},
-	{0x45f, 0, 0, 0, f(Yes, false, "")},
-	{0x474, 0, 0, 0, f(Yes, true, "")},
-	{0x476, 0, 0, 1, f(Yes, false, "Ѷ")},
-	{0x477, 0, 0, 1, f(Yes, false, "ѷ")},
-	{0x478, 0, 0, 0, f(Yes, false, "")},
-	{0x483, 230, 1, 1, f(Yes, false, "")},
-	{0x488, 0, 0, 0, f(Yes, false, "")},
-	{0x4c1, 0, 0, 1, f(Yes, false, "Ӂ")},
-	{0x4c2, 0, 0, 1, f(Yes, false, "ӂ")},
-	{0x4c3, 0, 0, 0, f(Yes, false, "")},
-	{0x4d0, 0, 0, 1, f(Yes, false, "Ӑ")},
-	{0x4d1, 0, 0, 1, f(Yes, false, "ӑ")},
-	{0x4d2, 0, 0, 1, f(Yes, false, "Ӓ")},
-	{0x4d3, 0, 0, 1, f(Yes, false, "ӓ")},
-	{0x4d4, 0, 0, 0, f(Yes, false, "")},
-	{0x4d6, 0, 0, 1, f(Yes, false, "Ӗ")},
-	{0x4d7, 0, 0, 1, f(Yes, false, "ӗ")},
-	{0x4d8, 0, 0, 0, f(Yes, true, "")},
-	{0x4da, 0, 0, 1, f(Yes, false, "Ӛ")},
-	{0x4db, 0, 0, 1, f(Yes, false, "ӛ")},
-	{0x4dc, 0, 0, 1, f(Yes, false, "Ӝ")},
-	{0x4dd, 0, 0, 1, f(Yes, false, "ӝ")},
-	{0x4de, 0, 0, 1, f(Yes, false, "Ӟ")},
-	{0x4df, 0, 0, 1, f(Yes, false, "ӟ")},
-	{0x4e0, 0, 0, 0, f(Yes, false, "")},
-	{0x4e2, 0, 0, 1, f(Yes, false, "Ӣ")},
-	{0x4e3, 0, 0, 1, f(Yes, false, "ӣ")},
-	{0x4e4, 0, 0, 1, f(Yes, false, "Ӥ")},
-	{0x4e5, 0, 0, 1, f(Yes, false, "ӥ")},
-	{0x4e6, 0, 0, 1, f(Yes, false, "Ӧ")},
-	{0x4e7, 0, 0, 1, f(Yes, false, "ӧ")},
-	{0x4e8, 0, 0, 0, f(Yes, true, "")},
-	{0x4ea, 0, 0, 1, f(Yes, false, "Ӫ")},
-	{0x4eb, 0, 0, 1, f(Yes, false, "ӫ")},
-	{0x4ec, 0, 0, 1, f(Yes, false, "Ӭ")},
-	{0x4ed, 0, 0, 1, f(Yes, false, "ӭ")},
-	{0x4ee, 0, 0, 1, f(Yes, false, "Ӯ")},
-	{0x4ef, 0, 0, 1, f(Yes, false, "ӯ")},
-	{0x4f0, 0, 0, 1, f(Yes, false, "Ӱ")},
-	{0x4f1, 0, 0, 1, f(Yes, false, "ӱ")},
-	{0x4f2, 0, 0, 1, f(Yes, false, "Ӳ")},
-	{0x4f3, 0, 0, 1, f(Yes, false, "ӳ")},
-	{0x4f4, 0, 0, 1, f(Yes, false, "Ӵ")},
-	{0x4f5, 0, 0, 1, f(Yes, false, "ӵ")},
-	{0x4f6, 0, 0, 0, f(Yes, false, "")},
-	{0x4f8, 0, 0, 1, f(Yes, false, "Ӹ")},
-	{0x4f9, 0, 0, 1, f(Yes, false, "ӹ")},
-	{0x4fa, 0, 0, 0, f(Yes, false, "")},
-	{0x587, 0, 0, 0, g(Yes, No, false, false, "", "եւ")},
-	{0x588, 0, 0, 0, f(Yes, false, "")},
-	{0x591, 220, 1, 1, f(Yes, false, "")},
-	{0x592, 230, 1, 1, f(Yes, false, "")},
-	{0x596, 220, 1, 1, f(Yes, false, "")},
-	{0x597, 230, 1, 1, f(Yes, false, "")},
-	{0x59a, 222, 1, 1, f(Yes, false, "")},
-	{0x59b, 220, 1, 1, f(Yes, false, "")},
-	{0x59c, 230, 1, 1, f(Yes, false, "")},
-	{0x5a2, 220, 1, 1, f(Yes, false, "")},
-	{0x5a8, 230, 1, 1, f(Yes, false, "")},
-	{0x5aa, 220, 1, 1, f(Yes, false, "")},
-	{0x5ab, 230, 1, 1, f(Yes, false, "")},
-	{0x5ad, 222, 1, 1, f(Yes, false, "")},
-	{0x5ae, 228, 1, 1, f(Yes, false, "")},
-	{0x5af, 230, 1, 1, f(Yes, false, "")},
-	{0x5b0, 10, 1, 1, f(Yes, false, "")},
-	{0x5b1, 11, 1, 1, f(Yes, false, "")},
-	{0x5b2, 12, 1, 1, f(Yes, false, "")},
-	{0x5b3, 13, 1, 1, f(Yes, false, "")},
-	{0x5b4, 14, 1, 1, f(Yes, false, "")},
-	{0x5b5, 15, 1, 1, f(Yes, false, "")},
-	{0x5b6, 16, 1, 1, f(Yes, false, "")},
-	{0x5b7, 17, 1, 1, f(Yes, false, "")},
-	{0x5b8, 18, 1, 1, f(Yes, false, "")},
-	{0x5b9, 19, 1, 1, f(Yes, false, "")},
-	{0x5bb, 20, 1, 1, f(Yes, false, "")},
-	{0x5bc, 21, 1, 1, f(Yes, false, "")},
-	{0x5bd, 22, 1, 1, f(Yes, false, "")},
-	{0x5be, 0, 0, 0, f(Yes, false, "")},
-	{0x5bf, 23, 1, 1, f(Yes, false, "")},
-	{0x5c0, 0, 0, 0, f(Yes, false, "")},
-	{0x5c1, 24, 1, 1, f(Yes, false, "")},
-	{0x5c2, 25, 1, 1, f(Yes, false, "")},
-	{0x5c3, 0, 0, 0, f(Yes, false, "")},
-	{0x5c4, 230, 1, 1, f(Yes, false, "")},
-	{0x5c5, 220, 1, 1, f(Yes, false, "")},
-	{0x5c6, 0, 0, 0, f(Yes, false, "")},
-	{0x5c7, 18, 1, 1, f(Yes, false, "")},
-	{0x5c8, 0, 0, 0, f(Yes, false, "")},
-	{0x610, 230, 1, 1, f(Yes, false, "")},
-	{0x618, 30, 1, 1, f(Yes, false, "")},
-	{0x619, 31, 1, 1, f(Yes, false, "")},
-	{0x61a, 32, 1, 1, f(Yes, false, "")},
-	{0x61b, 0, 0, 0, f(Yes, false, "")},
-	{0x622, 0, 0, 1, f(Yes, false, "آ")},
-	{0x623, 0, 0, 1, f(Yes, false, "أ")},
-	{0x624, 0, 0, 1, f(Yes, false, "ؤ")},
-	{0x625, 0, 0, 1, f(Yes, false, "إ")},
-	{0x626, 0, 0, 1, f(Yes, false, "ئ")},
-	{0x627, 0, 0, 0, f(Yes, true, "")},
-	{0x628, 0, 0, 0, f(Yes, false, "")},
-	{0x648, 0, 0, 0, f(Yes, true, "")},
-	{0x649, 0, 0, 0, f(Yes, false, "")},
-	{0x64a, 0, 0, 0, f(Yes, true, "")},
-	{0x64b, 27, 1, 1, f(Yes, false, "")},
-	{0x64c, 28, 1, 1, f(Yes, false, "")},
-	{0x64d, 29, 1, 1, f(Yes, false, "")},
-	{0x64e, 30, 1, 1, f(Yes, false, "")},
-	{0x64f, 31, 1, 1, f(Yes, false, "")},
-	{0x650, 32, 1, 1, f(Yes, false, "")},
-	{0x651, 33, 1, 1, f(Yes, false, "")},
-	{0x652, 34, 1, 1, f(Yes, false, "")},
-	{0x653, 230, 1, 1, f(Maybe, false, "")},
-	{0x655, 220, 1, 1, f(Maybe, false, "")},
-	{0x656, 220, 1, 1, f(Yes, false, "")},
-	{0x657, 230, 1, 1, f(Yes, false, "")},
-	{0x65c, 220, 1, 1, f(Yes, false, "")},
-	{0x65d, 230, 1, 1, f(Yes, false, "")},
-	{0x65f, 220, 1, 1, f(Yes, false, "")},
-	{0x660, 0, 0, 0, f(Yes, false, "")},
-	{0x670, 35, 1, 1, f(Yes, false, "")},
-	{0x671, 0, 0, 0, f(Yes, false, "")},
-	{0x675, 0, 0, 0, g(Yes, No, false, false, "", "اٴ")},
-	{0x676, 0, 0, 0, g(Yes, No, false, false, "", "وٴ")},
-	{0x677, 0, 0, 0, g(Yes, No, false, false, "", "ۇٴ")},
-	{0x678, 0, 0, 0, g(Yes, No, false, false, "", "يٴ")},
-	{0x679, 0, 0, 0, f(Yes, false, "")},
-	{0x6c0, 0, 0, 1, f(Yes, false, "ۀ")},
-	{0x6c1, 0, 0, 0, f(Yes, true, "")},
-	{0x6c2, 0, 0, 1, f(Yes, false, "ۂ")},
-	{0x6c3, 0, 0, 0, f(Yes, false, "")},
-	{0x6d2, 0, 0, 0, f(Yes, true, "")},
-	{0x6d3, 0, 0, 1, f(Yes, false, "ۓ")},
-	{0x6d4, 0, 0, 0, f(Yes, false, "")},
-	{0x6d5, 0, 0, 0, f(Yes, true, "")},
-	{0x6d6, 230, 1, 1, f(Yes, false, "")},
-	{0x6dd, 0, 0, 0, f(Yes, false, "")},
-	{0x6df, 230, 1, 1, f(Yes, false, "")},
-	{0x6e3, 220, 1, 1, f(Yes, false, "")},
-	{0x6e4, 230, 1, 1, f(Yes, false, "")},
-	{0x6e5, 0, 0, 0, f(Yes, false, "")},
-	{0x6e7, 230, 1, 1, f(Yes, false, "")},
-	{0x6e9, 0, 0, 0, f(Yes, false, "")},
-	{0x6ea, 220, 1, 1, f(Yes, false, "")},
-	{0x6eb, 230, 1, 1, f(Yes, false, "")},
-	{0x6ed, 220, 1, 1, f(Yes, false, "")},
-	{0x6ee, 0, 0, 0, f(Yes, false, "")},
-	{0x711, 36, 1, 1, f(Yes, false, "")},
-	{0x712, 0, 0, 0, f(Yes, false, "")},
-	{0x730, 230, 1, 1, f(Yes, false, "")},
-	{0x731, 220, 1, 1, f(Yes, false, "")},
-	{0x732, 230, 1, 1, f(Yes, false, "")},
-	{0x734, 220, 1, 1, f(Yes, false, "")},
-	{0x735, 230, 1, 1, f(Yes, false, "")},
-	{0x737, 220, 1, 1, f(Yes, false, "")},
-	{0x73a, 230, 1, 1, f(Yes, false, "")},
-	{0x73b, 220, 1, 1, f(Yes, false, "")},
-	{0x73d, 230, 1, 1, f(Yes, false, "")},
-	{0x73e, 220, 1, 1, f(Yes, false, "")},
-	{0x73f, 230, 1, 1, f(Yes, false, "")},
-	{0x742, 220, 1, 1, f(Yes, false, "")},
-	{0x743, 230, 1, 1, f(Yes, false, "")},
-	{0x744, 220, 1, 1, f(Yes, false, "")},
-	{0x745, 230, 1, 1, f(Yes, false, "")},
-	{0x746, 220, 1, 1, f(Yes, false, "")},
-	{0x747, 230, 1, 1, f(Yes, false, "")},
-	{0x748, 220, 1, 1, f(Yes, false, "")},
-	{0x749, 230, 1, 1, f(Yes, false, "")},
-	{0x74b, 0, 0, 0, f(Yes, false, "")},
-	{0x7eb, 230, 1, 1, f(Yes, false, "")},
-	{0x7f2, 220, 1, 1, f(Yes, false, "")},
-	{0x7f3, 230, 1, 1, f(Yes, false, "")},
-	{0x7f4, 0, 0, 0, f(Yes, false, "")},
-	{0x816, 230, 1, 1, f(Yes, false, "")},
-	{0x81a, 0, 0, 0, f(Yes, false, "")},
-	{0x81b, 230, 1, 1, f(Yes, false, "")},
-	{0x824, 0, 0, 0, f(Yes, false, "")},
-	{0x825, 230, 1, 1, f(Yes, false, "")},
-	{0x828, 0, 0, 0, f(Yes, false, "")},
-	{0x829, 230, 1, 1, f(Yes, false, "")},
-	{0x82e, 0, 0, 0, f(Yes, false, "")},
-	{0x859, 220, 1, 1, f(Yes, false, "")},
-	{0x85c, 0, 0, 0, f(Yes, false, "")},
-	{0x8d4, 230, 1, 1, f(Yes, false, "")},
-	{0x8e2, 0, 0, 0, f(Yes, false, "")},
-	{0x8e3, 220, 1, 1, f(Yes, false, "")},
-	{0x8e4, 230, 1, 1, f(Yes, false, "")},
-	{0x8e6, 220, 1, 1, f(Yes, false, "")},
-	{0x8e7, 230, 1, 1, f(Yes, false, "")},
-	{0x8e9, 220, 1, 1, f(Yes, false, "")},
-	{0x8ea, 230, 1, 1, f(Yes, false, "")},
-	{0x8ed, 220, 1, 1, f(Yes, false, "")},
-	{0x8f0, 27, 1, 1, f(Yes, false, "")},
-	{0x8f1, 28, 1, 1, f(Yes, false, "")},
-	{0x8f2, 29, 1, 1, f(Yes, false, "")},
-	{0x8f3, 230, 1, 1, f(Yes, false, "")},
-	{0x8f6, 220, 1, 1, f(Yes, false, "")},
-	{0x8f7, 230, 1, 1, f(Yes, false, "")},
-	{0x8f9, 220, 1, 1, f(Yes, false, "")},
-	{0x8fb, 230, 1, 1, f(Yes, false, "")},
-	{0x900, 0, 0, 0, f(Yes, false, "")},
-	{0x928, 0, 0, 0, f(Yes, true, "")},
-	{0x929, 0, 0, 1, f(Yes, false, "ऩ")},
-	{0x92a, 0, 0, 0, f(Yes, false, "")},
-	{0x930, 0, 0, 0, f(Yes, true, "")},
-	{0x931, 0, 0, 1, f(Yes, false, "ऱ")},
-	{0x932, 0, 0, 0, f(Yes, false, "")},
-	{0x933, 0, 0, 0, f(Yes, true, "")},
-	{0x934, 0, 0, 1, f(Yes, false, "ऴ")},
-	{0x935, 0, 0, 0, f(Yes, false, "")},
-	{0x93c, 7, 1, 1, f(Maybe, false, "")},
-	{0x93d, 0, 0, 0, f(Yes, false, "")},
-	{0x94d, 9, 1, 1, f(Yes, false, "")},
-	{0x94e, 0, 0, 0, f(Yes, false, "")},
-	{0x951, 230, 1, 1, f(Yes, false, "")},
-	{0x952, 220, 1, 1, f(Yes, false, "")},
-	{0x953, 230, 1, 1, f(Yes, false, "")},
-	{0x955, 0, 0, 0, f(Yes, false, "")},
-	{0x958, 0, 0, 1, f(No, false, "क़")},
-	{0x959, 0, 0, 1, f(No, false, "ख़")},
-	{0x95a, 0, 0, 1, f(No, false, "ग़")},
-	{0x95b, 0, 0, 1, f(No, false, "ज़")},
-	{0x95c, 0, 0, 1, f(No, false, "ड़")},
-	{0x95d, 0, 0, 1, f(No, false, "ढ़")},
-	{0x95e, 0, 0, 1, f(No, false, "फ़")},
-	{0x95f, 0, 0, 1, f(No, false, "य़")},
-	{0x960, 0, 0, 0, f(Yes, false, "")},
-	{0x9bc, 7, 1, 1, f(Yes, false, "")},
-	{0x9bd, 0, 0, 0, f(Yes, false, "")},
-	{0x9be, 0, 1, 1, f(Maybe, false, "")},
-	{0x9bf, 0, 0, 0, f(Yes, false, "")},
-	{0x9c7, 0, 0, 0, f(Yes, true, "")},
-	{0x9c8, 0, 0, 0, f(Yes, false, "")},
-	{0x9cb, 0, 0, 1, f(Yes, false, "ো")},
-	{0x9cc, 0, 0, 1, f(Yes, false, "ৌ")},
-	{0x9cd, 9, 1, 1, f(Yes, false, "")},
-	{0x9ce, 0, 0, 0, f(Yes, false, "")},
-	{0x9d7, 0, 1, 1, f(Maybe, false, "")},
-	{0x9d8, 0, 0, 0, f(Yes, false, "")},
-	{0x9dc, 0, 0, 1, f(No, false, "ড়")},
-	{0x9dd, 0, 0, 1, f(No, false, "ঢ়")},
-	{0x9de, 0, 0, 0, f(Yes, false, "")},
-	{0x9df, 0, 0, 1, f(No, false, "য়")},
-	{0x9e0, 0, 0, 0, f(Yes, false, "")},
-	{0xa33, 0, 0, 1, f(No, false, "ਲ਼")},
-	{0xa34, 0, 0, 0, f(Yes, false, "")},
-	{0xa36, 0, 0, 1, f(No, false, "ਸ਼")},
-	{0xa37, 0, 0, 0, f(Yes, false, "")},
-	{0xa3c, 7, 1, 1, f(Yes, false, "")},
-	{0xa3d, 0, 0, 0, f(Yes, false, "")},
-	{0xa4d, 9, 1, 1, f(Yes, false, "")},
-	{0xa4e, 0, 0, 0, f(Yes, false, "")},
-	{0xa59, 0, 0, 1, f(No, false, "ਖ਼")},
-	{0xa5a, 0, 0, 1, f(No, false, "ਗ਼")},
-	{0xa5b, 0, 0, 1, f(No, false, "ਜ਼")},
-	{0xa5c, 0, 0, 0, f(Yes, false, "")},
-	{0xa5e, 0, 0, 1, f(No, false, "ਫ਼")},
-	{0xa5f, 0, 0, 0, f(Yes, false, "")},
-	{0xabc, 7, 1, 1, f(Yes, false, "")},
-	{0xabd, 0, 0, 0, f(Yes, false, "")},
-	{0xacd, 9, 1, 1, f(Yes, false, "")},
-	{0xace, 0, 0, 0, f(Yes, false, "")},
-	{0xb3c, 7, 1, 1, f(Yes, false, "")},
-	{0xb3d, 0, 0, 0, f(Yes, false, "")},
-	{0xb3e, 0, 1, 1, f(Maybe, false, "")},
-	{0xb3f, 0, 0, 0, f(Yes, false, "")},
-	{0xb47, 0, 0, 0, f(Yes, true, "")},
-	{0xb48, 0, 0, 1, f(Yes, false, "ୈ")},
-	{0xb49, 0, 0, 0, f(Yes, false, "")},
-	{0xb4b, 0, 0, 1, f(Yes, false, "ୋ")},
-	{0xb4c, 0, 0, 1, f(Yes, false, "ୌ")},
-	{0xb4d, 9, 1, 1, f(Yes, false, "")},
-	{0xb4e, 0, 0, 0, f(Yes, false, "")},
-	{0xb56, 0, 1, 1, f(Maybe, false, "")},
-	{0xb58, 0, 0, 0, f(Yes, false, "")},
-	{0xb5c, 0, 0, 1, f(No, false, "ଡ଼")},
-	{0xb5d, 0, 0, 1, f(No, false, "ଢ଼")},
-	{0xb5e, 0, 0, 0, f(Yes, false, "")},
-	{0xb92, 0, 0, 0, f(Yes, true, "")},
-	{0xb93, 0, 0, 0, f(Yes, false, "")},
-	{0xb94, 0, 0, 1, f(Yes, false, "ஔ")},
-	{0xb95, 0, 0, 0, f(Yes, false, "")},
-	{0xbbe, 0, 1, 1, f(Maybe, false, "")},
-	{0xbbf, 0, 0, 0, f(Yes, false, "")},
-	{0xbc6, 0, 0, 0, f(Yes, true, "")},
-	{0xbc8, 0, 0, 0, f(Yes, false, "")},
-	{0xbca, 0, 0, 1, f(Yes, false, "ொ")},
-	{0xbcb, 0, 0, 1, f(Yes, false, "ோ")},
-	{0xbcc, 0, 0, 1, f(Yes, false, "ௌ")},
-	{0xbcd, 9, 1, 1, f(Yes, false, "")},
-	{0xbce, 0, 0, 0, f(Yes, false, "")},
-	{0xbd7, 0, 1, 1, f(Maybe, false, "")},
-	{0xbd8, 0, 0, 0, f(Yes, false, "")},
-	{0xc46, 0, 0, 0, f(Yes, true, "")},
-	{0xc47, 0, 0, 0, f(Yes, false, "")},
-	{0xc48, 0, 0, 1, f(Yes, false, "ై")},
-	{0xc49, 0, 0, 0, f(Yes, false, "")},
-	{0xc4d, 9, 1, 1, f(Yes, false, "")},
-	{0xc4e, 0, 0, 0, f(Yes, false, "")},
-	{0xc55, 84, 1, 1, f(Yes, false, "")},
-	{0xc56, 91, 1, 1, f(Maybe, false, "")},
-	{0xc57, 0, 0, 0, f(Yes, false, "")},
-	{0xcbc, 7, 1, 1, f(Yes, false, "")},
-	{0xcbd, 0, 0, 0, f(Yes, false, "")},
-	{0xcbf, 0, 0, 0, f(Yes, true, "")},
-	{0xcc0, 0, 0, 1, f(Yes, false, "ೀ")},
-	{0xcc1, 0, 0, 0, f(Yes, false, "")},
-	{0xcc2, 0, 1, 1, f(Maybe, false, "")},
-	{0xcc3, 0, 0, 0, f(Yes, false, "")},
-	{0xcc6, 0, 0, 0, f(Yes, true, "")},
-	{0xcc7, 0, 0, 1, f(Yes, false, "ೇ")},
-	{0xcc8, 0, 0, 1, f(Yes, false, "ೈ")},
-	{0xcc9, 0, 0, 0, f(Yes, false, "")},
-	{0xcca, 0, 0, 1, f(Yes, true, "ೊ")},
-	{0xccb, 0, 0, 2, f(Yes, false, "ೋ")},
-	{0xccc, 0, 0, 0, f(Yes, false, "")},
-	{0xccd, 9, 1, 1, f(Yes, false, "")},
-	{0xcce, 0, 0, 0, f(Yes, false, "")},
-	{0xcd5, 0, 1, 1, f(Maybe, false, "")},
-	{0xcd7, 0, 0, 0, f(Yes, false, "")},
-	{0xd3b, 9, 1, 1, f(Yes, false, "")},
-	{0xd3d, 0, 0, 0, f(Yes, false, "")},
-	{0xd3e, 0, 1, 1, f(Maybe, false, "")},
-	{0xd3f, 0, 0, 0, f(Yes, false, "")},
-	{0xd46, 0, 0, 0, f(Yes, true, "")},
-	{0xd48, 0, 0, 0, f(Yes, false, "")},
-	{0xd4a, 0, 0, 1, f(Yes, false, "ൊ")},
-	{0xd4b, 0, 0, 1, f(Yes, false, "ോ")},
-	{0xd4c, 0, 0, 1, f(Yes, false, "ൌ")},
-	{0xd4d, 9, 1, 1, f(Yes, false, "")},
-	{0xd4e, 0, 0, 0, f(Yes, false, "")},
-	{0xd57, 0, 1, 1, f(Maybe, false, "")},
-	{0xd58, 0, 0, 0, f(Yes, false, "")},
-	{0xdca, 9, 1, 1, f(Maybe, false, "")},
-	{0xdcb, 0, 0, 0, f(Yes, false, "")},
-	{0xdcf, 0, 1, 1, f(Maybe, false, "")},
-	{0xdd0, 0, 0, 0, f(Yes, false, "")},
-	{0xdd9, 0, 0, 0, f(Yes, true, "")},
-	{0xdda, 0, 0, 1, f(Yes, false, "ේ")},
-	{0xddb, 0, 0, 0, f(Yes, false, "")},
-	{0xddc, 0, 0, 1, f(Yes, true, "ො")},
-	{0xddd, 0, 0, 2, f(Yes, false, "ෝ")},
-	{0xdde, 0, 0, 1, f(Yes, false, "ෞ")},
-	{0xddf, 0, 1, 1, f(Maybe, false, "")},
-	{0xde0, 0, 0, 0, f(Yes, false, "")},
-	{0xe33, 0, 0, 0, g(Yes, No, false, false, "", "ํา")},
-	{0xe34, 0, 0, 0, f(Yes, false, "")},
-	{0xe38, 103, 1, 1, f(Yes, false, "")},
-	{0xe3a, 9, 1, 1, f(Yes, false, "")},
-	{0xe3b, 0, 0, 0, f(Yes, false, "")},
-	{0xe48, 107, 1, 1, f(Yes, false, "")},
-	{0xe4c, 0, 0, 0, f(Yes, false, "")},
-	{0xeb3, 0, 0, 0, g(Yes, No, false, false, "", "ໍາ")},
-	{0xeb4, 0, 0, 0, f(Yes, false, "")},
-	{0xeb8, 118, 1, 1, f(Yes, false, "")},
-	{0xeba, 0, 0, 0, f(Yes, false, "")},
-	{0xec8, 122, 1, 1, f(Yes, false, "")},
-	{0xecc, 0, 0, 0, f(Yes, false, "")},
-	{0xedc, 0, 0, 0, g(Yes, No, false, false, "", "ຫນ")},
-	{0xedd, 0, 0, 0, g(Yes, No, false, false, "", "ຫມ")},
-	{0xede, 0, 0, 0, f(Yes, false, "")},
-	{0xf0c, 0, 0, 0, g(Yes, No, false, false, "", "་")},
-	{0xf0d, 0, 0, 0, f(Yes, false, "")},
-	{0xf18, 220, 1, 1, f(Yes, false, "")},
-	{0xf1a, 0, 0, 0, f(Yes, false, "")},
-	{0xf35, 220, 1, 1, f(Yes, false, "")},
-	{0xf36, 0, 0, 0, f(Yes, false, "")},
-	{0xf37, 220, 1, 1, f(Yes, false, "")},
-	{0xf38, 0, 0, 0, f(Yes, false, "")},
-	{0xf39, 216, 1, 1, f(Yes, false, "")},
-	{0xf3a, 0, 0, 0, f(Yes, false, "")},
-	{0xf43, 0, 0, 0, f(No, false, "གྷ")},
-	{0xf44, 0, 0, 0, f(Yes, false, "")},
-	{0xf4d, 0, 0, 0, f(No, false, "ཌྷ")},
-	{0xf4e, 0, 0, 0, f(Yes, false, "")},
-	{0xf52, 0, 0, 0, f(No, false, "དྷ")},
-	{0xf53, 0, 0, 0, f(Yes, false, "")},
-	{0xf57, 0, 0, 0, f(No, false, "བྷ")},
-	{0xf58, 0, 0, 0, f(Yes, false, "")},
-	{0xf5c, 0, 0, 0, f(No, false, "ཛྷ")},
-	{0xf5d, 0, 0, 0, f(Yes, false, "")},
-	{0xf69, 0, 0, 0, f(No, false, "ཀྵ")},
-	{0xf6a, 0, 0, 0, f(Yes, false, "")},
-	{0xf71, 129, 1, 1, f(Yes, false, "")},
-	{0xf72, 130, 1, 1, f(Yes, false, "")},
-	{0xf73, 0, 2, 2, f(No, false, "ཱི")},
-	{0xf74, 132, 1, 1, f(Yes, false, "")},
-	{0xf75, 0, 2, 2, f(No, false, "ཱུ")},
-	{0xf76, 0, 0, 1, f(No, false, "ྲྀ")},
-	{0xf77, 0, 0, 2, g(Yes, No, false, false, "", "ྲཱྀ")},
-	{0xf78, 0, 0, 1, f(No, false, "ླྀ")},
-	{0xf79, 0, 0, 2, g(Yes, No, false, false, "", "ླཱྀ")},
-	{0xf7a, 130, 1, 1, f(Yes, false, "")},
-	{0xf7e, 0, 0, 0, f(Yes, false, "")},
-	{0xf80, 130, 1, 1, f(Yes, false, "")},
-	{0xf81, 0, 2, 2, f(No, false, "ཱྀ")},
-	{0xf82, 230, 1, 1, f(Yes, false, "")},
-	{0xf84, 9, 1, 1, f(Yes, false, "")},
-	{0xf85, 0, 0, 0, f(Yes, false, "")},
-	{0xf86, 230, 1, 1, f(Yes, false, "")},
-	{0xf88, 0, 0, 0, f(Yes, false, "")},
-	{0xf93, 0, 0, 0, f(No, false, "ྒྷ")},
-	{0xf94, 0, 0, 0, f(Yes, false, "")},
-	{0xf9d, 0, 0, 0, f(No, false, "ྜྷ")},
-	{0xf9e, 0, 0, 0, f(Yes, false, "")},
-	{0xfa2, 0, 0, 0, f(No, false, "ྡྷ")},
-	{0xfa3, 0, 0, 0, f(Yes, false, "")},
-	{0xfa7, 0, 0, 0, f(No, false, "ྦྷ")},
-	{0xfa8, 0, 0, 0, f(Yes, false, "")},
-	{0xfac, 0, 0, 0, f(No, false, "ྫྷ")},
-	{0xfad, 0, 0, 0, f(Yes, false, "")},
-	{0xfb9, 0, 0, 0, f(No, false, "ྐྵ")},
-	{0xfba, 0, 0, 0, f(Yes, false, "")},
-	{0xfc6, 220, 1, 1, f(Yes, false, "")},
-	{0xfc7, 0, 0, 0, f(Yes, false, "")},
-	{0x1025, 0, 0, 0, f(Yes, true, "")},
-	{0x1026, 0, 0, 1, f(Yes, false, "ဦ")},
-	{0x1027, 0, 0, 0, f(Yes, false, "")},
-	{0x102e, 0, 1, 1, f(Maybe, false, "")},
-	{0x102f, 0, 0, 0, f(Yes, false, "")},
-	{0x1037, 7, 1, 1, f(Yes, false, "")},
-	{0x1038, 0, 0, 0, f(Yes, false, "")},
-	{0x1039, 9, 1, 1, f(Yes, false, "")},
-	{0x103b, 0, 0, 0, f(Yes, false, "")},
-	{0x108d, 220, 1, 1, f(Yes, false, "")},
-	{0x108e, 0, 0, 0, f(Yes, false, "")},
-	{0x10fc, 0, 0, 0, g(Yes, No, false, false, "", "ნ")},
-	{0x10fd, 0, 0, 0, f(Yes, false, "")},
-	{0x1100, 0, 0, 0, f(Yes, true, "")},
-	{0x1113, 0, 0, 0, f(Yes, false, "")},
-	{0x1161, 0, 1, 1, f(Maybe, true, "")},
-	{0x1176, 0, 0, 0, f(Yes, false, "")},
-	{0x11a8, 0, 1, 1, f(Maybe, false, "")},
-	{0x11c3, 0, 0, 0, f(Yes, false, "")},
-	{0x135d, 230, 1, 1, f(Yes, false, "")},
-	{0x1360, 0, 0, 0, f(Yes, false, "")},
-	{0x1714, 9, 1, 1, f(Yes, false, "")},
-	{0x1715, 0, 0, 0, f(Yes, false, "")},
-	{0x1734, 9, 1, 1, f(Yes, false, "")},
-	{0x1735, 0, 0, 0, f(Yes, false, "")},
-	{0x17d2, 9, 1, 1, f(Yes, false, "")},
-	{0x17d3, 0, 0, 0, f(Yes, false, "")},
-	{0x17dd, 230, 1, 1, f(Yes, false, "")},
-	{0x17de, 0, 0, 0, f(Yes, false, "")},
-	{0x18a9, 228, 1, 1, f(Yes, false, "")},
-	{0x18aa, 0, 0, 0, f(Yes, false, "")},
-	{0x1939, 222, 1, 1, f(Yes, false, "")},
-	{0x193a, 230, 1, 1, f(Yes, false, "")},
-	{0x193b, 220, 1, 1, f(Yes, false, "")},
-	{0x193c, 0, 0, 0, f(Yes, false, "")},
-	{0x1a17, 230, 1, 1, f(Yes, false, "")},
-	{0x1a18, 220, 1, 1, f(Yes, false, "")},
-	{0x1a19, 0, 0, 0, f(Yes, false, "")},
-	{0x1a60, 9, 1, 1, f(Yes, false, "")},
-	{0x1a61, 0, 0, 0, f(Yes, false, "")},
-	{0x1a75, 230, 1, 1, f(Yes, false, "")},
-	{0x1a7d, 0, 0, 0, f(Yes, false, "")},
-	{0x1a7f, 220, 1, 1, f(Yes, false, "")},
-	{0x1a80, 0, 0, 0, f(Yes, false, "")},
-	{0x1ab0, 230, 1, 1, f(Yes, false, "")},
-	{0x1ab5, 220, 1, 1, f(Yes, false, "")},
-	{0x1abb, 230, 1, 1, f(Yes, false, "")},
-	{0x1abd, 220, 1, 1, f(Yes, false, "")},
-	{0x1abe, 0, 0, 0, f(Yes, false, "")},
-	{0x1b05, 0, 0, 0, f(Yes, true, "")},
-	{0x1b06, 0, 0, 1, f(Yes, false, "ᬆ")},
-	{0x1b07, 0, 0, 0, f(Yes, true, "")},
-	{0x1b08, 0, 0, 1, f(Yes, false, "ᬈ")},
-	{0x1b09, 0, 0, 0, f(Yes, true, "")},
-	{0x1b0a, 0, 0, 1, f(Yes, false, "ᬊ")},
-	{0x1b0b, 0, 0, 0, f(Yes, true, "")},
-	{0x1b0c, 0, 0, 1, f(Yes, false, "ᬌ")},
-	{0x1b0d, 0, 0, 0, f(Yes, true, "")},
-	{0x1b0e, 0, 0, 1, f(Yes, false, "ᬎ")},
-	{0x1b0f, 0, 0, 0, f(Yes, false, "")},
-	{0x1b11, 0, 0, 0, f(Yes, true, "")},
-	{0x1b12, 0, 0, 1, f(Yes, false, "ᬒ")},
-	{0x1b13, 0, 0, 0, f(Yes, false, "")},
-	{0x1b34, 7, 1, 1, f(Yes, false, "")},
-	{0x1b35, 0, 1, 1, f(Maybe, false, "")},
-	{0x1b36, 0, 0, 0, f(Yes, false, "")},
-	{0x1b3a, 0, 0, 0, f(Yes, true, "")},
-	{0x1b3b, 0, 0, 1, f(Yes, false, "ᬻ")},
-	{0x1b3c, 0, 0, 0, f(Yes, true, "")},
-	{0x1b3d, 0, 0, 1, f(Yes, false, "ᬽ")},
-	{0x1b3e, 0, 0, 0, f(Yes, true, "")},
-	{0x1b40, 0, 0, 1, f(Yes, false, "ᭀ")},
-	{0x1b41, 0, 0, 1, f(Yes, false, "ᭁ")},
-	{0x1b42, 0, 0, 0, f(Yes, true, "")},
-	{0x1b43, 0, 0, 1, f(Yes, false, "ᭃ")},
-	{0x1b44, 9, 1, 1, f(Yes, false, "")},
-	{0x1b45, 0, 0, 0, f(Yes, false, "")},
-	{0x1b6b, 230, 1, 1, f(Yes, false, "")},
-	{0x1b6c, 220, 1, 1, f(Yes, false, "")},
-	{0x1b6d, 230, 1, 1, f(Yes, false, "")},
-	{0x1b74, 0, 0, 0, f(Yes, false, "")},
-	{0x1baa, 9, 1, 1, f(Yes, false, "")},
-	{0x1bac, 0, 0, 0, f(Yes, false, "")},
-	{0x1be6, 7, 1, 1, f(Yes, false, "")},
-	{0x1be7, 0, 0, 0, f(Yes, false, "")},
-	{0x1bf2, 9, 1, 1, f(Yes, false, "")},
-	{0x1bf4, 0, 0, 0, f(Yes, false, "")},
-	{0x1c37, 7, 1, 1, f(Yes, false, "")},
-	{0x1c38, 0, 0, 0, f(Yes, false, "")},
-	{0x1cd0, 230, 1, 1, f(Yes, false, "")},
-	{0x1cd3, 0, 0, 0, f(Yes, false, "")},
-	{0x1cd4, 1, 1, 1, f(Yes, false, "")},
-	{0x1cd5, 220, 1, 1, f(Yes, false, "")},
-	{0x1cda, 230, 1, 1, f(Yes, false, "")},
-	{0x1cdc, 220, 1, 1, f(Yes, false, "")},
-	{0x1ce0, 230, 1, 1, f(Yes, false, "")},
-	{0x1ce1, 0, 0, 0, f(Yes, false, "")},
-	{0x1ce2, 1, 1, 1, f(Yes, false, "")},
-	{0x1ce9, 0, 0, 0, f(Yes, false, "")},
-	{0x1ced, 220, 1, 1, f(Yes, false, "")},
-	{0x1cee, 0, 0, 0, f(Yes, false, "")},
-	{0x1cf4, 230, 1, 1, f(Yes, false, "")},
-	{0x1cf5, 0, 0, 0, f(Yes, false, "")},
-	{0x1cf8, 230, 1, 1, f(Yes, false, "")},
-	{0x1cfa, 0, 0, 0, f(Yes, false, "")},
-	{0x1d2c, 0, 0, 0, g(Yes, No, false, false, "", "A")},
-	{0x1d2d, 0, 0, 0, g(Yes, No, false, false, "", "Æ")},
-	{0x1d2e, 0, 0, 0, g(Yes, No, false, false, "", "B")},
-	{0x1d2f, 0, 0, 0, f(Yes, false, "")},
-	{0x1d30, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x1d31, 0, 0, 0, g(Yes, No, false, false, "", "E")},
-	{0x1d32, 0, 0, 0, g(Yes, No, false, false, "", "Ǝ")},
-	{0x1d33, 0, 0, 0, g(Yes, No, false, false, "", "G")},
-	{0x1d34, 0, 0, 0, g(Yes, No, false, false, "", "H")},
-	{0x1d35, 0, 0, 0, g(Yes, No, false, false, "", "I")},
-	{0x1d36, 0, 0, 0, g(Yes, No, false, false, "", "J")},
-	{0x1d37, 0, 0, 0, g(Yes, No, false, false, "", "K")},
-	{0x1d38, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0x1d39, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0x1d3a, 0, 0, 0, g(Yes, No, false, false, "", "N")},
-	{0x1d3b, 0, 0, 0, f(Yes, false, "")},
-	{0x1d3c, 0, 0, 0, g(Yes, No, false, false, "", "O")},
-	{0x1d3d, 0, 0, 0, g(Yes, No, false, false, "", "Ȣ")},
-	{0x1d3e, 0, 0, 0, g(Yes, No, false, false, "", "P")},
-	{0x1d3f, 0, 0, 0, g(Yes, No, false, false, "", "R")},
-	{0x1d40, 0, 0, 0, g(Yes, No, false, false, "", "T")},
-	{0x1d41, 0, 0, 0, g(Yes, No, false, false, "", "U")},
-	{0x1d42, 0, 0, 0, g(Yes, No, false, false, "", "W")},
-	{0x1d43, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0x1d44, 0, 0, 0, g(Yes, No, false, false, "", "ɐ")},
-	{0x1d45, 0, 0, 0, g(Yes, No, false, false, "", "ɑ")},
-	{0x1d46, 0, 0, 0, g(Yes, No, false, false, "", "ᴂ")},
-	{0x1d47, 0, 0, 0, g(Yes, No, false, false, "", "b")},
-	{0x1d48, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0x1d49, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0x1d4a, 0, 0, 0, g(Yes, No, false, false, "", "ə")},
-	{0x1d4b, 0, 0, 0, g(Yes, No, false, false, "", "ɛ")},
-	{0x1d4c, 0, 0, 0, g(Yes, No, false, false, "", "ɜ")},
-	{0x1d4d, 0, 0, 0, g(Yes, No, false, false, "", "g")},
-	{0x1d4e, 0, 0, 0, f(Yes, false, "")},
-	{0x1d4f, 0, 0, 0, g(Yes, No, false, false, "", "k")},
-	{0x1d50, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0x1d51, 0, 0, 0, g(Yes, No, false, false, "", "ŋ")},
-	{0x1d52, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0x1d53, 0, 0, 0, g(Yes, No, false, false, "", "ɔ")},
-	{0x1d54, 0, 0, 0, g(Yes, No, false, false, "", "ᴖ")},
-	{0x1d55, 0, 0, 0, g(Yes, No, false, false, "", "ᴗ")},
-	{0x1d56, 0, 0, 0, g(Yes, No, false, false, "", "p")},
-	{0x1d57, 0, 0, 0, g(Yes, No, false, false, "", "t")},
-	{0x1d58, 0, 0, 0, g(Yes, No, false, false, "", "u")},
-	{0x1d59, 0, 0, 0, g(Yes, No, false, false, "", "ᴝ")},
-	{0x1d5a, 0, 0, 0, g(Yes, No, false, false, "", "ɯ")},
-	{0x1d5b, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0x1d5c, 0, 0, 0, g(Yes, No, false, false, "", "ᴥ")},
-	{0x1d5d, 0, 0, 0, g(Yes, No, false, false, "", "β")},
-	{0x1d5e, 0, 0, 0, g(Yes, No, false, false, "", "γ")},
-	{0x1d5f, 0, 0, 0, g(Yes, No, false, false, "", "δ")},
-	{0x1d60, 0, 0, 0, g(Yes, No, false, false, "", "φ")},
-	{0x1d61, 0, 0, 0, g(Yes, No, false, false, "", "χ")},
-	{0x1d62, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x1d63, 0, 0, 0, g(Yes, No, false, false, "", "r")},
-	{0x1d64, 0, 0, 0, g(Yes, No, false, false, "", "u")},
-	{0x1d65, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0x1d66, 0, 0, 0, g(Yes, No, false, false, "", "β")},
-	{0x1d67, 0, 0, 0, g(Yes, No, false, false, "", "γ")},
-	{0x1d68, 0, 0, 0, g(Yes, No, false, false, "", "ρ")},
-	{0x1d69, 0, 0, 0, g(Yes, No, false, false, "", "φ")},
-	{0x1d6a, 0, 0, 0, g(Yes, No, false, false, "", "χ")},
-	{0x1d6b, 0, 0, 0, f(Yes, false, "")},
-	{0x1d78, 0, 0, 0, g(Yes, No, false, false, "", "н")},
-	{0x1d79, 0, 0, 0, f(Yes, false, "")},
-	{0x1d9b, 0, 0, 0, g(Yes, No, false, false, "", "ɒ")},
-	{0x1d9c, 0, 0, 0, g(Yes, No, false, false, "", "c")},
-	{0x1d9d, 0, 0, 0, g(Yes, No, false, false, "", "ɕ")},
-	{0x1d9e, 0, 0, 0, g(Yes, No, false, false, "", "ð")},
-	{0x1d9f, 0, 0, 0, g(Yes, No, false, false, "", "ɜ")},
-	{0x1da0, 0, 0, 0, g(Yes, No, false, false, "", "f")},
-	{0x1da1, 0, 0, 0, g(Yes, No, false, false, "", "ɟ")},
-	{0x1da2, 0, 0, 0, g(Yes, No, false, false, "", "ɡ")},
-	{0x1da3, 0, 0, 0, g(Yes, No, false, false, "", "ɥ")},
-	{0x1da4, 0, 0, 0, g(Yes, No, false, false, "", "ɨ")},
-	{0x1da5, 0, 0, 0, g(Yes, No, false, false, "", "ɩ")},
-	{0x1da6, 0, 0, 0, g(Yes, No, false, false, "", "ɪ")},
-	{0x1da7, 0, 0, 0, g(Yes, No, false, false, "", "ᵻ")},
-	{0x1da8, 0, 0, 0, g(Yes, No, false, false, "", "ʝ")},
-	{0x1da9, 0, 0, 0, g(Yes, No, false, false, "", "ɭ")},
-	{0x1daa, 0, 0, 0, g(Yes, No, false, false, "", "ᶅ")},
-	{0x1dab, 0, 0, 0, g(Yes, No, false, false, "", "ʟ")},
-	{0x1dac, 0, 0, 0, g(Yes, No, false, false, "", "ɱ")},
-	{0x1dad, 0, 0, 0, g(Yes, No, false, false, "", "ɰ")},
-	{0x1dae, 0, 0, 0, g(Yes, No, false, false, "", "ɲ")},
-	{0x1daf, 0, 0, 0, g(Yes, No, false, false, "", "ɳ")},
-	{0x1db0, 0, 0, 0, g(Yes, No, false, false, "", "ɴ")},
-	{0x1db1, 0, 0, 0, g(Yes, No, false, false, "", "ɵ")},
-	{0x1db2, 0, 0, 0, g(Yes, No, false, false, "", "ɸ")},
-	{0x1db3, 0, 0, 0, g(Yes, No, false, false, "", "ʂ")},
-	{0x1db4, 0, 0, 0, g(Yes, No, false, false, "", "ʃ")},
-	{0x1db5, 0, 0, 0, g(Yes, No, false, false, "", "ƫ")},
-	{0x1db6, 0, 0, 0, g(Yes, No, false, false, "", "ʉ")},
-	{0x1db7, 0, 0, 0, g(Yes, No, false, false, "", "ʊ")},
-	{0x1db8, 0, 0, 0, g(Yes, No, false, false, "", "ᴜ")},
-	{0x1db9, 0, 0, 0, g(Yes, No, false, false, "", "ʋ")},
-	{0x1dba, 0, 0, 0, g(Yes, No, false, false, "", "ʌ")},
-	{0x1dbb, 0, 0, 0, g(Yes, No, false, false, "", "z")},
-	{0x1dbc, 0, 0, 0, g(Yes, No, false, false, "", "ʐ")},
-	{0x1dbd, 0, 0, 0, g(Yes, No, false, false, "", "ʑ")},
-	{0x1dbe, 0, 0, 0, g(Yes, No, false, false, "", "ʒ")},
-	{0x1dbf, 0, 0, 0, g(Yes, No, false, false, "", "θ")},
-	{0x1dc0, 230, 1, 1, f(Yes, false, "")},
-	{0x1dc2, 220, 1, 1, f(Yes, false, "")},
-	{0x1dc3, 230, 1, 1, f(Yes, false, "")},
-	{0x1dca, 220, 1, 1, f(Yes, false, "")},
-	{0x1dcb, 230, 1, 1, f(Yes, false, "")},
-	{0x1dcd, 234, 1, 1, f(Yes, false, "")},
-	{0x1dce, 214, 1, 1, f(Yes, false, "")},
-	{0x1dcf, 220, 1, 1, f(Yes, false, "")},
-	{0x1dd0, 202, 1, 1, f(Yes, false, "")},
-	{0x1dd1, 230, 1, 1, f(Yes, false, "")},
-	{0x1df6, 232, 1, 1, f(Yes, false, "")},
-	{0x1df7, 228, 1, 1, f(Yes, false, "")},
-	{0x1df9, 220, 1, 1, f(Yes, false, "")},
-	{0x1dfa, 0, 0, 0, f(Yes, false, "")},
-	{0x1dfb, 230, 1, 1, f(Yes, false, "")},
-	{0x1dfc, 233, 1, 1, f(Yes, false, "")},
-	{0x1dfd, 220, 1, 1, f(Yes, false, "")},
-	{0x1dfe, 230, 1, 1, f(Yes, false, "")},
-	{0x1dff, 220, 1, 1, f(Yes, false, "")},
-	{0x1e00, 0, 0, 1, f(Yes, false, "Ḁ")},
-	{0x1e01, 0, 0, 1, f(Yes, false, "ḁ")},
-	{0x1e02, 0, 0, 1, f(Yes, false, "Ḃ")},
-	{0x1e03, 0, 0, 1, f(Yes, false, "ḃ")},
-	{0x1e04, 0, 0, 1, f(Yes, false, "Ḅ")},
-	{0x1e05, 0, 0, 1, f(Yes, false, "ḅ")},
-	{0x1e06, 0, 0, 1, f(Yes, false, "Ḇ")},
-	{0x1e07, 0, 0, 1, f(Yes, false, "ḇ")},
-	{0x1e08, 0, 0, 2, f(Yes, false, "Ḉ")},
-	{0x1e09, 0, 0, 2, f(Yes, false, "ḉ")},
-	{0x1e0a, 0, 0, 1, f(Yes, false, "Ḋ")},
-	{0x1e0b, 0, 0, 1, f(Yes, false, "ḋ")},
-	{0x1e0c, 0, 0, 1, f(Yes, false, "Ḍ")},
-	{0x1e0d, 0, 0, 1, f(Yes, false, "ḍ")},
-	{0x1e0e, 0, 0, 1, f(Yes, false, "Ḏ")},
-	{0x1e0f, 0, 0, 1, f(Yes, false, "ḏ")},
-	{0x1e10, 0, 0, 1, f(Yes, false, "Ḑ")},
-	{0x1e11, 0, 0, 1, f(Yes, false, "ḑ")},
-	{0x1e12, 0, 0, 1, f(Yes, false, "Ḓ")},
-	{0x1e13, 0, 0, 1, f(Yes, false, "ḓ")},
-	{0x1e14, 0, 0, 2, f(Yes, false, "Ḕ")},
-	{0x1e15, 0, 0, 2, f(Yes, false, "ḕ")},
-	{0x1e16, 0, 0, 2, f(Yes, false, "Ḗ")},
-	{0x1e17, 0, 0, 2, f(Yes, false, "ḗ")},
-	{0x1e18, 0, 0, 1, f(Yes, false, "Ḙ")},
-	{0x1e19, 0, 0, 1, f(Yes, false, "ḙ")},
-	{0x1e1a, 0, 0, 1, f(Yes, false, "Ḛ")},
-	{0x1e1b, 0, 0, 1, f(Yes, false, "ḛ")},
-	{0x1e1c, 0, 0, 2, f(Yes, false, "Ḝ")},
-	{0x1e1d, 0, 0, 2, f(Yes, false, "ḝ")},
-	{0x1e1e, 0, 0, 1, f(Yes, false, "Ḟ")},
-	{0x1e1f, 0, 0, 1, f(Yes, false, "ḟ")},
-	{0x1e20, 0, 0, 1, f(Yes, false, "Ḡ")},
-	{0x1e21, 0, 0, 1, f(Yes, false, "ḡ")},
-	{0x1e22, 0, 0, 1, f(Yes, false, "Ḣ")},
-	{0x1e23, 0, 0, 1, f(Yes, false, "ḣ")},
-	{0x1e24, 0, 0, 1, f(Yes, false, "Ḥ")},
-	{0x1e25, 0, 0, 1, f(Yes, false, "ḥ")},
-	{0x1e26, 0, 0, 1, f(Yes, false, "Ḧ")},
-	{0x1e27, 0, 0, 1, f(Yes, false, "ḧ")},
-	{0x1e28, 0, 0, 1, f(Yes, false, "Ḩ")},
-	{0x1e29, 0, 0, 1, f(Yes, false, "ḩ")},
-	{0x1e2a, 0, 0, 1, f(Yes, false, "Ḫ")},
-	{0x1e2b, 0, 0, 1, f(Yes, false, "ḫ")},
-	{0x1e2c, 0, 0, 1, f(Yes, false, "Ḭ")},
-	{0x1e2d, 0, 0, 1, f(Yes, false, "ḭ")},
-	{0x1e2e, 0, 0, 2, f(Yes, false, "Ḯ")},
-	{0x1e2f, 0, 0, 2, f(Yes, false, "ḯ")},
-	{0x1e30, 0, 0, 1, f(Yes, false, "Ḱ")},
-	{0x1e31, 0, 0, 1, f(Yes, false, "ḱ")},
-	{0x1e32, 0, 0, 1, f(Yes, false, "Ḳ")},
-	{0x1e33, 0, 0, 1, f(Yes, false, "ḳ")},
-	{0x1e34, 0, 0, 1, f(Yes, false, "Ḵ")},
-	{0x1e35, 0, 0, 1, f(Yes, false, "ḵ")},
-	{0x1e36, 0, 0, 1, f(Yes, true, "Ḷ")},
-	{0x1e37, 0, 0, 1, f(Yes, true, "ḷ")},
-	{0x1e38, 0, 0, 2, f(Yes, false, "Ḹ")},
-	{0x1e39, 0, 0, 2, f(Yes, false, "ḹ")},
-	{0x1e3a, 0, 0, 1, f(Yes, false, "Ḻ")},
-	{0x1e3b, 0, 0, 1, f(Yes, false, "ḻ")},
-	{0x1e3c, 0, 0, 1, f(Yes, false, "Ḽ")},
-	{0x1e3d, 0, 0, 1, f(Yes, false, "ḽ")},
-	{0x1e3e, 0, 0, 1, f(Yes, false, "Ḿ")},
-	{0x1e3f, 0, 0, 1, f(Yes, false, "ḿ")},
-	{0x1e40, 0, 0, 1, f(Yes, false, "Ṁ")},
-	{0x1e41, 0, 0, 1, f(Yes, false, "ṁ")},
-	{0x1e42, 0, 0, 1, f(Yes, false, "Ṃ")},
-	{0x1e43, 0, 0, 1, f(Yes, false, "ṃ")},
-	{0x1e44, 0, 0, 1, f(Yes, false, "Ṅ")},
-	{0x1e45, 0, 0, 1, f(Yes, false, "ṅ")},
-	{0x1e46, 0, 0, 1, f(Yes, false, "Ṇ")},
-	{0x1e47, 0, 0, 1, f(Yes, false, "ṇ")},
-	{0x1e48, 0, 0, 1, f(Yes, false, "Ṉ")},
-	{0x1e49, 0, 0, 1, f(Yes, false, "ṉ")},
-	{0x1e4a, 0, 0, 1, f(Yes, false, "Ṋ")},
-	{0x1e4b, 0, 0, 1, f(Yes, false, "ṋ")},
-	{0x1e4c, 0, 0, 2, f(Yes, false, "Ṍ")},
-	{0x1e4d, 0, 0, 2, f(Yes, false, "ṍ")},
-	{0x1e4e, 0, 0, 2, f(Yes, false, "Ṏ")},
-	{0x1e4f, 0, 0, 2, f(Yes, false, "ṏ")},
-	{0x1e50, 0, 0, 2, f(Yes, false, "Ṑ")},
-	{0x1e51, 0, 0, 2, f(Yes, false, "ṑ")},
-	{0x1e52, 0, 0, 2, f(Yes, false, "Ṓ")},
-	{0x1e53, 0, 0, 2, f(Yes, false, "ṓ")},
-	{0x1e54, 0, 0, 1, f(Yes, false, "Ṕ")},
-	{0x1e55, 0, 0, 1, f(Yes, false, "ṕ")},
-	{0x1e56, 0, 0, 1, f(Yes, false, "Ṗ")},
-	{0x1e57, 0, 0, 1, f(Yes, false, "ṗ")},
-	{0x1e58, 0, 0, 1, f(Yes, false, "Ṙ")},
-	{0x1e59, 0, 0, 1, f(Yes, false, "ṙ")},
-	{0x1e5a, 0, 0, 1, f(Yes, true, "Ṛ")},
-	{0x1e5b, 0, 0, 1, f(Yes, true, "ṛ")},
-	{0x1e5c, 0, 0, 2, f(Yes, false, "Ṝ")},
-	{0x1e5d, 0, 0, 2, f(Yes, false, "ṝ")},
-	{0x1e5e, 0, 0, 1, f(Yes, false, "Ṟ")},
-	{0x1e5f, 0, 0, 1, f(Yes, false, "ṟ")},
-	{0x1e60, 0, 0, 1, f(Yes, false, "Ṡ")},
-	{0x1e61, 0, 0, 1, f(Yes, false, "ṡ")},
-	{0x1e62, 0, 0, 1, f(Yes, true, "Ṣ")},
-	{0x1e63, 0, 0, 1, f(Yes, true, "ṣ")},
-	{0x1e64, 0, 0, 2, f(Yes, false, "Ṥ")},
-	{0x1e65, 0, 0, 2, f(Yes, false, "ṥ")},
-	{0x1e66, 0, 0, 2, f(Yes, false, "Ṧ")},
-	{0x1e67, 0, 0, 2, f(Yes, false, "ṧ")},
-	{0x1e68, 0, 0, 2, f(Yes, false, "Ṩ")},
-	{0x1e69, 0, 0, 2, f(Yes, false, "ṩ")},
-	{0x1e6a, 0, 0, 1, f(Yes, false, "Ṫ")},
-	{0x1e6b, 0, 0, 1, f(Yes, false, "ṫ")},
-	{0x1e6c, 0, 0, 1, f(Yes, false, "Ṭ")},
-	{0x1e6d, 0, 0, 1, f(Yes, false, "ṭ")},
-	{0x1e6e, 0, 0, 1, f(Yes, false, "Ṯ")},
-	{0x1e6f, 0, 0, 1, f(Yes, false, "ṯ")},
-	{0x1e70, 0, 0, 1, f(Yes, false, "Ṱ")},
-	{0x1e71, 0, 0, 1, f(Yes, false, "ṱ")},
-	{0x1e72, 0, 0, 1, f(Yes, false, "Ṳ")},
-	{0x1e73, 0, 0, 1, f(Yes, false, "ṳ")},
-	{0x1e74, 0, 0, 1, f(Yes, false, "Ṵ")},
-	{0x1e75, 0, 0, 1, f(Yes, false, "ṵ")},
-	{0x1e76, 0, 0, 1, f(Yes, false, "Ṷ")},
-	{0x1e77, 0, 0, 1, f(Yes, false, "ṷ")},
-	{0x1e78, 0, 0, 2, f(Yes, false, "Ṹ")},
-	{0x1e79, 0, 0, 2, f(Yes, false, "ṹ")},
-	{0x1e7a, 0, 0, 2, f(Yes, false, "Ṻ")},
-	{0x1e7b, 0, 0, 2, f(Yes, false, "ṻ")},
-	{0x1e7c, 0, 0, 1, f(Yes, false, "Ṽ")},
-	{0x1e7d, 0, 0, 1, f(Yes, false, "ṽ")},
-	{0x1e7e, 0, 0, 1, f(Yes, false, "Ṿ")},
-	{0x1e7f, 0, 0, 1, f(Yes, false, "ṿ")},
-	{0x1e80, 0, 0, 1, f(Yes, false, "Ẁ")},
-	{0x1e81, 0, 0, 1, f(Yes, false, "ẁ")},
-	{0x1e82, 0, 0, 1, f(Yes, false, "Ẃ")},
-	{0x1e83, 0, 0, 1, f(Yes, false, "ẃ")},
-	{0x1e84, 0, 0, 1, f(Yes, false, "Ẅ")},
-	{0x1e85, 0, 0, 1, f(Yes, false, "ẅ")},
-	{0x1e86, 0, 0, 1, f(Yes, false, "Ẇ")},
-	{0x1e87, 0, 0, 1, f(Yes, false, "ẇ")},
-	{0x1e88, 0, 0, 1, f(Yes, false, "Ẉ")},
-	{0x1e89, 0, 0, 1, f(Yes, false, "ẉ")},
-	{0x1e8a, 0, 0, 1, f(Yes, false, "Ẋ")},
-	{0x1e8b, 0, 0, 1, f(Yes, false, "ẋ")},
-	{0x1e8c, 0, 0, 1, f(Yes, false, "Ẍ")},
-	{0x1e8d, 0, 0, 1, f(Yes, false, "ẍ")},
-	{0x1e8e, 0, 0, 1, f(Yes, false, "Ẏ")},
-	{0x1e8f, 0, 0, 1, f(Yes, false, "ẏ")},
-	{0x1e90, 0, 0, 1, f(Yes, false, "Ẑ")},
-	{0x1e91, 0, 0, 1, f(Yes, false, "ẑ")},
-	{0x1e92, 0, 0, 1, f(Yes, false, "Ẓ")},
-	{0x1e93, 0, 0, 1, f(Yes, false, "ẓ")},
-	{0x1e94, 0, 0, 1, f(Yes, false, "Ẕ")},
-	{0x1e95, 0, 0, 1, f(Yes, false, "ẕ")},
-	{0x1e96, 0, 0, 1, f(Yes, false, "ẖ")},
-	{0x1e97, 0, 0, 1, f(Yes, false, "ẗ")},
-	{0x1e98, 0, 0, 1, f(Yes, false, "ẘ")},
-	{0x1e99, 0, 0, 1, f(Yes, false, "ẙ")},
-	{0x1e9a, 0, 0, 0, g(Yes, No, false, false, "", "aʾ")},
-	{0x1e9b, 0, 0, 1, g(Yes, No, false, false, "ẛ", "ṡ")},
-	{0x1e9c, 0, 0, 0, f(Yes, false, "")},
-	{0x1ea0, 0, 0, 1, f(Yes, true, "Ạ")},
-	{0x1ea1, 0, 0, 1, f(Yes, true, "ạ")},
-	{0x1ea2, 0, 0, 1, f(Yes, false, "Ả")},
-	{0x1ea3, 0, 0, 1, f(Yes, false, "ả")},
-	{0x1ea4, 0, 0, 2, f(Yes, false, "Ấ")},
-	{0x1ea5, 0, 0, 2, f(Yes, false, "ấ")},
-	{0x1ea6, 0, 0, 2, f(Yes, false, "Ầ")},
-	{0x1ea7, 0, 0, 2, f(Yes, false, "ầ")},
-	{0x1ea8, 0, 0, 2, f(Yes, false, "Ẩ")},
-	{0x1ea9, 0, 0, 2, f(Yes, false, "ẩ")},
-	{0x1eaa, 0, 0, 2, f(Yes, false, "Ẫ")},
-	{0x1eab, 0, 0, 2, f(Yes, false, "ẫ")},
-	{0x1eac, 0, 0, 2, f(Yes, false, "Ậ")},
-	{0x1ead, 0, 0, 2, f(Yes, false, "ậ")},
-	{0x1eae, 0, 0, 2, f(Yes, false, "Ắ")},
-	{0x1eaf, 0, 0, 2, f(Yes, false, "ắ")},
-	{0x1eb0, 0, 0, 2, f(Yes, false, "Ằ")},
-	{0x1eb1, 0, 0, 2, f(Yes, false, "ằ")},
-	{0x1eb2, 0, 0, 2, f(Yes, false, "Ẳ")},
-	{0x1eb3, 0, 0, 2, f(Yes, false, "ẳ")},
-	{0x1eb4, 0, 0, 2, f(Yes, false, "Ẵ")},
-	{0x1eb5, 0, 0, 2, f(Yes, false, "ẵ")},
-	{0x1eb6, 0, 0, 2, f(Yes, false, "Ặ")},
-	{0x1eb7, 0, 0, 2, f(Yes, false, "ặ")},
-	{0x1eb8, 0, 0, 1, f(Yes, true, "Ẹ")},
-	{0x1eb9, 0, 0, 1, f(Yes, true, "ẹ")},
-	{0x1eba, 0, 0, 1, f(Yes, false, "Ẻ")},
-	{0x1ebb, 0, 0, 1, f(Yes, false, "ẻ")},
-	{0x1ebc, 0, 0, 1, f(Yes, false, "Ẽ")},
-	{0x1ebd, 0, 0, 1, f(Yes, false, "ẽ")},
-	{0x1ebe, 0, 0, 2, f(Yes, false, "Ế")},
-	{0x1ebf, 0, 0, 2, f(Yes, false, "ế")},
-	{0x1ec0, 0, 0, 2, f(Yes, false, "Ề")},
-	{0x1ec1, 0, 0, 2, f(Yes, false, "ề")},
-	{0x1ec2, 0, 0, 2, f(Yes, false, "Ể")},
-	{0x1ec3, 0, 0, 2, f(Yes, false, "ể")},
-	{0x1ec4, 0, 0, 2, f(Yes, false, "Ễ")},
-	{0x1ec5, 0, 0, 2, f(Yes, false, "ễ")},
-	{0x1ec6, 0, 0, 2, f(Yes, false, "Ệ")},
-	{0x1ec7, 0, 0, 2, f(Yes, false, "ệ")},
-	{0x1ec8, 0, 0, 1, f(Yes, false, "Ỉ")},
-	{0x1ec9, 0, 0, 1, f(Yes, false, "ỉ")},
-	{0x1eca, 0, 0, 1, f(Yes, false, "Ị")},
-	{0x1ecb, 0, 0, 1, f(Yes, false, "ị")},
-	{0x1ecc, 0, 0, 1, f(Yes, true, "Ọ")},
-	{0x1ecd, 0, 0, 1, f(Yes, true, "ọ")},
-	{0x1ece, 0, 0, 1, f(Yes, false, "Ỏ")},
-	{0x1ecf, 0, 0, 1, f(Yes, false, "ỏ")},
-	{0x1ed0, 0, 0, 2, f(Yes, false, "Ố")},
-	{0x1ed1, 0, 0, 2, f(Yes, false, "ố")},
-	{0x1ed2, 0, 0, 2, f(Yes, false, "Ồ")},
-	{0x1ed3, 0, 0, 2, f(Yes, false, "ồ")},
-	{0x1ed4, 0, 0, 2, f(Yes, false, "Ổ")},
-	{0x1ed5, 0, 0, 2, f(Yes, false, "ổ")},
-	{0x1ed6, 0, 0, 2, f(Yes, false, "Ỗ")},
-	{0x1ed7, 0, 0, 2, f(Yes, false, "ỗ")},
-	{0x1ed8, 0, 0, 2, f(Yes, false, "Ộ")},
-	{0x1ed9, 0, 0, 2, f(Yes, false, "ộ")},
-	{0x1eda, 0, 0, 2, f(Yes, false, "Ớ")},
-	{0x1edb, 0, 0, 2, f(Yes, false, "ớ")},
-	{0x1edc, 0, 0, 2, f(Yes, false, "Ờ")},
-	{0x1edd, 0, 0, 2, f(Yes, false, "ờ")},
-	{0x1ede, 0, 0, 2, f(Yes, false, "Ở")},
-	{0x1edf, 0, 0, 2, f(Yes, false, "ở")},
-	{0x1ee0, 0, 0, 2, f(Yes, false, "Ỡ")},
-	{0x1ee1, 0, 0, 2, f(Yes, false, "ỡ")},
-	{0x1ee2, 0, 0, 2, f(Yes, false, "Ợ")},
-	{0x1ee3, 0, 0, 2, f(Yes, false, "ợ")},
-	{0x1ee4, 0, 0, 1, f(Yes, false, "Ụ")},
-	{0x1ee5, 0, 0, 1, f(Yes, false, "ụ")},
-	{0x1ee6, 0, 0, 1, f(Yes, false, "Ủ")},
-	{0x1ee7, 0, 0, 1, f(Yes, false, "ủ")},
-	{0x1ee8, 0, 0, 2, f(Yes, false, "Ứ")},
-	{0x1ee9, 0, 0, 2, f(Yes, false, "ứ")},
-	{0x1eea, 0, 0, 2, f(Yes, false, "Ừ")},
-	{0x1eeb, 0, 0, 2, f(Yes, false, "ừ")},
-	{0x1eec, 0, 0, 2, f(Yes, false, "Ử")},
-	{0x1eed, 0, 0, 2, f(Yes, false, "ử")},
-	{0x1eee, 0, 0, 2, f(Yes, false, "Ữ")},
-	{0x1eef, 0, 0, 2, f(Yes, false, "ữ")},
-	{0x1ef0, 0, 0, 2, f(Yes, false, "Ự")},
-	{0x1ef1, 0, 0, 2, f(Yes, false, "ự")},
-	{0x1ef2, 0, 0, 1, f(Yes, false, "Ỳ")},
-	{0x1ef3, 0, 0, 1, f(Yes, false, "ỳ")},
-	{0x1ef4, 0, 0, 1, f(Yes, false, "Ỵ")},
-	{0x1ef5, 0, 0, 1, f(Yes, false, "ỵ")},
-	{0x1ef6, 0, 0, 1, f(Yes, false, "Ỷ")},
-	{0x1ef7, 0, 0, 1, f(Yes, false, "ỷ")},
-	{0x1ef8, 0, 0, 1, f(Yes, false, "Ỹ")},
-	{0x1ef9, 0, 0, 1, f(Yes, false, "ỹ")},
-	{0x1efa, 0, 0, 0, f(Yes, false, "")},
-	{0x1f00, 0, 0, 1, f(Yes, true, "ἀ")},
-	{0x1f01, 0, 0, 1, f(Yes, true, "ἁ")},
-	{0x1f02, 0, 0, 2, f(Yes, true, "ἂ")},
-	{0x1f03, 0, 0, 2, f(Yes, true, "ἃ")},
-	{0x1f04, 0, 0, 2, f(Yes, true, "ἄ")},
-	{0x1f05, 0, 0, 2, f(Yes, true, "ἅ")},
-	{0x1f06, 0, 0, 2, f(Yes, true, "ἆ")},
-	{0x1f07, 0, 0, 2, f(Yes, true, "ἇ")},
-	{0x1f08, 0, 0, 1, f(Yes, true, "Ἀ")},
-	{0x1f09, 0, 0, 1, f(Yes, true, "Ἁ")},
-	{0x1f0a, 0, 0, 2, f(Yes, true, "Ἂ")},
-	{0x1f0b, 0, 0, 2, f(Yes, true, "Ἃ")},
-	{0x1f0c, 0, 0, 2, f(Yes, true, "Ἄ")},
-	{0x1f0d, 0, 0, 2, f(Yes, true, "Ἅ")},
-	{0x1f0e, 0, 0, 2, f(Yes, true, "Ἆ")},
-	{0x1f0f, 0, 0, 2, f(Yes, true, "Ἇ")},
-	{0x1f10, 0, 0, 1, f(Yes, true, "ἐ")},
-	{0x1f11, 0, 0, 1, f(Yes, true, "ἑ")},
-	{0x1f12, 0, 0, 2, f(Yes, false, "ἒ")},
-	{0x1f13, 0, 0, 2, f(Yes, false, "ἓ")},
-	{0x1f14, 0, 0, 2, f(Yes, false, "ἔ")},
-	{0x1f15, 0, 0, 2, f(Yes, false, "ἕ")},
-	{0x1f16, 0, 0, 0, f(Yes, false, "")},
-	{0x1f18, 0, 0, 1, f(Yes, true, "Ἐ")},
-	{0x1f19, 0, 0, 1, f(Yes, true, "Ἑ")},
-	{0x1f1a, 0, 0, 2, f(Yes, false, "Ἒ")},
-	{0x1f1b, 0, 0, 2, f(Yes, false, "Ἓ")},
-	{0x1f1c, 0, 0, 2, f(Yes, false, "Ἔ")},
-	{0x1f1d, 0, 0, 2, f(Yes, false, "Ἕ")},
-	{0x1f1e, 0, 0, 0, f(Yes, false, "")},
-	{0x1f20, 0, 0, 1, f(Yes, true, "ἠ")},
-	{0x1f21, 0, 0, 1, f(Yes, true, "ἡ")},
-	{0x1f22, 0, 0, 2, f(Yes, true, "ἢ")},
-	{0x1f23, 0, 0, 2, f(Yes, true, "ἣ")},
-	{0x1f24, 0, 0, 2, f(Yes, true, "ἤ")},
-	{0x1f25, 0, 0, 2, f(Yes, true, "ἥ")},
-	{0x1f26, 0, 0, 2, f(Yes, true, "ἦ")},
-	{0x1f27, 0, 0, 2, f(Yes, true, "ἧ")},
-	{0x1f28, 0, 0, 1, f(Yes, true, "Ἠ")},
-	{0x1f29, 0, 0, 1, f(Yes, true, "Ἡ")},
-	{0x1f2a, 0, 0, 2, f(Yes, true, "Ἢ")},
-	{0x1f2b, 0, 0, 2, f(Yes, true, "Ἣ")},
-	{0x1f2c, 0, 0, 2, f(Yes, true, "Ἤ")},
-	{0x1f2d, 0, 0, 2, f(Yes, true, "Ἥ")},
-	{0x1f2e, 0, 0, 2, f(Yes, true, "Ἦ")},
-	{0x1f2f, 0, 0, 2, f(Yes, true, "Ἧ")},
-	{0x1f30, 0, 0, 1, f(Yes, true, "ἰ")},
-	{0x1f31, 0, 0, 1, f(Yes, true, "ἱ")},
-	{0x1f32, 0, 0, 2, f(Yes, false, "ἲ")},
-	{0x1f33, 0, 0, 2, f(Yes, false, "ἳ")},
-	{0x1f34, 0, 0, 2, f(Yes, false, "ἴ")},
-	{0x1f35, 0, 0, 2, f(Yes, false, "ἵ")},
-	{0x1f36, 0, 0, 2, f(Yes, false, "ἶ")},
-	{0x1f37, 0, 0, 2, f(Yes, false, "ἷ")},
-	{0x1f38, 0, 0, 1, f(Yes, true, "Ἰ")},
-	{0x1f39, 0, 0, 1, f(Yes, true, "Ἱ")},
-	{0x1f3a, 0, 0, 2, f(Yes, false, "Ἲ")},
-	{0x1f3b, 0, 0, 2, f(Yes, false, "Ἳ")},
-	{0x1f3c, 0, 0, 2, f(Yes, false, "Ἴ")},
-	{0x1f3d, 0, 0, 2, f(Yes, false, "Ἵ")},
-	{0x1f3e, 0, 0, 2, f(Yes, false, "Ἶ")},
-	{0x1f3f, 0, 0, 2, f(Yes, false, "Ἷ")},
-	{0x1f40, 0, 0, 1, f(Yes, true, "ὀ")},
-	{0x1f41, 0, 0, 1, f(Yes, true, "ὁ")},
-	{0x1f42, 0, 0, 2, f(Yes, false, "ὂ")},
-	{0x1f43, 0, 0, 2, f(Yes, false, "ὃ")},
-	{0x1f44, 0, 0, 2, f(Yes, false, "ὄ")},
-	{0x1f45, 0, 0, 2, f(Yes, false, "ὅ")},
-	{0x1f46, 0, 0, 0, f(Yes, false, "")},
-	{0x1f48, 0, 0, 1, f(Yes, true, "Ὀ")},
-	{0x1f49, 0, 0, 1, f(Yes, true, "Ὁ")},
-	{0x1f4a, 0, 0, 2, f(Yes, false, "Ὂ")},
-	{0x1f4b, 0, 0, 2, f(Yes, false, "Ὃ")},
-	{0x1f4c, 0, 0, 2, f(Yes, false, "Ὄ")},
-	{0x1f4d, 0, 0, 2, f(Yes, false, "Ὅ")},
-	{0x1f4e, 0, 0, 0, f(Yes, false, "")},
-	{0x1f50, 0, 0, 1, f(Yes, true, "ὐ")},
-	{0x1f51, 0, 0, 1, f(Yes, true, "ὑ")},
-	{0x1f52, 0, 0, 2, f(Yes, false, "ὒ")},
-	{0x1f53, 0, 0, 2, f(Yes, false, "ὓ")},
-	{0x1f54, 0, 0, 2, f(Yes, false, "ὔ")},
-	{0x1f55, 0, 0, 2, f(Yes, false, "ὕ")},
-	{0x1f56, 0, 0, 2, f(Yes, false, "ὖ")},
-	{0x1f57, 0, 0, 2, f(Yes, false, "ὗ")},
-	{0x1f58, 0, 0, 0, f(Yes, false, "")},
-	{0x1f59, 0, 0, 1, f(Yes, true, "Ὑ")},
-	{0x1f5a, 0, 0, 0, f(Yes, false, "")},
-	{0x1f5b, 0, 0, 2, f(Yes, false, "Ὓ")},
-	{0x1f5c, 0, 0, 0, f(Yes, false, "")},
-	{0x1f5d, 0, 0, 2, f(Yes, false, "Ὕ")},
-	{0x1f5e, 0, 0, 0, f(Yes, false, "")},
-	{0x1f5f, 0, 0, 2, f(Yes, false, "Ὗ")},
-	{0x1f60, 0, 0, 1, f(Yes, true, "ὠ")},
-	{0x1f61, 0, 0, 1, f(Yes, true, "ὡ")},
-	{0x1f62, 0, 0, 2, f(Yes, true, "ὢ")},
-	{0x1f63, 0, 0, 2, f(Yes, true, "ὣ")},
-	{0x1f64, 0, 0, 2, f(Yes, true, "ὤ")},
-	{0x1f65, 0, 0, 2, f(Yes, true, "ὥ")},
-	{0x1f66, 0, 0, 2, f(Yes, true, "ὦ")},
-	{0x1f67, 0, 0, 2, f(Yes, true, "ὧ")},
-	{0x1f68, 0, 0, 1, f(Yes, true, "Ὠ")},
-	{0x1f69, 0, 0, 1, f(Yes, true, "Ὡ")},
-	{0x1f6a, 0, 0, 2, f(Yes, true, "Ὢ")},
-	{0x1f6b, 0, 0, 2, f(Yes, true, "Ὣ")},
-	{0x1f6c, 0, 0, 2, f(Yes, true, "Ὤ")},
-	{0x1f6d, 0, 0, 2, f(Yes, true, "Ὥ")},
-	{0x1f6e, 0, 0, 2, f(Yes, true, "Ὦ")},
-	{0x1f6f, 0, 0, 2, f(Yes, true, "Ὧ")},
-	{0x1f70, 0, 0, 1, f(Yes, true, "ὰ")},
-	{0x1f71, 0, 0, 1, f(No, false, "ά")},
-	{0x1f72, 0, 0, 1, f(Yes, false, "ὲ")},
-	{0x1f73, 0, 0, 1, f(No, false, "έ")},
-	{0x1f74, 0, 0, 1, f(Yes, true, "ὴ")},
-	{0x1f75, 0, 0, 1, f(No, false, "ή")},
-	{0x1f76, 0, 0, 1, f(Yes, false, "ὶ")},
-	{0x1f77, 0, 0, 1, f(No, false, "ί")},
-	{0x1f78, 0, 0, 1, f(Yes, false, "ὸ")},
-	{0x1f79, 0, 0, 1, f(No, false, "ό")},
-	{0x1f7a, 0, 0, 1, f(Yes, false, "ὺ")},
-	{0x1f7b, 0, 0, 1, f(No, false, "ύ")},
-	{0x1f7c, 0, 0, 1, f(Yes, true, "ὼ")},
-	{0x1f7d, 0, 0, 1, f(No, false, "ώ")},
-	{0x1f7e, 0, 0, 0, f(Yes, false, "")},
-	{0x1f80, 0, 0, 2, f(Yes, false, "ᾀ")},
-	{0x1f81, 0, 0, 2, f(Yes, false, "ᾁ")},
-	{0x1f82, 0, 0, 3, f(Yes, false, "ᾂ")},
-	{0x1f83, 0, 0, 3, f(Yes, false, "ᾃ")},
-	{0x1f84, 0, 0, 3, f(Yes, false, "ᾄ")},
-	{0x1f85, 0, 0, 3, f(Yes, false, "ᾅ")},
-	{0x1f86, 0, 0, 3, f(Yes, false, "ᾆ")},
-	{0x1f87, 0, 0, 3, f(Yes, false, "ᾇ")},
-	{0x1f88, 0, 0, 2, f(Yes, false, "ᾈ")},
-	{0x1f89, 0, 0, 2, f(Yes, false, "ᾉ")},
-	{0x1f8a, 0, 0, 3, f(Yes, false, "ᾊ")},
-	{0x1f8b, 0, 0, 3, f(Yes, false, "ᾋ")},
-	{0x1f8c, 0, 0, 3, f(Yes, false, "ᾌ")},
-	{0x1f8d, 0, 0, 3, f(Yes, false, "ᾍ")},
-	{0x1f8e, 0, 0, 3, f(Yes, false, "ᾎ")},
-	{0x1f8f, 0, 0, 3, f(Yes, false, "ᾏ")},
-	{0x1f90, 0, 0, 2, f(Yes, false, "ᾐ")},
-	{0x1f91, 0, 0, 2, f(Yes, false, "ᾑ")},
-	{0x1f92, 0, 0, 3, f(Yes, false, "ᾒ")},
-	{0x1f93, 0, 0, 3, f(Yes, false, "ᾓ")},
-	{0x1f94, 0, 0, 3, f(Yes, false, "ᾔ")},
-	{0x1f95, 0, 0, 3, f(Yes, false, "ᾕ")},
-	{0x1f96, 0, 0, 3, f(Yes, false, "ᾖ")},
-	{0x1f97, 0, 0, 3, f(Yes, false, "ᾗ")},
-	{0x1f98, 0, 0, 2, f(Yes, false, "ᾘ")},
-	{0x1f99, 0, 0, 2, f(Yes, false, "ᾙ")},
-	{0x1f9a, 0, 0, 3, f(Yes, false, "ᾚ")},
-	{0x1f9b, 0, 0, 3, f(Yes, false, "ᾛ")},
-	{0x1f9c, 0, 0, 3, f(Yes, false, "ᾜ")},
-	{0x1f9d, 0, 0, 3, f(Yes, false, "ᾝ")},
-	{0x1f9e, 0, 0, 3, f(Yes, false, "ᾞ")},
-	{0x1f9f, 0, 0, 3, f(Yes, false, "ᾟ")},
-	{0x1fa0, 0, 0, 2, f(Yes, false, "ᾠ")},
-	{0x1fa1, 0, 0, 2, f(Yes, false, "ᾡ")},
-	{0x1fa2, 0, 0, 3, f(Yes, false, "ᾢ")},
-	{0x1fa3, 0, 0, 3, f(Yes, false, "ᾣ")},
-	{0x1fa4, 0, 0, 3, f(Yes, false, "ᾤ")},
-	{0x1fa5, 0, 0, 3, f(Yes, false, "ᾥ")},
-	{0x1fa6, 0, 0, 3, f(Yes, false, "ᾦ")},
-	{0x1fa7, 0, 0, 3, f(Yes, false, "ᾧ")},
-	{0x1fa8, 0, 0, 2, f(Yes, false, "ᾨ")},
-	{0x1fa9, 0, 0, 2, f(Yes, false, "ᾩ")},
-	{0x1faa, 0, 0, 3, f(Yes, false, "ᾪ")},
-	{0x1fab, 0, 0, 3, f(Yes, false, "ᾫ")},
-	{0x1fac, 0, 0, 3, f(Yes, false, "ᾬ")},
-	{0x1fad, 0, 0, 3, f(Yes, false, "ᾭ")},
-	{0x1fae, 0, 0, 3, f(Yes, false, "ᾮ")},
-	{0x1faf, 0, 0, 3, f(Yes, false, "ᾯ")},
-	{0x1fb0, 0, 0, 1, f(Yes, false, "ᾰ")},
-	{0x1fb1, 0, 0, 1, f(Yes, false, "ᾱ")},
-	{0x1fb2, 0, 0, 2, f(Yes, false, "ᾲ")},
-	{0x1fb3, 0, 0, 1, f(Yes, false, "ᾳ")},
-	{0x1fb4, 0, 0, 2, f(Yes, false, "ᾴ")},
-	{0x1fb5, 0, 0, 0, f(Yes, false, "")},
-	{0x1fb6, 0, 0, 1, f(Yes, true, "ᾶ")},
-	{0x1fb7, 0, 0, 2, f(Yes, false, "ᾷ")},
-	{0x1fb8, 0, 0, 1, f(Yes, false, "Ᾰ")},
-	{0x1fb9, 0, 0, 1, f(Yes, false, "Ᾱ")},
-	{0x1fba, 0, 0, 1, f(Yes, false, "Ὰ")},
-	{0x1fbb, 0, 0, 1, f(No, false, "Ά")},
-	{0x1fbc, 0, 0, 1, f(Yes, false, "ᾼ")},
-	{0x1fbd, 0, 0, 1, g(Yes, No, false, false, "", " ̓")},
-	{0x1fbe, 0, 0, 0, f(No, false, "ι")},
-	{0x1fbf, 0, 0, 1, g(Yes, No, true, false, "", " ̓")},
-	{0x1fc0, 0, 0, 1, g(Yes, No, false, false, "", " ͂")},
-	{0x1fc1, 0, 0, 2, g(Yes, No, false, false, "῁", " ̈͂")},
-	{0x1fc2, 0, 0, 2, f(Yes, false, "ῂ")},
-	{0x1fc3, 0, 0, 1, f(Yes, false, "ῃ")},
-	{0x1fc4, 0, 0, 2, f(Yes, false, "ῄ")},
-	{0x1fc5, 0, 0, 0, f(Yes, false, "")},
-	{0x1fc6, 0, 0, 1, f(Yes, true, "ῆ")},
-	{0x1fc7, 0, 0, 2, f(Yes, false, "ῇ")},
-	{0x1fc8, 0, 0, 1, f(Yes, false, "Ὲ")},
-	{0x1fc9, 0, 0, 1, f(No, false, "Έ")},
-	{0x1fca, 0, 0, 1, f(Yes, false, "Ὴ")},
-	{0x1fcb, 0, 0, 1, f(No, false, "Ή")},
-	{0x1fcc, 0, 0, 1, f(Yes, false, "ῌ")},
-	{0x1fcd, 0, 0, 2, g(Yes, No, false, false, "῍", " ̓̀")},
-	{0x1fce, 0, 0, 2, g(Yes, No, false, false, "῎", " ̓́")},
-	{0x1fcf, 0, 0, 2, g(Yes, No, false, false, "῏", " ̓͂")},
-	{0x1fd0, 0, 0, 1, f(Yes, false, "ῐ")},
-	{0x1fd1, 0, 0, 1, f(Yes, false, "ῑ")},
-	{0x1fd2, 0, 0, 2, f(Yes, false, "ῒ")},
-	{0x1fd3, 0, 0, 2, f(No, false, "ΐ")},
-	{0x1fd4, 0, 0, 0, f(Yes, false, "")},
-	{0x1fd6, 0, 0, 1, f(Yes, false, "ῖ")},
-	{0x1fd7, 0, 0, 2, f(Yes, false, "ῗ")},
-	{0x1fd8, 0, 0, 1, f(Yes, false, "Ῐ")},
-	{0x1fd9, 0, 0, 1, f(Yes, false, "Ῑ")},
-	{0x1fda, 0, 0, 1, f(Yes, false, "Ὶ")},
-	{0x1fdb, 0, 0, 1, f(No, false, "Ί")},
-	{0x1fdc, 0, 0, 0, f(Yes, false, "")},
-	{0x1fdd, 0, 0, 2, g(Yes, No, false, false, "῝", " ̔̀")},
-	{0x1fde, 0, 0, 2, g(Yes, No, false, false, "῞", " ̔́")},
-	{0x1fdf, 0, 0, 2, g(Yes, No, false, false, "῟", " ̔͂")},
-	{0x1fe0, 0, 0, 1, f(Yes, false, "ῠ")},
-	{0x1fe1, 0, 0, 1, f(Yes, false, "ῡ")},
-	{0x1fe2, 0, 0, 2, f(Yes, false, "ῢ")},
-	{0x1fe3, 0, 0, 2, f(No, false, "ΰ")},
-	{0x1fe4, 0, 0, 1, f(Yes, false, "ῤ")},
-	{0x1fe5, 0, 0, 1, f(Yes, false, "ῥ")},
-	{0x1fe6, 0, 0, 1, f(Yes, false, "ῦ")},
-	{0x1fe7, 0, 0, 2, f(Yes, false, "ῧ")},
-	{0x1fe8, 0, 0, 1, f(Yes, false, "Ῠ")},
-	{0x1fe9, 0, 0, 1, f(Yes, false, "Ῡ")},
-	{0x1fea, 0, 0, 1, f(Yes, false, "Ὺ")},
-	{0x1feb, 0, 0, 1, f(No, false, "Ύ")},
-	{0x1fec, 0, 0, 1, f(Yes, false, "Ῥ")},
-	{0x1fed, 0, 0, 2, g(Yes, No, false, false, "῭", " ̈̀")},
-	{0x1fee, 0, 0, 2, g(No, No, false, false, "΅", " ̈́")},
-	{0x1fef, 0, 0, 0, f(No, false, "`")},
-	{0x1ff0, 0, 0, 0, f(Yes, false, "")},
-	{0x1ff2, 0, 0, 2, f(Yes, false, "ῲ")},
-	{0x1ff3, 0, 0, 1, f(Yes, false, "ῳ")},
-	{0x1ff4, 0, 0, 2, f(Yes, false, "ῴ")},
-	{0x1ff5, 0, 0, 0, f(Yes, false, "")},
-	{0x1ff6, 0, 0, 1, f(Yes, true, "ῶ")},
-	{0x1ff7, 0, 0, 2, f(Yes, false, "ῷ")},
-	{0x1ff8, 0, 0, 1, f(Yes, false, "Ὸ")},
-	{0x1ff9, 0, 0, 1, f(No, false, "Ό")},
-	{0x1ffa, 0, 0, 1, f(Yes, false, "Ὼ")},
-	{0x1ffb, 0, 0, 1, f(No, false, "Ώ")},
-	{0x1ffc, 0, 0, 1, f(Yes, false, "ῼ")},
-	{0x1ffd, 0, 0, 1, g(No, No, false, false, "´", " ́")},
-	{0x1ffe, 0, 0, 1, g(Yes, No, true, false, "", " ̔")},
-	{0x1fff, 0, 0, 0, f(Yes, false, "")},
-	{0x2000, 0, 0, 0, g(No, No, false, false, "\u2002", " ")},
-	{0x2001, 0, 0, 0, g(No, No, false, false, "\u2003", " ")},
-	{0x2002, 0, 0, 0, g(Yes, No, false, false, "", " ")},
-	{0x200b, 0, 0, 0, f(Yes, false, "")},
-	{0x2011, 0, 0, 0, g(Yes, No, false, false, "", "‐")},
-	{0x2012, 0, 0, 0, f(Yes, false, "")},
-	{0x2017, 0, 0, 1, g(Yes, No, false, false, "", " ̳")},
-	{0x2018, 0, 0, 0, f(Yes, false, "")},
-	{0x2024, 0, 0, 0, g(Yes, No, false, false, "", ".")},
-	{0x2025, 0, 0, 0, g(Yes, No, false, false, "", "..")},
-	{0x2026, 0, 0, 0, g(Yes, No, false, false, "", "...")},
-	{0x2027, 0, 0, 0, f(Yes, false, "")},
-	{0x202f, 0, 0, 0, g(Yes, No, false, false, "", " ")},
-	{0x2030, 0, 0, 0, f(Yes, false, "")},
-	{0x2033, 0, 0, 0, g(Yes, No, false, false, "", "′′")},
-	{0x2034, 0, 0, 0, g(Yes, No, false, false, "", "′′′")},
-	{0x2035, 0, 0, 0, f(Yes, false, "")},
-	{0x2036, 0, 0, 0, g(Yes, No, false, false, "", "‵‵")},
-	{0x2037, 0, 0, 0, g(Yes, No, false, false, "", "‵‵‵")},
-	{0x2038, 0, 0, 0, f(Yes, false, "")},
-	{0x203c, 0, 0, 0, g(Yes, No, false, false, "", "!!")},
-	{0x203d, 0, 0, 0, f(Yes, false, "")},
-	{0x203e, 0, 0, 1, g(Yes, No, false, false, "", " ̅")},
-	{0x203f, 0, 0, 0, f(Yes, false, "")},
-	{0x2047, 0, 0, 0, g(Yes, No, false, false, "", "??")},
-	{0x2048, 0, 0, 0, g(Yes, No, false, false, "", "?!")},
-	{0x2049, 0, 0, 0, g(Yes, No, false, false, "", "!?")},
-	{0x204a, 0, 0, 0, f(Yes, false, "")},
-	{0x2057, 0, 0, 0, g(Yes, No, false, false, "", "′′′′")},
-	{0x2058, 0, 0, 0, f(Yes, false, "")},
-	{0x205f, 0, 0, 0, g(Yes, No, false, false, "", " ")},
-	{0x2060, 0, 0, 0, f(Yes, false, "")},
-	{0x2070, 0, 0, 0, g(Yes, No, false, false, "", "0")},
-	{0x2071, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x2072, 0, 0, 0, f(Yes, false, "")},
-	{0x2074, 0, 0, 0, g(Yes, No, false, false, "", "4")},
-	{0x2075, 0, 0, 0, g(Yes, No, false, false, "", "5")},
-	{0x2076, 0, 0, 0, g(Yes, No, false, false, "", "6")},
-	{0x2077, 0, 0, 0, g(Yes, No, false, false, "", "7")},
-	{0x2078, 0, 0, 0, g(Yes, No, false, false, "", "8")},
-	{0x2079, 0, 0, 0, g(Yes, No, false, false, "", "9")},
-	{0x207a, 0, 0, 0, g(Yes, No, false, false, "", "+")},
-	{0x207b, 0, 0, 0, g(Yes, No, false, false, "", "−")},
-	{0x207c, 0, 0, 0, g(Yes, No, false, false, "", "=")},
-	{0x207d, 0, 0, 0, g(Yes, No, false, false, "", "(")},
-	{0x207e, 0, 0, 0, g(Yes, No, false, false, "", ")")},
-	{0x207f, 0, 0, 0, g(Yes, No, false, false, "", "n")},
-	{0x2080, 0, 0, 0, g(Yes, No, false, false, "", "0")},
-	{0x2081, 0, 0, 0, g(Yes, No, false, false, "", "1")},
-	{0x2082, 0, 0, 0, g(Yes, No, false, false, "", "2")},
-	{0x2083, 0, 0, 0, g(Yes, No, false, false, "", "3")},
-	{0x2084, 0, 0, 0, g(Yes, No, false, false, "", "4")},
-	{0x2085, 0, 0, 0, g(Yes, No, false, false, "", "5")},
-	{0x2086, 0, 0, 0, g(Yes, No, false, false, "", "6")},
-	{0x2087, 0, 0, 0, g(Yes, No, false, false, "", "7")},
-	{0x2088, 0, 0, 0, g(Yes, No, false, false, "", "8")},
-	{0x2089, 0, 0, 0, g(Yes, No, false, false, "", "9")},
-	{0x208a, 0, 0, 0, g(Yes, No, false, false, "", "+")},
-	{0x208b, 0, 0, 0, g(Yes, No, false, false, "", "−")},
-	{0x208c, 0, 0, 0, g(Yes, No, false, false, "", "=")},
-	{0x208d, 0, 0, 0, g(Yes, No, false, false, "", "(")},
-	{0x208e, 0, 0, 0, g(Yes, No, false, false, "", ")")},
-	{0x208f, 0, 0, 0, f(Yes, false, "")},
-	{0x2090, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0x2091, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0x2092, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0x2093, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0x2094, 0, 0, 0, g(Yes, No, false, false, "", "ə")},
-	{0x2095, 0, 0, 0, g(Yes, No, false, false, "", "h")},
-	{0x2096, 0, 0, 0, g(Yes, No, false, false, "", "k")},
-	{0x2097, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x2098, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0x2099, 0, 0, 0, g(Yes, No, false, false, "", "n")},
-	{0x209a, 0, 0, 0, g(Yes, No, false, false, "", "p")},
-	{0x209b, 0, 0, 0, g(Yes, No, false, false, "", "s")},
-	{0x209c, 0, 0, 0, g(Yes, No, false, false, "", "t")},
-	{0x209d, 0, 0, 0, f(Yes, false, "")},
-	{0x20a8, 0, 0, 0, g(Yes, No, false, false, "", "Rs")},
-	{0x20a9, 0, 0, 0, f(Yes, false, "")},
-	{0x20d0, 230, 1, 1, f(Yes, false, "")},
-	{0x20d2, 1, 1, 1, f(Yes, false, "")},
-	{0x20d4, 230, 1, 1, f(Yes, false, "")},
-	{0x20d8, 1, 1, 1, f(Yes, false, "")},
-	{0x20db, 230, 1, 1, f(Yes, false, "")},
-	{0x20dd, 0, 0, 0, f(Yes, false, "")},
-	{0x20e1, 230, 1, 1, f(Yes, false, "")},
-	{0x20e2, 0, 0, 0, f(Yes, false, "")},
-	{0x20e5, 1, 1, 1, f(Yes, false, "")},
-	{0x20e7, 230, 1, 1, f(Yes, false, "")},
-	{0x20e8, 220, 1, 1, f(Yes, false, "")},
-	{0x20e9, 230, 1, 1, f(Yes, false, "")},
-	{0x20ea, 1, 1, 1, f(Yes, false, "")},
-	{0x20ec, 220, 1, 1, f(Yes, false, "")},
-	{0x20f0, 230, 1, 1, f(Yes, false, "")},
-	{0x20f1, 0, 0, 0, f(Yes, false, "")},
-	{0x2100, 0, 0, 0, g(Yes, No, false, false, "", "a/c")},
-	{0x2101, 0, 0, 0, g(Yes, No, false, false, "", "a/s")},
-	{0x2102, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0x2103, 0, 0, 0, g(Yes, No, false, false, "", "°C")},
-	{0x2104, 0, 0, 0, f(Yes, false, "")},
-	{0x2105, 0, 0, 0, g(Yes, No, false, false, "", "c/o")},
-	{0x2106, 0, 0, 0, g(Yes, No, false, false, "", "c/u")},
-	{0x2107, 0, 0, 0, g(Yes, No, false, false, "", "Ɛ")},
-	{0x2108, 0, 0, 0, f(Yes, false, "")},
-	{0x2109, 0, 0, 0, g(Yes, No, false, false, "", "°F")},
-	{0x210a, 0, 0, 0, g(Yes, No, false, false, "", "g")},
-	{0x210b, 0, 0, 0, g(Yes, No, false, false, "", "H")},
-	{0x210e, 0, 0, 0, g(Yes, No, false, false, "", "h")},
-	{0x210f, 0, 0, 0, g(Yes, No, false, false, "", "ħ")},
-	{0x2110, 0, 0, 0, g(Yes, No, false, false, "", "I")},
-	{0x2112, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0x2113, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x2114, 0, 0, 0, f(Yes, false, "")},
-	{0x2115, 0, 0, 0, g(Yes, No, false, false, "", "N")},
-	{0x2116, 0, 0, 0, g(Yes, No, false, false, "", "No")},
-	{0x2117, 0, 0, 0, f(Yes, false, "")},
-	{0x2119, 0, 0, 0, g(Yes, No, false, false, "", "P")},
-	{0x211a, 0, 0, 0, g(Yes, No, false, false, "", "Q")},
-	{0x211b, 0, 0, 0, g(Yes, No, false, false, "", "R")},
-	{0x211e, 0, 0, 0, f(Yes, false, "")},
-	{0x2120, 0, 0, 0, g(Yes, No, false, false, "", "SM")},
-	{0x2121, 0, 0, 0, g(Yes, No, false, false, "", "TEL")},
-	{0x2122, 0, 0, 0, g(Yes, No, false, false, "", "TM")},
-	{0x2123, 0, 0, 0, f(Yes, false, "")},
-	{0x2124, 0, 0, 0, g(Yes, No, false, false, "", "Z")},
-	{0x2125, 0, 0, 0, f(Yes, false, "")},
-	{0x2126, 0, 0, 0, f(No, false, "Ω")},
-	{0x2127, 0, 0, 0, f(Yes, false, "")},
-	{0x2128, 0, 0, 0, g(Yes, No, false, false, "", "Z")},
-	{0x2129, 0, 0, 0, f(Yes, false, "")},
-	{0x212a, 0, 0, 0, f(No, false, "K")},
-	{0x212b, 0, 0, 1, f(No, false, "Å")},
-	{0x212c, 0, 0, 0, g(Yes, No, false, false, "", "B")},
-	{0x212d, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0x212e, 0, 0, 0, f(Yes, false, "")},
-	{0x212f, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0x2130, 0, 0, 0, g(Yes, No, false, false, "", "E")},
-	{0x2131, 0, 0, 0, g(Yes, No, false, false, "", "F")},
-	{0x2132, 0, 0, 0, f(Yes, false, "")},
-	{0x2133, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0x2134, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0x2135, 0, 0, 0, g(Yes, No, false, false, "", "א")},
-	{0x2136, 0, 0, 0, g(Yes, No, false, false, "", "ב")},
-	{0x2137, 0, 0, 0, g(Yes, No, false, false, "", "ג")},
-	{0x2138, 0, 0, 0, g(Yes, No, false, false, "", "ד")},
-	{0x2139, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x213a, 0, 0, 0, f(Yes, false, "")},
-	{0x213b, 0, 0, 0, g(Yes, No, false, false, "", "FAX")},
-	{0x213c, 0, 0, 0, g(Yes, No, false, false, "", "π")},
-	{0x213d, 0, 0, 0, g(Yes, No, false, false, "", "γ")},
-	{0x213e, 0, 0, 0, g(Yes, No, false, false, "", "Γ")},
-	{0x213f, 0, 0, 0, g(Yes, No, false, false, "", "Π")},
-	{0x2140, 0, 0, 0, g(Yes, No, false, false, "", "∑")},
-	{0x2141, 0, 0, 0, f(Yes, false, "")},
-	{0x2145, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x2146, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0x2147, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0x2148, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x2149, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0x214a, 0, 0, 0, f(Yes, false, "")},
-	{0x2150, 0, 0, 0, g(Yes, No, false, false, "", "1⁄7")},
-	{0x2151, 0, 0, 0, g(Yes, No, false, false, "", "1⁄9")},
-	{0x2152, 0, 0, 0, g(Yes, No, false, false, "", "1⁄10")},
-	{0x2153, 0, 0, 0, g(Yes, No, false, false, "", "1⁄3")},
-	{0x2154, 0, 0, 0, g(Yes, No, false, false, "", "2⁄3")},
-	{0x2155, 0, 0, 0, g(Yes, No, false, false, "", "1⁄5")},
-	{0x2156, 0, 0, 0, g(Yes, No, false, false, "", "2⁄5")},
-	{0x2157, 0, 0, 0, g(Yes, No, false, false, "", "3⁄5")},
-	{0x2158, 0, 0, 0, g(Yes, No, false, false, "", "4⁄5")},
-	{0x2159, 0, 0, 0, g(Yes, No, false, false, "", "1⁄6")},
-	{0x215a, 0, 0, 0, g(Yes, No, false, false, "", "5⁄6")},
-	{0x215b, 0, 0, 0, g(Yes, No, false, false, "", "1⁄8")},
-	{0x215c, 0, 0, 0, g(Yes, No, false, false, "", "3⁄8")},
-	{0x215d, 0, 0, 0, g(Yes, No, false, false, "", "5⁄8")},
-	{0x215e, 0, 0, 0, g(Yes, No, false, false, "", "7⁄8")},
-	{0x215f, 0, 0, 0, g(Yes, No, false, false, "", "1⁄")},
-	{0x2160, 0, 0, 0, g(Yes, No, false, false, "", "I")},
-	{0x2161, 0, 0, 0, g(Yes, No, false, false, "", "II")},
-	{0x2162, 0, 0, 0, g(Yes, No, false, false, "", "III")},
-	{0x2163, 0, 0, 0, g(Yes, No, false, false, "", "IV")},
-	{0x2164, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0x2165, 0, 0, 0, g(Yes, No, false, false, "", "VI")},
-	{0x2166, 0, 0, 0, g(Yes, No, false, false, "", "VII")},
-	{0x2167, 0, 0, 0, g(Yes, No, false, false, "", "VIII")},
-	{0x2168, 0, 0, 0, g(Yes, No, false, false, "", "IX")},
-	{0x2169, 0, 0, 0, g(Yes, No, false, false, "", "X")},
-	{0x216a, 0, 0, 0, g(Yes, No, false, false, "", "XI")},
-	{0x216b, 0, 0, 0, g(Yes, No, false, false, "", "XII")},
-	{0x216c, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0x216d, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0x216e, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x216f, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0x2170, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x2171, 0, 0, 0, g(Yes, No, false, false, "", "ii")},
-	{0x2172, 0, 0, 0, g(Yes, No, false, false, "", "iii")},
-	{0x2173, 0, 0, 0, g(Yes, No, false, false, "", "iv")},
-	{0x2174, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0x2175, 0, 0, 0, g(Yes, No, false, false, "", "vi")},
-	{0x2176, 0, 0, 0, g(Yes, No, false, false, "", "vii")},
-	{0x2177, 0, 0, 0, g(Yes, No, false, false, "", "viii")},
-	{0x2178, 0, 0, 0, g(Yes, No, false, false, "", "ix")},
-	{0x2179, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0x217a, 0, 0, 0, g(Yes, No, false, false, "", "xi")},
-	{0x217b, 0, 0, 0, g(Yes, No, false, false, "", "xii")},
-	{0x217c, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x217d, 0, 0, 0, g(Yes, No, false, false, "", "c")},
-	{0x217e, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0x217f, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0x2180, 0, 0, 0, f(Yes, false, "")},
-	{0x2189, 0, 0, 0, g(Yes, No, false, false, "", "0⁄3")},
-	{0x218a, 0, 0, 0, f(Yes, false, "")},
-	{0x2190, 0, 0, 0, f(Yes, true, "")},
-	{0x2191, 0, 0, 0, f(Yes, false, "")},
-	{0x2192, 0, 0, 0, f(Yes, true, "")},
-	{0x2193, 0, 0, 0, f(Yes, false, "")},
-	{0x2194, 0, 0, 0, f(Yes, true, "")},
-	{0x2195, 0, 0, 0, f(Yes, false, "")},
-	{0x219a, 0, 0, 1, f(Yes, false, "↚")},
-	{0x219b, 0, 0, 1, f(Yes, false, "↛")},
-	{0x219c, 0, 0, 0, f(Yes, false, "")},
-	{0x21ae, 0, 0, 1, f(Yes, false, "↮")},
-	{0x21af, 0, 0, 0, f(Yes, false, "")},
-	{0x21cd, 0, 0, 1, f(Yes, false, "⇍")},
-	{0x21ce, 0, 0, 1, f(Yes, false, "⇎")},
-	{0x21cf, 0, 0, 1, f(Yes, false, "⇏")},
-	{0x21d0, 0, 0, 0, f(Yes, true, "")},
-	{0x21d1, 0, 0, 0, f(Yes, false, "")},
-	{0x21d2, 0, 0, 0, f(Yes, true, "")},
-	{0x21d3, 0, 0, 0, f(Yes, false, "")},
-	{0x21d4, 0, 0, 0, f(Yes, true, "")},
-	{0x21d5, 0, 0, 0, f(Yes, false, "")},
-	{0x2203, 0, 0, 0, f(Yes, true, "")},
-	{0x2204, 0, 0, 1, f(Yes, false, "∄")},
-	{0x2205, 0, 0, 0, f(Yes, false, "")},
-	{0x2208, 0, 0, 0, f(Yes, true, "")},
-	{0x2209, 0, 0, 1, f(Yes, false, "∉")},
-	{0x220a, 0, 0, 0, f(Yes, false, "")},
-	{0x220b, 0, 0, 0, f(Yes, true, "")},
-	{0x220c, 0, 0, 1, f(Yes, false, "∌")},
-	{0x220d, 0, 0, 0, f(Yes, false, "")},
-	{0x2223, 0, 0, 0, f(Yes, true, "")},
-	{0x2224, 0, 0, 1, f(Yes, false, "∤")},
-	{0x2225, 0, 0, 0, f(Yes, true, "")},
-	{0x2226, 0, 0, 1, f(Yes, false, "∦")},
-	{0x2227, 0, 0, 0, f(Yes, false, "")},
-	{0x222c, 0, 0, 0, g(Yes, No, false, false, "", "∫∫")},
-	{0x222d, 0, 0, 0, g(Yes, No, false, false, "", "∫∫∫")},
-	{0x222e, 0, 0, 0, f(Yes, false, "")},
-	{0x222f, 0, 0, 0, g(Yes, No, false, false, "", "∮∮")},
-	{0x2230, 0, 0, 0, g(Yes, No, false, false, "", "∮∮∮")},
-	{0x2231, 0, 0, 0, f(Yes, false, "")},
-	{0x223c, 0, 0, 0, f(Yes, true, "")},
-	{0x223d, 0, 0, 0, f(Yes, false, "")},
-	{0x2241, 0, 0, 1, f(Yes, false, "≁")},
-	{0x2242, 0, 0, 0, f(Yes, false, "")},
-	{0x2243, 0, 0, 0, f(Yes, true, "")},
-	{0x2244, 0, 0, 1, f(Yes, false, "≄")},
-	{0x2245, 0, 0, 0, f(Yes, true, "")},
-	{0x2246, 0, 0, 0, f(Yes, false, "")},
-	{0x2247, 0, 0, 1, f(Yes, false, "≇")},
-	{0x2248, 0, 0, 0, f(Yes, true, "")},
-	{0x2249, 0, 0, 1, f(Yes, false, "≉")},
-	{0x224a, 0, 0, 0, f(Yes, false, "")},
-	{0x224d, 0, 0, 0, f(Yes, true, "")},
-	{0x224e, 0, 0, 0, f(Yes, false, "")},
-	{0x2260, 0, 0, 1, f(Yes, false, "≠")},
-	{0x2261, 0, 0, 0, f(Yes, true, "")},
-	{0x2262, 0, 0, 1, f(Yes, false, "≢")},
-	{0x2263, 0, 0, 0, f(Yes, false, "")},
-	{0x2264, 0, 0, 0, f(Yes, true, "")},
-	{0x2266, 0, 0, 0, f(Yes, false, "")},
-	{0x226d, 0, 0, 1, f(Yes, false, "≭")},
-	{0x226e, 0, 0, 1, f(Yes, false, "≮")},
-	{0x226f, 0, 0, 1, f(Yes, false, "≯")},
-	{0x2270, 0, 0, 1, f(Yes, false, "≰")},
-	{0x2271, 0, 0, 1, f(Yes, false, "≱")},
-	{0x2272, 0, 0, 0, f(Yes, true, "")},
-	{0x2274, 0, 0, 1, f(Yes, false, "≴")},
-	{0x2275, 0, 0, 1, f(Yes, false, "≵")},
-	{0x2276, 0, 0, 0, f(Yes, true, "")},
-	{0x2278, 0, 0, 1, f(Yes, false, "≸")},
-	{0x2279, 0, 0, 1, f(Yes, false, "≹")},
-	{0x227a, 0, 0, 0, f(Yes, true, "")},
-	{0x227e, 0, 0, 0, f(Yes, false, "")},
-	{0x2280, 0, 0, 1, f(Yes, false, "⊀")},
-	{0x2281, 0, 0, 1, f(Yes, false, "⊁")},
-	{0x2282, 0, 0, 0, f(Yes, true, "")},
-	{0x2284, 0, 0, 1, f(Yes, false, "⊄")},
-	{0x2285, 0, 0, 1, f(Yes, false, "⊅")},
-	{0x2286, 0, 0, 0, f(Yes, true, "")},
-	{0x2288, 0, 0, 1, f(Yes, false, "⊈")},
-	{0x2289, 0, 0, 1, f(Yes, false, "⊉")},
-	{0x228a, 0, 0, 0, f(Yes, false, "")},
-	{0x2291, 0, 0, 0, f(Yes, true, "")},
-	{0x2293, 0, 0, 0, f(Yes, false, "")},
-	{0x22a2, 0, 0, 0, f(Yes, true, "")},
-	{0x22a3, 0, 0, 0, f(Yes, false, "")},
-	{0x22a8, 0, 0, 0, f(Yes, true, "")},
-	{0x22aa, 0, 0, 0, f(Yes, false, "")},
-	{0x22ab, 0, 0, 0, f(Yes, true, "")},
-	{0x22ac, 0, 0, 1, f(Yes, false, "⊬")},
-	{0x22ad, 0, 0, 1, f(Yes, false, "⊭")},
-	{0x22ae, 0, 0, 1, f(Yes, false, "⊮")},
-	{0x22af, 0, 0, 1, f(Yes, false, "⊯")},
-	{0x22b0, 0, 0, 0, f(Yes, false, "")},
-	{0x22b2, 0, 0, 0, f(Yes, true, "")},
-	{0x22b6, 0, 0, 0, f(Yes, false, "")},
-	{0x22e0, 0, 0, 1, f(Yes, false, "⋠")},
-	{0x22e1, 0, 0, 1, f(Yes, false, "⋡")},
-	{0x22e2, 0, 0, 1, f(Yes, false, "⋢")},
-	{0x22e3, 0, 0, 1, f(Yes, false, "⋣")},
-	{0x22e4, 0, 0, 0, f(Yes, false, "")},
-	{0x22ea, 0, 0, 1, f(Yes, false, "⋪")},
-	{0x22eb, 0, 0, 1, f(Yes, false, "⋫")},
-	{0x22ec, 0, 0, 1, f(Yes, false, "⋬")},
-	{0x22ed, 0, 0, 1, f(Yes, false, "⋭")},
-	{0x22ee, 0, 0, 0, f(Yes, false, "")},
-	{0x2329, 0, 0, 0, f(No, false, "〈")},
-	{0x232a, 0, 0, 0, f(No, false, "〉")},
-	{0x232b, 0, 0, 0, f(Yes, false, "")},
-	{0x2460, 0, 0, 0, g(Yes, No, false, false, "", "1")},
-	{0x2461, 0, 0, 0, g(Yes, No, false, false, "", "2")},
-	{0x2462, 0, 0, 0, g(Yes, No, false, false, "", "3")},
-	{0x2463, 0, 0, 0, g(Yes, No, false, false, "", "4")},
-	{0x2464, 0, 0, 0, g(Yes, No, false, false, "", "5")},
-	{0x2465, 0, 0, 0, g(Yes, No, false, false, "", "6")},
-	{0x2466, 0, 0, 0, g(Yes, No, false, false, "", "7")},
-	{0x2467, 0, 0, 0, g(Yes, No, false, false, "", "8")},
-	{0x2468, 0, 0, 0, g(Yes, No, false, false, "", "9")},
-	{0x2469, 0, 0, 0, g(Yes, No, false, false, "", "10")},
-	{0x246a, 0, 0, 0, g(Yes, No, false, false, "", "11")},
-	{0x246b, 0, 0, 0, g(Yes, No, false, false, "", "12")},
-	{0x246c, 0, 0, 0, g(Yes, No, false, false, "", "13")},
-	{0x246d, 0, 0, 0, g(Yes, No, false, false, "", "14")},
-	{0x246e, 0, 0, 0, g(Yes, No, false, false, "", "15")},
-	{0x246f, 0, 0, 0, g(Yes, No, false, false, "", "16")},
-	{0x2470, 0, 0, 0, g(Yes, No, false, false, "", "17")},
-	{0x2471, 0, 0, 0, g(Yes, No, false, false, "", "18")},
-	{0x2472, 0, 0, 0, g(Yes, No, false, false, "", "19")},
-	{0x2473, 0, 0, 0, g(Yes, No, false, false, "", "20")},
-	{0x2474, 0, 0, 0, g(Yes, No, false, false, "", "(1)")},
-	{0x2475, 0, 0, 0, g(Yes, No, false, false, "", "(2)")},
-	{0x2476, 0, 0, 0, g(Yes, No, false, false, "", "(3)")},
-	{0x2477, 0, 0, 0, g(Yes, No, false, false, "", "(4)")},
-	{0x2478, 0, 0, 0, g(Yes, No, false, false, "", "(5)")},
-	{0x2479, 0, 0, 0, g(Yes, No, false, false, "", "(6)")},
-	{0x247a, 0, 0, 0, g(Yes, No, false, false, "", "(7)")},
-	{0x247b, 0, 0, 0, g(Yes, No, false, false, "", "(8)")},
-	{0x247c, 0, 0, 0, g(Yes, No, false, false, "", "(9)")},
-	{0x247d, 0, 0, 0, g(Yes, No, false, false, "", "(10)")},
-	{0x247e, 0, 0, 0, g(Yes, No, false, false, "", "(11)")},
-	{0x247f, 0, 0, 0, g(Yes, No, false, false, "", "(12)")},
-	{0x2480, 0, 0, 0, g(Yes, No, false, false, "", "(13)")},
-	{0x2481, 0, 0, 0, g(Yes, No, false, false, "", "(14)")},
-	{0x2482, 0, 0, 0, g(Yes, No, false, false, "", "(15)")},
-	{0x2483, 0, 0, 0, g(Yes, No, false, false, "", "(16)")},
-	{0x2484, 0, 0, 0, g(Yes, No, false, false, "", "(17)")},
-	{0x2485, 0, 0, 0, g(Yes, No, false, false, "", "(18)")},
-	{0x2486, 0, 0, 0, g(Yes, No, false, false, "", "(19)")},
-	{0x2487, 0, 0, 0, g(Yes, No, false, false, "", "(20)")},
-	{0x2488, 0, 0, 0, g(Yes, No, false, false, "", "1.")},
-	{0x2489, 0, 0, 0, g(Yes, No, false, false, "", "2.")},
-	{0x248a, 0, 0, 0, g(Yes, No, false, false, "", "3.")},
-	{0x248b, 0, 0, 0, g(Yes, No, false, false, "", "4.")},
-	{0x248c, 0, 0, 0, g(Yes, No, false, false, "", "5.")},
-	{0x248d, 0, 0, 0, g(Yes, No, false, false, "", "6.")},
-	{0x248e, 0, 0, 0, g(Yes, No, false, false, "", "7.")},
-	{0x248f, 0, 0, 0, g(Yes, No, false, false, "", "8.")},
-	{0x2490, 0, 0, 0, g(Yes, No, false, false, "", "9.")},
-	{0x2491, 0, 0, 0, g(Yes, No, false, false, "", "10.")},
-	{0x2492, 0, 0, 0, g(Yes, No, false, false, "", "11.")},
-	{0x2493, 0, 0, 0, g(Yes, No, false, false, "", "12.")},
-	{0x2494, 0, 0, 0, g(Yes, No, false, false, "", "13.")},
-	{0x2495, 0, 0, 0, g(Yes, No, false, false, "", "14.")},
-	{0x2496, 0, 0, 0, g(Yes, No, false, false, "", "15.")},
-	{0x2497, 0, 0, 0, g(Yes, No, false, false, "", "16.")},
-	{0x2498, 0, 0, 0, g(Yes, No, false, false, "", "17.")},
-	{0x2499, 0, 0, 0, g(Yes, No, false, false, "", "18.")},
-	{0x249a, 0, 0, 0, g(Yes, No, false, false, "", "19.")},
-	{0x249b, 0, 0, 0, g(Yes, No, false, false, "", "20.")},
-	{0x249c, 0, 0, 0, g(Yes, No, false, false, "", "(a)")},
-	{0x249d, 0, 0, 0, g(Yes, No, false, false, "", "(b)")},
-	{0x249e, 0, 0, 0, g(Yes, No, false, false, "", "(c)")},
-	{0x249f, 0, 0, 0, g(Yes, No, false, false, "", "(d)")},
-	{0x24a0, 0, 0, 0, g(Yes, No, false, false, "", "(e)")},
-	{0x24a1, 0, 0, 0, g(Yes, No, false, false, "", "(f)")},
-	{0x24a2, 0, 0, 0, g(Yes, No, false, false, "", "(g)")},
-	{0x24a3, 0, 0, 0, g(Yes, No, false, false, "", "(h)")},
-	{0x24a4, 0, 0, 0, g(Yes, No, false, false, "", "(i)")},
-	{0x24a5, 0, 0, 0, g(Yes, No, false, false, "", "(j)")},
-	{0x24a6, 0, 0, 0, g(Yes, No, false, false, "", "(k)")},
-	{0x24a7, 0, 0, 0, g(Yes, No, false, false, "", "(l)")},
-	{0x24a8, 0, 0, 0, g(Yes, No, false, false, "", "(m)")},
-	{0x24a9, 0, 0, 0, g(Yes, No, false, false, "", "(n)")},
-	{0x24aa, 0, 0, 0, g(Yes, No, false, false, "", "(o)")},
-	{0x24ab, 0, 0, 0, g(Yes, No, false, false, "", "(p)")},
-	{0x24ac, 0, 0, 0, g(Yes, No, false, false, "", "(q)")},
-	{0x24ad, 0, 0, 0, g(Yes, No, false, false, "", "(r)")},
-	{0x24ae, 0, 0, 0, g(Yes, No, false, false, "", "(s)")},
-	{0x24af, 0, 0, 0, g(Yes, No, false, false, "", "(t)")},
-	{0x24b0, 0, 0, 0, g(Yes, No, false, false, "", "(u)")},
-	{0x24b1, 0, 0, 0, g(Yes, No, false, false, "", "(v)")},
-	{0x24b2, 0, 0, 0, g(Yes, No, false, false, "", "(w)")},
-	{0x24b3, 0, 0, 0, g(Yes, No, false, false, "", "(x)")},
-	{0x24b4, 0, 0, 0, g(Yes, No, false, false, "", "(y)")},
-	{0x24b5, 0, 0, 0, g(Yes, No, false, false, "", "(z)")},
-	{0x24b6, 0, 0, 0, g(Yes, No, false, false, "", "A")},
-	{0x24b7, 0, 0, 0, g(Yes, No, false, false, "", "B")},
-	{0x24b8, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0x24b9, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x24ba, 0, 0, 0, g(Yes, No, false, false, "", "E")},
-	{0x24bb, 0, 0, 0, g(Yes, No, false, false, "", "F")},
-	{0x24bc, 0, 0, 0, g(Yes, No, false, false, "", "G")},
-	{0x24bd, 0, 0, 0, g(Yes, No, false, false, "", "H")},
-	{0x24be, 0, 0, 0, g(Yes, No, false, false, "", "I")},
-	{0x24bf, 0, 0, 0, g(Yes, No, false, false, "", "J")},
-	{0x24c0, 0, 0, 0, g(Yes, No, false, false, "", "K")},
-	{0x24c1, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0x24c2, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0x24c3, 0, 0, 0, g(Yes, No, false, false, "", "N")},
-	{0x24c4, 0, 0, 0, g(Yes, No, false, false, "", "O")},
-	{0x24c5, 0, 0, 0, g(Yes, No, false, false, "", "P")},
-	{0x24c6, 0, 0, 0, g(Yes, No, false, false, "", "Q")},
-	{0x24c7, 0, 0, 0, g(Yes, No, false, false, "", "R")},
-	{0x24c8, 0, 0, 0, g(Yes, No, false, false, "", "S")},
-	{0x24c9, 0, 0, 0, g(Yes, No, false, false, "", "T")},
-	{0x24ca, 0, 0, 0, g(Yes, No, false, false, "", "U")},
-	{0x24cb, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0x24cc, 0, 0, 0, g(Yes, No, false, false, "", "W")},
-	{0x24cd, 0, 0, 0, g(Yes, No, false, false, "", "X")},
-	{0x24ce, 0, 0, 0, g(Yes, No, false, false, "", "Y")},
-	{0x24cf, 0, 0, 0, g(Yes, No, false, false, "", "Z")},
-	{0x24d0, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0x24d1, 0, 0, 0, g(Yes, No, false, false, "", "b")},
-	{0x24d2, 0, 0, 0, g(Yes, No, false, false, "", "c")},
-	{0x24d3, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0x24d4, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0x24d5, 0, 0, 0, g(Yes, No, false, false, "", "f")},
-	{0x24d6, 0, 0, 0, g(Yes, No, false, false, "", "g")},
-	{0x24d7, 0, 0, 0, g(Yes, No, false, false, "", "h")},
-	{0x24d8, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x24d9, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0x24da, 0, 0, 0, g(Yes, No, false, false, "", "k")},
-	{0x24db, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x24dc, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0x24dd, 0, 0, 0, g(Yes, No, false, false, "", "n")},
-	{0x24de, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0x24df, 0, 0, 0, g(Yes, No, false, false, "", "p")},
-	{0x24e0, 0, 0, 0, g(Yes, No, false, false, "", "q")},
-	{0x24e1, 0, 0, 0, g(Yes, No, false, false, "", "r")},
-	{0x24e2, 0, 0, 0, g(Yes, No, false, false, "", "s")},
-	{0x24e3, 0, 0, 0, g(Yes, No, false, false, "", "t")},
-	{0x24e4, 0, 0, 0, g(Yes, No, false, false, "", "u")},
-	{0x24e5, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0x24e6, 0, 0, 0, g(Yes, No, false, false, "", "w")},
-	{0x24e7, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0x24e8, 0, 0, 0, g(Yes, No, false, false, "", "y")},
-	{0x24e9, 0, 0, 0, g(Yes, No, false, false, "", "z")},
-	{0x24ea, 0, 0, 0, g(Yes, No, false, false, "", "0")},
-	{0x24eb, 0, 0, 0, f(Yes, false, "")},
-	{0x2a0c, 0, 0, 0, g(Yes, No, false, false, "", "∫∫∫∫")},
-	{0x2a0d, 0, 0, 0, f(Yes, false, "")},
-	{0x2a74, 0, 0, 0, g(Yes, No, false, false, "", "::=")},
-	{0x2a75, 0, 0, 0, g(Yes, No, false, false, "", "==")},
-	{0x2a76, 0, 0, 0, g(Yes, No, false, false, "", "===")},
-	{0x2a77, 0, 0, 0, f(Yes, false, "")},
-	{0x2adc, 0, 0, 1, f(No, false, "⫝̸")},
-	{0x2add, 0, 0, 0, f(Yes, false, "")},
-	{0x2c7c, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0x2c7d, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0x2c7e, 0, 0, 0, f(Yes, false, "")},
-	{0x2cef, 230, 1, 1, f(Yes, false, "")},
-	{0x2cf2, 0, 0, 0, f(Yes, false, "")},
-	{0x2d6f, 0, 0, 0, g(Yes, No, false, false, "", "ⵡ")},
-	{0x2d70, 0, 0, 0, f(Yes, false, "")},
-	{0x2d7f, 9, 1, 1, f(Yes, false, "")},
-	{0x2d80, 0, 0, 0, f(Yes, false, "")},
-	{0x2de0, 230, 1, 1, f(Yes, false, "")},
-	{0x2e00, 0, 0, 0, f(Yes, false, "")},
-	{0x2e9f, 0, 0, 0, g(Yes, No, false, false, "", "母")},
-	{0x2ea0, 0, 0, 0, f(Yes, false, "")},
-	{0x2ef3, 0, 0, 0, g(Yes, No, false, false, "", "龟")},
-	{0x2ef4, 0, 0, 0, f(Yes, false, "")},
-	{0x2f00, 0, 0, 0, g(Yes, No, false, false, "", "一")},
-	{0x2f01, 0, 0, 0, g(Yes, No, false, false, "", "丨")},
-	{0x2f02, 0, 0, 0, g(Yes, No, false, false, "", "丶")},
-	{0x2f03, 0, 0, 0, g(Yes, No, false, false, "", "丿")},
-	{0x2f04, 0, 0, 0, g(Yes, No, false, false, "", "乙")},
-	{0x2f05, 0, 0, 0, g(Yes, No, false, false, "", "亅")},
-	{0x2f06, 0, 0, 0, g(Yes, No, false, false, "", "二")},
-	{0x2f07, 0, 0, 0, g(Yes, No, false, false, "", "亠")},
-	{0x2f08, 0, 0, 0, g(Yes, No, false, false, "", "人")},
-	{0x2f09, 0, 0, 0, g(Yes, No, false, false, "", "儿")},
-	{0x2f0a, 0, 0, 0, g(Yes, No, false, false, "", "入")},
-	{0x2f0b, 0, 0, 0, g(Yes, No, false, false, "", "八")},
-	{0x2f0c, 0, 0, 0, g(Yes, No, false, false, "", "冂")},
-	{0x2f0d, 0, 0, 0, g(Yes, No, false, false, "", "冖")},
-	{0x2f0e, 0, 0, 0, g(Yes, No, false, false, "", "冫")},
-	{0x2f0f, 0, 0, 0, g(Yes, No, false, false, "", "几")},
-	{0x2f10, 0, 0, 0, g(Yes, No, false, false, "", "凵")},
-	{0x2f11, 0, 0, 0, g(Yes, No, false, false, "", "刀")},
-	{0x2f12, 0, 0, 0, g(Yes, No, false, false, "", "力")},
-	{0x2f13, 0, 0, 0, g(Yes, No, false, false, "", "勹")},
-	{0x2f14, 0, 0, 0, g(Yes, No, false, false, "", "匕")},
-	{0x2f15, 0, 0, 0, g(Yes, No, false, false, "", "匚")},
-	{0x2f16, 0, 0, 0, g(Yes, No, false, false, "", "匸")},
-	{0x2f17, 0, 0, 0, g(Yes, No, false, false, "", "十")},
-	{0x2f18, 0, 0, 0, g(Yes, No, false, false, "", "卜")},
-	{0x2f19, 0, 0, 0, g(Yes, No, false, false, "", "卩")},
-	{0x2f1a, 0, 0, 0, g(Yes, No, false, false, "", "厂")},
-	{0x2f1b, 0, 0, 0, g(Yes, No, false, false, "", "厶")},
-	{0x2f1c, 0, 0, 0, g(Yes, No, false, false, "", "又")},
-	{0x2f1d, 0, 0, 0, g(Yes, No, false, false, "", "口")},
-	{0x2f1e, 0, 0, 0, g(Yes, No, false, false, "", "囗")},
-	{0x2f1f, 0, 0, 0, g(Yes, No, false, false, "", "土")},
-	{0x2f20, 0, 0, 0, g(Yes, No, false, false, "", "士")},
-	{0x2f21, 0, 0, 0, g(Yes, No, false, false, "", "夂")},
-	{0x2f22, 0, 0, 0, g(Yes, No, false, false, "", "夊")},
-	{0x2f23, 0, 0, 0, g(Yes, No, false, false, "", "夕")},
-	{0x2f24, 0, 0, 0, g(Yes, No, false, false, "", "大")},
-	{0x2f25, 0, 0, 0, g(Yes, No, false, false, "", "女")},
-	{0x2f26, 0, 0, 0, g(Yes, No, false, false, "", "子")},
-	{0x2f27, 0, 0, 0, g(Yes, No, false, false, "", "宀")},
-	{0x2f28, 0, 0, 0, g(Yes, No, false, false, "", "寸")},
-	{0x2f29, 0, 0, 0, g(Yes, No, false, false, "", "小")},
-	{0x2f2a, 0, 0, 0, g(Yes, No, false, false, "", "尢")},
-	{0x2f2b, 0, 0, 0, g(Yes, No, false, false, "", "尸")},
-	{0x2f2c, 0, 0, 0, g(Yes, No, false, false, "", "屮")},
-	{0x2f2d, 0, 0, 0, g(Yes, No, false, false, "", "山")},
-	{0x2f2e, 0, 0, 0, g(Yes, No, false, false, "", "巛")},
-	{0x2f2f, 0, 0, 0, g(Yes, No, false, false, "", "工")},
-	{0x2f30, 0, 0, 0, g(Yes, No, false, false, "", "己")},
-	{0x2f31, 0, 0, 0, g(Yes, No, false, false, "", "巾")},
-	{0x2f32, 0, 0, 0, g(Yes, No, false, false, "", "干")},
-	{0x2f33, 0, 0, 0, g(Yes, No, false, false, "", "幺")},
-	{0x2f34, 0, 0, 0, g(Yes, No, false, false, "", "广")},
-	{0x2f35, 0, 0, 0, g(Yes, No, false, false, "", "廴")},
-	{0x2f36, 0, 0, 0, g(Yes, No, false, false, "", "廾")},
-	{0x2f37, 0, 0, 0, g(Yes, No, false, false, "", "弋")},
-	{0x2f38, 0, 0, 0, g(Yes, No, false, false, "", "弓")},
-	{0x2f39, 0, 0, 0, g(Yes, No, false, false, "", "彐")},
-	{0x2f3a, 0, 0, 0, g(Yes, No, false, false, "", "彡")},
-	{0x2f3b, 0, 0, 0, g(Yes, No, false, false, "", "彳")},
-	{0x2f3c, 0, 0, 0, g(Yes, No, false, false, "", "心")},
-	{0x2f3d, 0, 0, 0, g(Yes, No, false, false, "", "戈")},
-	{0x2f3e, 0, 0, 0, g(Yes, No, false, false, "", "戶")},
-	{0x2f3f, 0, 0, 0, g(Yes, No, false, false, "", "手")},
-	{0x2f40, 0, 0, 0, g(Yes, No, false, false, "", "支")},
-	{0x2f41, 0, 0, 0, g(Yes, No, false, false, "", "攴")},
-	{0x2f42, 0, 0, 0, g(Yes, No, false, false, "", "文")},
-	{0x2f43, 0, 0, 0, g(Yes, No, false, false, "", "斗")},
-	{0x2f44, 0, 0, 0, g(Yes, No, false, false, "", "斤")},
-	{0x2f45, 0, 0, 0, g(Yes, No, false, false, "", "方")},
-	{0x2f46, 0, 0, 0, g(Yes, No, false, false, "", "无")},
-	{0x2f47, 0, 0, 0, g(Yes, No, false, false, "", "日")},
-	{0x2f48, 0, 0, 0, g(Yes, No, false, false, "", "曰")},
-	{0x2f49, 0, 0, 0, g(Yes, No, false, false, "", "月")},
-	{0x2f4a, 0, 0, 0, g(Yes, No, false, false, "", "木")},
-	{0x2f4b, 0, 0, 0, g(Yes, No, false, false, "", "欠")},
-	{0x2f4c, 0, 0, 0, g(Yes, No, false, false, "", "止")},
-	{0x2f4d, 0, 0, 0, g(Yes, No, false, false, "", "歹")},
-	{0x2f4e, 0, 0, 0, g(Yes, No, false, false, "", "殳")},
-	{0x2f4f, 0, 0, 0, g(Yes, No, false, false, "", "毋")},
-	{0x2f50, 0, 0, 0, g(Yes, No, false, false, "", "比")},
-	{0x2f51, 0, 0, 0, g(Yes, No, false, false, "", "毛")},
-	{0x2f52, 0, 0, 0, g(Yes, No, false, false, "", "氏")},
-	{0x2f53, 0, 0, 0, g(Yes, No, false, false, "", "气")},
-	{0x2f54, 0, 0, 0, g(Yes, No, false, false, "", "水")},
-	{0x2f55, 0, 0, 0, g(Yes, No, false, false, "", "火")},
-	{0x2f56, 0, 0, 0, g(Yes, No, false, false, "", "爪")},
-	{0x2f57, 0, 0, 0, g(Yes, No, false, false, "", "父")},
-	{0x2f58, 0, 0, 0, g(Yes, No, false, false, "", "爻")},
-	{0x2f59, 0, 0, 0, g(Yes, No, false, false, "", "爿")},
-	{0x2f5a, 0, 0, 0, g(Yes, No, false, false, "", "片")},
-	{0x2f5b, 0, 0, 0, g(Yes, No, false, false, "", "牙")},
-	{0x2f5c, 0, 0, 0, g(Yes, No, false, false, "", "牛")},
-	{0x2f5d, 0, 0, 0, g(Yes, No, false, false, "", "犬")},
-	{0x2f5e, 0, 0, 0, g(Yes, No, false, false, "", "玄")},
-	{0x2f5f, 0, 0, 0, g(Yes, No, false, false, "", "玉")},
-	{0x2f60, 0, 0, 0, g(Yes, No, false, false, "", "瓜")},
-	{0x2f61, 0, 0, 0, g(Yes, No, false, false, "", "瓦")},
-	{0x2f62, 0, 0, 0, g(Yes, No, false, false, "", "甘")},
-	{0x2f63, 0, 0, 0, g(Yes, No, false, false, "", "生")},
-	{0x2f64, 0, 0, 0, g(Yes, No, false, false, "", "用")},
-	{0x2f65, 0, 0, 0, g(Yes, No, false, false, "", "田")},
-	{0x2f66, 0, 0, 0, g(Yes, No, false, false, "", "疋")},
-	{0x2f67, 0, 0, 0, g(Yes, No, false, false, "", "疒")},
-	{0x2f68, 0, 0, 0, g(Yes, No, false, false, "", "癶")},
-	{0x2f69, 0, 0, 0, g(Yes, No, false, false, "", "白")},
-	{0x2f6a, 0, 0, 0, g(Yes, No, false, false, "", "皮")},
-	{0x2f6b, 0, 0, 0, g(Yes, No, false, false, "", "皿")},
-	{0x2f6c, 0, 0, 0, g(Yes, No, false, false, "", "目")},
-	{0x2f6d, 0, 0, 0, g(Yes, No, false, false, "", "矛")},
-	{0x2f6e, 0, 0, 0, g(Yes, No, false, false, "", "矢")},
-	{0x2f6f, 0, 0, 0, g(Yes, No, false, false, "", "石")},
-	{0x2f70, 0, 0, 0, g(Yes, No, false, false, "", "示")},
-	{0x2f71, 0, 0, 0, g(Yes, No, false, false, "", "禸")},
-	{0x2f72, 0, 0, 0, g(Yes, No, false, false, "", "禾")},
-	{0x2f73, 0, 0, 0, g(Yes, No, false, false, "", "穴")},
-	{0x2f74, 0, 0, 0, g(Yes, No, false, false, "", "立")},
-	{0x2f75, 0, 0, 0, g(Yes, No, false, false, "", "竹")},
-	{0x2f76, 0, 0, 0, g(Yes, No, false, false, "", "米")},
-	{0x2f77, 0, 0, 0, g(Yes, No, false, false, "", "糸")},
-	{0x2f78, 0, 0, 0, g(Yes, No, false, false, "", "缶")},
-	{0x2f79, 0, 0, 0, g(Yes, No, false, false, "", "网")},
-	{0x2f7a, 0, 0, 0, g(Yes, No, false, false, "", "羊")},
-	{0x2f7b, 0, 0, 0, g(Yes, No, false, false, "", "羽")},
-	{0x2f7c, 0, 0, 0, g(Yes, No, false, false, "", "老")},
-	{0x2f7d, 0, 0, 0, g(Yes, No, false, false, "", "而")},
-	{0x2f7e, 0, 0, 0, g(Yes, No, false, false, "", "耒")},
-	{0x2f7f, 0, 0, 0, g(Yes, No, false, false, "", "耳")},
-	{0x2f80, 0, 0, 0, g(Yes, No, false, false, "", "聿")},
-	{0x2f81, 0, 0, 0, g(Yes, No, false, false, "", "肉")},
-	{0x2f82, 0, 0, 0, g(Yes, No, false, false, "", "臣")},
-	{0x2f83, 0, 0, 0, g(Yes, No, false, false, "", "自")},
-	{0x2f84, 0, 0, 0, g(Yes, No, false, false, "", "至")},
-	{0x2f85, 0, 0, 0, g(Yes, No, false, false, "", "臼")},
-	{0x2f86, 0, 0, 0, g(Yes, No, false, false, "", "舌")},
-	{0x2f87, 0, 0, 0, g(Yes, No, false, false, "", "舛")},
-	{0x2f88, 0, 0, 0, g(Yes, No, false, false, "", "舟")},
-	{0x2f89, 0, 0, 0, g(Yes, No, false, false, "", "艮")},
-	{0x2f8a, 0, 0, 0, g(Yes, No, false, false, "", "色")},
-	{0x2f8b, 0, 0, 0, g(Yes, No, false, false, "", "艸")},
-	{0x2f8c, 0, 0, 0, g(Yes, No, false, false, "", "虍")},
-	{0x2f8d, 0, 0, 0, g(Yes, No, false, false, "", "虫")},
-	{0x2f8e, 0, 0, 0, g(Yes, No, false, false, "", "血")},
-	{0x2f8f, 0, 0, 0, g(Yes, No, false, false, "", "行")},
-	{0x2f90, 0, 0, 0, g(Yes, No, false, false, "", "衣")},
-	{0x2f91, 0, 0, 0, g(Yes, No, false, false, "", "襾")},
-	{0x2f92, 0, 0, 0, g(Yes, No, false, false, "", "見")},
-	{0x2f93, 0, 0, 0, g(Yes, No, false, false, "", "角")},
-	{0x2f94, 0, 0, 0, g(Yes, No, false, false, "", "言")},
-	{0x2f95, 0, 0, 0, g(Yes, No, false, false, "", "谷")},
-	{0x2f96, 0, 0, 0, g(Yes, No, false, false, "", "豆")},
-	{0x2f97, 0, 0, 0, g(Yes, No, false, false, "", "豕")},
-	{0x2f98, 0, 0, 0, g(Yes, No, false, false, "", "豸")},
-	{0x2f99, 0, 0, 0, g(Yes, No, false, false, "", "貝")},
-	{0x2f9a, 0, 0, 0, g(Yes, No, false, false, "", "赤")},
-	{0x2f9b, 0, 0, 0, g(Yes, No, false, false, "", "走")},
-	{0x2f9c, 0, 0, 0, g(Yes, No, false, false, "", "足")},
-	{0x2f9d, 0, 0, 0, g(Yes, No, false, false, "", "身")},
-	{0x2f9e, 0, 0, 0, g(Yes, No, false, false, "", "車")},
-	{0x2f9f, 0, 0, 0, g(Yes, No, false, false, "", "辛")},
-	{0x2fa0, 0, 0, 0, g(Yes, No, false, false, "", "辰")},
-	{0x2fa1, 0, 0, 0, g(Yes, No, false, false, "", "辵")},
-	{0x2fa2, 0, 0, 0, g(Yes, No, false, false, "", "邑")},
-	{0x2fa3, 0, 0, 0, g(Yes, No, false, false, "", "酉")},
-	{0x2fa4, 0, 0, 0, g(Yes, No, false, false, "", "釆")},
-	{0x2fa5, 0, 0, 0, g(Yes, No, false, false, "", "里")},
-	{0x2fa6, 0, 0, 0, g(Yes, No, false, false, "", "金")},
-	{0x2fa7, 0, 0, 0, g(Yes, No, false, false, "", "長")},
-	{0x2fa8, 0, 0, 0, g(Yes, No, false, false, "", "門")},
-	{0x2fa9, 0, 0, 0, g(Yes, No, false, false, "", "阜")},
-	{0x2faa, 0, 0, 0, g(Yes, No, false, false, "", "隶")},
-	{0x2fab, 0, 0, 0, g(Yes, No, false, false, "", "隹")},
-	{0x2fac, 0, 0, 0, g(Yes, No, false, false, "", "雨")},
-	{0x2fad, 0, 0, 0, g(Yes, No, false, false, "", "靑")},
-	{0x2fae, 0, 0, 0, g(Yes, No, false, false, "", "非")},
-	{0x2faf, 0, 0, 0, g(Yes, No, false, false, "", "面")},
-	{0x2fb0, 0, 0, 0, g(Yes, No, false, false, "", "革")},
-	{0x2fb1, 0, 0, 0, g(Yes, No, false, false, "", "韋")},
-	{0x2fb2, 0, 0, 0, g(Yes, No, false, false, "", "韭")},
-	{0x2fb3, 0, 0, 0, g(Yes, No, false, false, "", "音")},
-	{0x2fb4, 0, 0, 0, g(Yes, No, false, false, "", "頁")},
-	{0x2fb5, 0, 0, 0, g(Yes, No, false, false, "", "風")},
-	{0x2fb6, 0, 0, 0, g(Yes, No, false, false, "", "飛")},
-	{0x2fb7, 0, 0, 0, g(Yes, No, false, false, "", "食")},
-	{0x2fb8, 0, 0, 0, g(Yes, No, false, false, "", "首")},
-	{0x2fb9, 0, 0, 0, g(Yes, No, false, false, "", "香")},
-	{0x2fba, 0, 0, 0, g(Yes, No, false, false, "", "馬")},
-	{0x2fbb, 0, 0, 0, g(Yes, No, false, false, "", "骨")},
-	{0x2fbc, 0, 0, 0, g(Yes, No, false, false, "", "高")},
-	{0x2fbd, 0, 0, 0, g(Yes, No, false, false, "", "髟")},
-	{0x2fbe, 0, 0, 0, g(Yes, No, false, false, "", "鬥")},
-	{0x2fbf, 0, 0, 0, g(Yes, No, false, false, "", "鬯")},
-	{0x2fc0, 0, 0, 0, g(Yes, No, false, false, "", "鬲")},
-	{0x2fc1, 0, 0, 0, g(Yes, No, false, false, "", "鬼")},
-	{0x2fc2, 0, 0, 0, g(Yes, No, false, false, "", "魚")},
-	{0x2fc3, 0, 0, 0, g(Yes, No, false, false, "", "鳥")},
-	{0x2fc4, 0, 0, 0, g(Yes, No, false, false, "", "鹵")},
-	{0x2fc5, 0, 0, 0, g(Yes, No, false, false, "", "鹿")},
-	{0x2fc6, 0, 0, 0, g(Yes, No, false, false, "", "麥")},
-	{0x2fc7, 0, 0, 0, g(Yes, No, false, false, "", "麻")},
-	{0x2fc8, 0, 0, 0, g(Yes, No, false, false, "", "黃")},
-	{0x2fc9, 0, 0, 0, g(Yes, No, false, false, "", "黍")},
-	{0x2fca, 0, 0, 0, g(Yes, No, false, false, "", "黑")},
-	{0x2fcb, 0, 0, 0, g(Yes, No, false, false, "", "黹")},
-	{0x2fcc, 0, 0, 0, g(Yes, No, false, false, "", "黽")},
-	{0x2fcd, 0, 0, 0, g(Yes, No, false, false, "", "鼎")},
-	{0x2fce, 0, 0, 0, g(Yes, No, false, false, "", "鼓")},
-	{0x2fcf, 0, 0, 0, g(Yes, No, false, false, "", "鼠")},
-	{0x2fd0, 0, 0, 0, g(Yes, No, false, false, "", "鼻")},
-	{0x2fd1, 0, 0, 0, g(Yes, No, false, false, "", "齊")},
-	{0x2fd2, 0, 0, 0, g(Yes, No, false, false, "", "齒")},
-	{0x2fd3, 0, 0, 0, g(Yes, No, false, false, "", "龍")},
-	{0x2fd4, 0, 0, 0, g(Yes, No, false, false, "", "龜")},
-	{0x2fd5, 0, 0, 0, g(Yes, No, false, false, "", "龠")},
-	{0x2fd6, 0, 0, 0, f(Yes, false, "")},
-	{0x3000, 0, 0, 0, g(Yes, No, false, false, "", " ")},
-	{0x3001, 0, 0, 0, f(Yes, false, "")},
-	{0x302a, 218, 1, 1, f(Yes, false, "")},
-	{0x302b, 228, 1, 1, f(Yes, false, "")},
-	{0x302c, 232, 1, 1, f(Yes, false, "")},
-	{0x302d, 222, 1, 1, f(Yes, false, "")},
-	{0x302e, 224, 1, 1, f(Yes, false, "")},
-	{0x3030, 0, 0, 0, f(Yes, false, "")},
-	{0x3036, 0, 0, 0, g(Yes, No, false, false, "", "〒")},
-	{0x3037, 0, 0, 0, f(Yes, false, "")},
-	{0x3038, 0, 0, 0, g(Yes, No, false, false, "", "十")},
-	{0x3039, 0, 0, 0, g(Yes, No, false, false, "", "卄")},
-	{0x303a, 0, 0, 0, g(Yes, No, false, false, "", "卅")},
-	{0x303b, 0, 0, 0, f(Yes, false, "")},
-	{0x3046, 0, 0, 0, f(Yes, true, "")},
-	{0x3047, 0, 0, 0, f(Yes, false, "")},
-	{0x304b, 0, 0, 0, f(Yes, true, "")},
-	{0x304c, 0, 0, 1, f(Yes, false, "が")},
-	{0x304d, 0, 0, 0, f(Yes, true, "")},
-	{0x304e, 0, 0, 1, f(Yes, false, "ぎ")},
-	{0x304f, 0, 0, 0, f(Yes, true, "")},
-	{0x3050, 0, 0, 1, f(Yes, false, "ぐ")},
-	{0x3051, 0, 0, 0, f(Yes, true, "")},
-	{0x3052, 0, 0, 1, f(Yes, false, "げ")},
-	{0x3053, 0, 0, 0, f(Yes, true, "")},
-	{0x3054, 0, 0, 1, f(Yes, false, "ご")},
-	{0x3055, 0, 0, 0, f(Yes, true, "")},
-	{0x3056, 0, 0, 1, f(Yes, false, "ざ")},
-	{0x3057, 0, 0, 0, f(Yes, true, "")},
-	{0x3058, 0, 0, 1, f(Yes, false, "じ")},
-	{0x3059, 0, 0, 0, f(Yes, true, "")},
-	{0x305a, 0, 0, 1, f(Yes, false, "ず")},
-	{0x305b, 0, 0, 0, f(Yes, true, "")},
-	{0x305c, 0, 0, 1, f(Yes, false, "ぜ")},
-	{0x305d, 0, 0, 0, f(Yes, true, "")},
-	{0x305e, 0, 0, 1, f(Yes, false, "ぞ")},
-	{0x305f, 0, 0, 0, f(Yes, true, "")},
-	{0x3060, 0, 0, 1, f(Yes, false, "だ")},
-	{0x3061, 0, 0, 0, f(Yes, true, "")},
-	{0x3062, 0, 0, 1, f(Yes, false, "ぢ")},
-	{0x3063, 0, 0, 0, f(Yes, false, "")},
-	{0x3064, 0, 0, 0, f(Yes, true, "")},
-	{0x3065, 0, 0, 1, f(Yes, false, "づ")},
-	{0x3066, 0, 0, 0, f(Yes, true, "")},
-	{0x3067, 0, 0, 1, f(Yes, false, "で")},
-	{0x3068, 0, 0, 0, f(Yes, true, "")},
-	{0x3069, 0, 0, 1, f(Yes, false, "ど")},
-	{0x306a, 0, 0, 0, f(Yes, false, "")},
-	{0x306f, 0, 0, 0, f(Yes, true, "")},
-	{0x3070, 0, 0, 1, f(Yes, false, "ば")},
-	{0x3071, 0, 0, 1, f(Yes, false, "ぱ")},
-	{0x3072, 0, 0, 0, f(Yes, true, "")},
-	{0x3073, 0, 0, 1, f(Yes, false, "び")},
-	{0x3074, 0, 0, 1, f(Yes, false, "ぴ")},
-	{0x3075, 0, 0, 0, f(Yes, true, "")},
-	{0x3076, 0, 0, 1, f(Yes, false, "ぶ")},
-	{0x3077, 0, 0, 1, f(Yes, false, "ぷ")},
-	{0x3078, 0, 0, 0, f(Yes, true, "")},
-	{0x3079, 0, 0, 1, f(Yes, false, "べ")},
-	{0x307a, 0, 0, 1, f(Yes, false, "ぺ")},
-	{0x307b, 0, 0, 0, f(Yes, true, "")},
-	{0x307c, 0, 0, 1, f(Yes, false, "ぼ")},
-	{0x307d, 0, 0, 1, f(Yes, false, "ぽ")},
-	{0x307e, 0, 0, 0, f(Yes, false, "")},
-	{0x3094, 0, 0, 1, f(Yes, false, "ゔ")},
-	{0x3095, 0, 0, 0, f(Yes, false, "")},
-	{0x3099, 8, 1, 1, f(Maybe, false, "")},
-	{0x309b, 0, 0, 1, g(Yes, No, false, false, "", " ゙")},
-	{0x309c, 0, 0, 1, g(Yes, No, false, false, "", " ゚")},
-	{0x309d, 0, 0, 0, f(Yes, true, "")},
-	{0x309e, 0, 0, 1, f(Yes, false, "ゞ")},
-	{0x309f, 0, 0, 0, g(Yes, No, false, false, "", "より")},
-	{0x30a0, 0, 0, 0, f(Yes, false, "")},
-	{0x30a6, 0, 0, 0, f(Yes, true, "")},
-	{0x30a7, 0, 0, 0, f(Yes, false, "")},
-	{0x30ab, 0, 0, 0, f(Yes, true, "")},
-	{0x30ac, 0, 0, 1, f(Yes, false, "ガ")},
-	{0x30ad, 0, 0, 0, f(Yes, true, "")},
-	{0x30ae, 0, 0, 1, f(Yes, false, "ギ")},
-	{0x30af, 0, 0, 0, f(Yes, true, "")},
-	{0x30b0, 0, 0, 1, f(Yes, false, "グ")},
-	{0x30b1, 0, 0, 0, f(Yes, true, "")},
-	{0x30b2, 0, 0, 1, f(Yes, false, "ゲ")},
-	{0x30b3, 0, 0, 0, f(Yes, true, "")},
-	{0x30b4, 0, 0, 1, f(Yes, false, "ゴ")},
-	{0x30b5, 0, 0, 0, f(Yes, true, "")},
-	{0x30b6, 0, 0, 1, f(Yes, false, "ザ")},
-	{0x30b7, 0, 0, 0, f(Yes, true, "")},
-	{0x30b8, 0, 0, 1, f(Yes, false, "ジ")},
-	{0x30b9, 0, 0, 0, f(Yes, true, "")},
-	{0x30ba, 0, 0, 1, f(Yes, false, "ズ")},
-	{0x30bb, 0, 0, 0, f(Yes, true, "")},
-	{0x30bc, 0, 0, 1, f(Yes, false, "ゼ")},
-	{0x30bd, 0, 0, 0, f(Yes, true, "")},
-	{0x30be, 0, 0, 1, f(Yes, false, "ゾ")},
-	{0x30bf, 0, 0, 0, f(Yes, true, "")},
-	{0x30c0, 0, 0, 1, f(Yes, false, "ダ")},
-	{0x30c1, 0, 0, 0, f(Yes, true, "")},
-	{0x30c2, 0, 0, 1, f(Yes, false, "ヂ")},
-	{0x30c3, 0, 0, 0, f(Yes, false, "")},
-	{0x30c4, 0, 0, 0, f(Yes, true, "")},
-	{0x30c5, 0, 0, 1, f(Yes, false, "ヅ")},
-	{0x30c6, 0, 0, 0, f(Yes, true, "")},
-	{0x30c7, 0, 0, 1, f(Yes, false, "デ")},
-	{0x30c8, 0, 0, 0, f(Yes, true, "")},
-	{0x30c9, 0, 0, 1, f(Yes, false, "ド")},
-	{0x30ca, 0, 0, 0, f(Yes, false, "")},
-	{0x30cf, 0, 0, 0, f(Yes, true, "")},
-	{0x30d0, 0, 0, 1, f(Yes, false, "バ")},
-	{0x30d1, 0, 0, 1, f(Yes, false, "パ")},
-	{0x30d2, 0, 0, 0, f(Yes, true, "")},
-	{0x30d3, 0, 0, 1, f(Yes, false, "ビ")},
-	{0x30d4, 0, 0, 1, f(Yes, false, "ピ")},
-	{0x30d5, 0, 0, 0, f(Yes, true, "")},
-	{0x30d6, 0, 0, 1, f(Yes, false, "ブ")},
-	{0x30d7, 0, 0, 1, f(Yes, false, "プ")},
-	{0x30d8, 0, 0, 0, f(Yes, true, "")},
-	{0x30d9, 0, 0, 1, f(Yes, false, "ベ")},
-	{0x30da, 0, 0, 1, f(Yes, false, "ペ")},
-	{0x30db, 0, 0, 0, f(Yes, true, "")},
-	{0x30dc, 0, 0, 1, f(Yes, false, "ボ")},
-	{0x30dd, 0, 0, 1, f(Yes, false, "ポ")},
-	{0x30de, 0, 0, 0, f(Yes, false, "")},
-	{0x30ef, 0, 0, 0, f(Yes, true, "")},
-	{0x30f3, 0, 0, 0, f(Yes, false, "")},
-	{0x30f4, 0, 0, 1, f(Yes, false, "ヴ")},
-	{0x30f5, 0, 0, 0, f(Yes, false, "")},
-	{0x30f7, 0, 0, 1, f(Yes, false, "ヷ")},
-	{0x30f8, 0, 0, 1, f(Yes, false, "ヸ")},
-	{0x30f9, 0, 0, 1, f(Yes, false, "ヹ")},
-	{0x30fa, 0, 0, 1, f(Yes, false, "ヺ")},
-	{0x30fb, 0, 0, 0, f(Yes, false, "")},
-	{0x30fd, 0, 0, 0, f(Yes, true, "")},
-	{0x30fe, 0, 0, 1, f(Yes, false, "ヾ")},
-	{0x30ff, 0, 0, 0, g(Yes, No, false, false, "", "コト")},
-	{0x3100, 0, 0, 0, f(Yes, false, "")},
-	{0x3131, 0, 0, 0, g(Yes, No, false, false, "", "ᄀ")},
-	{0x3132, 0, 0, 0, g(Yes, No, false, false, "", "ᄁ")},
-	{0x3133, 0, 1, 1, g(Yes, No, false, false, "", "ᆪ")},
-	{0x3134, 0, 0, 0, g(Yes, No, false, false, "", "ᄂ")},
-	{0x3135, 0, 1, 1, g(Yes, No, false, false, "", "ᆬ")},
-	{0x3136, 0, 1, 1, g(Yes, No, false, false, "", "ᆭ")},
-	{0x3137, 0, 0, 0, g(Yes, No, false, false, "", "ᄃ")},
-	{0x3138, 0, 0, 0, g(Yes, No, false, false, "", "ᄄ")},
-	{0x3139, 0, 0, 0, g(Yes, No, false, false, "", "ᄅ")},
-	{0x313a, 0, 1, 1, g(Yes, No, false, false, "", "ᆰ")},
-	{0x313b, 0, 1, 1, g(Yes, No, false, false, "", "ᆱ")},
-	{0x313c, 0, 1, 1, g(Yes, No, false, false, "", "ᆲ")},
-	{0x313d, 0, 1, 1, g(Yes, No, false, false, "", "ᆳ")},
-	{0x313e, 0, 1, 1, g(Yes, No, false, false, "", "ᆴ")},
-	{0x313f, 0, 1, 1, g(Yes, No, false, false, "", "ᆵ")},
-	{0x3140, 0, 0, 0, g(Yes, No, false, false, "", "ᄚ")},
-	{0x3141, 0, 0, 0, g(Yes, No, false, false, "", "ᄆ")},
-	{0x3142, 0, 0, 0, g(Yes, No, false, false, "", "ᄇ")},
-	{0x3143, 0, 0, 0, g(Yes, No, false, false, "", "ᄈ")},
-	{0x3144, 0, 0, 0, g(Yes, No, false, false, "", "ᄡ")},
-	{0x3145, 0, 0, 0, g(Yes, No, false, false, "", "ᄉ")},
-	{0x3146, 0, 0, 0, g(Yes, No, false, false, "", "ᄊ")},
-	{0x3147, 0, 0, 0, g(Yes, No, false, false, "", "ᄋ")},
-	{0x3148, 0, 0, 0, g(Yes, No, false, false, "", "ᄌ")},
-	{0x3149, 0, 0, 0, g(Yes, No, false, false, "", "ᄍ")},
-	{0x314a, 0, 0, 0, g(Yes, No, false, false, "", "ᄎ")},
-	{0x314b, 0, 0, 0, g(Yes, No, false, false, "", "ᄏ")},
-	{0x314c, 0, 0, 0, g(Yes, No, false, false, "", "ᄐ")},
-	{0x314d, 0, 0, 0, g(Yes, No, false, false, "", "ᄑ")},
-	{0x314e, 0, 0, 0, g(Yes, No, false, false, "", "ᄒ")},
-	{0x314f, 0, 1, 1, g(Yes, No, false, false, "", "ᅡ")},
-	{0x3150, 0, 1, 1, g(Yes, No, false, false, "", "ᅢ")},
-	{0x3151, 0, 1, 1, g(Yes, No, false, false, "", "ᅣ")},
-	{0x3152, 0, 1, 1, g(Yes, No, false, false, "", "ᅤ")},
-	{0x3153, 0, 1, 1, g(Yes, No, false, false, "", "ᅥ")},
-	{0x3154, 0, 1, 1, g(Yes, No, false, false, "", "ᅦ")},
-	{0x3155, 0, 1, 1, g(Yes, No, false, false, "", "ᅧ")},
-	{0x3156, 0, 1, 1, g(Yes, No, false, false, "", "ᅨ")},
-	{0x3157, 0, 1, 1, g(Yes, No, false, false, "", "ᅩ")},
-	{0x3158, 0, 1, 1, g(Yes, No, false, false, "", "ᅪ")},
-	{0x3159, 0, 1, 1, g(Yes, No, false, false, "", "ᅫ")},
-	{0x315a, 0, 1, 1, g(Yes, No, false, false, "", "ᅬ")},
-	{0x315b, 0, 1, 1, g(Yes, No, false, false, "", "ᅭ")},
-	{0x315c, 0, 1, 1, g(Yes, No, false, false, "", "ᅮ")},
-	{0x315d, 0, 1, 1, g(Yes, No, false, false, "", "ᅯ")},
-	{0x315e, 0, 1, 1, g(Yes, No, false, false, "", "ᅰ")},
-	{0x315f, 0, 1, 1, g(Yes, No, false, false, "", "ᅱ")},
-	{0x3160, 0, 1, 1, g(Yes, No, false, false, "", "ᅲ")},
-	{0x3161, 0, 1, 1, g(Yes, No, false, false, "", "ᅳ")},
-	{0x3162, 0, 1, 1, g(Yes, No, false, false, "", "ᅴ")},
-	{0x3163, 0, 1, 1, g(Yes, No, false, false, "", "ᅵ")},
-	{0x3164, 0, 0, 0, g(Yes, No, false, false, "", "ᅠ")},
-	{0x3165, 0, 0, 0, g(Yes, No, false, false, "", "ᄔ")},
-	{0x3166, 0, 0, 0, g(Yes, No, false, false, "", "ᄕ")},
-	{0x3167, 0, 0, 0, g(Yes, No, false, false, "", "ᇇ")},
-	{0x3168, 0, 0, 0, g(Yes, No, false, false, "", "ᇈ")},
-	{0x3169, 0, 0, 0, g(Yes, No, false, false, "", "ᇌ")},
-	{0x316a, 0, 0, 0, g(Yes, No, false, false, "", "ᇎ")},
-	{0x316b, 0, 0, 0, g(Yes, No, false, false, "", "ᇓ")},
-	{0x316c, 0, 0, 0, g(Yes, No, false, false, "", "ᇗ")},
-	{0x316d, 0, 0, 0, g(Yes, No, false, false, "", "ᇙ")},
-	{0x316e, 0, 0, 0, g(Yes, No, false, false, "", "ᄜ")},
-	{0x316f, 0, 0, 0, g(Yes, No, false, false, "", "ᇝ")},
-	{0x3170, 0, 0, 0, g(Yes, No, false, false, "", "ᇟ")},
-	{0x3171, 0, 0, 0, g(Yes, No, false, false, "", "ᄝ")},
-	{0x3172, 0, 0, 0, g(Yes, No, false, false, "", "ᄞ")},
-	{0x3173, 0, 0, 0, g(Yes, No, false, false, "", "ᄠ")},
-	{0x3174, 0, 0, 0, g(Yes, No, false, false, "", "ᄢ")},
-	{0x3175, 0, 0, 0, g(Yes, No, false, false, "", "ᄣ")},
-	{0x3176, 0, 0, 0, g(Yes, No, false, false, "", "ᄧ")},
-	{0x3177, 0, 0, 0, g(Yes, No, false, false, "", "ᄩ")},
-	{0x3178, 0, 0, 0, g(Yes, No, false, false, "", "ᄫ")},
-	{0x3179, 0, 0, 0, g(Yes, No, false, false, "", "ᄬ")},
-	{0x317a, 0, 0, 0, g(Yes, No, false, false, "", "ᄭ")},
-	{0x317b, 0, 0, 0, g(Yes, No, false, false, "", "ᄮ")},
-	{0x317c, 0, 0, 0, g(Yes, No, false, false, "", "ᄯ")},
-	{0x317d, 0, 0, 0, g(Yes, No, false, false, "", "ᄲ")},
-	{0x317e, 0, 0, 0, g(Yes, No, false, false, "", "ᄶ")},
-	{0x317f, 0, 0, 0, g(Yes, No, false, false, "", "ᅀ")},
-	{0x3180, 0, 0, 0, g(Yes, No, false, false, "", "ᅇ")},
-	{0x3181, 0, 0, 0, g(Yes, No, false, false, "", "ᅌ")},
-	{0x3182, 0, 0, 0, g(Yes, No, false, false, "", "ᇱ")},
-	{0x3183, 0, 0, 0, g(Yes, No, false, false, "", "ᇲ")},
-	{0x3184, 0, 0, 0, g(Yes, No, false, false, "", "ᅗ")},
-	{0x3185, 0, 0, 0, g(Yes, No, false, false, "", "ᅘ")},
-	{0x3186, 0, 0, 0, g(Yes, No, false, false, "", "ᅙ")},
-	{0x3187, 0, 0, 0, g(Yes, No, false, false, "", "ᆄ")},
-	{0x3188, 0, 0, 0, g(Yes, No, false, false, "", "ᆅ")},
-	{0x3189, 0, 0, 0, g(Yes, No, false, false, "", "ᆈ")},
-	{0x318a, 0, 0, 0, g(Yes, No, false, false, "", "ᆑ")},
-	{0x318b, 0, 0, 0, g(Yes, No, false, false, "", "ᆒ")},
-	{0x318c, 0, 0, 0, g(Yes, No, false, false, "", "ᆔ")},
-	{0x318d, 0, 0, 0, g(Yes, No, false, false, "", "ᆞ")},
-	{0x318e, 0, 0, 0, g(Yes, No, false, false, "", "ᆡ")},
-	{0x318f, 0, 0, 0, f(Yes, false, "")},
-	{0x3192, 0, 0, 0, g(Yes, No, false, false, "", "一")},
-	{0x3193, 0, 0, 0, g(Yes, No, false, false, "", "二")},
-	{0x3194, 0, 0, 0, g(Yes, No, false, false, "", "三")},
-	{0x3195, 0, 0, 0, g(Yes, No, false, false, "", "四")},
-	{0x3196, 0, 0, 0, g(Yes, No, false, false, "", "上")},
-	{0x3197, 0, 0, 0, g(Yes, No, false, false, "", "中")},
-	{0x3198, 0, 0, 0, g(Yes, No, false, false, "", "下")},
-	{0x3199, 0, 0, 0, g(Yes, No, false, false, "", "甲")},
-	{0x319a, 0, 0, 0, g(Yes, No, false, false, "", "乙")},
-	{0x319b, 0, 0, 0, g(Yes, No, false, false, "", "丙")},
-	{0x319c, 0, 0, 0, g(Yes, No, false, false, "", "丁")},
-	{0x319d, 0, 0, 0, g(Yes, No, false, false, "", "天")},
-	{0x319e, 0, 0, 0, g(Yes, No, false, false, "", "地")},
-	{0x319f, 0, 0, 0, g(Yes, No, false, false, "", "人")},
-	{0x31a0, 0, 0, 0, f(Yes, false, "")},
-	{0x3200, 0, 0, 0, g(Yes, No, false, false, "", "(ᄀ)")},
-	{0x3201, 0, 0, 0, g(Yes, No, false, false, "", "(ᄂ)")},
-	{0x3202, 0, 0, 0, g(Yes, No, false, false, "", "(ᄃ)")},
-	{0x3203, 0, 0, 0, g(Yes, No, false, false, "", "(ᄅ)")},
-	{0x3204, 0, 0, 0, g(Yes, No, false, false, "", "(ᄆ)")},
-	{0x3205, 0, 0, 0, g(Yes, No, false, false, "", "(ᄇ)")},
-	{0x3206, 0, 0, 0, g(Yes, No, false, false, "", "(ᄉ)")},
-	{0x3207, 0, 0, 0, g(Yes, No, false, false, "", "(ᄋ)")},
-	{0x3208, 0, 0, 0, g(Yes, No, false, false, "", "(ᄌ)")},
-	{0x3209, 0, 0, 0, g(Yes, No, false, false, "", "(ᄎ)")},
-	{0x320a, 0, 0, 0, g(Yes, No, false, false, "", "(ᄏ)")},
-	{0x320b, 0, 0, 0, g(Yes, No, false, false, "", "(ᄐ)")},
-	{0x320c, 0, 0, 0, g(Yes, No, false, false, "", "(ᄑ)")},
-	{0x320d, 0, 0, 0, g(Yes, No, false, false, "", "(ᄒ)")},
-	{0x320e, 0, 0, 0, g(Yes, No, false, false, "", "(가)")},
-	{0x320f, 0, 0, 0, g(Yes, No, false, false, "", "(나)")},
-	{0x3210, 0, 0, 0, g(Yes, No, false, false, "", "(다)")},
-	{0x3211, 0, 0, 0, g(Yes, No, false, false, "", "(라)")},
-	{0x3212, 0, 0, 0, g(Yes, No, false, false, "", "(마)")},
-	{0x3213, 0, 0, 0, g(Yes, No, false, false, "", "(바)")},
-	{0x3214, 0, 0, 0, g(Yes, No, false, false, "", "(사)")},
-	{0x3215, 0, 0, 0, g(Yes, No, false, false, "", "(아)")},
-	{0x3216, 0, 0, 0, g(Yes, No, false, false, "", "(자)")},
-	{0x3217, 0, 0, 0, g(Yes, No, false, false, "", "(차)")},
-	{0x3218, 0, 0, 0, g(Yes, No, false, false, "", "(카)")},
-	{0x3219, 0, 0, 0, g(Yes, No, false, false, "", "(타)")},
-	{0x321a, 0, 0, 0, g(Yes, No, false, false, "", "(파)")},
-	{0x321b, 0, 0, 0, g(Yes, No, false, false, "", "(하)")},
-	{0x321c, 0, 0, 0, g(Yes, No, false, false, "", "(주)")},
-	{0x321d, 0, 0, 0, g(Yes, No, false, false, "", "(오전)")},
-	{0x321e, 0, 0, 0, g(Yes, No, false, false, "", "(오후)")},
-	{0x321f, 0, 0, 0, f(Yes, false, "")},
-	{0x3220, 0, 0, 0, g(Yes, No, false, false, "", "(一)")},
-	{0x3221, 0, 0, 0, g(Yes, No, false, false, "", "(二)")},
-	{0x3222, 0, 0, 0, g(Yes, No, false, false, "", "(三)")},
-	{0x3223, 0, 0, 0, g(Yes, No, false, false, "", "(四)")},
-	{0x3224, 0, 0, 0, g(Yes, No, false, false, "", "(五)")},
-	{0x3225, 0, 0, 0, g(Yes, No, false, false, "", "(六)")},
-	{0x3226, 0, 0, 0, g(Yes, No, false, false, "", "(七)")},
-	{0x3227, 0, 0, 0, g(Yes, No, false, false, "", "(八)")},
-	{0x3228, 0, 0, 0, g(Yes, No, false, false, "", "(九)")},
-	{0x3229, 0, 0, 0, g(Yes, No, false, false, "", "(十)")},
-	{0x322a, 0, 0, 0, g(Yes, No, false, false, "", "(月)")},
-	{0x322b, 0, 0, 0, g(Yes, No, false, false, "", "(火)")},
-	{0x322c, 0, 0, 0, g(Yes, No, false, false, "", "(水)")},
-	{0x322d, 0, 0, 0, g(Yes, No, false, false, "", "(木)")},
-	{0x322e, 0, 0, 0, g(Yes, No, false, false, "", "(金)")},
-	{0x322f, 0, 0, 0, g(Yes, No, false, false, "", "(土)")},
-	{0x3230, 0, 0, 0, g(Yes, No, false, false, "", "(日)")},
-	{0x3231, 0, 0, 0, g(Yes, No, false, false, "", "(株)")},
-	{0x3232, 0, 0, 0, g(Yes, No, false, false, "", "(有)")},
-	{0x3233, 0, 0, 0, g(Yes, No, false, false, "", "(社)")},
-	{0x3234, 0, 0, 0, g(Yes, No, false, false, "", "(名)")},
-	{0x3235, 0, 0, 0, g(Yes, No, false, false, "", "(特)")},
-	{0x3236, 0, 0, 0, g(Yes, No, false, false, "", "(財)")},
-	{0x3237, 0, 0, 0, g(Yes, No, false, false, "", "(祝)")},
-	{0x3238, 0, 0, 0, g(Yes, No, false, false, "", "(労)")},
-	{0x3239, 0, 0, 0, g(Yes, No, false, false, "", "(代)")},
-	{0x323a, 0, 0, 0, g(Yes, No, false, false, "", "(呼)")},
-	{0x323b, 0, 0, 0, g(Yes, No, false, false, "", "(学)")},
-	{0x323c, 0, 0, 0, g(Yes, No, false, false, "", "(監)")},
-	{0x323d, 0, 0, 0, g(Yes, No, false, false, "", "(企)")},
-	{0x323e, 0, 0, 0, g(Yes, No, false, false, "", "(資)")},
-	{0x323f, 0, 0, 0, g(Yes, No, false, false, "", "(協)")},
-	{0x3240, 0, 0, 0, g(Yes, No, false, false, "", "(祭)")},
-	{0x3241, 0, 0, 0, g(Yes, No, false, false, "", "(休)")},
-	{0x3242, 0, 0, 0, g(Yes, No, false, false, "", "(自)")},
-	{0x3243, 0, 0, 0, g(Yes, No, false, false, "", "(至)")},
-	{0x3244, 0, 0, 0, g(Yes, No, false, false, "", "問")},
-	{0x3245, 0, 0, 0, g(Yes, No, false, false, "", "幼")},
-	{0x3246, 0, 0, 0, g(Yes, No, false, false, "", "文")},
-	{0x3247, 0, 0, 0, g(Yes, No, false, false, "", "箏")},
-	{0x3248, 0, 0, 0, f(Yes, false, "")},
-	{0x3250, 0, 0, 0, g(Yes, No, false, false, "", "PTE")},
-	{0x3251, 0, 0, 0, g(Yes, No, false, false, "", "21")},
-	{0x3252, 0, 0, 0, g(Yes, No, false, false, "", "22")},
-	{0x3253, 0, 0, 0, g(Yes, No, false, false, "", "23")},
-	{0x3254, 0, 0, 0, g(Yes, No, false, false, "", "24")},
-	{0x3255, 0, 0, 0, g(Yes, No, false, false, "", "25")},
-	{0x3256, 0, 0, 0, g(Yes, No, false, false, "", "26")},
-	{0x3257, 0, 0, 0, g(Yes, No, false, false, "", "27")},
-	{0x3258, 0, 0, 0, g(Yes, No, false, false, "", "28")},
-	{0x3259, 0, 0, 0, g(Yes, No, false, false, "", "29")},
-	{0x325a, 0, 0, 0, g(Yes, No, false, false, "", "30")},
-	{0x325b, 0, 0, 0, g(Yes, No, false, false, "", "31")},
-	{0x325c, 0, 0, 0, g(Yes, No, false, false, "", "32")},
-	{0x325d, 0, 0, 0, g(Yes, No, false, false, "", "33")},
-	{0x325e, 0, 0, 0, g(Yes, No, false, false, "", "34")},
-	{0x325f, 0, 0, 0, g(Yes, No, false, false, "", "35")},
-	{0x3260, 0, 0, 0, g(Yes, No, false, false, "", "ᄀ")},
-	{0x3261, 0, 0, 0, g(Yes, No, false, false, "", "ᄂ")},
-	{0x3262, 0, 0, 0, g(Yes, No, false, false, "", "ᄃ")},
-	{0x3263, 0, 0, 0, g(Yes, No, false, false, "", "ᄅ")},
-	{0x3264, 0, 0, 0, g(Yes, No, false, false, "", "ᄆ")},
-	{0x3265, 0, 0, 0, g(Yes, No, false, false, "", "ᄇ")},
-	{0x3266, 0, 0, 0, g(Yes, No, false, false, "", "ᄉ")},
-	{0x3267, 0, 0, 0, g(Yes, No, false, false, "", "ᄋ")},
-	{0x3268, 0, 0, 0, g(Yes, No, false, false, "", "ᄌ")},
-	{0x3269, 0, 0, 0, g(Yes, No, false, false, "", "ᄎ")},
-	{0x326a, 0, 0, 0, g(Yes, No, false, false, "", "ᄏ")},
-	{0x326b, 0, 0, 0, g(Yes, No, false, false, "", "ᄐ")},
-	{0x326c, 0, 0, 0, g(Yes, No, false, false, "", "ᄑ")},
-	{0x326d, 0, 0, 0, g(Yes, No, false, false, "", "ᄒ")},
-	{0x326e, 0, 0, 1, g(Yes, No, false, false, "", "가")},
-	{0x326f, 0, 0, 1, g(Yes, No, false, false, "", "나")},
-	{0x3270, 0, 0, 1, g(Yes, No, false, false, "", "다")},
-	{0x3271, 0, 0, 1, g(Yes, No, false, false, "", "라")},
-	{0x3272, 0, 0, 1, g(Yes, No, false, false, "", "마")},
-	{0x3273, 0, 0, 1, g(Yes, No, false, false, "", "바")},
-	{0x3274, 0, 0, 1, g(Yes, No, false, false, "", "사")},
-	{0x3275, 0, 0, 1, g(Yes, No, false, false, "", "아")},
-	{0x3276, 0, 0, 1, g(Yes, No, false, false, "", "자")},
-	{0x3277, 0, 0, 1, g(Yes, No, false, false, "", "차")},
-	{0x3278, 0, 0, 1, g(Yes, No, false, false, "", "카")},
-	{0x3279, 0, 0, 1, g(Yes, No, false, false, "", "타")},
-	{0x327a, 0, 0, 1, g(Yes, No, false, false, "", "파")},
-	{0x327b, 0, 0, 1, g(Yes, No, false, false, "", "하")},
-	{0x327c, 0, 0, 1, g(Yes, No, false, false, "", "참고")},
-	{0x327d, 0, 0, 1, g(Yes, No, false, false, "", "주의")},
-	{0x327e, 0, 0, 1, g(Yes, No, false, false, "", "우")},
-	{0x327f, 0, 0, 0, f(Yes, false, "")},
-	{0x3280, 0, 0, 0, g(Yes, No, false, false, "", "一")},
-	{0x3281, 0, 0, 0, g(Yes, No, false, false, "", "二")},
-	{0x3282, 0, 0, 0, g(Yes, No, false, false, "", "三")},
-	{0x3283, 0, 0, 0, g(Yes, No, false, false, "", "四")},
-	{0x3284, 0, 0, 0, g(Yes, No, false, false, "", "五")},
-	{0x3285, 0, 0, 0, g(Yes, No, false, false, "", "六")},
-	{0x3286, 0, 0, 0, g(Yes, No, false, false, "", "七")},
-	{0x3287, 0, 0, 0, g(Yes, No, false, false, "", "八")},
-	{0x3288, 0, 0, 0, g(Yes, No, false, false, "", "九")},
-	{0x3289, 0, 0, 0, g(Yes, No, false, false, "", "十")},
-	{0x328a, 0, 0, 0, g(Yes, No, false, false, "", "月")},
-	{0x328b, 0, 0, 0, g(Yes, No, false, false, "", "火")},
-	{0x328c, 0, 0, 0, g(Yes, No, false, false, "", "水")},
-	{0x328d, 0, 0, 0, g(Yes, No, false, false, "", "木")},
-	{0x328e, 0, 0, 0, g(Yes, No, false, false, "", "金")},
-	{0x328f, 0, 0, 0, g(Yes, No, false, false, "", "土")},
-	{0x3290, 0, 0, 0, g(Yes, No, false, false, "", "日")},
-	{0x3291, 0, 0, 0, g(Yes, No, false, false, "", "株")},
-	{0x3292, 0, 0, 0, g(Yes, No, false, false, "", "有")},
-	{0x3293, 0, 0, 0, g(Yes, No, false, false, "", "社")},
-	{0x3294, 0, 0, 0, g(Yes, No, false, false, "", "名")},
-	{0x3295, 0, 0, 0, g(Yes, No, false, false, "", "特")},
-	{0x3296, 0, 0, 0, g(Yes, No, false, false, "", "財")},
-	{0x3297, 0, 0, 0, g(Yes, No, false, false, "", "祝")},
-	{0x3298, 0, 0, 0, g(Yes, No, false, false, "", "労")},
-	{0x3299, 0, 0, 0, g(Yes, No, false, false, "", "秘")},
-	{0x329a, 0, 0, 0, g(Yes, No, false, false, "", "男")},
-	{0x329b, 0, 0, 0, g(Yes, No, false, false, "", "女")},
-	{0x329c, 0, 0, 0, g(Yes, No, false, false, "", "適")},
-	{0x329d, 0, 0, 0, g(Yes, No, false, false, "", "優")},
-	{0x329e, 0, 0, 0, g(Yes, No, false, false, "", "印")},
-	{0x329f, 0, 0, 0, g(Yes, No, false, false, "", "注")},
-	{0x32a0, 0, 0, 0, g(Yes, No, false, false, "", "項")},
-	{0x32a1, 0, 0, 0, g(Yes, No, false, false, "", "休")},
-	{0x32a2, 0, 0, 0, g(Yes, No, false, false, "", "写")},
-	{0x32a3, 0, 0, 0, g(Yes, No, false, false, "", "正")},
-	{0x32a4, 0, 0, 0, g(Yes, No, false, false, "", "上")},
-	{0x32a5, 0, 0, 0, g(Yes, No, false, false, "", "中")},
-	{0x32a6, 0, 0, 0, g(Yes, No, false, false, "", "下")},
-	{0x32a7, 0, 0, 0, g(Yes, No, false, false, "", "左")},
-	{0x32a8, 0, 0, 0, g(Yes, No, false, false, "", "右")},
-	{0x32a9, 0, 0, 0, g(Yes, No, false, false, "", "医")},
-	{0x32aa, 0, 0, 0, g(Yes, No, false, false, "", "宗")},
-	{0x32ab, 0, 0, 0, g(Yes, No, false, false, "", "学")},
-	{0x32ac, 0, 0, 0, g(Yes, No, false, false, "", "監")},
-	{0x32ad, 0, 0, 0, g(Yes, No, false, false, "", "企")},
-	{0x32ae, 0, 0, 0, g(Yes, No, false, false, "", "資")},
-	{0x32af, 0, 0, 0, g(Yes, No, false, false, "", "協")},
-	{0x32b0, 0, 0, 0, g(Yes, No, false, false, "", "夜")},
-	{0x32b1, 0, 0, 0, g(Yes, No, false, false, "", "36")},
-	{0x32b2, 0, 0, 0, g(Yes, No, false, false, "", "37")},
-	{0x32b3, 0, 0, 0, g(Yes, No, false, false, "", "38")},
-	{0x32b4, 0, 0, 0, g(Yes, No, false, false, "", "39")},
-	{0x32b5, 0, 0, 0, g(Yes, No, false, false, "", "40")},
-	{0x32b6, 0, 0, 0, g(Yes, No, false, false, "", "41")},
-	{0x32b7, 0, 0, 0, g(Yes, No, false, false, "", "42")},
-	{0x32b8, 0, 0, 0, g(Yes, No, false, false, "", "43")},
-	{0x32b9, 0, 0, 0, g(Yes, No, false, false, "", "44")},
-	{0x32ba, 0, 0, 0, g(Yes, No, false, false, "", "45")},
-	{0x32bb, 0, 0, 0, g(Yes, No, false, false, "", "46")},
-	{0x32bc, 0, 0, 0, g(Yes, No, false, false, "", "47")},
-	{0x32bd, 0, 0, 0, g(Yes, No, false, false, "", "48")},
-	{0x32be, 0, 0, 0, g(Yes, No, false, false, "", "49")},
-	{0x32bf, 0, 0, 0, g(Yes, No, false, false, "", "50")},
-	{0x32c0, 0, 0, 0, g(Yes, No, false, false, "", "1月")},
-	{0x32c1, 0, 0, 0, g(Yes, No, false, false, "", "2月")},
-	{0x32c2, 0, 0, 0, g(Yes, No, false, false, "", "3月")},
-	{0x32c3, 0, 0, 0, g(Yes, No, false, false, "", "4月")},
-	{0x32c4, 0, 0, 0, g(Yes, No, false, false, "", "5月")},
-	{0x32c5, 0, 0, 0, g(Yes, No, false, false, "", "6月")},
-	{0x32c6, 0, 0, 0, g(Yes, No, false, false, "", "7月")},
-	{0x32c7, 0, 0, 0, g(Yes, No, false, false, "", "8月")},
-	{0x32c8, 0, 0, 0, g(Yes, No, false, false, "", "9月")},
-	{0x32c9, 0, 0, 0, g(Yes, No, false, false, "", "10月")},
-	{0x32ca, 0, 0, 0, g(Yes, No, false, false, "", "11月")},
-	{0x32cb, 0, 0, 0, g(Yes, No, false, false, "", "12月")},
-	{0x32cc, 0, 0, 0, g(Yes, No, false, false, "", "Hg")},
-	{0x32cd, 0, 0, 0, g(Yes, No, false, false, "", "erg")},
-	{0x32ce, 0, 0, 0, g(Yes, No, false, false, "", "eV")},
-	{0x32cf, 0, 0, 0, g(Yes, No, false, false, "", "LTD")},
-	{0x32d0, 0, 0, 0, g(Yes, No, false, false, "", "ア")},
-	{0x32d1, 0, 0, 0, g(Yes, No, false, false, "", "イ")},
-	{0x32d2, 0, 0, 0, g(Yes, No, false, false, "", "ウ")},
-	{0x32d3, 0, 0, 0, g(Yes, No, false, false, "", "エ")},
-	{0x32d4, 0, 0, 0, g(Yes, No, false, false, "", "オ")},
-	{0x32d5, 0, 0, 0, g(Yes, No, false, false, "", "カ")},
-	{0x32d6, 0, 0, 0, g(Yes, No, false, false, "", "キ")},
-	{0x32d7, 0, 0, 0, g(Yes, No, false, false, "", "ク")},
-	{0x32d8, 0, 0, 0, g(Yes, No, false, false, "", "ケ")},
-	{0x32d9, 0, 0, 0, g(Yes, No, false, false, "", "コ")},
-	{0x32da, 0, 0, 0, g(Yes, No, false, false, "", "サ")},
-	{0x32db, 0, 0, 0, g(Yes, No, false, false, "", "シ")},
-	{0x32dc, 0, 0, 0, g(Yes, No, false, false, "", "ス")},
-	{0x32dd, 0, 0, 0, g(Yes, No, false, false, "", "セ")},
-	{0x32de, 0, 0, 0, g(Yes, No, false, false, "", "ソ")},
-	{0x32df, 0, 0, 0, g(Yes, No, false, false, "", "タ")},
-	{0x32e0, 0, 0, 0, g(Yes, No, false, false, "", "チ")},
-	{0x32e1, 0, 0, 0, g(Yes, No, false, false, "", "ツ")},
-	{0x32e2, 0, 0, 0, g(Yes, No, false, false, "", "テ")},
-	{0x32e3, 0, 0, 0, g(Yes, No, false, false, "", "ト")},
-	{0x32e4, 0, 0, 0, g(Yes, No, false, false, "", "ナ")},
-	{0x32e5, 0, 0, 0, g(Yes, No, false, false, "", "ニ")},
-	{0x32e6, 0, 0, 0, g(Yes, No, false, false, "", "ヌ")},
-	{0x32e7, 0, 0, 0, g(Yes, No, false, false, "", "ネ")},
-	{0x32e8, 0, 0, 0, g(Yes, No, false, false, "", "ノ")},
-	{0x32e9, 0, 0, 0, g(Yes, No, false, false, "", "ハ")},
-	{0x32ea, 0, 0, 0, g(Yes, No, false, false, "", "ヒ")},
-	{0x32eb, 0, 0, 0, g(Yes, No, false, false, "", "フ")},
-	{0x32ec, 0, 0, 0, g(Yes, No, false, false, "", "ヘ")},
-	{0x32ed, 0, 0, 0, g(Yes, No, false, false, "", "ホ")},
-	{0x32ee, 0, 0, 0, g(Yes, No, false, false, "", "マ")},
-	{0x32ef, 0, 0, 0, g(Yes, No, false, false, "", "ミ")},
-	{0x32f0, 0, 0, 0, g(Yes, No, false, false, "", "ム")},
-	{0x32f1, 0, 0, 0, g(Yes, No, false, false, "", "メ")},
-	{0x32f2, 0, 0, 0, g(Yes, No, false, false, "", "モ")},
-	{0x32f3, 0, 0, 0, g(Yes, No, false, false, "", "ヤ")},
-	{0x32f4, 0, 0, 0, g(Yes, No, false, false, "", "ユ")},
-	{0x32f5, 0, 0, 0, g(Yes, No, false, false, "", "ヨ")},
-	{0x32f6, 0, 0, 0, g(Yes, No, false, false, "", "ラ")},
-	{0x32f7, 0, 0, 0, g(Yes, No, false, false, "", "リ")},
-	{0x32f8, 0, 0, 0, g(Yes, No, false, false, "", "ル")},
-	{0x32f9, 0, 0, 0, g(Yes, No, false, false, "", "レ")},
-	{0x32fa, 0, 0, 0, g(Yes, No, false, false, "", "ロ")},
-	{0x32fb, 0, 0, 0, g(Yes, No, false, false, "", "ワ")},
-	{0x32fc, 0, 0, 0, g(Yes, No, false, false, "", "ヰ")},
-	{0x32fd, 0, 0, 0, g(Yes, No, false, false, "", "ヱ")},
-	{0x32fe, 0, 0, 0, g(Yes, No, false, false, "", "ヲ")},
-	{0x32ff, 0, 0, 0, f(Yes, false, "")},
-	{0x3300, 0, 0, 0, g(Yes, No, false, false, "", "アパート")},
-	{0x3301, 0, 0, 0, g(Yes, No, false, false, "", "アルファ")},
-	{0x3302, 0, 0, 0, g(Yes, No, false, false, "", "アンペア")},
-	{0x3303, 0, 0, 0, g(Yes, No, false, false, "", "アール")},
-	{0x3304, 0, 0, 1, g(Yes, No, false, false, "", "イニング")},
-	{0x3305, 0, 0, 0, g(Yes, No, false, false, "", "インチ")},
-	{0x3306, 0, 0, 0, g(Yes, No, false, false, "", "ウォン")},
-	{0x3307, 0, 0, 1, g(Yes, No, false, false, "", "エスクード")},
-	{0x3308, 0, 0, 0, g(Yes, No, false, false, "", "エーカー")},
-	{0x3309, 0, 0, 0, g(Yes, No, false, false, "", "オンス")},
-	{0x330a, 0, 0, 0, g(Yes, No, false, false, "", "オーム")},
-	{0x330b, 0, 0, 0, g(Yes, No, false, false, "", "カイリ")},
-	{0x330c, 0, 0, 0, g(Yes, No, false, false, "", "カラット")},
-	{0x330d, 0, 0, 0, g(Yes, No, false, false, "", "カロリー")},
-	{0x330e, 0, 0, 0, g(Yes, No, false, false, "", "ガロン")},
-	{0x330f, 0, 0, 0, g(Yes, No, false, false, "", "ガンマ")},
-	{0x3310, 0, 0, 1, g(Yes, No, false, false, "", "ギガ")},
-	{0x3311, 0, 0, 0, g(Yes, No, false, false, "", "ギニー")},
-	{0x3312, 0, 0, 0, g(Yes, No, false, false, "", "キュリー")},
-	{0x3313, 0, 0, 0, g(Yes, No, false, false, "", "ギルダー")},
-	{0x3314, 0, 0, 0, g(Yes, No, false, false, "", "キロ")},
-	{0x3315, 0, 0, 0, g(Yes, No, false, false, "", "キログラム")},
-	{0x3316, 0, 0, 0, g(Yes, No, false, false, "", "キロメートル")},
-	{0x3317, 0, 0, 0, g(Yes, No, false, false, "", "キロワット")},
-	{0x3318, 0, 0, 0, g(Yes, No, false, false, "", "グラム")},
-	{0x3319, 0, 0, 0, g(Yes, No, false, false, "", "グラムトン")},
-	{0x331a, 0, 0, 0, g(Yes, No, false, false, "", "クルゼイロ")},
-	{0x331b, 0, 0, 0, g(Yes, No, false, false, "", "クローネ")},
-	{0x331c, 0, 0, 0, g(Yes, No, false, false, "", "ケース")},
-	{0x331d, 0, 0, 0, g(Yes, No, false, false, "", "コルナ")},
-	{0x331e, 0, 0, 1, g(Yes, No, false, false, "", "コーポ")},
-	{0x331f, 0, 0, 0, g(Yes, No, false, false, "", "サイクル")},
-	{0x3320, 0, 0, 0, g(Yes, No, false, false, "", "サンチーム")},
-	{0x3321, 0, 0, 1, g(Yes, No, false, false, "", "シリング")},
-	{0x3322, 0, 0, 0, g(Yes, No, false, false, "", "センチ")},
-	{0x3323, 0, 0, 0, g(Yes, No, false, false, "", "セント")},
-	{0x3324, 0, 0, 0, g(Yes, No, false, false, "", "ダース")},
-	{0x3325, 0, 0, 0, g(Yes, No, false, false, "", "デシ")},
-	{0x3326, 0, 0, 0, g(Yes, No, false, false, "", "ドル")},
-	{0x3327, 0, 0, 0, g(Yes, No, false, false, "", "トン")},
-	{0x3328, 0, 0, 0, g(Yes, No, false, false, "", "ナノ")},
-	{0x3329, 0, 0, 0, g(Yes, No, false, false, "", "ノット")},
-	{0x332a, 0, 0, 0, g(Yes, No, false, false, "", "ハイツ")},
-	{0x332b, 0, 0, 0, g(Yes, No, false, false, "", "パーセント")},
-	{0x332c, 0, 0, 0, g(Yes, No, false, false, "", "パーツ")},
-	{0x332d, 0, 0, 0, g(Yes, No, false, false, "", "バーレル")},
-	{0x332e, 0, 0, 0, g(Yes, No, false, false, "", "ピアストル")},
-	{0x332f, 0, 0, 0, g(Yes, No, false, false, "", "ピクル")},
-	{0x3330, 0, 0, 0, g(Yes, No, false, false, "", "ピコ")},
-	{0x3331, 0, 0, 0, g(Yes, No, false, false, "", "ビル")},
-	{0x3332, 0, 0, 1, g(Yes, No, false, false, "", "ファラッド")},
-	{0x3333, 0, 0, 0, g(Yes, No, false, false, "", "フィート")},
-	{0x3334, 0, 0, 0, g(Yes, No, false, false, "", "ブッシェル")},
-	{0x3335, 0, 0, 0, g(Yes, No, false, false, "", "フラン")},
-	{0x3336, 0, 0, 0, g(Yes, No, false, false, "", "ヘクタール")},
-	{0x3337, 0, 0, 0, g(Yes, No, false, false, "", "ペソ")},
-	{0x3338, 0, 0, 0, g(Yes, No, false, false, "", "ペニヒ")},
-	{0x3339, 0, 0, 0, g(Yes, No, false, false, "", "ヘルツ")},
-	{0x333a, 0, 0, 0, g(Yes, No, false, false, "", "ペンス")},
-	{0x333b, 0, 0, 1, g(Yes, No, false, false, "", "ページ")},
-	{0x333c, 0, 0, 0, g(Yes, No, false, false, "", "ベータ")},
-	{0x333d, 0, 0, 0, g(Yes, No, false, false, "", "ポイント")},
-	{0x333e, 0, 0, 0, g(Yes, No, false, false, "", "ボルト")},
-	{0x333f, 0, 0, 0, g(Yes, No, false, false, "", "ホン")},
-	{0x3340, 0, 0, 1, g(Yes, No, false, false, "", "ポンド")},
-	{0x3341, 0, 0, 0, g(Yes, No, false, false, "", "ホール")},
-	{0x3342, 0, 0, 0, g(Yes, No, false, false, "", "ホーン")},
-	{0x3343, 0, 0, 0, g(Yes, No, false, false, "", "マイクロ")},
-	{0x3344, 0, 0, 0, g(Yes, No, false, false, "", "マイル")},
-	{0x3345, 0, 0, 0, g(Yes, No, false, false, "", "マッハ")},
-	{0x3346, 0, 0, 0, g(Yes, No, false, false, "", "マルク")},
-	{0x3347, 0, 0, 0, g(Yes, No, false, false, "", "マンション")},
-	{0x3348, 0, 0, 0, g(Yes, No, false, false, "", "ミクロン")},
-	{0x3349, 0, 0, 0, g(Yes, No, false, false, "", "ミリ")},
-	{0x334a, 0, 0, 0, g(Yes, No, false, false, "", "ミリバール")},
-	{0x334b, 0, 0, 1, g(Yes, No, false, false, "", "メガ")},
-	{0x334c, 0, 0, 0, g(Yes, No, false, false, "", "メガトン")},
-	{0x334d, 0, 0, 0, g(Yes, No, false, false, "", "メートル")},
-	{0x334e, 0, 0, 1, g(Yes, No, false, false, "", "ヤード")},
-	{0x334f, 0, 0, 0, g(Yes, No, false, false, "", "ヤール")},
-	{0x3350, 0, 0, 0, g(Yes, No, false, false, "", "ユアン")},
-	{0x3351, 0, 0, 0, g(Yes, No, false, false, "", "リットル")},
-	{0x3352, 0, 0, 0, g(Yes, No, false, false, "", "リラ")},
-	{0x3353, 0, 0, 0, g(Yes, No, false, false, "", "ルピー")},
-	{0x3354, 0, 0, 0, g(Yes, No, false, false, "", "ルーブル")},
-	{0x3355, 0, 0, 0, g(Yes, No, false, false, "", "レム")},
-	{0x3356, 0, 0, 0, g(Yes, No, false, false, "", "レントゲン")},
-	{0x3357, 0, 0, 0, g(Yes, No, false, false, "", "ワット")},
-	{0x3358, 0, 0, 0, g(Yes, No, false, false, "", "0点")},
-	{0x3359, 0, 0, 0, g(Yes, No, false, false, "", "1点")},
-	{0x335a, 0, 0, 0, g(Yes, No, false, false, "", "2点")},
-	{0x335b, 0, 0, 0, g(Yes, No, false, false, "", "3点")},
-	{0x335c, 0, 0, 0, g(Yes, No, false, false, "", "4点")},
-	{0x335d, 0, 0, 0, g(Yes, No, false, false, "", "5点")},
-	{0x335e, 0, 0, 0, g(Yes, No, false, false, "", "6点")},
-	{0x335f, 0, 0, 0, g(Yes, No, false, false, "", "7点")},
-	{0x3360, 0, 0, 0, g(Yes, No, false, false, "", "8点")},
-	{0x3361, 0, 0, 0, g(Yes, No, false, false, "", "9点")},
-	{0x3362, 0, 0, 0, g(Yes, No, false, false, "", "10点")},
-	{0x3363, 0, 0, 0, g(Yes, No, false, false, "", "11点")},
-	{0x3364, 0, 0, 0, g(Yes, No, false, false, "", "12点")},
-	{0x3365, 0, 0, 0, g(Yes, No, false, false, "", "13点")},
-	{0x3366, 0, 0, 0, g(Yes, No, false, false, "", "14点")},
-	{0x3367, 0, 0, 0, g(Yes, No, false, false, "", "15点")},
-	{0x3368, 0, 0, 0, g(Yes, No, false, false, "", "16点")},
-	{0x3369, 0, 0, 0, g(Yes, No, false, false, "", "17点")},
-	{0x336a, 0, 0, 0, g(Yes, No, false, false, "", "18点")},
-	{0x336b, 0, 0, 0, g(Yes, No, false, false, "", "19点")},
-	{0x336c, 0, 0, 0, g(Yes, No, false, false, "", "20点")},
-	{0x336d, 0, 0, 0, g(Yes, No, false, false, "", "21点")},
-	{0x336e, 0, 0, 0, g(Yes, No, false, false, "", "22点")},
-	{0x336f, 0, 0, 0, g(Yes, No, false, false, "", "23点")},
-	{0x3370, 0, 0, 0, g(Yes, No, false, false, "", "24点")},
-	{0x3371, 0, 0, 0, g(Yes, No, false, false, "", "hPa")},
-	{0x3372, 0, 0, 0, g(Yes, No, false, false, "", "da")},
-	{0x3373, 0, 0, 0, g(Yes, No, false, false, "", "AU")},
-	{0x3374, 0, 0, 0, g(Yes, No, false, false, "", "bar")},
-	{0x3375, 0, 0, 0, g(Yes, No, false, false, "", "oV")},
-	{0x3376, 0, 0, 0, g(Yes, No, false, false, "", "pc")},
-	{0x3377, 0, 0, 0, g(Yes, No, false, false, "", "dm")},
-	{0x3378, 0, 0, 0, g(Yes, No, false, false, "", "dm2")},
-	{0x3379, 0, 0, 0, g(Yes, No, false, false, "", "dm3")},
-	{0x337a, 0, 0, 0, g(Yes, No, false, false, "", "IU")},
-	{0x337b, 0, 0, 0, g(Yes, No, false, false, "", "平成")},
-	{0x337c, 0, 0, 0, g(Yes, No, false, false, "", "昭和")},
-	{0x337d, 0, 0, 0, g(Yes, No, false, false, "", "大正")},
-	{0x337e, 0, 0, 0, g(Yes, No, false, false, "", "明治")},
-	{0x337f, 0, 0, 0, g(Yes, No, false, false, "", "株式会社")},
-	{0x3380, 0, 0, 0, g(Yes, No, false, false, "", "pA")},
-	{0x3381, 0, 0, 0, g(Yes, No, false, false, "", "nA")},
-	{0x3382, 0, 0, 0, g(Yes, No, false, false, "", "μA")},
-	{0x3383, 0, 0, 0, g(Yes, No, false, false, "", "mA")},
-	{0x3384, 0, 0, 0, g(Yes, No, false, false, "", "kA")},
-	{0x3385, 0, 0, 0, g(Yes, No, false, false, "", "KB")},
-	{0x3386, 0, 0, 0, g(Yes, No, false, false, "", "MB")},
-	{0x3387, 0, 0, 0, g(Yes, No, false, false, "", "GB")},
-	{0x3388, 0, 0, 0, g(Yes, No, false, false, "", "cal")},
-	{0x3389, 0, 0, 0, g(Yes, No, false, false, "", "kcal")},
-	{0x338a, 0, 0, 0, g(Yes, No, false, false, "", "pF")},
-	{0x338b, 0, 0, 0, g(Yes, No, false, false, "", "nF")},
-	{0x338c, 0, 0, 0, g(Yes, No, false, false, "", "μF")},
-	{0x338d, 0, 0, 0, g(Yes, No, false, false, "", "μg")},
-	{0x338e, 0, 0, 0, g(Yes, No, false, false, "", "mg")},
-	{0x338f, 0, 0, 0, g(Yes, No, false, false, "", "kg")},
-	{0x3390, 0, 0, 0, g(Yes, No, false, false, "", "Hz")},
-	{0x3391, 0, 0, 0, g(Yes, No, false, false, "", "kHz")},
-	{0x3392, 0, 0, 0, g(Yes, No, false, false, "", "MHz")},
-	{0x3393, 0, 0, 0, g(Yes, No, false, false, "", "GHz")},
-	{0x3394, 0, 0, 0, g(Yes, No, false, false, "", "THz")},
-	{0x3395, 0, 0, 0, g(Yes, No, false, false, "", "μl")},
-	{0x3396, 0, 0, 0, g(Yes, No, false, false, "", "ml")},
-	{0x3397, 0, 0, 0, g(Yes, No, false, false, "", "dl")},
-	{0x3398, 0, 0, 0, g(Yes, No, false, false, "", "kl")},
-	{0x3399, 0, 0, 0, g(Yes, No, false, false, "", "fm")},
-	{0x339a, 0, 0, 0, g(Yes, No, false, false, "", "nm")},
-	{0x339b, 0, 0, 0, g(Yes, No, false, false, "", "μm")},
-	{0x339c, 0, 0, 0, g(Yes, No, false, false, "", "mm")},
-	{0x339d, 0, 0, 0, g(Yes, No, false, false, "", "cm")},
-	{0x339e, 0, 0, 0, g(Yes, No, false, false, "", "km")},
-	{0x339f, 0, 0, 0, g(Yes, No, false, false, "", "mm2")},
-	{0x33a0, 0, 0, 0, g(Yes, No, false, false, "", "cm2")},
-	{0x33a1, 0, 0, 0, g(Yes, No, false, false, "", "m2")},
-	{0x33a2, 0, 0, 0, g(Yes, No, false, false, "", "km2")},
-	{0x33a3, 0, 0, 0, g(Yes, No, false, false, "", "mm3")},
-	{0x33a4, 0, 0, 0, g(Yes, No, false, false, "", "cm3")},
-	{0x33a5, 0, 0, 0, g(Yes, No, false, false, "", "m3")},
-	{0x33a6, 0, 0, 0, g(Yes, No, false, false, "", "km3")},
-	{0x33a7, 0, 0, 0, g(Yes, No, false, false, "", "m∕s")},
-	{0x33a8, 0, 0, 0, g(Yes, No, false, false, "", "m∕s2")},
-	{0x33a9, 0, 0, 0, g(Yes, No, false, false, "", "Pa")},
-	{0x33aa, 0, 0, 0, g(Yes, No, false, false, "", "kPa")},
-	{0x33ab, 0, 0, 0, g(Yes, No, false, false, "", "MPa")},
-	{0x33ac, 0, 0, 0, g(Yes, No, false, false, "", "GPa")},
-	{0x33ad, 0, 0, 0, g(Yes, No, false, false, "", "rad")},
-	{0x33ae, 0, 0, 0, g(Yes, No, false, false, "", "rad∕s")},
-	{0x33af, 0, 0, 0, g(Yes, No, false, false, "", "rad∕s2")},
-	{0x33b0, 0, 0, 0, g(Yes, No, false, false, "", "ps")},
-	{0x33b1, 0, 0, 0, g(Yes, No, false, false, "", "ns")},
-	{0x33b2, 0, 0, 0, g(Yes, No, false, false, "", "μs")},
-	{0x33b3, 0, 0, 0, g(Yes, No, false, false, "", "ms")},
-	{0x33b4, 0, 0, 0, g(Yes, No, false, false, "", "pV")},
-	{0x33b5, 0, 0, 0, g(Yes, No, false, false, "", "nV")},
-	{0x33b6, 0, 0, 0, g(Yes, No, false, false, "", "μV")},
-	{0x33b7, 0, 0, 0, g(Yes, No, false, false, "", "mV")},
-	{0x33b8, 0, 0, 0, g(Yes, No, false, false, "", "kV")},
-	{0x33b9, 0, 0, 0, g(Yes, No, false, false, "", "MV")},
-	{0x33ba, 0, 0, 0, g(Yes, No, false, false, "", "pW")},
-	{0x33bb, 0, 0, 0, g(Yes, No, false, false, "", "nW")},
-	{0x33bc, 0, 0, 0, g(Yes, No, false, false, "", "μW")},
-	{0x33bd, 0, 0, 0, g(Yes, No, false, false, "", "mW")},
-	{0x33be, 0, 0, 0, g(Yes, No, false, false, "", "kW")},
-	{0x33bf, 0, 0, 0, g(Yes, No, false, false, "", "MW")},
-	{0x33c0, 0, 0, 0, g(Yes, No, false, false, "", "kΩ")},
-	{0x33c1, 0, 0, 0, g(Yes, No, false, false, "", "MΩ")},
-	{0x33c2, 0, 0, 0, g(Yes, No, false, false, "", "a.m.")},
-	{0x33c3, 0, 0, 0, g(Yes, No, false, false, "", "Bq")},
-	{0x33c4, 0, 0, 0, g(Yes, No, false, false, "", "cc")},
-	{0x33c5, 0, 0, 0, g(Yes, No, false, false, "", "cd")},
-	{0x33c6, 0, 0, 0, g(Yes, No, false, false, "", "C∕kg")},
-	{0x33c7, 0, 0, 0, g(Yes, No, false, false, "", "Co.")},
-	{0x33c8, 0, 0, 0, g(Yes, No, false, false, "", "dB")},
-	{0x33c9, 0, 0, 0, g(Yes, No, false, false, "", "Gy")},
-	{0x33ca, 0, 0, 0, g(Yes, No, false, false, "", "ha")},
-	{0x33cb, 0, 0, 0, g(Yes, No, false, false, "", "HP")},
-	{0x33cc, 0, 0, 0, g(Yes, No, false, false, "", "in")},
-	{0x33cd, 0, 0, 0, g(Yes, No, false, false, "", "KK")},
-	{0x33ce, 0, 0, 0, g(Yes, No, false, false, "", "KM")},
-	{0x33cf, 0, 0, 0, g(Yes, No, false, false, "", "kt")},
-	{0x33d0, 0, 0, 0, g(Yes, No, false, false, "", "lm")},
-	{0x33d1, 0, 0, 0, g(Yes, No, false, false, "", "ln")},
-	{0x33d2, 0, 0, 0, g(Yes, No, false, false, "", "log")},
-	{0x33d3, 0, 0, 0, g(Yes, No, false, false, "", "lx")},
-	{0x33d4, 0, 0, 0, g(Yes, No, false, false, "", "mb")},
-	{0x33d5, 0, 0, 0, g(Yes, No, false, false, "", "mil")},
-	{0x33d6, 0, 0, 0, g(Yes, No, false, false, "", "mol")},
-	{0x33d7, 0, 0, 0, g(Yes, No, false, false, "", "PH")},
-	{0x33d8, 0, 0, 0, g(Yes, No, false, false, "", "p.m.")},
-	{0x33d9, 0, 0, 0, g(Yes, No, false, false, "", "PPM")},
-	{0x33da, 0, 0, 0, g(Yes, No, false, false, "", "PR")},
-	{0x33db, 0, 0, 0, g(Yes, No, false, false, "", "sr")},
-	{0x33dc, 0, 0, 0, g(Yes, No, false, false, "", "Sv")},
-	{0x33dd, 0, 0, 0, g(Yes, No, false, false, "", "Wb")},
-	{0x33de, 0, 0, 0, g(Yes, No, false, false, "", "V∕m")},
-	{0x33df, 0, 0, 0, g(Yes, No, false, false, "", "A∕m")},
-	{0x33e0, 0, 0, 0, g(Yes, No, false, false, "", "1日")},
-	{0x33e1, 0, 0, 0, g(Yes, No, false, false, "", "2日")},
-	{0x33e2, 0, 0, 0, g(Yes, No, false, false, "", "3日")},
-	{0x33e3, 0, 0, 0, g(Yes, No, false, false, "", "4日")},
-	{0x33e4, 0, 0, 0, g(Yes, No, false, false, "", "5日")},
-	{0x33e5, 0, 0, 0, g(Yes, No, false, false, "", "6日")},
-	{0x33e6, 0, 0, 0, g(Yes, No, false, false, "", "7日")},
-	{0x33e7, 0, 0, 0, g(Yes, No, false, false, "", "8日")},
-	{0x33e8, 0, 0, 0, g(Yes, No, false, false, "", "9日")},
-	{0x33e9, 0, 0, 0, g(Yes, No, false, false, "", "10日")},
-	{0x33ea, 0, 0, 0, g(Yes, No, false, false, "", "11日")},
-	{0x33eb, 0, 0, 0, g(Yes, No, false, false, "", "12日")},
-	{0x33ec, 0, 0, 0, g(Yes, No, false, false, "", "13日")},
-	{0x33ed, 0, 0, 0, g(Yes, No, false, false, "", "14日")},
-	{0x33ee, 0, 0, 0, g(Yes, No, false, false, "", "15日")},
-	{0x33ef, 0, 0, 0, g(Yes, No, false, false, "", "16日")},
-	{0x33f0, 0, 0, 0, g(Yes, No, false, false, "", "17日")},
-	{0x33f1, 0, 0, 0, g(Yes, No, false, false, "", "18日")},
-	{0x33f2, 0, 0, 0, g(Yes, No, false, false, "", "19日")},
-	{0x33f3, 0, 0, 0, g(Yes, No, false, false, "", "20日")},
-	{0x33f4, 0, 0, 0, g(Yes, No, false, false, "", "21日")},
-	{0x33f5, 0, 0, 0, g(Yes, No, false, false, "", "22日")},
-	{0x33f6, 0, 0, 0, g(Yes, No, false, false, "", "23日")},
-	{0x33f7, 0, 0, 0, g(Yes, No, false, false, "", "24日")},
-	{0x33f8, 0, 0, 0, g(Yes, No, false, false, "", "25日")},
-	{0x33f9, 0, 0, 0, g(Yes, No, false, false, "", "26日")},
-	{0x33fa, 0, 0, 0, g(Yes, No, false, false, "", "27日")},
-	{0x33fb, 0, 0, 0, g(Yes, No, false, false, "", "28日")},
-	{0x33fc, 0, 0, 0, g(Yes, No, false, false, "", "29日")},
-	{0x33fd, 0, 0, 0, g(Yes, No, false, false, "", "30日")},
-	{0x33fe, 0, 0, 0, g(Yes, No, false, false, "", "31日")},
-	{0x33ff, 0, 0, 0, g(Yes, No, false, false, "", "gal")},
-	{0x3400, 0, 0, 0, f(Yes, false, "")},
-	{0xa66f, 230, 1, 1, f(Yes, false, "")},
-	{0xa670, 0, 0, 0, f(Yes, false, "")},
-	{0xa674, 230, 1, 1, f(Yes, false, "")},
-	{0xa67e, 0, 0, 0, f(Yes, false, "")},
-	{0xa69c, 0, 0, 0, g(Yes, No, false, false, "", "ъ")},
-	{0xa69d, 0, 0, 0, g(Yes, No, false, false, "", "ь")},
-	{0xa69e, 230, 1, 1, f(Yes, false, "")},
-	{0xa6a0, 0, 0, 0, f(Yes, false, "")},
-	{0xa6f0, 230, 1, 1, f(Yes, false, "")},
-	{0xa6f2, 0, 0, 0, f(Yes, false, "")},
-	{0xa770, 0, 0, 0, g(Yes, No, false, false, "", "ꝯ")},
-	{0xa771, 0, 0, 0, f(Yes, false, "")},
-	{0xa7f8, 0, 0, 0, g(Yes, No, false, false, "", "Ħ")},
-	{0xa7f9, 0, 0, 0, g(Yes, No, false, false, "", "œ")},
-	{0xa7fa, 0, 0, 0, f(Yes, false, "")},
-	{0xa806, 9, 1, 1, f(Yes, false, "")},
-	{0xa807, 0, 0, 0, f(Yes, false, "")},
-	{0xa8c4, 9, 1, 1, f(Yes, false, "")},
-	{0xa8c5, 0, 0, 0, f(Yes, false, "")},
-	{0xa8e0, 230, 1, 1, f(Yes, false, "")},
-	{0xa8f2, 0, 0, 0, f(Yes, false, "")},
-	{0xa92b, 220, 1, 1, f(Yes, false, "")},
-	{0xa92e, 0, 0, 0, f(Yes, false, "")},
-	{0xa953, 9, 1, 1, f(Yes, false, "")},
-	{0xa954, 0, 0, 0, f(Yes, false, "")},
-	{0xa9b3, 7, 1, 1, f(Yes, false, "")},
-	{0xa9b4, 0, 0, 0, f(Yes, false, "")},
-	{0xa9c0, 9, 1, 1, f(Yes, false, "")},
-	{0xa9c1, 0, 0, 0, f(Yes, false, "")},
-	{0xaab0, 230, 1, 1, f(Yes, false, "")},
-	{0xaab1, 0, 0, 0, f(Yes, false, "")},
-	{0xaab2, 230, 1, 1, f(Yes, false, "")},
-	{0xaab4, 220, 1, 1, f(Yes, false, "")},
-	{0xaab5, 0, 0, 0, f(Yes, false, "")},
-	{0xaab7, 230, 1, 1, f(Yes, false, "")},
-	{0xaab9, 0, 0, 0, f(Yes, false, "")},
-	{0xaabe, 230, 1, 1, f(Yes, false, "")},
-	{0xaac0, 0, 0, 0, f(Yes, false, "")},
-	{0xaac1, 230, 1, 1, f(Yes, false, "")},
-	{0xaac2, 0, 0, 0, f(Yes, false, "")},
-	{0xaaf6, 9, 1, 1, f(Yes, false, "")},
-	{0xaaf7, 0, 0, 0, f(Yes, false, "")},
-	{0xab5c, 0, 0, 0, g(Yes, No, false, false, "", "ꜧ")},
-	{0xab5d, 0, 0, 0, g(Yes, No, false, false, "", "ꬷ")},
-	{0xab5e, 0, 0, 0, g(Yes, No, false, false, "", "ɫ")},
-	{0xab5f, 0, 0, 0, g(Yes, No, false, false, "", "ꭒ")},
-	{0xab60, 0, 0, 0, f(Yes, false, "")},
-	{0xabed, 9, 1, 1, f(Yes, false, "")},
-	{0xabee, 0, 0, 0, f(Yes, false, "")},
-	{0xac00, 0, 0, 1, f(Yes, true, "")},
-	{0xac01, 0, 0, 2, f(Yes, false, "")},
-	{0xac1c, 0, 0, 1, f(Yes, true, "")},
-	{0xac1d, 0, 0, 2, f(Yes, false, "")},
-	{0xac38, 0, 0, 1, f(Yes, true, "")},
-	{0xac39, 0, 0, 2, f(Yes, false, "")},
-	{0xac54, 0, 0, 1, f(Yes, true, "")},
-	{0xac55, 0, 0, 2, f(Yes, false, "")},
-	{0xac70, 0, 0, 1, f(Yes, true, "")},
-	{0xac71, 0, 0, 2, f(Yes, false, "")},
-	{0xac8c, 0, 0, 1, f(Yes, true, "")},
-	{0xac8d, 0, 0, 2, f(Yes, false, "")},
-	{0xaca8, 0, 0, 1, f(Yes, true, "")},
-	{0xaca9, 0, 0, 2, f(Yes, false, "")},
-	{0xacc4, 0, 0, 1, f(Yes, true, "")},
-	{0xacc5, 0, 0, 2, f(Yes, false, "")},
-	{0xace0, 0, 0, 1, f(Yes, true, "")},
-	{0xace1, 0, 0, 2, f(Yes, false, "")},
-	{0xacfc, 0, 0, 1, f(Yes, true, "")},
-	{0xacfd, 0, 0, 2, f(Yes, false, "")},
-	{0xad18, 0, 0, 1, f(Yes, true, "")},
-	{0xad19, 0, 0, 2, f(Yes, false, "")},
-	{0xad34, 0, 0, 1, f(Yes, true, "")},
-	{0xad35, 0, 0, 2, f(Yes, false, "")},
-	{0xad50, 0, 0, 1, f(Yes, true, "")},
-	{0xad51, 0, 0, 2, f(Yes, false, "")},
-	{0xad6c, 0, 0, 1, f(Yes, true, "")},
-	{0xad6d, 0, 0, 2, f(Yes, false, "")},
-	{0xad88, 0, 0, 1, f(Yes, true, "")},
-	{0xad89, 0, 0, 2, f(Yes, false, "")},
-	{0xada4, 0, 0, 1, f(Yes, true, "")},
-	{0xada5, 0, 0, 2, f(Yes, false, "")},
-	{0xadc0, 0, 0, 1, f(Yes, true, "")},
-	{0xadc1, 0, 0, 2, f(Yes, false, "")},
-	{0xaddc, 0, 0, 1, f(Yes, true, "")},
-	{0xaddd, 0, 0, 2, f(Yes, false, "")},
-	{0xadf8, 0, 0, 1, f(Yes, true, "")},
-	{0xadf9, 0, 0, 2, f(Yes, false, "")},
-	{0xae14, 0, 0, 1, f(Yes, true, "")},
-	{0xae15, 0, 0, 2, f(Yes, false, "")},
-	{0xae30, 0, 0, 1, f(Yes, true, "")},
-	{0xae31, 0, 0, 2, f(Yes, false, "")},
-	{0xae4c, 0, 0, 1, f(Yes, true, "")},
-	{0xae4d, 0, 0, 2, f(Yes, false, "")},
-	{0xae68, 0, 0, 1, f(Yes, true, "")},
-	{0xae69, 0, 0, 2, f(Yes, false, "")},
-	{0xae84, 0, 0, 1, f(Yes, true, "")},
-	{0xae85, 0, 0, 2, f(Yes, false, "")},
-	{0xaea0, 0, 0, 1, f(Yes, true, "")},
-	{0xaea1, 0, 0, 2, f(Yes, false, "")},
-	{0xaebc, 0, 0, 1, f(Yes, true, "")},
-	{0xaebd, 0, 0, 2, f(Yes, false, "")},
-	{0xaed8, 0, 0, 1, f(Yes, true, "")},
-	{0xaed9, 0, 0, 2, f(Yes, false, "")},
-	{0xaef4, 0, 0, 1, f(Yes, true, "")},
-	{0xaef5, 0, 0, 2, f(Yes, false, "")},
-	{0xaf10, 0, 0, 1, f(Yes, true, "")},
-	{0xaf11, 0, 0, 2, f(Yes, false, "")},
-	{0xaf2c, 0, 0, 1, f(Yes, true, "")},
-	{0xaf2d, 0, 0, 2, f(Yes, false, "")},
-	{0xaf48, 0, 0, 1, f(Yes, true, "")},
-	{0xaf49, 0, 0, 2, f(Yes, false, "")},
-	{0xaf64, 0, 0, 1, f(Yes, true, "")},
-	{0xaf65, 0, 0, 2, f(Yes, false, "")},
-	{0xaf80, 0, 0, 1, f(Yes, true, "")},
-	{0xaf81, 0, 0, 2, f(Yes, false, "")},
-	{0xaf9c, 0, 0, 1, f(Yes, true, "")},
-	{0xaf9d, 0, 0, 2, f(Yes, false, "")},
-	{0xafb8, 0, 0, 1, f(Yes, true, "")},
-	{0xafb9, 0, 0, 2, f(Yes, false, "")},
-	{0xafd4, 0, 0, 1, f(Yes, true, "")},
-	{0xafd5, 0, 0, 2, f(Yes, false, "")},
-	{0xaff0, 0, 0, 1, f(Yes, true, "")},
-	{0xaff1, 0, 0, 2, f(Yes, false, "")},
-	{0xb00c, 0, 0, 1, f(Yes, true, "")},
-	{0xb00d, 0, 0, 2, f(Yes, false, "")},
-	{0xb028, 0, 0, 1, f(Yes, true, "")},
-	{0xb029, 0, 0, 2, f(Yes, false, "")},
-	{0xb044, 0, 0, 1, f(Yes, true, "")},
-	{0xb045, 0, 0, 2, f(Yes, false, "")},
-	{0xb060, 0, 0, 1, f(Yes, true, "")},
-	{0xb061, 0, 0, 2, f(Yes, false, "")},
-	{0xb07c, 0, 0, 1, f(Yes, true, "")},
-	{0xb07d, 0, 0, 2, f(Yes, false, "")},
-	{0xb098, 0, 0, 1, f(Yes, true, "")},
-	{0xb099, 0, 0, 2, f(Yes, false, "")},
-	{0xb0b4, 0, 0, 1, f(Yes, true, "")},
-	{0xb0b5, 0, 0, 2, f(Yes, false, "")},
-	{0xb0d0, 0, 0, 1, f(Yes, true, "")},
-	{0xb0d1, 0, 0, 2, f(Yes, false, "")},
-	{0xb0ec, 0, 0, 1, f(Yes, true, "")},
-	{0xb0ed, 0, 0, 2, f(Yes, false, "")},
-	{0xb108, 0, 0, 1, f(Yes, true, "")},
-	{0xb109, 0, 0, 2, f(Yes, false, "")},
-	{0xb124, 0, 0, 1, f(Yes, true, "")},
-	{0xb125, 0, 0, 2, f(Yes, false, "")},
-	{0xb140, 0, 0, 1, f(Yes, true, "")},
-	{0xb141, 0, 0, 2, f(Yes, false, "")},
-	{0xb15c, 0, 0, 1, f(Yes, true, "")},
-	{0xb15d, 0, 0, 2, f(Yes, false, "")},
-	{0xb178, 0, 0, 1, f(Yes, true, "")},
-	{0xb179, 0, 0, 2, f(Yes, false, "")},
-	{0xb194, 0, 0, 1, f(Yes, true, "")},
-	{0xb195, 0, 0, 2, f(Yes, false, "")},
-	{0xb1b0, 0, 0, 1, f(Yes, true, "")},
-	{0xb1b1, 0, 0, 2, f(Yes, false, "")},
-	{0xb1cc, 0, 0, 1, f(Yes, true, "")},
-	{0xb1cd, 0, 0, 2, f(Yes, false, "")},
-	{0xb1e8, 0, 0, 1, f(Yes, true, "")},
-	{0xb1e9, 0, 0, 2, f(Yes, false, "")},
-	{0xb204, 0, 0, 1, f(Yes, true, "")},
-	{0xb205, 0, 0, 2, f(Yes, false, "")},
-	{0xb220, 0, 0, 1, f(Yes, true, "")},
-	{0xb221, 0, 0, 2, f(Yes, false, "")},
-	{0xb23c, 0, 0, 1, f(Yes, true, "")},
-	{0xb23d, 0, 0, 2, f(Yes, false, "")},
-	{0xb258, 0, 0, 1, f(Yes, true, "")},
-	{0xb259, 0, 0, 2, f(Yes, false, "")},
-	{0xb274, 0, 0, 1, f(Yes, true, "")},
-	{0xb275, 0, 0, 2, f(Yes, false, "")},
-	{0xb290, 0, 0, 1, f(Yes, true, "")},
-	{0xb291, 0, 0, 2, f(Yes, false, "")},
-	{0xb2ac, 0, 0, 1, f(Yes, true, "")},
-	{0xb2ad, 0, 0, 2, f(Yes, false, "")},
-	{0xb2c8, 0, 0, 1, f(Yes, true, "")},
-	{0xb2c9, 0, 0, 2, f(Yes, false, "")},
-	{0xb2e4, 0, 0, 1, f(Yes, true, "")},
-	{0xb2e5, 0, 0, 2, f(Yes, false, "")},
-	{0xb300, 0, 0, 1, f(Yes, true, "")},
-	{0xb301, 0, 0, 2, f(Yes, false, "")},
-	{0xb31c, 0, 0, 1, f(Yes, true, "")},
-	{0xb31d, 0, 0, 2, f(Yes, false, "")},
-	{0xb338, 0, 0, 1, f(Yes, true, "")},
-	{0xb339, 0, 0, 2, f(Yes, false, "")},
-	{0xb354, 0, 0, 1, f(Yes, true, "")},
-	{0xb355, 0, 0, 2, f(Yes, false, "")},
-	{0xb370, 0, 0, 1, f(Yes, true, "")},
-	{0xb371, 0, 0, 2, f(Yes, false, "")},
-	{0xb38c, 0, 0, 1, f(Yes, true, "")},
-	{0xb38d, 0, 0, 2, f(Yes, false, "")},
-	{0xb3a8, 0, 0, 1, f(Yes, true, "")},
-	{0xb3a9, 0, 0, 2, f(Yes, false, "")},
-	{0xb3c4, 0, 0, 1, f(Yes, true, "")},
-	{0xb3c5, 0, 0, 2, f(Yes, false, "")},
-	{0xb3e0, 0, 0, 1, f(Yes, true, "")},
-	{0xb3e1, 0, 0, 2, f(Yes, false, "")},
-	{0xb3fc, 0, 0, 1, f(Yes, true, "")},
-	{0xb3fd, 0, 0, 2, f(Yes, false, "")},
-	{0xb418, 0, 0, 1, f(Yes, true, "")},
-	{0xb419, 0, 0, 2, f(Yes, false, "")},
-	{0xb434, 0, 0, 1, f(Yes, true, "")},
-	{0xb435, 0, 0, 2, f(Yes, false, "")},
-	{0xb450, 0, 0, 1, f(Yes, true, "")},
-	{0xb451, 0, 0, 2, f(Yes, false, "")},
-	{0xb46c, 0, 0, 1, f(Yes, true, "")},
-	{0xb46d, 0, 0, 2, f(Yes, false, "")},
-	{0xb488, 0, 0, 1, f(Yes, true, "")},
-	{0xb489, 0, 0, 2, f(Yes, false, "")},
-	{0xb4a4, 0, 0, 1, f(Yes, true, "")},
-	{0xb4a5, 0, 0, 2, f(Yes, false, "")},
-	{0xb4c0, 0, 0, 1, f(Yes, true, "")},
-	{0xb4c1, 0, 0, 2, f(Yes, false, "")},
-	{0xb4dc, 0, 0, 1, f(Yes, true, "")},
-	{0xb4dd, 0, 0, 2, f(Yes, false, "")},
-	{0xb4f8, 0, 0, 1, f(Yes, true, "")},
-	{0xb4f9, 0, 0, 2, f(Yes, false, "")},
-	{0xb514, 0, 0, 1, f(Yes, true, "")},
-	{0xb515, 0, 0, 2, f(Yes, false, "")},
-	{0xb530, 0, 0, 1, f(Yes, true, "")},
-	{0xb531, 0, 0, 2, f(Yes, false, "")},
-	{0xb54c, 0, 0, 1, f(Yes, true, "")},
-	{0xb54d, 0, 0, 2, f(Yes, false, "")},
-	{0xb568, 0, 0, 1, f(Yes, true, "")},
-	{0xb569, 0, 0, 2, f(Yes, false, "")},
-	{0xb584, 0, 0, 1, f(Yes, true, "")},
-	{0xb585, 0, 0, 2, f(Yes, false, "")},
-	{0xb5a0, 0, 0, 1, f(Yes, true, "")},
-	{0xb5a1, 0, 0, 2, f(Yes, false, "")},
-	{0xb5bc, 0, 0, 1, f(Yes, true, "")},
-	{0xb5bd, 0, 0, 2, f(Yes, false, "")},
-	{0xb5d8, 0, 0, 1, f(Yes, true, "")},
-	{0xb5d9, 0, 0, 2, f(Yes, false, "")},
-	{0xb5f4, 0, 0, 1, f(Yes, true, "")},
-	{0xb5f5, 0, 0, 2, f(Yes, false, "")},
-	{0xb610, 0, 0, 1, f(Yes, true, "")},
-	{0xb611, 0, 0, 2, f(Yes, false, "")},
-	{0xb62c, 0, 0, 1, f(Yes, true, "")},
-	{0xb62d, 0, 0, 2, f(Yes, false, "")},
-	{0xb648, 0, 0, 1, f(Yes, true, "")},
-	{0xb649, 0, 0, 2, f(Yes, false, "")},
-	{0xb664, 0, 0, 1, f(Yes, true, "")},
-	{0xb665, 0, 0, 2, f(Yes, false, "")},
-	{0xb680, 0, 0, 1, f(Yes, true, "")},
-	{0xb681, 0, 0, 2, f(Yes, false, "")},
-	{0xb69c, 0, 0, 1, f(Yes, true, "")},
-	{0xb69d, 0, 0, 2, f(Yes, false, "")},
-	{0xb6b8, 0, 0, 1, f(Yes, true, "")},
-	{0xb6b9, 0, 0, 2, f(Yes, false, "")},
-	{0xb6d4, 0, 0, 1, f(Yes, true, "")},
-	{0xb6d5, 0, 0, 2, f(Yes, false, "")},
-	{0xb6f0, 0, 0, 1, f(Yes, true, "")},
-	{0xb6f1, 0, 0, 2, f(Yes, false, "")},
-	{0xb70c, 0, 0, 1, f(Yes, true, "")},
-	{0xb70d, 0, 0, 2, f(Yes, false, "")},
-	{0xb728, 0, 0, 1, f(Yes, true, "")},
-	{0xb729, 0, 0, 2, f(Yes, false, "")},
-	{0xb744, 0, 0, 1, f(Yes, true, "")},
-	{0xb745, 0, 0, 2, f(Yes, false, "")},
-	{0xb760, 0, 0, 1, f(Yes, true, "")},
-	{0xb761, 0, 0, 2, f(Yes, false, "")},
-	{0xb77c, 0, 0, 1, f(Yes, true, "")},
-	{0xb77d, 0, 0, 2, f(Yes, false, "")},
-	{0xb798, 0, 0, 1, f(Yes, true, "")},
-	{0xb799, 0, 0, 2, f(Yes, false, "")},
-	{0xb7b4, 0, 0, 1, f(Yes, true, "")},
-	{0xb7b5, 0, 0, 2, f(Yes, false, "")},
-	{0xb7d0, 0, 0, 1, f(Yes, true, "")},
-	{0xb7d1, 0, 0, 2, f(Yes, false, "")},
-	{0xb7ec, 0, 0, 1, f(Yes, true, "")},
-	{0xb7ed, 0, 0, 2, f(Yes, false, "")},
-	{0xb808, 0, 0, 1, f(Yes, true, "")},
-	{0xb809, 0, 0, 2, f(Yes, false, "")},
-	{0xb824, 0, 0, 1, f(Yes, true, "")},
-	{0xb825, 0, 0, 2, f(Yes, false, "")},
-	{0xb840, 0, 0, 1, f(Yes, true, "")},
-	{0xb841, 0, 0, 2, f(Yes, false, "")},
-	{0xb85c, 0, 0, 1, f(Yes, true, "")},
-	{0xb85d, 0, 0, 2, f(Yes, false, "")},
-	{0xb878, 0, 0, 1, f(Yes, true, "")},
-	{0xb879, 0, 0, 2, f(Yes, false, "")},
-	{0xb894, 0, 0, 1, f(Yes, true, "")},
-	{0xb895, 0, 0, 2, f(Yes, false, "")},
-	{0xb8b0, 0, 0, 1, f(Yes, true, "")},
-	{0xb8b1, 0, 0, 2, f(Yes, false, "")},
-	{0xb8cc, 0, 0, 1, f(Yes, true, "")},
-	{0xb8cd, 0, 0, 2, f(Yes, false, "")},
-	{0xb8e8, 0, 0, 1, f(Yes, true, "")},
-	{0xb8e9, 0, 0, 2, f(Yes, false, "")},
-	{0xb904, 0, 0, 1, f(Yes, true, "")},
-	{0xb905, 0, 0, 2, f(Yes, false, "")},
-	{0xb920, 0, 0, 1, f(Yes, true, "")},
-	{0xb921, 0, 0, 2, f(Yes, false, "")},
-	{0xb93c, 0, 0, 1, f(Yes, true, "")},
-	{0xb93d, 0, 0, 2, f(Yes, false, "")},
-	{0xb958, 0, 0, 1, f(Yes, true, "")},
-	{0xb959, 0, 0, 2, f(Yes, false, "")},
-	{0xb974, 0, 0, 1, f(Yes, true, "")},
-	{0xb975, 0, 0, 2, f(Yes, false, "")},
-	{0xb990, 0, 0, 1, f(Yes, true, "")},
-	{0xb991, 0, 0, 2, f(Yes, false, "")},
-	{0xb9ac, 0, 0, 1, f(Yes, true, "")},
-	{0xb9ad, 0, 0, 2, f(Yes, false, "")},
-	{0xb9c8, 0, 0, 1, f(Yes, true, "")},
-	{0xb9c9, 0, 0, 2, f(Yes, false, "")},
-	{0xb9e4, 0, 0, 1, f(Yes, true, "")},
-	{0xb9e5, 0, 0, 2, f(Yes, false, "")},
-	{0xba00, 0, 0, 1, f(Yes, true, "")},
-	{0xba01, 0, 0, 2, f(Yes, false, "")},
-	{0xba1c, 0, 0, 1, f(Yes, true, "")},
-	{0xba1d, 0, 0, 2, f(Yes, false, "")},
-	{0xba38, 0, 0, 1, f(Yes, true, "")},
-	{0xba39, 0, 0, 2, f(Yes, false, "")},
-	{0xba54, 0, 0, 1, f(Yes, true, "")},
-	{0xba55, 0, 0, 2, f(Yes, false, "")},
-	{0xba70, 0, 0, 1, f(Yes, true, "")},
-	{0xba71, 0, 0, 2, f(Yes, false, "")},
-	{0xba8c, 0, 0, 1, f(Yes, true, "")},
-	{0xba8d, 0, 0, 2, f(Yes, false, "")},
-	{0xbaa8, 0, 0, 1, f(Yes, true, "")},
-	{0xbaa9, 0, 0, 2, f(Yes, false, "")},
-	{0xbac4, 0, 0, 1, f(Yes, true, "")},
-	{0xbac5, 0, 0, 2, f(Yes, false, "")},
-	{0xbae0, 0, 0, 1, f(Yes, true, "")},
-	{0xbae1, 0, 0, 2, f(Yes, false, "")},
-	{0xbafc, 0, 0, 1, f(Yes, true, "")},
-	{0xbafd, 0, 0, 2, f(Yes, false, "")},
-	{0xbb18, 0, 0, 1, f(Yes, true, "")},
-	{0xbb19, 0, 0, 2, f(Yes, false, "")},
-	{0xbb34, 0, 0, 1, f(Yes, true, "")},
-	{0xbb35, 0, 0, 2, f(Yes, false, "")},
-	{0xbb50, 0, 0, 1, f(Yes, true, "")},
-	{0xbb51, 0, 0, 2, f(Yes, false, "")},
-	{0xbb6c, 0, 0, 1, f(Yes, true, "")},
-	{0xbb6d, 0, 0, 2, f(Yes, false, "")},
-	{0xbb88, 0, 0, 1, f(Yes, true, "")},
-	{0xbb89, 0, 0, 2, f(Yes, false, "")},
-	{0xbba4, 0, 0, 1, f(Yes, true, "")},
-	{0xbba5, 0, 0, 2, f(Yes, false, "")},
-	{0xbbc0, 0, 0, 1, f(Yes, true, "")},
-	{0xbbc1, 0, 0, 2, f(Yes, false, "")},
-	{0xbbdc, 0, 0, 1, f(Yes, true, "")},
-	{0xbbdd, 0, 0, 2, f(Yes, false, "")},
-	{0xbbf8, 0, 0, 1, f(Yes, true, "")},
-	{0xbbf9, 0, 0, 2, f(Yes, false, "")},
-	{0xbc14, 0, 0, 1, f(Yes, true, "")},
-	{0xbc15, 0, 0, 2, f(Yes, false, "")},
-	{0xbc30, 0, 0, 1, f(Yes, true, "")},
-	{0xbc31, 0, 0, 2, f(Yes, false, "")},
-	{0xbc4c, 0, 0, 1, f(Yes, true, "")},
-	{0xbc4d, 0, 0, 2, f(Yes, false, "")},
-	{0xbc68, 0, 0, 1, f(Yes, true, "")},
-	{0xbc69, 0, 0, 2, f(Yes, false, "")},
-	{0xbc84, 0, 0, 1, f(Yes, true, "")},
-	{0xbc85, 0, 0, 2, f(Yes, false, "")},
-	{0xbca0, 0, 0, 1, f(Yes, true, "")},
-	{0xbca1, 0, 0, 2, f(Yes, false, "")},
-	{0xbcbc, 0, 0, 1, f(Yes, true, "")},
-	{0xbcbd, 0, 0, 2, f(Yes, false, "")},
-	{0xbcd8, 0, 0, 1, f(Yes, true, "")},
-	{0xbcd9, 0, 0, 2, f(Yes, false, "")},
-	{0xbcf4, 0, 0, 1, f(Yes, true, "")},
-	{0xbcf5, 0, 0, 2, f(Yes, false, "")},
-	{0xbd10, 0, 0, 1, f(Yes, true, "")},
-	{0xbd11, 0, 0, 2, f(Yes, false, "")},
-	{0xbd2c, 0, 0, 1, f(Yes, true, "")},
-	{0xbd2d, 0, 0, 2, f(Yes, false, "")},
-	{0xbd48, 0, 0, 1, f(Yes, true, "")},
-	{0xbd49, 0, 0, 2, f(Yes, false, "")},
-	{0xbd64, 0, 0, 1, f(Yes, true, "")},
-	{0xbd65, 0, 0, 2, f(Yes, false, "")},
-	{0xbd80, 0, 0, 1, f(Yes, true, "")},
-	{0xbd81, 0, 0, 2, f(Yes, false, "")},
-	{0xbd9c, 0, 0, 1, f(Yes, true, "")},
-	{0xbd9d, 0, 0, 2, f(Yes, false, "")},
-	{0xbdb8, 0, 0, 1, f(Yes, true, "")},
-	{0xbdb9, 0, 0, 2, f(Yes, false, "")},
-	{0xbdd4, 0, 0, 1, f(Yes, true, "")},
-	{0xbdd5, 0, 0, 2, f(Yes, false, "")},
-	{0xbdf0, 0, 0, 1, f(Yes, true, "")},
-	{0xbdf1, 0, 0, 2, f(Yes, false, "")},
-	{0xbe0c, 0, 0, 1, f(Yes, true, "")},
-	{0xbe0d, 0, 0, 2, f(Yes, false, "")},
-	{0xbe28, 0, 0, 1, f(Yes, true, "")},
-	{0xbe29, 0, 0, 2, f(Yes, false, "")},
-	{0xbe44, 0, 0, 1, f(Yes, true, "")},
-	{0xbe45, 0, 0, 2, f(Yes, false, "")},
-	{0xbe60, 0, 0, 1, f(Yes, true, "")},
-	{0xbe61, 0, 0, 2, f(Yes, false, "")},
-	{0xbe7c, 0, 0, 1, f(Yes, true, "")},
-	{0xbe7d, 0, 0, 2, f(Yes, false, "")},
-	{0xbe98, 0, 0, 1, f(Yes, true, "")},
-	{0xbe99, 0, 0, 2, f(Yes, false, "")},
-	{0xbeb4, 0, 0, 1, f(Yes, true, "")},
-	{0xbeb5, 0, 0, 2, f(Yes, false, "")},
-	{0xbed0, 0, 0, 1, f(Yes, true, "")},
-	{0xbed1, 0, 0, 2, f(Yes, false, "")},
-	{0xbeec, 0, 0, 1, f(Yes, true, "")},
-	{0xbeed, 0, 0, 2, f(Yes, false, "")},
-	{0xbf08, 0, 0, 1, f(Yes, true, "")},
-	{0xbf09, 0, 0, 2, f(Yes, false, "")},
-	{0xbf24, 0, 0, 1, f(Yes, true, "")},
-	{0xbf25, 0, 0, 2, f(Yes, false, "")},
-	{0xbf40, 0, 0, 1, f(Yes, true, "")},
-	{0xbf41, 0, 0, 2, f(Yes, false, "")},
-	{0xbf5c, 0, 0, 1, f(Yes, true, "")},
-	{0xbf5d, 0, 0, 2, f(Yes, false, "")},
-	{0xbf78, 0, 0, 1, f(Yes, true, "")},
-	{0xbf79, 0, 0, 2, f(Yes, false, "")},
-	{0xbf94, 0, 0, 1, f(Yes, true, "")},
-	{0xbf95, 0, 0, 2, f(Yes, false, "")},
-	{0xbfb0, 0, 0, 1, f(Yes, true, "")},
-	{0xbfb1, 0, 0, 2, f(Yes, false, "")},
-	{0xbfcc, 0, 0, 1, f(Yes, true, "")},
-	{0xbfcd, 0, 0, 2, f(Yes, false, "")},
-	{0xbfe8, 0, 0, 1, f(Yes, true, "")},
-	{0xbfe9, 0, 0, 2, f(Yes, false, "")},
-	{0xc004, 0, 0, 1, f(Yes, true, "")},
-	{0xc005, 0, 0, 2, f(Yes, false, "")},
-	{0xc020, 0, 0, 1, f(Yes, true, "")},
-	{0xc021, 0, 0, 2, f(Yes, false, "")},
-	{0xc03c, 0, 0, 1, f(Yes, true, "")},
-	{0xc03d, 0, 0, 2, f(Yes, false, "")},
-	{0xc058, 0, 0, 1, f(Yes, true, "")},
-	{0xc059, 0, 0, 2, f(Yes, false, "")},
-	{0xc074, 0, 0, 1, f(Yes, true, "")},
-	{0xc075, 0, 0, 2, f(Yes, false, "")},
-	{0xc090, 0, 0, 1, f(Yes, true, "")},
-	{0xc091, 0, 0, 2, f(Yes, false, "")},
-	{0xc0ac, 0, 0, 1, f(Yes, true, "")},
-	{0xc0ad, 0, 0, 2, f(Yes, false, "")},
-	{0xc0c8, 0, 0, 1, f(Yes, true, "")},
-	{0xc0c9, 0, 0, 2, f(Yes, false, "")},
-	{0xc0e4, 0, 0, 1, f(Yes, true, "")},
-	{0xc0e5, 0, 0, 2, f(Yes, false, "")},
-	{0xc100, 0, 0, 1, f(Yes, true, "")},
-	{0xc101, 0, 0, 2, f(Yes, false, "")},
-	{0xc11c, 0, 0, 1, f(Yes, true, "")},
-	{0xc11d, 0, 0, 2, f(Yes, false, "")},
-	{0xc138, 0, 0, 1, f(Yes, true, "")},
-	{0xc139, 0, 0, 2, f(Yes, false, "")},
-	{0xc154, 0, 0, 1, f(Yes, true, "")},
-	{0xc155, 0, 0, 2, f(Yes, false, "")},
-	{0xc170, 0, 0, 1, f(Yes, true, "")},
-	{0xc171, 0, 0, 2, f(Yes, false, "")},
-	{0xc18c, 0, 0, 1, f(Yes, true, "")},
-	{0xc18d, 0, 0, 2, f(Yes, false, "")},
-	{0xc1a8, 0, 0, 1, f(Yes, true, "")},
-	{0xc1a9, 0, 0, 2, f(Yes, false, "")},
-	{0xc1c4, 0, 0, 1, f(Yes, true, "")},
-	{0xc1c5, 0, 0, 2, f(Yes, false, "")},
-	{0xc1e0, 0, 0, 1, f(Yes, true, "")},
-	{0xc1e1, 0, 0, 2, f(Yes, false, "")},
-	{0xc1fc, 0, 0, 1, f(Yes, true, "")},
-	{0xc1fd, 0, 0, 2, f(Yes, false, "")},
-	{0xc218, 0, 0, 1, f(Yes, true, "")},
-	{0xc219, 0, 0, 2, f(Yes, false, "")},
-	{0xc234, 0, 0, 1, f(Yes, true, "")},
-	{0xc235, 0, 0, 2, f(Yes, false, "")},
-	{0xc250, 0, 0, 1, f(Yes, true, "")},
-	{0xc251, 0, 0, 2, f(Yes, false, "")},
-	{0xc26c, 0, 0, 1, f(Yes, true, "")},
-	{0xc26d, 0, 0, 2, f(Yes, false, "")},
-	{0xc288, 0, 0, 1, f(Yes, true, "")},
-	{0xc289, 0, 0, 2, f(Yes, false, "")},
-	{0xc2a4, 0, 0, 1, f(Yes, true, "")},
-	{0xc2a5, 0, 0, 2, f(Yes, false, "")},
-	{0xc2c0, 0, 0, 1, f(Yes, true, "")},
-	{0xc2c1, 0, 0, 2, f(Yes, false, "")},
-	{0xc2dc, 0, 0, 1, f(Yes, true, "")},
-	{0xc2dd, 0, 0, 2, f(Yes, false, "")},
-	{0xc2f8, 0, 0, 1, f(Yes, true, "")},
-	{0xc2f9, 0, 0, 2, f(Yes, false, "")},
-	{0xc314, 0, 0, 1, f(Yes, true, "")},
-	{0xc315, 0, 0, 2, f(Yes, false, "")},
-	{0xc330, 0, 0, 1, f(Yes, true, "")},
-	{0xc331, 0, 0, 2, f(Yes, false, "")},
-	{0xc34c, 0, 0, 1, f(Yes, true, "")},
-	{0xc34d, 0, 0, 2, f(Yes, false, "")},
-	{0xc368, 0, 0, 1, f(Yes, true, "")},
-	{0xc369, 0, 0, 2, f(Yes, false, "")},
-	{0xc384, 0, 0, 1, f(Yes, true, "")},
-	{0xc385, 0, 0, 2, f(Yes, false, "")},
-	{0xc3a0, 0, 0, 1, f(Yes, true, "")},
-	{0xc3a1, 0, 0, 2, f(Yes, false, "")},
-	{0xc3bc, 0, 0, 1, f(Yes, true, "")},
-	{0xc3bd, 0, 0, 2, f(Yes, false, "")},
-	{0xc3d8, 0, 0, 1, f(Yes, true, "")},
-	{0xc3d9, 0, 0, 2, f(Yes, false, "")},
-	{0xc3f4, 0, 0, 1, f(Yes, true, "")},
-	{0xc3f5, 0, 0, 2, f(Yes, false, "")},
-	{0xc410, 0, 0, 1, f(Yes, true, "")},
-	{0xc411, 0, 0, 2, f(Yes, false, "")},
-	{0xc42c, 0, 0, 1, f(Yes, true, "")},
-	{0xc42d, 0, 0, 2, f(Yes, false, "")},
-	{0xc448, 0, 0, 1, f(Yes, true, "")},
-	{0xc449, 0, 0, 2, f(Yes, false, "")},
-	{0xc464, 0, 0, 1, f(Yes, true, "")},
-	{0xc465, 0, 0, 2, f(Yes, false, "")},
-	{0xc480, 0, 0, 1, f(Yes, true, "")},
-	{0xc481, 0, 0, 2, f(Yes, false, "")},
-	{0xc49c, 0, 0, 1, f(Yes, true, "")},
-	{0xc49d, 0, 0, 2, f(Yes, false, "")},
-	{0xc4b8, 0, 0, 1, f(Yes, true, "")},
-	{0xc4b9, 0, 0, 2, f(Yes, false, "")},
-	{0xc4d4, 0, 0, 1, f(Yes, true, "")},
-	{0xc4d5, 0, 0, 2, f(Yes, false, "")},
-	{0xc4f0, 0, 0, 1, f(Yes, true, "")},
-	{0xc4f1, 0, 0, 2, f(Yes, false, "")},
-	{0xc50c, 0, 0, 1, f(Yes, true, "")},
-	{0xc50d, 0, 0, 2, f(Yes, false, "")},
-	{0xc528, 0, 0, 1, f(Yes, true, "")},
-	{0xc529, 0, 0, 2, f(Yes, false, "")},
-	{0xc544, 0, 0, 1, f(Yes, true, "")},
-	{0xc545, 0, 0, 2, f(Yes, false, "")},
-	{0xc560, 0, 0, 1, f(Yes, true, "")},
-	{0xc561, 0, 0, 2, f(Yes, false, "")},
-	{0xc57c, 0, 0, 1, f(Yes, true, "")},
-	{0xc57d, 0, 0, 2, f(Yes, false, "")},
-	{0xc598, 0, 0, 1, f(Yes, true, "")},
-	{0xc599, 0, 0, 2, f(Yes, false, "")},
-	{0xc5b4, 0, 0, 1, f(Yes, true, "")},
-	{0xc5b5, 0, 0, 2, f(Yes, false, "")},
-	{0xc5d0, 0, 0, 1, f(Yes, true, "")},
-	{0xc5d1, 0, 0, 2, f(Yes, false, "")},
-	{0xc5ec, 0, 0, 1, f(Yes, true, "")},
-	{0xc5ed, 0, 0, 2, f(Yes, false, "")},
-	{0xc608, 0, 0, 1, f(Yes, true, "")},
-	{0xc609, 0, 0, 2, f(Yes, false, "")},
-	{0xc624, 0, 0, 1, f(Yes, true, "")},
-	{0xc625, 0, 0, 2, f(Yes, false, "")},
-	{0xc640, 0, 0, 1, f(Yes, true, "")},
-	{0xc641, 0, 0, 2, f(Yes, false, "")},
-	{0xc65c, 0, 0, 1, f(Yes, true, "")},
-	{0xc65d, 0, 0, 2, f(Yes, false, "")},
-	{0xc678, 0, 0, 1, f(Yes, true, "")},
-	{0xc679, 0, 0, 2, f(Yes, false, "")},
-	{0xc694, 0, 0, 1, f(Yes, true, "")},
-	{0xc695, 0, 0, 2, f(Yes, false, "")},
-	{0xc6b0, 0, 0, 1, f(Yes, true, "")},
-	{0xc6b1, 0, 0, 2, f(Yes, false, "")},
-	{0xc6cc, 0, 0, 1, f(Yes, true, "")},
-	{0xc6cd, 0, 0, 2, f(Yes, false, "")},
-	{0xc6e8, 0, 0, 1, f(Yes, true, "")},
-	{0xc6e9, 0, 0, 2, f(Yes, false, "")},
-	{0xc704, 0, 0, 1, f(Yes, true, "")},
-	{0xc705, 0, 0, 2, f(Yes, false, "")},
-	{0xc720, 0, 0, 1, f(Yes, true, "")},
-	{0xc721, 0, 0, 2, f(Yes, false, "")},
-	{0xc73c, 0, 0, 1, f(Yes, true, "")},
-	{0xc73d, 0, 0, 2, f(Yes, false, "")},
-	{0xc758, 0, 0, 1, f(Yes, true, "")},
-	{0xc759, 0, 0, 2, f(Yes, false, "")},
-	{0xc774, 0, 0, 1, f(Yes, true, "")},
-	{0xc775, 0, 0, 2, f(Yes, false, "")},
-	{0xc790, 0, 0, 1, f(Yes, true, "")},
-	{0xc791, 0, 0, 2, f(Yes, false, "")},
-	{0xc7ac, 0, 0, 1, f(Yes, true, "")},
-	{0xc7ad, 0, 0, 2, f(Yes, false, "")},
-	{0xc7c8, 0, 0, 1, f(Yes, true, "")},
-	{0xc7c9, 0, 0, 2, f(Yes, false, "")},
-	{0xc7e4, 0, 0, 1, f(Yes, true, "")},
-	{0xc7e5, 0, 0, 2, f(Yes, false, "")},
-	{0xc800, 0, 0, 1, f(Yes, true, "")},
-	{0xc801, 0, 0, 2, f(Yes, false, "")},
-	{0xc81c, 0, 0, 1, f(Yes, true, "")},
-	{0xc81d, 0, 0, 2, f(Yes, false, "")},
-	{0xc838, 0, 0, 1, f(Yes, true, "")},
-	{0xc839, 0, 0, 2, f(Yes, false, "")},
-	{0xc854, 0, 0, 1, f(Yes, true, "")},
-	{0xc855, 0, 0, 2, f(Yes, false, "")},
-	{0xc870, 0, 0, 1, f(Yes, true, "")},
-	{0xc871, 0, 0, 2, f(Yes, false, "")},
-	{0xc88c, 0, 0, 1, f(Yes, true, "")},
-	{0xc88d, 0, 0, 2, f(Yes, false, "")},
-	{0xc8a8, 0, 0, 1, f(Yes, true, "")},
-	{0xc8a9, 0, 0, 2, f(Yes, false, "")},
-	{0xc8c4, 0, 0, 1, f(Yes, true, "")},
-	{0xc8c5, 0, 0, 2, f(Yes, false, "")},
-	{0xc8e0, 0, 0, 1, f(Yes, true, "")},
-	{0xc8e1, 0, 0, 2, f(Yes, false, "")},
-	{0xc8fc, 0, 0, 1, f(Yes, true, "")},
-	{0xc8fd, 0, 0, 2, f(Yes, false, "")},
-	{0xc918, 0, 0, 1, f(Yes, true, "")},
-	{0xc919, 0, 0, 2, f(Yes, false, "")},
-	{0xc934, 0, 0, 1, f(Yes, true, "")},
-	{0xc935, 0, 0, 2, f(Yes, false, "")},
-	{0xc950, 0, 0, 1, f(Yes, true, "")},
-	{0xc951, 0, 0, 2, f(Yes, false, "")},
-	{0xc96c, 0, 0, 1, f(Yes, true, "")},
-	{0xc96d, 0, 0, 2, f(Yes, false, "")},
-	{0xc988, 0, 0, 1, f(Yes, true, "")},
-	{0xc989, 0, 0, 2, f(Yes, false, "")},
-	{0xc9a4, 0, 0, 1, f(Yes, true, "")},
-	{0xc9a5, 0, 0, 2, f(Yes, false, "")},
-	{0xc9c0, 0, 0, 1, f(Yes, true, "")},
-	{0xc9c1, 0, 0, 2, f(Yes, false, "")},
-	{0xc9dc, 0, 0, 1, f(Yes, true, "")},
-	{0xc9dd, 0, 0, 2, f(Yes, false, "")},
-	{0xc9f8, 0, 0, 1, f(Yes, true, "")},
-	{0xc9f9, 0, 0, 2, f(Yes, false, "")},
-	{0xca14, 0, 0, 1, f(Yes, true, "")},
-	{0xca15, 0, 0, 2, f(Yes, false, "")},
-	{0xca30, 0, 0, 1, f(Yes, true, "")},
-	{0xca31, 0, 0, 2, f(Yes, false, "")},
-	{0xca4c, 0, 0, 1, f(Yes, true, "")},
-	{0xca4d, 0, 0, 2, f(Yes, false, "")},
-	{0xca68, 0, 0, 1, f(Yes, true, "")},
-	{0xca69, 0, 0, 2, f(Yes, false, "")},
-	{0xca84, 0, 0, 1, f(Yes, true, "")},
-	{0xca85, 0, 0, 2, f(Yes, false, "")},
-	{0xcaa0, 0, 0, 1, f(Yes, true, "")},
-	{0xcaa1, 0, 0, 2, f(Yes, false, "")},
-	{0xcabc, 0, 0, 1, f(Yes, true, "")},
-	{0xcabd, 0, 0, 2, f(Yes, false, "")},
-	{0xcad8, 0, 0, 1, f(Yes, true, "")},
-	{0xcad9, 0, 0, 2, f(Yes, false, "")},
-	{0xcaf4, 0, 0, 1, f(Yes, true, "")},
-	{0xcaf5, 0, 0, 2, f(Yes, false, "")},
-	{0xcb10, 0, 0, 1, f(Yes, true, "")},
-	{0xcb11, 0, 0, 2, f(Yes, false, "")},
-	{0xcb2c, 0, 0, 1, f(Yes, true, "")},
-	{0xcb2d, 0, 0, 2, f(Yes, false, "")},
-	{0xcb48, 0, 0, 1, f(Yes, true, "")},
-	{0xcb49, 0, 0, 2, f(Yes, false, "")},
-	{0xcb64, 0, 0, 1, f(Yes, true, "")},
-	{0xcb65, 0, 0, 2, f(Yes, false, "")},
-	{0xcb80, 0, 0, 1, f(Yes, true, "")},
-	{0xcb81, 0, 0, 2, f(Yes, false, "")},
-	{0xcb9c, 0, 0, 1, f(Yes, true, "")},
-	{0xcb9d, 0, 0, 2, f(Yes, false, "")},
-	{0xcbb8, 0, 0, 1, f(Yes, true, "")},
-	{0xcbb9, 0, 0, 2, f(Yes, false, "")},
-	{0xcbd4, 0, 0, 1, f(Yes, true, "")},
-	{0xcbd5, 0, 0, 2, f(Yes, false, "")},
-	{0xcbf0, 0, 0, 1, f(Yes, true, "")},
-	{0xcbf1, 0, 0, 2, f(Yes, false, "")},
-	{0xcc0c, 0, 0, 1, f(Yes, true, "")},
-	{0xcc0d, 0, 0, 2, f(Yes, false, "")},
-	{0xcc28, 0, 0, 1, f(Yes, true, "")},
-	{0xcc29, 0, 0, 2, f(Yes, false, "")},
-	{0xcc44, 0, 0, 1, f(Yes, true, "")},
-	{0xcc45, 0, 0, 2, f(Yes, false, "")},
-	{0xcc60, 0, 0, 1, f(Yes, true, "")},
-	{0xcc61, 0, 0, 2, f(Yes, false, "")},
-	{0xcc7c, 0, 0, 1, f(Yes, true, "")},
-	{0xcc7d, 0, 0, 2, f(Yes, false, "")},
-	{0xcc98, 0, 0, 1, f(Yes, true, "")},
-	{0xcc99, 0, 0, 2, f(Yes, false, "")},
-	{0xccb4, 0, 0, 1, f(Yes, true, "")},
-	{0xccb5, 0, 0, 2, f(Yes, false, "")},
-	{0xccd0, 0, 0, 1, f(Yes, true, "")},
-	{0xccd1, 0, 0, 2, f(Yes, false, "")},
-	{0xccec, 0, 0, 1, f(Yes, true, "")},
-	{0xcced, 0, 0, 2, f(Yes, false, "")},
-	{0xcd08, 0, 0, 1, f(Yes, true, "")},
-	{0xcd09, 0, 0, 2, f(Yes, false, "")},
-	{0xcd24, 0, 0, 1, f(Yes, true, "")},
-	{0xcd25, 0, 0, 2, f(Yes, false, "")},
-	{0xcd40, 0, 0, 1, f(Yes, true, "")},
-	{0xcd41, 0, 0, 2, f(Yes, false, "")},
-	{0xcd5c, 0, 0, 1, f(Yes, true, "")},
-	{0xcd5d, 0, 0, 2, f(Yes, false, "")},
-	{0xcd78, 0, 0, 1, f(Yes, true, "")},
-	{0xcd79, 0, 0, 2, f(Yes, false, "")},
-	{0xcd94, 0, 0, 1, f(Yes, true, "")},
-	{0xcd95, 0, 0, 2, f(Yes, false, "")},
-	{0xcdb0, 0, 0, 1, f(Yes, true, "")},
-	{0xcdb1, 0, 0, 2, f(Yes, false, "")},
-	{0xcdcc, 0, 0, 1, f(Yes, true, "")},
-	{0xcdcd, 0, 0, 2, f(Yes, false, "")},
-	{0xcde8, 0, 0, 1, f(Yes, true, "")},
-	{0xcde9, 0, 0, 2, f(Yes, false, "")},
-	{0xce04, 0, 0, 1, f(Yes, true, "")},
-	{0xce05, 0, 0, 2, f(Yes, false, "")},
-	{0xce20, 0, 0, 1, f(Yes, true, "")},
-	{0xce21, 0, 0, 2, f(Yes, false, "")},
-	{0xce3c, 0, 0, 1, f(Yes, true, "")},
-	{0xce3d, 0, 0, 2, f(Yes, false, "")},
-	{0xce58, 0, 0, 1, f(Yes, true, "")},
-	{0xce59, 0, 0, 2, f(Yes, false, "")},
-	{0xce74, 0, 0, 1, f(Yes, true, "")},
-	{0xce75, 0, 0, 2, f(Yes, false, "")},
-	{0xce90, 0, 0, 1, f(Yes, true, "")},
-	{0xce91, 0, 0, 2, f(Yes, false, "")},
-	{0xceac, 0, 0, 1, f(Yes, true, "")},
-	{0xcead, 0, 0, 2, f(Yes, false, "")},
-	{0xcec8, 0, 0, 1, f(Yes, true, "")},
-	{0xcec9, 0, 0, 2, f(Yes, false, "")},
-	{0xcee4, 0, 0, 1, f(Yes, true, "")},
-	{0xcee5, 0, 0, 2, f(Yes, false, "")},
-	{0xcf00, 0, 0, 1, f(Yes, true, "")},
-	{0xcf01, 0, 0, 2, f(Yes, false, "")},
-	{0xcf1c, 0, 0, 1, f(Yes, true, "")},
-	{0xcf1d, 0, 0, 2, f(Yes, false, "")},
-	{0xcf38, 0, 0, 1, f(Yes, true, "")},
-	{0xcf39, 0, 0, 2, f(Yes, false, "")},
-	{0xcf54, 0, 0, 1, f(Yes, true, "")},
-	{0xcf55, 0, 0, 2, f(Yes, false, "")},
-	{0xcf70, 0, 0, 1, f(Yes, true, "")},
-	{0xcf71, 0, 0, 2, f(Yes, false, "")},
-	{0xcf8c, 0, 0, 1, f(Yes, true, "")},
-	{0xcf8d, 0, 0, 2, f(Yes, false, "")},
-	{0xcfa8, 0, 0, 1, f(Yes, true, "")},
-	{0xcfa9, 0, 0, 2, f(Yes, false, "")},
-	{0xcfc4, 0, 0, 1, f(Yes, true, "")},
-	{0xcfc5, 0, 0, 2, f(Yes, false, "")},
-	{0xcfe0, 0, 0, 1, f(Yes, true, "")},
-	{0xcfe1, 0, 0, 2, f(Yes, false, "")},
-	{0xcffc, 0, 0, 1, f(Yes, true, "")},
-	{0xcffd, 0, 0, 2, f(Yes, false, "")},
-	{0xd018, 0, 0, 1, f(Yes, true, "")},
-	{0xd019, 0, 0, 2, f(Yes, false, "")},
-	{0xd034, 0, 0, 1, f(Yes, true, "")},
-	{0xd035, 0, 0, 2, f(Yes, false, "")},
-	{0xd050, 0, 0, 1, f(Yes, true, "")},
-	{0xd051, 0, 0, 2, f(Yes, false, "")},
-	{0xd06c, 0, 0, 1, f(Yes, true, "")},
-	{0xd06d, 0, 0, 2, f(Yes, false, "")},
-	{0xd088, 0, 0, 1, f(Yes, true, "")},
-	{0xd089, 0, 0, 2, f(Yes, false, "")},
-	{0xd0a4, 0, 0, 1, f(Yes, true, "")},
-	{0xd0a5, 0, 0, 2, f(Yes, false, "")},
-	{0xd0c0, 0, 0, 1, f(Yes, true, "")},
-	{0xd0c1, 0, 0, 2, f(Yes, false, "")},
-	{0xd0dc, 0, 0, 1, f(Yes, true, "")},
-	{0xd0dd, 0, 0, 2, f(Yes, false, "")},
-	{0xd0f8, 0, 0, 1, f(Yes, true, "")},
-	{0xd0f9, 0, 0, 2, f(Yes, false, "")},
-	{0xd114, 0, 0, 1, f(Yes, true, "")},
-	{0xd115, 0, 0, 2, f(Yes, false, "")},
-	{0xd130, 0, 0, 1, f(Yes, true, "")},
-	{0xd131, 0, 0, 2, f(Yes, false, "")},
-	{0xd14c, 0, 0, 1, f(Yes, true, "")},
-	{0xd14d, 0, 0, 2, f(Yes, false, "")},
-	{0xd168, 0, 0, 1, f(Yes, true, "")},
-	{0xd169, 0, 0, 2, f(Yes, false, "")},
-	{0xd184, 0, 0, 1, f(Yes, true, "")},
-	{0xd185, 0, 0, 2, f(Yes, false, "")},
-	{0xd1a0, 0, 0, 1, f(Yes, true, "")},
-	{0xd1a1, 0, 0, 2, f(Yes, false, "")},
-	{0xd1bc, 0, 0, 1, f(Yes, true, "")},
-	{0xd1bd, 0, 0, 2, f(Yes, false, "")},
-	{0xd1d8, 0, 0, 1, f(Yes, true, "")},
-	{0xd1d9, 0, 0, 2, f(Yes, false, "")},
-	{0xd1f4, 0, 0, 1, f(Yes, true, "")},
-	{0xd1f5, 0, 0, 2, f(Yes, false, "")},
-	{0xd210, 0, 0, 1, f(Yes, true, "")},
-	{0xd211, 0, 0, 2, f(Yes, false, "")},
-	{0xd22c, 0, 0, 1, f(Yes, true, "")},
-	{0xd22d, 0, 0, 2, f(Yes, false, "")},
-	{0xd248, 0, 0, 1, f(Yes, true, "")},
-	{0xd249, 0, 0, 2, f(Yes, false, "")},
-	{0xd264, 0, 0, 1, f(Yes, true, "")},
-	{0xd265, 0, 0, 2, f(Yes, false, "")},
-	{0xd280, 0, 0, 1, f(Yes, true, "")},
-	{0xd281, 0, 0, 2, f(Yes, false, "")},
-	{0xd29c, 0, 0, 1, f(Yes, true, "")},
-	{0xd29d, 0, 0, 2, f(Yes, false, "")},
-	{0xd2b8, 0, 0, 1, f(Yes, true, "")},
-	{0xd2b9, 0, 0, 2, f(Yes, false, "")},
-	{0xd2d4, 0, 0, 1, f(Yes, true, "")},
-	{0xd2d5, 0, 0, 2, f(Yes, false, "")},
-	{0xd2f0, 0, 0, 1, f(Yes, true, "")},
-	{0xd2f1, 0, 0, 2, f(Yes, false, "")},
-	{0xd30c, 0, 0, 1, f(Yes, true, "")},
-	{0xd30d, 0, 0, 2, f(Yes, false, "")},
-	{0xd328, 0, 0, 1, f(Yes, true, "")},
-	{0xd329, 0, 0, 2, f(Yes, false, "")},
-	{0xd344, 0, 0, 1, f(Yes, true, "")},
-	{0xd345, 0, 0, 2, f(Yes, false, "")},
-	{0xd360, 0, 0, 1, f(Yes, true, "")},
-	{0xd361, 0, 0, 2, f(Yes, false, "")},
-	{0xd37c, 0, 0, 1, f(Yes, true, "")},
-	{0xd37d, 0, 0, 2, f(Yes, false, "")},
-	{0xd398, 0, 0, 1, f(Yes, true, "")},
-	{0xd399, 0, 0, 2, f(Yes, false, "")},
-	{0xd3b4, 0, 0, 1, f(Yes, true, "")},
-	{0xd3b5, 0, 0, 2, f(Yes, false, "")},
-	{0xd3d0, 0, 0, 1, f(Yes, true, "")},
-	{0xd3d1, 0, 0, 2, f(Yes, false, "")},
-	{0xd3ec, 0, 0, 1, f(Yes, true, "")},
-	{0xd3ed, 0, 0, 2, f(Yes, false, "")},
-	{0xd408, 0, 0, 1, f(Yes, true, "")},
-	{0xd409, 0, 0, 2, f(Yes, false, "")},
-	{0xd424, 0, 0, 1, f(Yes, true, "")},
-	{0xd425, 0, 0, 2, f(Yes, false, "")},
-	{0xd440, 0, 0, 1, f(Yes, true, "")},
-	{0xd441, 0, 0, 2, f(Yes, false, "")},
-	{0xd45c, 0, 0, 1, f(Yes, true, "")},
-	{0xd45d, 0, 0, 2, f(Yes, false, "")},
-	{0xd478, 0, 0, 1, f(Yes, true, "")},
-	{0xd479, 0, 0, 2, f(Yes, false, "")},
-	{0xd494, 0, 0, 1, f(Yes, true, "")},
-	{0xd495, 0, 0, 2, f(Yes, false, "")},
-	{0xd4b0, 0, 0, 1, f(Yes, true, "")},
-	{0xd4b1, 0, 0, 2, f(Yes, false, "")},
-	{0xd4cc, 0, 0, 1, f(Yes, true, "")},
-	{0xd4cd, 0, 0, 2, f(Yes, false, "")},
-	{0xd4e8, 0, 0, 1, f(Yes, true, "")},
-	{0xd4e9, 0, 0, 2, f(Yes, false, "")},
-	{0xd504, 0, 0, 1, f(Yes, true, "")},
-	{0xd505, 0, 0, 2, f(Yes, false, "")},
-	{0xd520, 0, 0, 1, f(Yes, true, "")},
-	{0xd521, 0, 0, 2, f(Yes, false, "")},
-	{0xd53c, 0, 0, 1, f(Yes, true, "")},
-	{0xd53d, 0, 0, 2, f(Yes, false, "")},
-	{0xd558, 0, 0, 1, f(Yes, true, "")},
-	{0xd559, 0, 0, 2, f(Yes, false, "")},
-	{0xd574, 0, 0, 1, f(Yes, true, "")},
-	{0xd575, 0, 0, 2, f(Yes, false, "")},
-	{0xd590, 0, 0, 1, f(Yes, true, "")},
-	{0xd591, 0, 0, 2, f(Yes, false, "")},
-	{0xd5ac, 0, 0, 1, f(Yes, true, "")},
-	{0xd5ad, 0, 0, 2, f(Yes, false, "")},
-	{0xd5c8, 0, 0, 1, f(Yes, true, "")},
-	{0xd5c9, 0, 0, 2, f(Yes, false, "")},
-	{0xd5e4, 0, 0, 1, f(Yes, true, "")},
-	{0xd5e5, 0, 0, 2, f(Yes, false, "")},
-	{0xd600, 0, 0, 1, f(Yes, true, "")},
-	{0xd601, 0, 0, 2, f(Yes, false, "")},
-	{0xd61c, 0, 0, 1, f(Yes, true, "")},
-	{0xd61d, 0, 0, 2, f(Yes, false, "")},
-	{0xd638, 0, 0, 1, f(Yes, true, "")},
-	{0xd639, 0, 0, 2, f(Yes, false, "")},
-	{0xd654, 0, 0, 1, f(Yes, true, "")},
-	{0xd655, 0, 0, 2, f(Yes, false, "")},
-	{0xd670, 0, 0, 1, f(Yes, true, "")},
-	{0xd671, 0, 0, 2, f(Yes, false, "")},
-	{0xd68c, 0, 0, 1, f(Yes, true, "")},
-	{0xd68d, 0, 0, 2, f(Yes, false, "")},
-	{0xd6a8, 0, 0, 1, f(Yes, true, "")},
-	{0xd6a9, 0, 0, 2, f(Yes, false, "")},
-	{0xd6c4, 0, 0, 1, f(Yes, true, "")},
-	{0xd6c5, 0, 0, 2, f(Yes, false, "")},
-	{0xd6e0, 0, 0, 1, f(Yes, true, "")},
-	{0xd6e1, 0, 0, 2, f(Yes, false, "")},
-	{0xd6fc, 0, 0, 1, f(Yes, true, "")},
-	{0xd6fd, 0, 0, 2, f(Yes, false, "")},
-	{0xd718, 0, 0, 1, f(Yes, true, "")},
-	{0xd719, 0, 0, 2, f(Yes, false, "")},
-	{0xd734, 0, 0, 1, f(Yes, true, "")},
-	{0xd735, 0, 0, 2, f(Yes, false, "")},
-	{0xd750, 0, 0, 1, f(Yes, true, "")},
-	{0xd751, 0, 0, 2, f(Yes, false, "")},
-	{0xd76c, 0, 0, 1, f(Yes, true, "")},
-	{0xd76d, 0, 0, 2, f(Yes, false, "")},
-	{0xd788, 0, 0, 1, f(Yes, true, "")},
-	{0xd789, 0, 0, 2, f(Yes, false, "")},
-	{0xd7a4, 0, 0, 0, f(Yes, false, "")},
-	{0xf900, 0, 0, 0, f(No, false, "豈")},
-	{0xf901, 0, 0, 0, f(No, false, "更")},
-	{0xf902, 0, 0, 0, f(No, false, "車")},
-	{0xf903, 0, 0, 0, f(No, false, "賈")},
-	{0xf904, 0, 0, 0, f(No, false, "滑")},
-	{0xf905, 0, 0, 0, f(No, false, "串")},
-	{0xf906, 0, 0, 0, f(No, false, "句")},
-	{0xf907, 0, 0, 0, f(No, false, "龜")},
-	{0xf909, 0, 0, 0, f(No, false, "契")},
-	{0xf90a, 0, 0, 0, f(No, false, "金")},
-	{0xf90b, 0, 0, 0, f(No, false, "喇")},
-	{0xf90c, 0, 0, 0, f(No, false, "奈")},
-	{0xf90d, 0, 0, 0, f(No, false, "懶")},
-	{0xf90e, 0, 0, 0, f(No, false, "癩")},
-	{0xf90f, 0, 0, 0, f(No, false, "羅")},
-	{0xf910, 0, 0, 0, f(No, false, "蘿")},
-	{0xf911, 0, 0, 0, f(No, false, "螺")},
-	{0xf912, 0, 0, 0, f(No, false, "裸")},
-	{0xf913, 0, 0, 0, f(No, false, "邏")},
-	{0xf914, 0, 0, 0, f(No, false, "樂")},
-	{0xf915, 0, 0, 0, f(No, false, "洛")},
-	{0xf916, 0, 0, 0, f(No, false, "烙")},
-	{0xf917, 0, 0, 0, f(No, false, "珞")},
-	{0xf918, 0, 0, 0, f(No, false, "落")},
-	{0xf919, 0, 0, 0, f(No, false, "酪")},
-	{0xf91a, 0, 0, 0, f(No, false, "駱")},
-	{0xf91b, 0, 0, 0, f(No, false, "亂")},
-	{0xf91c, 0, 0, 0, f(No, false, "卵")},
-	{0xf91d, 0, 0, 0, f(No, false, "欄")},
-	{0xf91e, 0, 0, 0, f(No, false, "爛")},
-	{0xf91f, 0, 0, 0, f(No, false, "蘭")},
-	{0xf920, 0, 0, 0, f(No, false, "鸞")},
-	{0xf921, 0, 0, 0, f(No, false, "嵐")},
-	{0xf922, 0, 0, 0, f(No, false, "濫")},
-	{0xf923, 0, 0, 0, f(No, false, "藍")},
-	{0xf924, 0, 0, 0, f(No, false, "襤")},
-	{0xf925, 0, 0, 0, f(No, false, "拉")},
-	{0xf926, 0, 0, 0, f(No, false, "臘")},
-	{0xf927, 0, 0, 0, f(No, false, "蠟")},
-	{0xf928, 0, 0, 0, f(No, false, "廊")},
-	{0xf929, 0, 0, 0, f(No, false, "朗")},
-	{0xf92a, 0, 0, 0, f(No, false, "浪")},
-	{0xf92b, 0, 0, 0, f(No, false, "狼")},
-	{0xf92c, 0, 0, 0, f(No, false, "郎")},
-	{0xf92d, 0, 0, 0, f(No, false, "來")},
-	{0xf92e, 0, 0, 0, f(No, false, "冷")},
-	{0xf92f, 0, 0, 0, f(No, false, "勞")},
-	{0xf930, 0, 0, 0, f(No, false, "擄")},
-	{0xf931, 0, 0, 0, f(No, false, "櫓")},
-	{0xf932, 0, 0, 0, f(No, false, "爐")},
-	{0xf933, 0, 0, 0, f(No, false, "盧")},
-	{0xf934, 0, 0, 0, f(No, false, "老")},
-	{0xf935, 0, 0, 0, f(No, false, "蘆")},
-	{0xf936, 0, 0, 0, f(No, false, "虜")},
-	{0xf937, 0, 0, 0, f(No, false, "路")},
-	{0xf938, 0, 0, 0, f(No, false, "露")},
-	{0xf939, 0, 0, 0, f(No, false, "魯")},
-	{0xf93a, 0, 0, 0, f(No, false, "鷺")},
-	{0xf93b, 0, 0, 0, f(No, false, "碌")},
-	{0xf93c, 0, 0, 0, f(No, false, "祿")},
-	{0xf93d, 0, 0, 0, f(No, false, "綠")},
-	{0xf93e, 0, 0, 0, f(No, false, "菉")},
-	{0xf93f, 0, 0, 0, f(No, false, "錄")},
-	{0xf940, 0, 0, 0, f(No, false, "鹿")},
-	{0xf941, 0, 0, 0, f(No, false, "論")},
-	{0xf942, 0, 0, 0, f(No, false, "壟")},
-	{0xf943, 0, 0, 0, f(No, false, "弄")},
-	{0xf944, 0, 0, 0, f(No, false, "籠")},
-	{0xf945, 0, 0, 0, f(No, false, "聾")},
-	{0xf946, 0, 0, 0, f(No, false, "牢")},
-	{0xf947, 0, 0, 0, f(No, false, "磊")},
-	{0xf948, 0, 0, 0, f(No, false, "賂")},
-	{0xf949, 0, 0, 0, f(No, false, "雷")},
-	{0xf94a, 0, 0, 0, f(No, false, "壘")},
-	{0xf94b, 0, 0, 0, f(No, false, "屢")},
-	{0xf94c, 0, 0, 0, f(No, false, "樓")},
-	{0xf94d, 0, 0, 0, f(No, false, "淚")},
-	{0xf94e, 0, 0, 0, f(No, false, "漏")},
-	{0xf94f, 0, 0, 0, f(No, false, "累")},
-	{0xf950, 0, 0, 0, f(No, false, "縷")},
-	{0xf951, 0, 0, 0, f(No, false, "陋")},
-	{0xf952, 0, 0, 0, f(No, false, "勒")},
-	{0xf953, 0, 0, 0, f(No, false, "肋")},
-	{0xf954, 0, 0, 0, f(No, false, "凜")},
-	{0xf955, 0, 0, 0, f(No, false, "凌")},
-	{0xf956, 0, 0, 0, f(No, false, "稜")},
-	{0xf957, 0, 0, 0, f(No, false, "綾")},
-	{0xf958, 0, 0, 0, f(No, false, "菱")},
-	{0xf959, 0, 0, 0, f(No, false, "陵")},
-	{0xf95a, 0, 0, 0, f(No, false, "讀")},
-	{0xf95b, 0, 0, 0, f(No, false, "拏")},
-	{0xf95c, 0, 0, 0, f(No, false, "樂")},
-	{0xf95d, 0, 0, 0, f(No, false, "諾")},
-	{0xf95e, 0, 0, 0, f(No, false, "丹")},
-	{0xf95f, 0, 0, 0, f(No, false, "寧")},
-	{0xf960, 0, 0, 0, f(No, false, "怒")},
-	{0xf961, 0, 0, 0, f(No, false, "率")},
-	{0xf962, 0, 0, 0, f(No, false, "異")},
-	{0xf963, 0, 0, 0, f(No, false, "北")},
-	{0xf964, 0, 0, 0, f(No, false, "磻")},
-	{0xf965, 0, 0, 0, f(No, false, "便")},
-	{0xf966, 0, 0, 0, f(No, false, "復")},
-	{0xf967, 0, 0, 0, f(No, false, "不")},
-	{0xf968, 0, 0, 0, f(No, false, "泌")},
-	{0xf969, 0, 0, 0, f(No, false, "數")},
-	{0xf96a, 0, 0, 0, f(No, false, "索")},
-	{0xf96b, 0, 0, 0, f(No, false, "參")},
-	{0xf96c, 0, 0, 0, f(No, false, "塞")},
-	{0xf96d, 0, 0, 0, f(No, false, "省")},
-	{0xf96e, 0, 0, 0, f(No, false, "葉")},
-	{0xf96f, 0, 0, 0, f(No, false, "說")},
-	{0xf970, 0, 0, 0, f(No, false, "殺")},
-	{0xf971, 0, 0, 0, f(No, false, "辰")},
-	{0xf972, 0, 0, 0, f(No, false, "沈")},
-	{0xf973, 0, 0, 0, f(No, false, "拾")},
-	{0xf974, 0, 0, 0, f(No, false, "若")},
-	{0xf975, 0, 0, 0, f(No, false, "掠")},
-	{0xf976, 0, 0, 0, f(No, false, "略")},
-	{0xf977, 0, 0, 0, f(No, false, "亮")},
-	{0xf978, 0, 0, 0, f(No, false, "兩")},
-	{0xf979, 0, 0, 0, f(No, false, "凉")},
-	{0xf97a, 0, 0, 0, f(No, false, "梁")},
-	{0xf97b, 0, 0, 0, f(No, false, "糧")},
-	{0xf97c, 0, 0, 0, f(No, false, "良")},
-	{0xf97d, 0, 0, 0, f(No, false, "諒")},
-	{0xf97e, 0, 0, 0, f(No, false, "量")},
-	{0xf97f, 0, 0, 0, f(No, false, "勵")},
-	{0xf980, 0, 0, 0, f(No, false, "呂")},
-	{0xf981, 0, 0, 0, f(No, false, "女")},
-	{0xf982, 0, 0, 0, f(No, false, "廬")},
-	{0xf983, 0, 0, 0, f(No, false, "旅")},
-	{0xf984, 0, 0, 0, f(No, false, "濾")},
-	{0xf985, 0, 0, 0, f(No, false, "礪")},
-	{0xf986, 0, 0, 0, f(No, false, "閭")},
-	{0xf987, 0, 0, 0, f(No, false, "驪")},
-	{0xf988, 0, 0, 0, f(No, false, "麗")},
-	{0xf989, 0, 0, 0, f(No, false, "黎")},
-	{0xf98a, 0, 0, 0, f(No, false, "力")},
-	{0xf98b, 0, 0, 0, f(No, false, "曆")},
-	{0xf98c, 0, 0, 0, f(No, false, "歷")},
-	{0xf98d, 0, 0, 0, f(No, false, "轢")},
-	{0xf98e, 0, 0, 0, f(No, false, "年")},
-	{0xf98f, 0, 0, 0, f(No, false, "憐")},
-	{0xf990, 0, 0, 0, f(No, false, "戀")},
-	{0xf991, 0, 0, 0, f(No, false, "撚")},
-	{0xf992, 0, 0, 0, f(No, false, "漣")},
-	{0xf993, 0, 0, 0, f(No, false, "煉")},
-	{0xf994, 0, 0, 0, f(No, false, "璉")},
-	{0xf995, 0, 0, 0, f(No, false, "秊")},
-	{0xf996, 0, 0, 0, f(No, false, "練")},
-	{0xf997, 0, 0, 0, f(No, false, "聯")},
-	{0xf998, 0, 0, 0, f(No, false, "輦")},
-	{0xf999, 0, 0, 0, f(No, false, "蓮")},
-	{0xf99a, 0, 0, 0, f(No, false, "連")},
-	{0xf99b, 0, 0, 0, f(No, false, "鍊")},
-	{0xf99c, 0, 0, 0, f(No, false, "列")},
-	{0xf99d, 0, 0, 0, f(No, false, "劣")},
-	{0xf99e, 0, 0, 0, f(No, false, "咽")},
-	{0xf99f, 0, 0, 0, f(No, false, "烈")},
-	{0xf9a0, 0, 0, 0, f(No, false, "裂")},
-	{0xf9a1, 0, 0, 0, f(No, false, "說")},
-	{0xf9a2, 0, 0, 0, f(No, false, "廉")},
-	{0xf9a3, 0, 0, 0, f(No, false, "念")},
-	{0xf9a4, 0, 0, 0, f(No, false, "捻")},
-	{0xf9a5, 0, 0, 0, f(No, false, "殮")},
-	{0xf9a6, 0, 0, 0, f(No, false, "簾")},
-	{0xf9a7, 0, 0, 0, f(No, false, "獵")},
-	{0xf9a8, 0, 0, 0, f(No, false, "令")},
-	{0xf9a9, 0, 0, 0, f(No, false, "囹")},
-	{0xf9aa, 0, 0, 0, f(No, false, "寧")},
-	{0xf9ab, 0, 0, 0, f(No, false, "嶺")},
-	{0xf9ac, 0, 0, 0, f(No, false, "怜")},
-	{0xf9ad, 0, 0, 0, f(No, false, "玲")},
-	{0xf9ae, 0, 0, 0, f(No, false, "瑩")},
-	{0xf9af, 0, 0, 0, f(No, false, "羚")},
-	{0xf9b0, 0, 0, 0, f(No, false, "聆")},
-	{0xf9b1, 0, 0, 0, f(No, false, "鈴")},
-	{0xf9b2, 0, 0, 0, f(No, false, "零")},
-	{0xf9b3, 0, 0, 0, f(No, false, "靈")},
-	{0xf9b4, 0, 0, 0, f(No, false, "領")},
-	{0xf9b5, 0, 0, 0, f(No, false, "例")},
-	{0xf9b6, 0, 0, 0, f(No, false, "禮")},
-	{0xf9b7, 0, 0, 0, f(No, false, "醴")},
-	{0xf9b8, 0, 0, 0, f(No, false, "隸")},
-	{0xf9b9, 0, 0, 0, f(No, false, "惡")},
-	{0xf9ba, 0, 0, 0, f(No, false, "了")},
-	{0xf9bb, 0, 0, 0, f(No, false, "僚")},
-	{0xf9bc, 0, 0, 0, f(No, false, "寮")},
-	{0xf9bd, 0, 0, 0, f(No, false, "尿")},
-	{0xf9be, 0, 0, 0, f(No, false, "料")},
-	{0xf9bf, 0, 0, 0, f(No, false, "樂")},
-	{0xf9c0, 0, 0, 0, f(No, false, "燎")},
-	{0xf9c1, 0, 0, 0, f(No, false, "療")},
-	{0xf9c2, 0, 0, 0, f(No, false, "蓼")},
-	{0xf9c3, 0, 0, 0, f(No, false, "遼")},
-	{0xf9c4, 0, 0, 0, f(No, false, "龍")},
-	{0xf9c5, 0, 0, 0, f(No, false, "暈")},
-	{0xf9c6, 0, 0, 0, f(No, false, "阮")},
-	{0xf9c7, 0, 0, 0, f(No, false, "劉")},
-	{0xf9c8, 0, 0, 0, f(No, false, "杻")},
-	{0xf9c9, 0, 0, 0, f(No, false, "柳")},
-	{0xf9ca, 0, 0, 0, f(No, false, "流")},
-	{0xf9cb, 0, 0, 0, f(No, false, "溜")},
-	{0xf9cc, 0, 0, 0, f(No, false, "琉")},
-	{0xf9cd, 0, 0, 0, f(No, false, "留")},
-	{0xf9ce, 0, 0, 0, f(No, false, "硫")},
-	{0xf9cf, 0, 0, 0, f(No, false, "紐")},
-	{0xf9d0, 0, 0, 0, f(No, false, "類")},
-	{0xf9d1, 0, 0, 0, f(No, false, "六")},
-	{0xf9d2, 0, 0, 0, f(No, false, "戮")},
-	{0xf9d3, 0, 0, 0, f(No, false, "陸")},
-	{0xf9d4, 0, 0, 0, f(No, false, "倫")},
-	{0xf9d5, 0, 0, 0, f(No, false, "崙")},
-	{0xf9d6, 0, 0, 0, f(No, false, "淪")},
-	{0xf9d7, 0, 0, 0, f(No, false, "輪")},
-	{0xf9d8, 0, 0, 0, f(No, false, "律")},
-	{0xf9d9, 0, 0, 0, f(No, false, "慄")},
-	{0xf9da, 0, 0, 0, f(No, false, "栗")},
-	{0xf9db, 0, 0, 0, f(No, false, "率")},
-	{0xf9dc, 0, 0, 0, f(No, false, "隆")},
-	{0xf9dd, 0, 0, 0, f(No, false, "利")},
-	{0xf9de, 0, 0, 0, f(No, false, "吏")},
-	{0xf9df, 0, 0, 0, f(No, false, "履")},
-	{0xf9e0, 0, 0, 0, f(No, false, "易")},
-	{0xf9e1, 0, 0, 0, f(No, false, "李")},
-	{0xf9e2, 0, 0, 0, f(No, false, "梨")},
-	{0xf9e3, 0, 0, 0, f(No, false, "泥")},
-	{0xf9e4, 0, 0, 0, f(No, false, "理")},
-	{0xf9e5, 0, 0, 0, f(No, false, "痢")},
-	{0xf9e6, 0, 0, 0, f(No, false, "罹")},
-	{0xf9e7, 0, 0, 0, f(No, false, "裏")},
-	{0xf9e8, 0, 0, 0, f(No, false, "裡")},
-	{0xf9e9, 0, 0, 0, f(No, false, "里")},
-	{0xf9ea, 0, 0, 0, f(No, false, "離")},
-	{0xf9eb, 0, 0, 0, f(No, false, "匿")},
-	{0xf9ec, 0, 0, 0, f(No, false, "溺")},
-	{0xf9ed, 0, 0, 0, f(No, false, "吝")},
-	{0xf9ee, 0, 0, 0, f(No, false, "燐")},
-	{0xf9ef, 0, 0, 0, f(No, false, "璘")},
-	{0xf9f0, 0, 0, 0, f(No, false, "藺")},
-	{0xf9f1, 0, 0, 0, f(No, false, "隣")},
-	{0xf9f2, 0, 0, 0, f(No, false, "鱗")},
-	{0xf9f3, 0, 0, 0, f(No, false, "麟")},
-	{0xf9f4, 0, 0, 0, f(No, false, "林")},
-	{0xf9f5, 0, 0, 0, f(No, false, "淋")},
-	{0xf9f6, 0, 0, 0, f(No, false, "臨")},
-	{0xf9f7, 0, 0, 0, f(No, false, "立")},
-	{0xf9f8, 0, 0, 0, f(No, false, "笠")},
-	{0xf9f9, 0, 0, 0, f(No, false, "粒")},
-	{0xf9fa, 0, 0, 0, f(No, false, "狀")},
-	{0xf9fb, 0, 0, 0, f(No, false, "炙")},
-	{0xf9fc, 0, 0, 0, f(No, false, "識")},
-	{0xf9fd, 0, 0, 0, f(No, false, "什")},
-	{0xf9fe, 0, 0, 0, f(No, false, "茶")},
-	{0xf9ff, 0, 0, 0, f(No, false, "刺")},
-	{0xfa00, 0, 0, 0, f(No, false, "切")},
-	{0xfa01, 0, 0, 0, f(No, false, "度")},
-	{0xfa02, 0, 0, 0, f(No, false, "拓")},
-	{0xfa03, 0, 0, 0, f(No, false, "糖")},
-	{0xfa04, 0, 0, 0, f(No, false, "宅")},
-	{0xfa05, 0, 0, 0, f(No, false, "洞")},
-	{0xfa06, 0, 0, 0, f(No, false, "暴")},
-	{0xfa07, 0, 0, 0, f(No, false, "輻")},
-	{0xfa08, 0, 0, 0, f(No, false, "行")},
-	{0xfa09, 0, 0, 0, f(No, false, "降")},
-	{0xfa0a, 0, 0, 0, f(No, false, "見")},
-	{0xfa0b, 0, 0, 0, f(No, false, "廓")},
-	{0xfa0c, 0, 0, 0, f(No, false, "兀")},
-	{0xfa0d, 0, 0, 0, f(No, false, "嗀")},
-	{0xfa0e, 0, 0, 0, f(Yes, false, "")},
-	{0xfa10, 0, 0, 0, f(No, false, "塚")},
-	{0xfa11, 0, 0, 0, f(Yes, false, "")},
-	{0xfa12, 0, 0, 0, f(No, false, "晴")},
-	{0xfa13, 0, 0, 0, f(Yes, false, "")},
-	{0xfa15, 0, 0, 0, f(No, false, "凞")},
-	{0xfa16, 0, 0, 0, f(No, false, "猪")},
-	{0xfa17, 0, 0, 0, f(No, false, "益")},
-	{0xfa18, 0, 0, 0, f(No, false, "礼")},
-	{0xfa19, 0, 0, 0, f(No, false, "神")},
-	{0xfa1a, 0, 0, 0, f(No, false, "祥")},
-	{0xfa1b, 0, 0, 0, f(No, false, "福")},
-	{0xfa1c, 0, 0, 0, f(No, false, "靖")},
-	{0xfa1d, 0, 0, 0, f(No, false, "精")},
-	{0xfa1e, 0, 0, 0, f(No, false, "羽")},
-	{0xfa1f, 0, 0, 0, f(Yes, false, "")},
-	{0xfa20, 0, 0, 0, f(No, false, "蘒")},
-	{0xfa21, 0, 0, 0, f(Yes, false, "")},
-	{0xfa22, 0, 0, 0, f(No, false, "諸")},
-	{0xfa23, 0, 0, 0, f(Yes, false, "")},
-	{0xfa25, 0, 0, 0, f(No, false, "逸")},
-	{0xfa26, 0, 0, 0, f(No, false, "都")},
-	{0xfa27, 0, 0, 0, f(Yes, false, "")},
-	{0xfa2a, 0, 0, 0, f(No, false, "飯")},
-	{0xfa2b, 0, 0, 0, f(No, false, "飼")},
-	{0xfa2c, 0, 0, 0, f(No, false, "館")},
-	{0xfa2d, 0, 0, 0, f(No, false, "鶴")},
-	{0xfa2e, 0, 0, 0, f(No, false, "郞")},
-	{0xfa2f, 0, 0, 0, f(No, false, "隷")},
-	{0xfa30, 0, 0, 0, f(No, false, "侮")},
-	{0xfa31, 0, 0, 0, f(No, false, "僧")},
-	{0xfa32, 0, 0, 0, f(No, false, "免")},
-	{0xfa33, 0, 0, 0, f(No, false, "勉")},
-	{0xfa34, 0, 0, 0, f(No, false, "勤")},
-	{0xfa35, 0, 0, 0, f(No, false, "卑")},
-	{0xfa36, 0, 0, 0, f(No, false, "喝")},
-	{0xfa37, 0, 0, 0, f(No, false, "嘆")},
-	{0xfa38, 0, 0, 0, f(No, false, "器")},
-	{0xfa39, 0, 0, 0, f(No, false, "塀")},
-	{0xfa3a, 0, 0, 0, f(No, false, "墨")},
-	{0xfa3b, 0, 0, 0, f(No, false, "層")},
-	{0xfa3c, 0, 0, 0, f(No, false, "屮")},
-	{0xfa3d, 0, 0, 0, f(No, false, "悔")},
-	{0xfa3e, 0, 0, 0, f(No, false, "慨")},
-	{0xfa3f, 0, 0, 0, f(No, false, "憎")},
-	{0xfa40, 0, 0, 0, f(No, false, "懲")},
-	{0xfa41, 0, 0, 0, f(No, false, "敏")},
-	{0xfa42, 0, 0, 0, f(No, false, "既")},
-	{0xfa43, 0, 0, 0, f(No, false, "暑")},
-	{0xfa44, 0, 0, 0, f(No, false, "梅")},
-	{0xfa45, 0, 0, 0, f(No, false, "海")},
-	{0xfa46, 0, 0, 0, f(No, false, "渚")},
-	{0xfa47, 0, 0, 0, f(No, false, "漢")},
-	{0xfa48, 0, 0, 0, f(No, false, "煮")},
-	{0xfa49, 0, 0, 0, f(No, false, "爫")},
-	{0xfa4a, 0, 0, 0, f(No, false, "琢")},
-	{0xfa4b, 0, 0, 0, f(No, false, "碑")},
-	{0xfa4c, 0, 0, 0, f(No, false, "社")},
-	{0xfa4d, 0, 0, 0, f(No, false, "祉")},
-	{0xfa4e, 0, 0, 0, f(No, false, "祈")},
-	{0xfa4f, 0, 0, 0, f(No, false, "祐")},
-	{0xfa50, 0, 0, 0, f(No, false, "祖")},
-	{0xfa51, 0, 0, 0, f(No, false, "祝")},
-	{0xfa52, 0, 0, 0, f(No, false, "禍")},
-	{0xfa53, 0, 0, 0, f(No, false, "禎")},
-	{0xfa54, 0, 0, 0, f(No, false, "穀")},
-	{0xfa55, 0, 0, 0, f(No, false, "突")},
-	{0xfa56, 0, 0, 0, f(No, false, "節")},
-	{0xfa57, 0, 0, 0, f(No, false, "練")},
-	{0xfa58, 0, 0, 0, f(No, false, "縉")},
-	{0xfa59, 0, 0, 0, f(No, false, "繁")},
-	{0xfa5a, 0, 0, 0, f(No, false, "署")},
-	{0xfa5b, 0, 0, 0, f(No, false, "者")},
-	{0xfa5c, 0, 0, 0, f(No, false, "臭")},
-	{0xfa5d, 0, 0, 0, f(No, false, "艹")},
-	{0xfa5f, 0, 0, 0, f(No, false, "著")},
-	{0xfa60, 0, 0, 0, f(No, false, "褐")},
-	{0xfa61, 0, 0, 0, f(No, false, "視")},
-	{0xfa62, 0, 0, 0, f(No, false, "謁")},
-	{0xfa63, 0, 0, 0, f(No, false, "謹")},
-	{0xfa64, 0, 0, 0, f(No, false, "賓")},
-	{0xfa65, 0, 0, 0, f(No, false, "贈")},
-	{0xfa66, 0, 0, 0, f(No, false, "辶")},
-	{0xfa67, 0, 0, 0, f(No, false, "逸")},
-	{0xfa68, 0, 0, 0, f(No, false, "難")},
-	{0xfa69, 0, 0, 0, f(No, false, "響")},
-	{0xfa6a, 0, 0, 0, f(No, false, "頻")},
-	{0xfa6b, 0, 0, 0, f(No, false, "恵")},
-	{0xfa6c, 0, 0, 0, f(No, false, "𤋮")},
-	{0xfa6d, 0, 0, 0, f(No, false, "舘")},
-	{0xfa6e, 0, 0, 0, f(Yes, false, "")},
-	{0xfa70, 0, 0, 0, f(No, false, "並")},
-	{0xfa71, 0, 0, 0, f(No, false, "况")},
-	{0xfa72, 0, 0, 0, f(No, false, "全")},
-	{0xfa73, 0, 0, 0, f(No, false, "侀")},
-	{0xfa74, 0, 0, 0, f(No, false, "充")},
-	{0xfa75, 0, 0, 0, f(No, false, "冀")},
-	{0xfa76, 0, 0, 0, f(No, false, "勇")},
-	{0xfa77, 0, 0, 0, f(No, false, "勺")},
-	{0xfa78, 0, 0, 0, f(No, false, "喝")},
-	{0xfa79, 0, 0, 0, f(No, false, "啕")},
-	{0xfa7a, 0, 0, 0, f(No, false, "喙")},
-	{0xfa7b, 0, 0, 0, f(No, false, "嗢")},
-	{0xfa7c, 0, 0, 0, f(No, false, "塚")},
-	{0xfa7d, 0, 0, 0, f(No, false, "墳")},
-	{0xfa7e, 0, 0, 0, f(No, false, "奄")},
-	{0xfa7f, 0, 0, 0, f(No, false, "奔")},
-	{0xfa80, 0, 0, 0, f(No, false, "婢")},
-	{0xfa81, 0, 0, 0, f(No, false, "嬨")},
-	{0xfa82, 0, 0, 0, f(No, false, "廒")},
-	{0xfa83, 0, 0, 0, f(No, false, "廙")},
-	{0xfa84, 0, 0, 0, f(No, false, "彩")},
-	{0xfa85, 0, 0, 0, f(No, false, "徭")},
-	{0xfa86, 0, 0, 0, f(No, false, "惘")},
-	{0xfa87, 0, 0, 0, f(No, false, "慎")},
-	{0xfa88, 0, 0, 0, f(No, false, "愈")},
-	{0xfa89, 0, 0, 0, f(No, false, "憎")},
-	{0xfa8a, 0, 0, 0, f(No, false, "慠")},
-	{0xfa8b, 0, 0, 0, f(No, false, "懲")},
-	{0xfa8c, 0, 0, 0, f(No, false, "戴")},
-	{0xfa8d, 0, 0, 0, f(No, false, "揄")},
-	{0xfa8e, 0, 0, 0, f(No, false, "搜")},
-	{0xfa8f, 0, 0, 0, f(No, false, "摒")},
-	{0xfa90, 0, 0, 0, f(No, false, "敖")},
-	{0xfa91, 0, 0, 0, f(No, false, "晴")},
-	{0xfa92, 0, 0, 0, f(No, false, "朗")},
-	{0xfa93, 0, 0, 0, f(No, false, "望")},
-	{0xfa94, 0, 0, 0, f(No, false, "杖")},
-	{0xfa95, 0, 0, 0, f(No, false, "歹")},
-	{0xfa96, 0, 0, 0, f(No, false, "殺")},
-	{0xfa97, 0, 0, 0, f(No, false, "流")},
-	{0xfa98, 0, 0, 0, f(No, false, "滛")},
-	{0xfa99, 0, 0, 0, f(No, false, "滋")},
-	{0xfa9a, 0, 0, 0, f(No, false, "漢")},
-	{0xfa9b, 0, 0, 0, f(No, false, "瀞")},
-	{0xfa9c, 0, 0, 0, f(No, false, "煮")},
-	{0xfa9d, 0, 0, 0, f(No, false, "瞧")},
-	{0xfa9e, 0, 0, 0, f(No, false, "爵")},
-	{0xfa9f, 0, 0, 0, f(No, false, "犯")},
-	{0xfaa0, 0, 0, 0, f(No, false, "猪")},
-	{0xfaa1, 0, 0, 0, f(No, false, "瑱")},
-	{0xfaa2, 0, 0, 0, f(No, false, "甆")},
-	{0xfaa3, 0, 0, 0, f(No, false, "画")},
-	{0xfaa4, 0, 0, 0, f(No, false, "瘝")},
-	{0xfaa5, 0, 0, 0, f(No, false, "瘟")},
-	{0xfaa6, 0, 0, 0, f(No, false, "益")},
-	{0xfaa7, 0, 0, 0, f(No, false, "盛")},
-	{0xfaa8, 0, 0, 0, f(No, false, "直")},
-	{0xfaa9, 0, 0, 0, f(No, false, "睊")},
-	{0xfaaa, 0, 0, 0, f(No, false, "着")},
-	{0xfaab, 0, 0, 0, f(No, false, "磌")},
-	{0xfaac, 0, 0, 0, f(No, false, "窱")},
-	{0xfaad, 0, 0, 0, f(No, false, "節")},
-	{0xfaae, 0, 0, 0, f(No, false, "类")},
-	{0xfaaf, 0, 0, 0, f(No, false, "絛")},
-	{0xfab0, 0, 0, 0, f(No, false, "練")},
-	{0xfab1, 0, 0, 0, f(No, false, "缾")},
-	{0xfab2, 0, 0, 0, f(No, false, "者")},
-	{0xfab3, 0, 0, 0, f(No, false, "荒")},
-	{0xfab4, 0, 0, 0, f(No, false, "華")},
-	{0xfab5, 0, 0, 0, f(No, false, "蝹")},
-	{0xfab6, 0, 0, 0, f(No, false, "襁")},
-	{0xfab7, 0, 0, 0, f(No, false, "覆")},
-	{0xfab8, 0, 0, 0, f(No, false, "視")},
-	{0xfab9, 0, 0, 0, f(No, false, "調")},
-	{0xfaba, 0, 0, 0, f(No, false, "諸")},
-	{0xfabb, 0, 0, 0, f(No, false, "請")},
-	{0xfabc, 0, 0, 0, f(No, false, "謁")},
-	{0xfabd, 0, 0, 0, f(No, false, "諾")},
-	{0xfabe, 0, 0, 0, f(No, false, "諭")},
-	{0xfabf, 0, 0, 0, f(No, false, "謹")},
-	{0xfac0, 0, 0, 0, f(No, false, "變")},
-	{0xfac1, 0, 0, 0, f(No, false, "贈")},
-	{0xfac2, 0, 0, 0, f(No, false, "輸")},
-	{0xfac3, 0, 0, 0, f(No, false, "遲")},
-	{0xfac4, 0, 0, 0, f(No, false, "醙")},
-	{0xfac5, 0, 0, 0, f(No, false, "鉶")},
-	{0xfac6, 0, 0, 0, f(No, false, "陼")},
-	{0xfac7, 0, 0, 0, f(No, false, "難")},
-	{0xfac8, 0, 0, 0, f(No, false, "靖")},
-	{0xfac9, 0, 0, 0, f(No, false, "韛")},
-	{0xfaca, 0, 0, 0, f(No, false, "響")},
-	{0xfacb, 0, 0, 0, f(No, false, "頋")},
-	{0xfacc, 0, 0, 0, f(No, false, "頻")},
-	{0xfacd, 0, 0, 0, f(No, false, "鬒")},
-	{0xface, 0, 0, 0, f(No, false, "龜")},
-	{0xfacf, 0, 0, 0, f(No, false, "𢡊")},
-	{0xfad0, 0, 0, 0, f(No, false, "𢡄")},
-	{0xfad1, 0, 0, 0, f(No, false, "𣏕")},
-	{0xfad2, 0, 0, 0, f(No, false, "㮝")},
-	{0xfad3, 0, 0, 0, f(No, false, "䀘")},
-	{0xfad4, 0, 0, 0, f(No, false, "䀹")},
-	{0xfad5, 0, 0, 0, f(No, false, "𥉉")},
-	{0xfad6, 0, 0, 0, f(No, false, "𥳐")},
-	{0xfad7, 0, 0, 0, f(No, false, "𧻓")},
-	{0xfad8, 0, 0, 0, f(No, false, "齃")},
-	{0xfad9, 0, 0, 0, f(No, false, "龎")},
-	{0xfada, 0, 0, 0, f(Yes, false, "")},
-	{0xfb00, 0, 0, 0, g(Yes, No, false, false, "", "ff")},
-	{0xfb01, 0, 0, 0, g(Yes, No, false, false, "", "fi")},
-	{0xfb02, 0, 0, 0, g(Yes, No, false, false, "", "fl")},
-	{0xfb03, 0, 0, 0, g(Yes, No, false, false, "", "ffi")},
-	{0xfb04, 0, 0, 0, g(Yes, No, false, false, "", "ffl")},
-	{0xfb05, 0, 0, 0, g(Yes, No, false, false, "", "st")},
-	{0xfb07, 0, 0, 0, f(Yes, false, "")},
-	{0xfb13, 0, 0, 0, g(Yes, No, false, false, "", "մն")},
-	{0xfb14, 0, 0, 0, g(Yes, No, false, false, "", "մե")},
-	{0xfb15, 0, 0, 0, g(Yes, No, false, false, "", "մի")},
-	{0xfb16, 0, 0, 0, g(Yes, No, false, false, "", "վն")},
-	{0xfb17, 0, 0, 0, g(Yes, No, false, false, "", "մխ")},
-	{0xfb18, 0, 0, 0, f(Yes, false, "")},
-	{0xfb1d, 0, 0, 1, f(No, false, "יִ")},
-	{0xfb1e, 26, 1, 1, f(Yes, false, "")},
-	{0xfb1f, 0, 0, 1, f(No, false, "ײַ")},
-	{0xfb20, 0, 0, 0, g(Yes, No, false, false, "", "ע")},
-	{0xfb21, 0, 0, 0, g(Yes, No, false, false, "", "א")},
-	{0xfb22, 0, 0, 0, g(Yes, No, false, false, "", "ד")},
-	{0xfb23, 0, 0, 0, g(Yes, No, false, false, "", "ה")},
-	{0xfb24, 0, 0, 0, g(Yes, No, false, false, "", "כ")},
-	{0xfb25, 0, 0, 0, g(Yes, No, false, false, "", "ל")},
-	{0xfb26, 0, 0, 0, g(Yes, No, false, false, "", "ם")},
-	{0xfb27, 0, 0, 0, g(Yes, No, false, false, "", "ר")},
-	{0xfb28, 0, 0, 0, g(Yes, No, false, false, "", "ת")},
-	{0xfb29, 0, 0, 0, g(Yes, No, false, false, "", "+")},
-	{0xfb2a, 0, 0, 1, f(No, false, "שׁ")},
-	{0xfb2b, 0, 0, 1, f(No, false, "שׂ")},
-	{0xfb2c, 0, 0, 2, f(No, false, "שּׁ")},
-	{0xfb2d, 0, 0, 2, f(No, false, "שּׂ")},
-	{0xfb2e, 0, 0, 1, f(No, false, "אַ")},
-	{0xfb2f, 0, 0, 1, f(No, false, "אָ")},
-	{0xfb30, 0, 0, 1, f(No, false, "אּ")},
-	{0xfb31, 0, 0, 1, f(No, false, "בּ")},
-	{0xfb32, 0, 0, 1, f(No, false, "גּ")},
-	{0xfb33, 0, 0, 1, f(No, false, "דּ")},
-	{0xfb34, 0, 0, 1, f(No, false, "הּ")},
-	{0xfb35, 0, 0, 1, f(No, false, "וּ")},
-	{0xfb36, 0, 0, 1, f(No, false, "זּ")},
-	{0xfb37, 0, 0, 0, f(Yes, false, "")},
-	{0xfb38, 0, 0, 1, f(No, false, "טּ")},
-	{0xfb39, 0, 0, 1, f(No, false, "יּ")},
-	{0xfb3a, 0, 0, 1, f(No, false, "ךּ")},
-	{0xfb3b, 0, 0, 1, f(No, false, "כּ")},
-	{0xfb3c, 0, 0, 1, f(No, false, "לּ")},
-	{0xfb3d, 0, 0, 0, f(Yes, false, "")},
-	{0xfb3e, 0, 0, 1, f(No, false, "מּ")},
-	{0xfb3f, 0, 0, 0, f(Yes, false, "")},
-	{0xfb40, 0, 0, 1, f(No, false, "נּ")},
-	{0xfb41, 0, 0, 1, f(No, false, "סּ")},
-	{0xfb42, 0, 0, 0, f(Yes, false, "")},
-	{0xfb43, 0, 0, 1, f(No, false, "ףּ")},
-	{0xfb44, 0, 0, 1, f(No, false, "פּ")},
-	{0xfb45, 0, 0, 0, f(Yes, false, "")},
-	{0xfb46, 0, 0, 1, f(No, false, "צּ")},
-	{0xfb47, 0, 0, 1, f(No, false, "קּ")},
-	{0xfb48, 0, 0, 1, f(No, false, "רּ")},
-	{0xfb49, 0, 0, 1, f(No, false, "שּ")},
-	{0xfb4a, 0, 0, 1, f(No, false, "תּ")},
-	{0xfb4b, 0, 0, 1, f(No, false, "וֹ")},
-	{0xfb4c, 0, 0, 1, f(No, false, "בֿ")},
-	{0xfb4d, 0, 0, 1, f(No, false, "כֿ")},
-	{0xfb4e, 0, 0, 1, f(No, false, "פֿ")},
-	{0xfb4f, 0, 0, 0, g(Yes, No, false, false, "", "אל")},
-	{0xfb50, 0, 0, 0, g(Yes, No, false, false, "", "ٱ")},
-	{0xfb52, 0, 0, 0, g(Yes, No, false, false, "", "ٻ")},
-	{0xfb56, 0, 0, 0, g(Yes, No, false, false, "", "پ")},
-	{0xfb5a, 0, 0, 0, g(Yes, No, false, false, "", "ڀ")},
-	{0xfb5e, 0, 0, 0, g(Yes, No, false, false, "", "ٺ")},
-	{0xfb62, 0, 0, 0, g(Yes, No, false, false, "", "ٿ")},
-	{0xfb66, 0, 0, 0, g(Yes, No, false, false, "", "ٹ")},
-	{0xfb6a, 0, 0, 0, g(Yes, No, false, false, "", "ڤ")},
-	{0xfb6e, 0, 0, 0, g(Yes, No, false, false, "", "ڦ")},
-	{0xfb72, 0, 0, 0, g(Yes, No, false, false, "", "ڄ")},
-	{0xfb76, 0, 0, 0, g(Yes, No, false, false, "", "ڃ")},
-	{0xfb7a, 0, 0, 0, g(Yes, No, false, false, "", "چ")},
-	{0xfb7e, 0, 0, 0, g(Yes, No, false, false, "", "ڇ")},
-	{0xfb82, 0, 0, 0, g(Yes, No, false, false, "", "ڍ")},
-	{0xfb84, 0, 0, 0, g(Yes, No, false, false, "", "ڌ")},
-	{0xfb86, 0, 0, 0, g(Yes, No, false, false, "", "ڎ")},
-	{0xfb88, 0, 0, 0, g(Yes, No, false, false, "", "ڈ")},
-	{0xfb8a, 0, 0, 0, g(Yes, No, false, false, "", "ژ")},
-	{0xfb8c, 0, 0, 0, g(Yes, No, false, false, "", "ڑ")},
-	{0xfb8e, 0, 0, 0, g(Yes, No, false, false, "", "ک")},
-	{0xfb92, 0, 0, 0, g(Yes, No, false, false, "", "گ")},
-	{0xfb96, 0, 0, 0, g(Yes, No, false, false, "", "ڳ")},
-	{0xfb9a, 0, 0, 0, g(Yes, No, false, false, "", "ڱ")},
-	{0xfb9e, 0, 0, 0, g(Yes, No, false, false, "", "ں")},
-	{0xfba0, 0, 0, 0, g(Yes, No, false, false, "", "ڻ")},
-	{0xfba4, 0, 0, 1, g(Yes, No, false, false, "", "ۀ")},
-	{0xfba6, 0, 0, 0, g(Yes, No, false, false, "", "ہ")},
-	{0xfbaa, 0, 0, 0, g(Yes, No, false, false, "", "ھ")},
-	{0xfbae, 0, 0, 0, g(Yes, No, false, false, "", "ے")},
-	{0xfbb0, 0, 0, 1, g(Yes, No, false, false, "", "ۓ")},
-	{0xfbb2, 0, 0, 0, f(Yes, false, "")},
-	{0xfbd3, 0, 0, 0, g(Yes, No, false, false, "", "ڭ")},
-	{0xfbd7, 0, 0, 0, g(Yes, No, false, false, "", "ۇ")},
-	{0xfbd9, 0, 0, 0, g(Yes, No, false, false, "", "ۆ")},
-	{0xfbdb, 0, 0, 0, g(Yes, No, false, false, "", "ۈ")},
-	{0xfbdd, 0, 0, 0, g(Yes, No, false, false, "", "ۇٴ")},
-	{0xfbde, 0, 0, 0, g(Yes, No, false, false, "", "ۋ")},
-	{0xfbe0, 0, 0, 0, g(Yes, No, false, false, "", "ۅ")},
-	{0xfbe2, 0, 0, 0, g(Yes, No, false, false, "", "ۉ")},
-	{0xfbe4, 0, 0, 0, g(Yes, No, false, false, "", "ې")},
-	{0xfbe8, 0, 0, 0, g(Yes, No, false, false, "", "ى")},
-	{0xfbea, 0, 0, 0, g(Yes, No, false, false, "", "ئا")},
-	{0xfbec, 0, 0, 0, g(Yes, No, false, false, "", "ئە")},
-	{0xfbee, 0, 0, 0, g(Yes, No, false, false, "", "ئو")},
-	{0xfbf0, 0, 0, 0, g(Yes, No, false, false, "", "ئۇ")},
-	{0xfbf2, 0, 0, 0, g(Yes, No, false, false, "", "ئۆ")},
-	{0xfbf4, 0, 0, 0, g(Yes, No, false, false, "", "ئۈ")},
-	{0xfbf6, 0, 0, 0, g(Yes, No, false, false, "", "ئې")},
-	{0xfbf9, 0, 0, 0, g(Yes, No, false, false, "", "ئى")},
-	{0xfbfc, 0, 0, 0, g(Yes, No, false, false, "", "ی")},
-	{0xfc00, 0, 0, 0, g(Yes, No, false, false, "", "ئج")},
-	{0xfc01, 0, 0, 0, g(Yes, No, false, false, "", "ئح")},
-	{0xfc02, 0, 0, 0, g(Yes, No, false, false, "", "ئم")},
-	{0xfc03, 0, 0, 0, g(Yes, No, false, false, "", "ئى")},
-	{0xfc04, 0, 0, 0, g(Yes, No, false, false, "", "ئي")},
-	{0xfc05, 0, 0, 0, g(Yes, No, false, false, "", "بج")},
-	{0xfc06, 0, 0, 0, g(Yes, No, false, false, "", "بح")},
-	{0xfc07, 0, 0, 0, g(Yes, No, false, false, "", "بخ")},
-	{0xfc08, 0, 0, 0, g(Yes, No, false, false, "", "بم")},
-	{0xfc09, 0, 0, 0, g(Yes, No, false, false, "", "بى")},
-	{0xfc0a, 0, 0, 0, g(Yes, No, false, false, "", "بي")},
-	{0xfc0b, 0, 0, 0, g(Yes, No, false, false, "", "تج")},
-	{0xfc0c, 0, 0, 0, g(Yes, No, false, false, "", "تح")},
-	{0xfc0d, 0, 0, 0, g(Yes, No, false, false, "", "تخ")},
-	{0xfc0e, 0, 0, 0, g(Yes, No, false, false, "", "تم")},
-	{0xfc0f, 0, 0, 0, g(Yes, No, false, false, "", "تى")},
-	{0xfc10, 0, 0, 0, g(Yes, No, false, false, "", "تي")},
-	{0xfc11, 0, 0, 0, g(Yes, No, false, false, "", "ثج")},
-	{0xfc12, 0, 0, 0, g(Yes, No, false, false, "", "ثم")},
-	{0xfc13, 0, 0, 0, g(Yes, No, false, false, "", "ثى")},
-	{0xfc14, 0, 0, 0, g(Yes, No, false, false, "", "ثي")},
-	{0xfc15, 0, 0, 0, g(Yes, No, false, false, "", "جح")},
-	{0xfc16, 0, 0, 0, g(Yes, No, false, false, "", "جم")},
-	{0xfc17, 0, 0, 0, g(Yes, No, false, false, "", "حج")},
-	{0xfc18, 0, 0, 0, g(Yes, No, false, false, "", "حم")},
-	{0xfc19, 0, 0, 0, g(Yes, No, false, false, "", "خج")},
-	{0xfc1a, 0, 0, 0, g(Yes, No, false, false, "", "خح")},
-	{0xfc1b, 0, 0, 0, g(Yes, No, false, false, "", "خم")},
-	{0xfc1c, 0, 0, 0, g(Yes, No, false, false, "", "سج")},
-	{0xfc1d, 0, 0, 0, g(Yes, No, false, false, "", "سح")},
-	{0xfc1e, 0, 0, 0, g(Yes, No, false, false, "", "سخ")},
-	{0xfc1f, 0, 0, 0, g(Yes, No, false, false, "", "سم")},
-	{0xfc20, 0, 0, 0, g(Yes, No, false, false, "", "صح")},
-	{0xfc21, 0, 0, 0, g(Yes, No, false, false, "", "صم")},
-	{0xfc22, 0, 0, 0, g(Yes, No, false, false, "", "ضج")},
-	{0xfc23, 0, 0, 0, g(Yes, No, false, false, "", "ضح")},
-	{0xfc24, 0, 0, 0, g(Yes, No, false, false, "", "ضخ")},
-	{0xfc25, 0, 0, 0, g(Yes, No, false, false, "", "ضم")},
-	{0xfc26, 0, 0, 0, g(Yes, No, false, false, "", "طح")},
-	{0xfc27, 0, 0, 0, g(Yes, No, false, false, "", "طم")},
-	{0xfc28, 0, 0, 0, g(Yes, No, false, false, "", "ظم")},
-	{0xfc29, 0, 0, 0, g(Yes, No, false, false, "", "عج")},
-	{0xfc2a, 0, 0, 0, g(Yes, No, false, false, "", "عم")},
-	{0xfc2b, 0, 0, 0, g(Yes, No, false, false, "", "غج")},
-	{0xfc2c, 0, 0, 0, g(Yes, No, false, false, "", "غم")},
-	{0xfc2d, 0, 0, 0, g(Yes, No, false, false, "", "فج")},
-	{0xfc2e, 0, 0, 0, g(Yes, No, false, false, "", "فح")},
-	{0xfc2f, 0, 0, 0, g(Yes, No, false, false, "", "فخ")},
-	{0xfc30, 0, 0, 0, g(Yes, No, false, false, "", "فم")},
-	{0xfc31, 0, 0, 0, g(Yes, No, false, false, "", "فى")},
-	{0xfc32, 0, 0, 0, g(Yes, No, false, false, "", "في")},
-	{0xfc33, 0, 0, 0, g(Yes, No, false, false, "", "قح")},
-	{0xfc34, 0, 0, 0, g(Yes, No, false, false, "", "قم")},
-	{0xfc35, 0, 0, 0, g(Yes, No, false, false, "", "قى")},
-	{0xfc36, 0, 0, 0, g(Yes, No, false, false, "", "قي")},
-	{0xfc37, 0, 0, 0, g(Yes, No, false, false, "", "كا")},
-	{0xfc38, 0, 0, 0, g(Yes, No, false, false, "", "كج")},
-	{0xfc39, 0, 0, 0, g(Yes, No, false, false, "", "كح")},
-	{0xfc3a, 0, 0, 0, g(Yes, No, false, false, "", "كخ")},
-	{0xfc3b, 0, 0, 0, g(Yes, No, false, false, "", "كل")},
-	{0xfc3c, 0, 0, 0, g(Yes, No, false, false, "", "كم")},
-	{0xfc3d, 0, 0, 0, g(Yes, No, false, false, "", "كى")},
-	{0xfc3e, 0, 0, 0, g(Yes, No, false, false, "", "كي")},
-	{0xfc3f, 0, 0, 0, g(Yes, No, false, false, "", "لج")},
-	{0xfc40, 0, 0, 0, g(Yes, No, false, false, "", "لح")},
-	{0xfc41, 0, 0, 0, g(Yes, No, false, false, "", "لخ")},
-	{0xfc42, 0, 0, 0, g(Yes, No, false, false, "", "لم")},
-	{0xfc43, 0, 0, 0, g(Yes, No, false, false, "", "لى")},
-	{0xfc44, 0, 0, 0, g(Yes, No, false, false, "", "لي")},
-	{0xfc45, 0, 0, 0, g(Yes, No, false, false, "", "مج")},
-	{0xfc46, 0, 0, 0, g(Yes, No, false, false, "", "مح")},
-	{0xfc47, 0, 0, 0, g(Yes, No, false, false, "", "مخ")},
-	{0xfc48, 0, 0, 0, g(Yes, No, false, false, "", "مم")},
-	{0xfc49, 0, 0, 0, g(Yes, No, false, false, "", "مى")},
-	{0xfc4a, 0, 0, 0, g(Yes, No, false, false, "", "مي")},
-	{0xfc4b, 0, 0, 0, g(Yes, No, false, false, "", "نج")},
-	{0xfc4c, 0, 0, 0, g(Yes, No, false, false, "", "نح")},
-	{0xfc4d, 0, 0, 0, g(Yes, No, false, false, "", "نخ")},
-	{0xfc4e, 0, 0, 0, g(Yes, No, false, false, "", "نم")},
-	{0xfc4f, 0, 0, 0, g(Yes, No, false, false, "", "نى")},
-	{0xfc50, 0, 0, 0, g(Yes, No, false, false, "", "ني")},
-	{0xfc51, 0, 0, 0, g(Yes, No, false, false, "", "هج")},
-	{0xfc52, 0, 0, 0, g(Yes, No, false, false, "", "هم")},
-	{0xfc53, 0, 0, 0, g(Yes, No, false, false, "", "هى")},
-	{0xfc54, 0, 0, 0, g(Yes, No, false, false, "", "هي")},
-	{0xfc55, 0, 0, 0, g(Yes, No, false, false, "", "يج")},
-	{0xfc56, 0, 0, 0, g(Yes, No, false, false, "", "يح")},
-	{0xfc57, 0, 0, 0, g(Yes, No, false, false, "", "يخ")},
-	{0xfc58, 0, 0, 0, g(Yes, No, false, false, "", "يم")},
-	{0xfc59, 0, 0, 0, g(Yes, No, false, false, "", "يى")},
-	{0xfc5a, 0, 0, 0, g(Yes, No, false, false, "", "يي")},
-	{0xfc5b, 0, 0, 1, g(Yes, No, false, false, "", "ذٰ")},
-	{0xfc5c, 0, 0, 1, g(Yes, No, false, false, "", "رٰ")},
-	{0xfc5d, 0, 0, 1, g(Yes, No, false, false, "", "ىٰ")},
-	{0xfc5e, 0, 0, 2, g(Yes, No, false, false, "", " ٌّ")},
-	{0xfc5f, 0, 0, 2, g(Yes, No, false, false, "", " ٍّ")},
-	{0xfc60, 0, 0, 2, g(Yes, No, false, false, "", " َّ")},
-	{0xfc61, 0, 0, 2, g(Yes, No, false, false, "", " ُّ")},
-	{0xfc62, 0, 0, 2, g(Yes, No, false, false, "", " ِّ")},
-	{0xfc63, 0, 0, 2, g(Yes, No, false, false, "", " ّٰ")},
-	{0xfc64, 0, 0, 0, g(Yes, No, false, false, "", "ئر")},
-	{0xfc65, 0, 0, 0, g(Yes, No, false, false, "", "ئز")},
-	{0xfc66, 0, 0, 0, g(Yes, No, false, false, "", "ئم")},
-	{0xfc67, 0, 0, 0, g(Yes, No, false, false, "", "ئن")},
-	{0xfc68, 0, 0, 0, g(Yes, No, false, false, "", "ئى")},
-	{0xfc69, 0, 0, 0, g(Yes, No, false, false, "", "ئي")},
-	{0xfc6a, 0, 0, 0, g(Yes, No, false, false, "", "بر")},
-	{0xfc6b, 0, 0, 0, g(Yes, No, false, false, "", "بز")},
-	{0xfc6c, 0, 0, 0, g(Yes, No, false, false, "", "بم")},
-	{0xfc6d, 0, 0, 0, g(Yes, No, false, false, "", "بن")},
-	{0xfc6e, 0, 0, 0, g(Yes, No, false, false, "", "بى")},
-	{0xfc6f, 0, 0, 0, g(Yes, No, false, false, "", "بي")},
-	{0xfc70, 0, 0, 0, g(Yes, No, false, false, "", "تر")},
-	{0xfc71, 0, 0, 0, g(Yes, No, false, false, "", "تز")},
-	{0xfc72, 0, 0, 0, g(Yes, No, false, false, "", "تم")},
-	{0xfc73, 0, 0, 0, g(Yes, No, false, false, "", "تن")},
-	{0xfc74, 0, 0, 0, g(Yes, No, false, false, "", "تى")},
-	{0xfc75, 0, 0, 0, g(Yes, No, false, false, "", "تي")},
-	{0xfc76, 0, 0, 0, g(Yes, No, false, false, "", "ثر")},
-	{0xfc77, 0, 0, 0, g(Yes, No, false, false, "", "ثز")},
-	{0xfc78, 0, 0, 0, g(Yes, No, false, false, "", "ثم")},
-	{0xfc79, 0, 0, 0, g(Yes, No, false, false, "", "ثن")},
-	{0xfc7a, 0, 0, 0, g(Yes, No, false, false, "", "ثى")},
-	{0xfc7b, 0, 0, 0, g(Yes, No, false, false, "", "ثي")},
-	{0xfc7c, 0, 0, 0, g(Yes, No, false, false, "", "فى")},
-	{0xfc7d, 0, 0, 0, g(Yes, No, false, false, "", "في")},
-	{0xfc7e, 0, 0, 0, g(Yes, No, false, false, "", "قى")},
-	{0xfc7f, 0, 0, 0, g(Yes, No, false, false, "", "قي")},
-	{0xfc80, 0, 0, 0, g(Yes, No, false, false, "", "كا")},
-	{0xfc81, 0, 0, 0, g(Yes, No, false, false, "", "كل")},
-	{0xfc82, 0, 0, 0, g(Yes, No, false, false, "", "كم")},
-	{0xfc83, 0, 0, 0, g(Yes, No, false, false, "", "كى")},
-	{0xfc84, 0, 0, 0, g(Yes, No, false, false, "", "كي")},
-	{0xfc85, 0, 0, 0, g(Yes, No, false, false, "", "لم")},
-	{0xfc86, 0, 0, 0, g(Yes, No, false, false, "", "لى")},
-	{0xfc87, 0, 0, 0, g(Yes, No, false, false, "", "لي")},
-	{0xfc88, 0, 0, 0, g(Yes, No, false, false, "", "ما")},
-	{0xfc89, 0, 0, 0, g(Yes, No, false, false, "", "مم")},
-	{0xfc8a, 0, 0, 0, g(Yes, No, false, false, "", "نر")},
-	{0xfc8b, 0, 0, 0, g(Yes, No, false, false, "", "نز")},
-	{0xfc8c, 0, 0, 0, g(Yes, No, false, false, "", "نم")},
-	{0xfc8d, 0, 0, 0, g(Yes, No, false, false, "", "نن")},
-	{0xfc8e, 0, 0, 0, g(Yes, No, false, false, "", "نى")},
-	{0xfc8f, 0, 0, 0, g(Yes, No, false, false, "", "ني")},
-	{0xfc90, 0, 0, 1, g(Yes, No, false, false, "", "ىٰ")},
-	{0xfc91, 0, 0, 0, g(Yes, No, false, false, "", "ير")},
-	{0xfc92, 0, 0, 0, g(Yes, No, false, false, "", "يز")},
-	{0xfc93, 0, 0, 0, g(Yes, No, false, false, "", "يم")},
-	{0xfc94, 0, 0, 0, g(Yes, No, false, false, "", "ين")},
-	{0xfc95, 0, 0, 0, g(Yes, No, false, false, "", "يى")},
-	{0xfc96, 0, 0, 0, g(Yes, No, false, false, "", "يي")},
-	{0xfc97, 0, 0, 0, g(Yes, No, false, false, "", "ئج")},
-	{0xfc98, 0, 0, 0, g(Yes, No, false, false, "", "ئح")},
-	{0xfc99, 0, 0, 0, g(Yes, No, false, false, "", "ئخ")},
-	{0xfc9a, 0, 0, 0, g(Yes, No, false, false, "", "ئم")},
-	{0xfc9b, 0, 0, 0, g(Yes, No, false, false, "", "ئه")},
-	{0xfc9c, 0, 0, 0, g(Yes, No, false, false, "", "بج")},
-	{0xfc9d, 0, 0, 0, g(Yes, No, false, false, "", "بح")},
-	{0xfc9e, 0, 0, 0, g(Yes, No, false, false, "", "بخ")},
-	{0xfc9f, 0, 0, 0, g(Yes, No, false, false, "", "بم")},
-	{0xfca0, 0, 0, 0, g(Yes, No, false, false, "", "به")},
-	{0xfca1, 0, 0, 0, g(Yes, No, false, false, "", "تج")},
-	{0xfca2, 0, 0, 0, g(Yes, No, false, false, "", "تح")},
-	{0xfca3, 0, 0, 0, g(Yes, No, false, false, "", "تخ")},
-	{0xfca4, 0, 0, 0, g(Yes, No, false, false, "", "تم")},
-	{0xfca5, 0, 0, 0, g(Yes, No, false, false, "", "ته")},
-	{0xfca6, 0, 0, 0, g(Yes, No, false, false, "", "ثم")},
-	{0xfca7, 0, 0, 0, g(Yes, No, false, false, "", "جح")},
-	{0xfca8, 0, 0, 0, g(Yes, No, false, false, "", "جم")},
-	{0xfca9, 0, 0, 0, g(Yes, No, false, false, "", "حج")},
-	{0xfcaa, 0, 0, 0, g(Yes, No, false, false, "", "حم")},
-	{0xfcab, 0, 0, 0, g(Yes, No, false, false, "", "خج")},
-	{0xfcac, 0, 0, 0, g(Yes, No, false, false, "", "خم")},
-	{0xfcad, 0, 0, 0, g(Yes, No, false, false, "", "سج")},
-	{0xfcae, 0, 0, 0, g(Yes, No, false, false, "", "سح")},
-	{0xfcaf, 0, 0, 0, g(Yes, No, false, false, "", "سخ")},
-	{0xfcb0, 0, 0, 0, g(Yes, No, false, false, "", "سم")},
-	{0xfcb1, 0, 0, 0, g(Yes, No, false, false, "", "صح")},
-	{0xfcb2, 0, 0, 0, g(Yes, No, false, false, "", "صخ")},
-	{0xfcb3, 0, 0, 0, g(Yes, No, false, false, "", "صم")},
-	{0xfcb4, 0, 0, 0, g(Yes, No, false, false, "", "ضج")},
-	{0xfcb5, 0, 0, 0, g(Yes, No, false, false, "", "ضح")},
-	{0xfcb6, 0, 0, 0, g(Yes, No, false, false, "", "ضخ")},
-	{0xfcb7, 0, 0, 0, g(Yes, No, false, false, "", "ضم")},
-	{0xfcb8, 0, 0, 0, g(Yes, No, false, false, "", "طح")},
-	{0xfcb9, 0, 0, 0, g(Yes, No, false, false, "", "ظم")},
-	{0xfcba, 0, 0, 0, g(Yes, No, false, false, "", "عج")},
-	{0xfcbb, 0, 0, 0, g(Yes, No, false, false, "", "عم")},
-	{0xfcbc, 0, 0, 0, g(Yes, No, false, false, "", "غج")},
-	{0xfcbd, 0, 0, 0, g(Yes, No, false, false, "", "غم")},
-	{0xfcbe, 0, 0, 0, g(Yes, No, false, false, "", "فج")},
-	{0xfcbf, 0, 0, 0, g(Yes, No, false, false, "", "فح")},
-	{0xfcc0, 0, 0, 0, g(Yes, No, false, false, "", "فخ")},
-	{0xfcc1, 0, 0, 0, g(Yes, No, false, false, "", "فم")},
-	{0xfcc2, 0, 0, 0, g(Yes, No, false, false, "", "قح")},
-	{0xfcc3, 0, 0, 0, g(Yes, No, false, false, "", "قم")},
-	{0xfcc4, 0, 0, 0, g(Yes, No, false, false, "", "كج")},
-	{0xfcc5, 0, 0, 0, g(Yes, No, false, false, "", "كح")},
-	{0xfcc6, 0, 0, 0, g(Yes, No, false, false, "", "كخ")},
-	{0xfcc7, 0, 0, 0, g(Yes, No, false, false, "", "كل")},
-	{0xfcc8, 0, 0, 0, g(Yes, No, false, false, "", "كم")},
-	{0xfcc9, 0, 0, 0, g(Yes, No, false, false, "", "لج")},
-	{0xfcca, 0, 0, 0, g(Yes, No, false, false, "", "لح")},
-	{0xfccb, 0, 0, 0, g(Yes, No, false, false, "", "لخ")},
-	{0xfccc, 0, 0, 0, g(Yes, No, false, false, "", "لم")},
-	{0xfccd, 0, 0, 0, g(Yes, No, false, false, "", "له")},
-	{0xfcce, 0, 0, 0, g(Yes, No, false, false, "", "مج")},
-	{0xfccf, 0, 0, 0, g(Yes, No, false, false, "", "مح")},
-	{0xfcd0, 0, 0, 0, g(Yes, No, false, false, "", "مخ")},
-	{0xfcd1, 0, 0, 0, g(Yes, No, false, false, "", "مم")},
-	{0xfcd2, 0, 0, 0, g(Yes, No, false, false, "", "نج")},
-	{0xfcd3, 0, 0, 0, g(Yes, No, false, false, "", "نح")},
-	{0xfcd4, 0, 0, 0, g(Yes, No, false, false, "", "نخ")},
-	{0xfcd5, 0, 0, 0, g(Yes, No, false, false, "", "نم")},
-	{0xfcd6, 0, 0, 0, g(Yes, No, false, false, "", "نه")},
-	{0xfcd7, 0, 0, 0, g(Yes, No, false, false, "", "هج")},
-	{0xfcd8, 0, 0, 0, g(Yes, No, false, false, "", "هم")},
-	{0xfcd9, 0, 0, 1, g(Yes, No, false, false, "", "هٰ")},
-	{0xfcda, 0, 0, 0, g(Yes, No, false, false, "", "يج")},
-	{0xfcdb, 0, 0, 0, g(Yes, No, false, false, "", "يح")},
-	{0xfcdc, 0, 0, 0, g(Yes, No, false, false, "", "يخ")},
-	{0xfcdd, 0, 0, 0, g(Yes, No, false, false, "", "يم")},
-	{0xfcde, 0, 0, 0, g(Yes, No, false, false, "", "يه")},
-	{0xfcdf, 0, 0, 0, g(Yes, No, false, false, "", "ئم")},
-	{0xfce0, 0, 0, 0, g(Yes, No, false, false, "", "ئه")},
-	{0xfce1, 0, 0, 0, g(Yes, No, false, false, "", "بم")},
-	{0xfce2, 0, 0, 0, g(Yes, No, false, false, "", "به")},
-	{0xfce3, 0, 0, 0, g(Yes, No, false, false, "", "تم")},
-	{0xfce4, 0, 0, 0, g(Yes, No, false, false, "", "ته")},
-	{0xfce5, 0, 0, 0, g(Yes, No, false, false, "", "ثم")},
-	{0xfce6, 0, 0, 0, g(Yes, No, false, false, "", "ثه")},
-	{0xfce7, 0, 0, 0, g(Yes, No, false, false, "", "سم")},
-	{0xfce8, 0, 0, 0, g(Yes, No, false, false, "", "سه")},
-	{0xfce9, 0, 0, 0, g(Yes, No, false, false, "", "شم")},
-	{0xfcea, 0, 0, 0, g(Yes, No, false, false, "", "شه")},
-	{0xfceb, 0, 0, 0, g(Yes, No, false, false, "", "كل")},
-	{0xfcec, 0, 0, 0, g(Yes, No, false, false, "", "كم")},
-	{0xfced, 0, 0, 0, g(Yes, No, false, false, "", "لم")},
-	{0xfcee, 0, 0, 0, g(Yes, No, false, false, "", "نم")},
-	{0xfcef, 0, 0, 0, g(Yes, No, false, false, "", "نه")},
-	{0xfcf0, 0, 0, 0, g(Yes, No, false, false, "", "يم")},
-	{0xfcf1, 0, 0, 0, g(Yes, No, false, false, "", "يه")},
-	{0xfcf2, 0, 0, 2, g(Yes, No, false, false, "", "ـَّ")},
-	{0xfcf3, 0, 0, 2, g(Yes, No, false, false, "", "ـُّ")},
-	{0xfcf4, 0, 0, 2, g(Yes, No, false, false, "", "ـِّ")},
-	{0xfcf5, 0, 0, 0, g(Yes, No, false, false, "", "طى")},
-	{0xfcf6, 0, 0, 0, g(Yes, No, false, false, "", "طي")},
-	{0xfcf7, 0, 0, 0, g(Yes, No, false, false, "", "عى")},
-	{0xfcf8, 0, 0, 0, g(Yes, No, false, false, "", "عي")},
-	{0xfcf9, 0, 0, 0, g(Yes, No, false, false, "", "غى")},
-	{0xfcfa, 0, 0, 0, g(Yes, No, false, false, "", "غي")},
-	{0xfcfb, 0, 0, 0, g(Yes, No, false, false, "", "سى")},
-	{0xfcfc, 0, 0, 0, g(Yes, No, false, false, "", "سي")},
-	{0xfcfd, 0, 0, 0, g(Yes, No, false, false, "", "شى")},
-	{0xfcfe, 0, 0, 0, g(Yes, No, false, false, "", "شي")},
-	{0xfcff, 0, 0, 0, g(Yes, No, false, false, "", "حى")},
-	{0xfd00, 0, 0, 0, g(Yes, No, false, false, "", "حي")},
-	{0xfd01, 0, 0, 0, g(Yes, No, false, false, "", "جى")},
-	{0xfd02, 0, 0, 0, g(Yes, No, false, false, "", "جي")},
-	{0xfd03, 0, 0, 0, g(Yes, No, false, false, "", "خى")},
-	{0xfd04, 0, 0, 0, g(Yes, No, false, false, "", "خي")},
-	{0xfd05, 0, 0, 0, g(Yes, No, false, false, "", "صى")},
-	{0xfd06, 0, 0, 0, g(Yes, No, false, false, "", "صي")},
-	{0xfd07, 0, 0, 0, g(Yes, No, false, false, "", "ضى")},
-	{0xfd08, 0, 0, 0, g(Yes, No, false, false, "", "ضي")},
-	{0xfd09, 0, 0, 0, g(Yes, No, false, false, "", "شج")},
-	{0xfd0a, 0, 0, 0, g(Yes, No, false, false, "", "شح")},
-	{0xfd0b, 0, 0, 0, g(Yes, No, false, false, "", "شخ")},
-	{0xfd0c, 0, 0, 0, g(Yes, No, false, false, "", "شم")},
-	{0xfd0d, 0, 0, 0, g(Yes, No, false, false, "", "شر")},
-	{0xfd0e, 0, 0, 0, g(Yes, No, false, false, "", "سر")},
-	{0xfd0f, 0, 0, 0, g(Yes, No, false, false, "", "صر")},
-	{0xfd10, 0, 0, 0, g(Yes, No, false, false, "", "ضر")},
-	{0xfd11, 0, 0, 0, g(Yes, No, false, false, "", "طى")},
-	{0xfd12, 0, 0, 0, g(Yes, No, false, false, "", "طي")},
-	{0xfd13, 0, 0, 0, g(Yes, No, false, false, "", "عى")},
-	{0xfd14, 0, 0, 0, g(Yes, No, false, false, "", "عي")},
-	{0xfd15, 0, 0, 0, g(Yes, No, false, false, "", "غى")},
-	{0xfd16, 0, 0, 0, g(Yes, No, false, false, "", "غي")},
-	{0xfd17, 0, 0, 0, g(Yes, No, false, false, "", "سى")},
-	{0xfd18, 0, 0, 0, g(Yes, No, false, false, "", "سي")},
-	{0xfd19, 0, 0, 0, g(Yes, No, false, false, "", "شى")},
-	{0xfd1a, 0, 0, 0, g(Yes, No, false, false, "", "شي")},
-	{0xfd1b, 0, 0, 0, g(Yes, No, false, false, "", "حى")},
-	{0xfd1c, 0, 0, 0, g(Yes, No, false, false, "", "حي")},
-	{0xfd1d, 0, 0, 0, g(Yes, No, false, false, "", "جى")},
-	{0xfd1e, 0, 0, 0, g(Yes, No, false, false, "", "جي")},
-	{0xfd1f, 0, 0, 0, g(Yes, No, false, false, "", "خى")},
-	{0xfd20, 0, 0, 0, g(Yes, No, false, false, "", "خي")},
-	{0xfd21, 0, 0, 0, g(Yes, No, false, false, "", "صى")},
-	{0xfd22, 0, 0, 0, g(Yes, No, false, false, "", "صي")},
-	{0xfd23, 0, 0, 0, g(Yes, No, false, false, "", "ضى")},
-	{0xfd24, 0, 0, 0, g(Yes, No, false, false, "", "ضي")},
-	{0xfd25, 0, 0, 0, g(Yes, No, false, false, "", "شج")},
-	{0xfd26, 0, 0, 0, g(Yes, No, false, false, "", "شح")},
-	{0xfd27, 0, 0, 0, g(Yes, No, false, false, "", "شخ")},
-	{0xfd28, 0, 0, 0, g(Yes, No, false, false, "", "شم")},
-	{0xfd29, 0, 0, 0, g(Yes, No, false, false, "", "شر")},
-	{0xfd2a, 0, 0, 0, g(Yes, No, false, false, "", "سر")},
-	{0xfd2b, 0, 0, 0, g(Yes, No, false, false, "", "صر")},
-	{0xfd2c, 0, 0, 0, g(Yes, No, false, false, "", "ضر")},
-	{0xfd2d, 0, 0, 0, g(Yes, No, false, false, "", "شج")},
-	{0xfd2e, 0, 0, 0, g(Yes, No, false, false, "", "شح")},
-	{0xfd2f, 0, 0, 0, g(Yes, No, false, false, "", "شخ")},
-	{0xfd30, 0, 0, 0, g(Yes, No, false, false, "", "شم")},
-	{0xfd31, 0, 0, 0, g(Yes, No, false, false, "", "سه")},
-	{0xfd32, 0, 0, 0, g(Yes, No, false, false, "", "شه")},
-	{0xfd33, 0, 0, 0, g(Yes, No, false, false, "", "طم")},
-	{0xfd34, 0, 0, 0, g(Yes, No, false, false, "", "سج")},
-	{0xfd35, 0, 0, 0, g(Yes, No, false, false, "", "سح")},
-	{0xfd36, 0, 0, 0, g(Yes, No, false, false, "", "سخ")},
-	{0xfd37, 0, 0, 0, g(Yes, No, false, false, "", "شج")},
-	{0xfd38, 0, 0, 0, g(Yes, No, false, false, "", "شح")},
-	{0xfd39, 0, 0, 0, g(Yes, No, false, false, "", "شخ")},
-	{0xfd3a, 0, 0, 0, g(Yes, No, false, false, "", "طم")},
-	{0xfd3b, 0, 0, 0, g(Yes, No, false, false, "", "ظم")},
-	{0xfd3c, 0, 0, 1, g(Yes, No, false, false, "", "اً")},
-	{0xfd3e, 0, 0, 0, f(Yes, false, "")},
-	{0xfd50, 0, 0, 0, g(Yes, No, false, false, "", "تجم")},
-	{0xfd51, 0, 0, 0, g(Yes, No, false, false, "", "تحج")},
-	{0xfd53, 0, 0, 0, g(Yes, No, false, false, "", "تحم")},
-	{0xfd54, 0, 0, 0, g(Yes, No, false, false, "", "تخم")},
-	{0xfd55, 0, 0, 0, g(Yes, No, false, false, "", "تمج")},
-	{0xfd56, 0, 0, 0, g(Yes, No, false, false, "", "تمح")},
-	{0xfd57, 0, 0, 0, g(Yes, No, false, false, "", "تمخ")},
-	{0xfd58, 0, 0, 0, g(Yes, No, false, false, "", "جمح")},
-	{0xfd5a, 0, 0, 0, g(Yes, No, false, false, "", "حمي")},
-	{0xfd5b, 0, 0, 0, g(Yes, No, false, false, "", "حمى")},
-	{0xfd5c, 0, 0, 0, g(Yes, No, false, false, "", "سحج")},
-	{0xfd5d, 0, 0, 0, g(Yes, No, false, false, "", "سجح")},
-	{0xfd5e, 0, 0, 0, g(Yes, No, false, false, "", "سجى")},
-	{0xfd5f, 0, 0, 0, g(Yes, No, false, false, "", "سمح")},
-	{0xfd61, 0, 0, 0, g(Yes, No, false, false, "", "سمج")},
-	{0xfd62, 0, 0, 0, g(Yes, No, false, false, "", "سمم")},
-	{0xfd64, 0, 0, 0, g(Yes, No, false, false, "", "صحح")},
-	{0xfd66, 0, 0, 0, g(Yes, No, false, false, "", "صمم")},
-	{0xfd67, 0, 0, 0, g(Yes, No, false, false, "", "شحم")},
-	{0xfd69, 0, 0, 0, g(Yes, No, false, false, "", "شجي")},
-	{0xfd6a, 0, 0, 0, g(Yes, No, false, false, "", "شمخ")},
-	{0xfd6c, 0, 0, 0, g(Yes, No, false, false, "", "شمم")},
-	{0xfd6e, 0, 0, 0, g(Yes, No, false, false, "", "ضحى")},
-	{0xfd6f, 0, 0, 0, g(Yes, No, false, false, "", "ضخم")},
-	{0xfd71, 0, 0, 0, g(Yes, No, false, false, "", "طمح")},
-	{0xfd73, 0, 0, 0, g(Yes, No, false, false, "", "طمم")},
-	{0xfd74, 0, 0, 0, g(Yes, No, false, false, "", "طمي")},
-	{0xfd75, 0, 0, 0, g(Yes, No, false, false, "", "عجم")},
-	{0xfd76, 0, 0, 0, g(Yes, No, false, false, "", "عمم")},
-	{0xfd78, 0, 0, 0, g(Yes, No, false, false, "", "عمى")},
-	{0xfd79, 0, 0, 0, g(Yes, No, false, false, "", "غمم")},
-	{0xfd7a, 0, 0, 0, g(Yes, No, false, false, "", "غمي")},
-	{0xfd7b, 0, 0, 0, g(Yes, No, false, false, "", "غمى")},
-	{0xfd7c, 0, 0, 0, g(Yes, No, false, false, "", "فخم")},
-	{0xfd7e, 0, 0, 0, g(Yes, No, false, false, "", "قمح")},
-	{0xfd7f, 0, 0, 0, g(Yes, No, false, false, "", "قمم")},
-	{0xfd80, 0, 0, 0, g(Yes, No, false, false, "", "لحم")},
-	{0xfd81, 0, 0, 0, g(Yes, No, false, false, "", "لحي")},
-	{0xfd82, 0, 0, 0, g(Yes, No, false, false, "", "لحى")},
-	{0xfd83, 0, 0, 0, g(Yes, No, false, false, "", "لجج")},
-	{0xfd85, 0, 0, 0, g(Yes, No, false, false, "", "لخم")},
-	{0xfd87, 0, 0, 0, g(Yes, No, false, false, "", "لمح")},
-	{0xfd89, 0, 0, 0, g(Yes, No, false, false, "", "محج")},
-	{0xfd8a, 0, 0, 0, g(Yes, No, false, false, "", "محم")},
-	{0xfd8b, 0, 0, 0, g(Yes, No, false, false, "", "محي")},
-	{0xfd8c, 0, 0, 0, g(Yes, No, false, false, "", "مجح")},
-	{0xfd8d, 0, 0, 0, g(Yes, No, false, false, "", "مجم")},
-	{0xfd8e, 0, 0, 0, g(Yes, No, false, false, "", "مخج")},
-	{0xfd8f, 0, 0, 0, g(Yes, No, false, false, "", "مخم")},
-	{0xfd90, 0, 0, 0, f(Yes, false, "")},
-	{0xfd92, 0, 0, 0, g(Yes, No, false, false, "", "مجخ")},
-	{0xfd93, 0, 0, 0, g(Yes, No, false, false, "", "همج")},
-	{0xfd94, 0, 0, 0, g(Yes, No, false, false, "", "همم")},
-	{0xfd95, 0, 0, 0, g(Yes, No, false, false, "", "نحم")},
-	{0xfd96, 0, 0, 0, g(Yes, No, false, false, "", "نحى")},
-	{0xfd97, 0, 0, 0, g(Yes, No, false, false, "", "نجم")},
-	{0xfd99, 0, 0, 0, g(Yes, No, false, false, "", "نجى")},
-	{0xfd9a, 0, 0, 0, g(Yes, No, false, false, "", "نمي")},
-	{0xfd9b, 0, 0, 0, g(Yes, No, false, false, "", "نمى")},
-	{0xfd9c, 0, 0, 0, g(Yes, No, false, false, "", "يمم")},
-	{0xfd9e, 0, 0, 0, g(Yes, No, false, false, "", "بخي")},
-	{0xfd9f, 0, 0, 0, g(Yes, No, false, false, "", "تجي")},
-	{0xfda0, 0, 0, 0, g(Yes, No, false, false, "", "تجى")},
-	{0xfda1, 0, 0, 0, g(Yes, No, false, false, "", "تخي")},
-	{0xfda2, 0, 0, 0, g(Yes, No, false, false, "", "تخى")},
-	{0xfda3, 0, 0, 0, g(Yes, No, false, false, "", "تمي")},
-	{0xfda4, 0, 0, 0, g(Yes, No, false, false, "", "تمى")},
-	{0xfda5, 0, 0, 0, g(Yes, No, false, false, "", "جمي")},
-	{0xfda6, 0, 0, 0, g(Yes, No, false, false, "", "جحى")},
-	{0xfda7, 0, 0, 0, g(Yes, No, false, false, "", "جمى")},
-	{0xfda8, 0, 0, 0, g(Yes, No, false, false, "", "سخى")},
-	{0xfda9, 0, 0, 0, g(Yes, No, false, false, "", "صحي")},
-	{0xfdaa, 0, 0, 0, g(Yes, No, false, false, "", "شحي")},
-	{0xfdab, 0, 0, 0, g(Yes, No, false, false, "", "ضحي")},
-	{0xfdac, 0, 0, 0, g(Yes, No, false, false, "", "لجي")},
-	{0xfdad, 0, 0, 0, g(Yes, No, false, false, "", "لمي")},
-	{0xfdae, 0, 0, 0, g(Yes, No, false, false, "", "يحي")},
-	{0xfdaf, 0, 0, 0, g(Yes, No, false, false, "", "يجي")},
-	{0xfdb0, 0, 0, 0, g(Yes, No, false, false, "", "يمي")},
-	{0xfdb1, 0, 0, 0, g(Yes, No, false, false, "", "ممي")},
-	{0xfdb2, 0, 0, 0, g(Yes, No, false, false, "", "قمي")},
-	{0xfdb3, 0, 0, 0, g(Yes, No, false, false, "", "نحي")},
-	{0xfdb4, 0, 0, 0, g(Yes, No, false, false, "", "قمح")},
-	{0xfdb5, 0, 0, 0, g(Yes, No, false, false, "", "لحم")},
-	{0xfdb6, 0, 0, 0, g(Yes, No, false, false, "", "عمي")},
-	{0xfdb7, 0, 0, 0, g(Yes, No, false, false, "", "كمي")},
-	{0xfdb8, 0, 0, 0, g(Yes, No, false, false, "", "نجح")},
-	{0xfdb9, 0, 0, 0, g(Yes, No, false, false, "", "مخي")},
-	{0xfdba, 0, 0, 0, g(Yes, No, false, false, "", "لجم")},
-	{0xfdbb, 0, 0, 0, g(Yes, No, false, false, "", "كمم")},
-	{0xfdbc, 0, 0, 0, g(Yes, No, false, false, "", "لجم")},
-	{0xfdbd, 0, 0, 0, g(Yes, No, false, false, "", "نجح")},
-	{0xfdbe, 0, 0, 0, g(Yes, No, false, false, "", "جحي")},
-	{0xfdbf, 0, 0, 0, g(Yes, No, false, false, "", "حجي")},
-	{0xfdc0, 0, 0, 0, g(Yes, No, false, false, "", "مجي")},
-	{0xfdc1, 0, 0, 0, g(Yes, No, false, false, "", "فمي")},
-	{0xfdc2, 0, 0, 0, g(Yes, No, false, false, "", "بحي")},
-	{0xfdc3, 0, 0, 0, g(Yes, No, false, false, "", "كمم")},
-	{0xfdc4, 0, 0, 0, g(Yes, No, false, false, "", "عجم")},
-	{0xfdc5, 0, 0, 0, g(Yes, No, false, false, "", "صمم")},
-	{0xfdc6, 0, 0, 0, g(Yes, No, false, false, "", "سخي")},
-	{0xfdc7, 0, 0, 0, g(Yes, No, false, false, "", "نجي")},
-	{0xfdc8, 0, 0, 0, f(Yes, false, "")},
-	{0xfdf0, 0, 0, 0, g(Yes, No, false, false, "", "صلے")},
-	{0xfdf1, 0, 0, 0, g(Yes, No, false, false, "", "قلے")},
-	{0xfdf2, 0, 0, 0, g(Yes, No, false, false, "", "الله")},
-	{0xfdf3, 0, 0, 0, g(Yes, No, false, false, "", "اكبر")},
-	{0xfdf4, 0, 0, 0, g(Yes, No, false, false, "", "محمد")},
-	{0xfdf5, 0, 0, 0, g(Yes, No, false, false, "", "صلعم")},
-	{0xfdf6, 0, 0, 0, g(Yes, No, false, false, "", "رسول")},
-	{0xfdf7, 0, 0, 0, g(Yes, No, false, false, "", "عليه")},
-	{0xfdf8, 0, 0, 0, g(Yes, No, false, false, "", "وسلم")},
-	{0xfdf9, 0, 0, 0, g(Yes, No, false, false, "", "صلى")},
-	{0xfdfa, 0, 0, 0, g(Yes, No, false, false, "", "صلى الله عليه وسلم")},
-	{0xfdfb, 0, 0, 0, g(Yes, No, false, false, "", "جل جلاله")},
-	{0xfdfc, 0, 0, 0, g(Yes, No, false, false, "", "ریال")},
-	{0xfdfd, 0, 0, 0, f(Yes, false, "")},
-	{0xfe10, 0, 0, 0, g(Yes, No, false, false, "", ",")},
-	{0xfe11, 0, 0, 0, g(Yes, No, false, false, "", "、")},
-	{0xfe12, 0, 0, 0, g(Yes, No, false, false, "", "。")},
-	{0xfe13, 0, 0, 0, g(Yes, No, false, false, "", ":")},
-	{0xfe14, 0, 0, 0, g(Yes, No, false, false, "", ";")},
-	{0xfe15, 0, 0, 0, g(Yes, No, false, false, "", "!")},
-	{0xfe16, 0, 0, 0, g(Yes, No, false, false, "", "?")},
-	{0xfe17, 0, 0, 0, g(Yes, No, false, false, "", "〖")},
-	{0xfe18, 0, 0, 0, g(Yes, No, false, false, "", "〗")},
-	{0xfe19, 0, 0, 0, g(Yes, No, false, false, "", "...")},
-	{0xfe1a, 0, 0, 0, f(Yes, false, "")},
-	{0xfe20, 230, 1, 1, f(Yes, false, "")},
-	{0xfe27, 220, 1, 1, f(Yes, false, "")},
-	{0xfe2e, 230, 1, 1, f(Yes, false, "")},
-	{0xfe30, 0, 0, 0, g(Yes, No, false, false, "", "..")},
-	{0xfe31, 0, 0, 0, g(Yes, No, false, false, "", "—")},
-	{0xfe32, 0, 0, 0, g(Yes, No, false, false, "", "–")},
-	{0xfe33, 0, 0, 0, g(Yes, No, false, false, "", "_")},
-	{0xfe35, 0, 0, 0, g(Yes, No, false, false, "", "(")},
-	{0xfe36, 0, 0, 0, g(Yes, No, false, false, "", ")")},
-	{0xfe37, 0, 0, 0, g(Yes, No, false, false, "", "{")},
-	{0xfe38, 0, 0, 0, g(Yes, No, false, false, "", "}")},
-	{0xfe39, 0, 0, 0, g(Yes, No, false, false, "", "〔")},
-	{0xfe3a, 0, 0, 0, g(Yes, No, false, false, "", "〕")},
-	{0xfe3b, 0, 0, 0, g(Yes, No, false, false, "", "【")},
-	{0xfe3c, 0, 0, 0, g(Yes, No, false, false, "", "】")},
-	{0xfe3d, 0, 0, 0, g(Yes, No, false, false, "", "《")},
-	{0xfe3e, 0, 0, 0, g(Yes, No, false, false, "", "》")},
-	{0xfe3f, 0, 0, 0, g(Yes, No, false, false, "", "〈")},
-	{0xfe40, 0, 0, 0, g(Yes, No, false, false, "", "〉")},
-	{0xfe41, 0, 0, 0, g(Yes, No, false, false, "", "「")},
-	{0xfe42, 0, 0, 0, g(Yes, No, false, false, "", "」")},
-	{0xfe43, 0, 0, 0, g(Yes, No, false, false, "", "『")},
-	{0xfe44, 0, 0, 0, g(Yes, No, false, false, "", "』")},
-	{0xfe45, 0, 0, 0, f(Yes, false, "")},
-	{0xfe47, 0, 0, 0, g(Yes, No, false, false, "", "[")},
-	{0xfe48, 0, 0, 0, g(Yes, No, false, false, "", "]")},
-	{0xfe49, 0, 0, 1, g(Yes, No, false, false, "", " ̅")},
-	{0xfe4d, 0, 0, 0, g(Yes, No, false, false, "", "_")},
-	{0xfe50, 0, 0, 0, g(Yes, No, false, false, "", ",")},
-	{0xfe51, 0, 0, 0, g(Yes, No, false, false, "", "、")},
-	{0xfe52, 0, 0, 0, g(Yes, No, false, false, "", ".")},
-	{0xfe53, 0, 0, 0, f(Yes, false, "")},
-	{0xfe54, 0, 0, 0, g(Yes, No, false, false, "", ";")},
-	{0xfe55, 0, 0, 0, g(Yes, No, false, false, "", ":")},
-	{0xfe56, 0, 0, 0, g(Yes, No, false, false, "", "?")},
-	{0xfe57, 0, 0, 0, g(Yes, No, false, false, "", "!")},
-	{0xfe58, 0, 0, 0, g(Yes, No, false, false, "", "—")},
-	{0xfe59, 0, 0, 0, g(Yes, No, false, false, "", "(")},
-	{0xfe5a, 0, 0, 0, g(Yes, No, false, false, "", ")")},
-	{0xfe5b, 0, 0, 0, g(Yes, No, false, false, "", "{")},
-	{0xfe5c, 0, 0, 0, g(Yes, No, false, false, "", "}")},
-	{0xfe5d, 0, 0, 0, g(Yes, No, false, false, "", "〔")},
-	{0xfe5e, 0, 0, 0, g(Yes, No, false, false, "", "〕")},
-	{0xfe5f, 0, 0, 0, g(Yes, No, false, false, "", "#")},
-	{0xfe60, 0, 0, 0, g(Yes, No, false, false, "", "&")},
-	{0xfe61, 0, 0, 0, g(Yes, No, false, false, "", "*")},
-	{0xfe62, 0, 0, 0, g(Yes, No, false, false, "", "+")},
-	{0xfe63, 0, 0, 0, g(Yes, No, false, false, "", "-")},
-	{0xfe64, 0, 0, 0, g(Yes, No, false, false, "", "<")},
-	{0xfe65, 0, 0, 0, g(Yes, No, false, false, "", ">")},
-	{0xfe66, 0, 0, 0, g(Yes, No, false, false, "", "=")},
-	{0xfe67, 0, 0, 0, f(Yes, false, "")},
-	{0xfe68, 0, 0, 0, g(Yes, No, false, false, "", "\\")},
-	{0xfe69, 0, 0, 0, g(Yes, No, false, false, "", "$")},
-	{0xfe6a, 0, 0, 0, g(Yes, No, false, false, "", "%")},
-	{0xfe6b, 0, 0, 0, g(Yes, No, false, false, "", "@")},
-	{0xfe6c, 0, 0, 0, f(Yes, false, "")},
-	{0xfe70, 0, 0, 1, g(Yes, No, false, false, "", " ً")},
-	{0xfe71, 0, 0, 1, g(Yes, No, false, false, "", "ـً")},
-	{0xfe72, 0, 0, 1, g(Yes, No, false, false, "", " ٌ")},
-	{0xfe73, 0, 0, 0, f(Yes, false, "")},
-	{0xfe74, 0, 0, 1, g(Yes, No, false, false, "", " ٍ")},
-	{0xfe75, 0, 0, 0, f(Yes, false, "")},
-	{0xfe76, 0, 0, 1, g(Yes, No, false, false, "", " َ")},
-	{0xfe77, 0, 0, 1, g(Yes, No, false, false, "", "ـَ")},
-	{0xfe78, 0, 0, 1, g(Yes, No, false, false, "", " ُ")},
-	{0xfe79, 0, 0, 1, g(Yes, No, false, false, "", "ـُ")},
-	{0xfe7a, 0, 0, 1, g(Yes, No, false, false, "", " ِ")},
-	{0xfe7b, 0, 0, 1, g(Yes, No, false, false, "", "ـِ")},
-	{0xfe7c, 0, 0, 1, g(Yes, No, false, false, "", " ّ")},
-	{0xfe7d, 0, 0, 1, g(Yes, No, false, false, "", "ـّ")},
-	{0xfe7e, 0, 0, 1, g(Yes, No, false, false, "", " ْ")},
-	{0xfe7f, 0, 0, 1, g(Yes, No, false, false, "", "ـْ")},
-	{0xfe80, 0, 0, 0, g(Yes, No, false, false, "", "ء")},
-	{0xfe81, 0, 0, 1, g(Yes, No, false, false, "", "آ")},
-	{0xfe83, 0, 0, 1, g(Yes, No, false, false, "", "أ")},
-	{0xfe85, 0, 0, 1, g(Yes, No, false, false, "", "ؤ")},
-	{0xfe87, 0, 0, 1, g(Yes, No, false, false, "", "إ")},
-	{0xfe89, 0, 0, 1, g(Yes, No, false, false, "", "ئ")},
-	{0xfe8d, 0, 0, 0, g(Yes, No, false, false, "", "ا")},
-	{0xfe8f, 0, 0, 0, g(Yes, No, false, false, "", "ب")},
-	{0xfe93, 0, 0, 0, g(Yes, No, false, false, "", "ة")},
-	{0xfe95, 0, 0, 0, g(Yes, No, false, false, "", "ت")},
-	{0xfe99, 0, 0, 0, g(Yes, No, false, false, "", "ث")},
-	{0xfe9d, 0, 0, 0, g(Yes, No, false, false, "", "ج")},
-	{0xfea1, 0, 0, 0, g(Yes, No, false, false, "", "ح")},
-	{0xfea5, 0, 0, 0, g(Yes, No, false, false, "", "خ")},
-	{0xfea9, 0, 0, 0, g(Yes, No, false, false, "", "د")},
-	{0xfeab, 0, 0, 0, g(Yes, No, false, false, "", "ذ")},
-	{0xfead, 0, 0, 0, g(Yes, No, false, false, "", "ر")},
-	{0xfeaf, 0, 0, 0, g(Yes, No, false, false, "", "ز")},
-	{0xfeb1, 0, 0, 0, g(Yes, No, false, false, "", "س")},
-	{0xfeb5, 0, 0, 0, g(Yes, No, false, false, "", "ش")},
-	{0xfeb9, 0, 0, 0, g(Yes, No, false, false, "", "ص")},
-	{0xfebd, 0, 0, 0, g(Yes, No, false, false, "", "ض")},
-	{0xfec1, 0, 0, 0, g(Yes, No, false, false, "", "ط")},
-	{0xfec5, 0, 0, 0, g(Yes, No, false, false, "", "ظ")},
-	{0xfec9, 0, 0, 0, g(Yes, No, false, false, "", "ع")},
-	{0xfecd, 0, 0, 0, g(Yes, No, false, false, "", "غ")},
-	{0xfed1, 0, 0, 0, g(Yes, No, false, false, "", "ف")},
-	{0xfed5, 0, 0, 0, g(Yes, No, false, false, "", "ق")},
-	{0xfed9, 0, 0, 0, g(Yes, No, false, false, "", "ك")},
-	{0xfedd, 0, 0, 0, g(Yes, No, false, false, "", "ل")},
-	{0xfee1, 0, 0, 0, g(Yes, No, false, false, "", "م")},
-	{0xfee5, 0, 0, 0, g(Yes, No, false, false, "", "ن")},
-	{0xfee9, 0, 0, 0, g(Yes, No, false, false, "", "ه")},
-	{0xfeed, 0, 0, 0, g(Yes, No, false, false, "", "و")},
-	{0xfeef, 0, 0, 0, g(Yes, No, false, false, "", "ى")},
-	{0xfef1, 0, 0, 0, g(Yes, No, false, false, "", "ي")},
-	{0xfef5, 0, 0, 1, g(Yes, No, false, false, "", "لآ")},
-	{0xfef7, 0, 0, 1, g(Yes, No, false, false, "", "لأ")},
-	{0xfef9, 0, 0, 1, g(Yes, No, false, false, "", "لإ")},
-	{0xfefb, 0, 0, 0, g(Yes, No, false, false, "", "لا")},
-	{0xfefd, 0, 0, 0, f(Yes, false, "")},
-	{0xff01, 0, 0, 0, g(Yes, No, false, false, "", "!")},
-	{0xff02, 0, 0, 0, g(Yes, No, false, false, "", "\"")},
-	{0xff03, 0, 0, 0, g(Yes, No, false, false, "", "#")},
-	{0xff04, 0, 0, 0, g(Yes, No, false, false, "", "$")},
-	{0xff05, 0, 0, 0, g(Yes, No, false, false, "", "%")},
-	{0xff06, 0, 0, 0, g(Yes, No, false, false, "", "&")},
-	{0xff07, 0, 0, 0, g(Yes, No, false, false, "", "'")},
-	{0xff08, 0, 0, 0, g(Yes, No, false, false, "", "(")},
-	{0xff09, 0, 0, 0, g(Yes, No, false, false, "", ")")},
-	{0xff0a, 0, 0, 0, g(Yes, No, false, false, "", "*")},
-	{0xff0b, 0, 0, 0, g(Yes, No, false, false, "", "+")},
-	{0xff0c, 0, 0, 0, g(Yes, No, false, false, "", ",")},
-	{0xff0d, 0, 0, 0, g(Yes, No, false, false, "", "-")},
-	{0xff0e, 0, 0, 0, g(Yes, No, false, false, "", ".")},
-	{0xff0f, 0, 0, 0, g(Yes, No, false, false, "", "/")},
-	{0xff10, 0, 0, 0, g(Yes, No, false, false, "", "0")},
-	{0xff11, 0, 0, 0, g(Yes, No, false, false, "", "1")},
-	{0xff12, 0, 0, 0, g(Yes, No, false, false, "", "2")},
-	{0xff13, 0, 0, 0, g(Yes, No, false, false, "", "3")},
-	{0xff14, 0, 0, 0, g(Yes, No, false, false, "", "4")},
-	{0xff15, 0, 0, 0, g(Yes, No, false, false, "", "5")},
-	{0xff16, 0, 0, 0, g(Yes, No, false, false, "", "6")},
-	{0xff17, 0, 0, 0, g(Yes, No, false, false, "", "7")},
-	{0xff18, 0, 0, 0, g(Yes, No, false, false, "", "8")},
-	{0xff19, 0, 0, 0, g(Yes, No, false, false, "", "9")},
-	{0xff1a, 0, 0, 0, g(Yes, No, false, false, "", ":")},
-	{0xff1b, 0, 0, 0, g(Yes, No, false, false, "", ";")},
-	{0xff1c, 0, 0, 0, g(Yes, No, false, false, "", "<")},
-	{0xff1d, 0, 0, 0, g(Yes, No, false, false, "", "=")},
-	{0xff1e, 0, 0, 0, g(Yes, No, false, false, "", ">")},
-	{0xff1f, 0, 0, 0, g(Yes, No, false, false, "", "?")},
-	{0xff20, 0, 0, 0, g(Yes, No, false, false, "", "@")},
-	{0xff21, 0, 0, 0, g(Yes, No, false, false, "", "A")},
-	{0xff22, 0, 0, 0, g(Yes, No, false, false, "", "B")},
-	{0xff23, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0xff24, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0xff25, 0, 0, 0, g(Yes, No, false, false, "", "E")},
-	{0xff26, 0, 0, 0, g(Yes, No, false, false, "", "F")},
-	{0xff27, 0, 0, 0, g(Yes, No, false, false, "", "G")},
-	{0xff28, 0, 0, 0, g(Yes, No, false, false, "", "H")},
-	{0xff29, 0, 0, 0, g(Yes, No, false, false, "", "I")},
-	{0xff2a, 0, 0, 0, g(Yes, No, false, false, "", "J")},
-	{0xff2b, 0, 0, 0, g(Yes, No, false, false, "", "K")},
-	{0xff2c, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0xff2d, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0xff2e, 0, 0, 0, g(Yes, No, false, false, "", "N")},
-	{0xff2f, 0, 0, 0, g(Yes, No, false, false, "", "O")},
-	{0xff30, 0, 0, 0, g(Yes, No, false, false, "", "P")},
-	{0xff31, 0, 0, 0, g(Yes, No, false, false, "", "Q")},
-	{0xff32, 0, 0, 0, g(Yes, No, false, false, "", "R")},
-	{0xff33, 0, 0, 0, g(Yes, No, false, false, "", "S")},
-	{0xff34, 0, 0, 0, g(Yes, No, false, false, "", "T")},
-	{0xff35, 0, 0, 0, g(Yes, No, false, false, "", "U")},
-	{0xff36, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0xff37, 0, 0, 0, g(Yes, No, false, false, "", "W")},
-	{0xff38, 0, 0, 0, g(Yes, No, false, false, "", "X")},
-	{0xff39, 0, 0, 0, g(Yes, No, false, false, "", "Y")},
-	{0xff3a, 0, 0, 0, g(Yes, No, false, false, "", "Z")},
-	{0xff3b, 0, 0, 0, g(Yes, No, false, false, "", "[")},
-	{0xff3c, 0, 0, 0, g(Yes, No, false, false, "", "\\")},
-	{0xff3d, 0, 0, 0, g(Yes, No, false, false, "", "]")},
-	{0xff3e, 0, 0, 0, g(Yes, No, false, false, "", "^")},
-	{0xff3f, 0, 0, 0, g(Yes, No, false, false, "", "_")},
-	{0xff40, 0, 0, 0, g(Yes, No, false, false, "", "`")},
-	{0xff41, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0xff42, 0, 0, 0, g(Yes, No, false, false, "", "b")},
-	{0xff43, 0, 0, 0, g(Yes, No, false, false, "", "c")},
-	{0xff44, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0xff45, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0xff46, 0, 0, 0, g(Yes, No, false, false, "", "f")},
-	{0xff47, 0, 0, 0, g(Yes, No, false, false, "", "g")},
-	{0xff48, 0, 0, 0, g(Yes, No, false, false, "", "h")},
-	{0xff49, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0xff4a, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0xff4b, 0, 0, 0, g(Yes, No, false, false, "", "k")},
-	{0xff4c, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0xff4d, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0xff4e, 0, 0, 0, g(Yes, No, false, false, "", "n")},
-	{0xff4f, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0xff50, 0, 0, 0, g(Yes, No, false, false, "", "p")},
-	{0xff51, 0, 0, 0, g(Yes, No, false, false, "", "q")},
-	{0xff52, 0, 0, 0, g(Yes, No, false, false, "", "r")},
-	{0xff53, 0, 0, 0, g(Yes, No, false, false, "", "s")},
-	{0xff54, 0, 0, 0, g(Yes, No, false, false, "", "t")},
-	{0xff55, 0, 0, 0, g(Yes, No, false, false, "", "u")},
-	{0xff56, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0xff57, 0, 0, 0, g(Yes, No, false, false, "", "w")},
-	{0xff58, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0xff59, 0, 0, 0, g(Yes, No, false, false, "", "y")},
-	{0xff5a, 0, 0, 0, g(Yes, No, false, false, "", "z")},
-	{0xff5b, 0, 0, 0, g(Yes, No, false, false, "", "{")},
-	{0xff5c, 0, 0, 0, g(Yes, No, false, false, "", "|")},
-	{0xff5d, 0, 0, 0, g(Yes, No, false, false, "", "}")},
-	{0xff5e, 0, 0, 0, g(Yes, No, false, false, "", "~")},
-	{0xff5f, 0, 0, 0, g(Yes, No, false, false, "", "⦅")},
-	{0xff60, 0, 0, 0, g(Yes, No, false, false, "", "⦆")},
-	{0xff61, 0, 0, 0, g(Yes, No, false, false, "", "。")},
-	{0xff62, 0, 0, 0, g(Yes, No, false, false, "", "「")},
-	{0xff63, 0, 0, 0, g(Yes, No, false, false, "", "」")},
-	{0xff64, 0, 0, 0, g(Yes, No, false, false, "", "、")},
-	{0xff65, 0, 0, 0, g(Yes, No, false, false, "", "・")},
-	{0xff66, 0, 0, 0, g(Yes, No, false, false, "", "ヲ")},
-	{0xff67, 0, 0, 0, g(Yes, No, false, false, "", "ァ")},
-	{0xff68, 0, 0, 0, g(Yes, No, false, false, "", "ィ")},
-	{0xff69, 0, 0, 0, g(Yes, No, false, false, "", "ゥ")},
-	{0xff6a, 0, 0, 0, g(Yes, No, false, false, "", "ェ")},
-	{0xff6b, 0, 0, 0, g(Yes, No, false, false, "", "ォ")},
-	{0xff6c, 0, 0, 0, g(Yes, No, false, false, "", "ャ")},
-	{0xff6d, 0, 0, 0, g(Yes, No, false, false, "", "ュ")},
-	{0xff6e, 0, 0, 0, g(Yes, No, false, false, "", "ョ")},
-	{0xff6f, 0, 0, 0, g(Yes, No, false, false, "", "ッ")},
-	{0xff70, 0, 0, 0, g(Yes, No, false, false, "", "ー")},
-	{0xff71, 0, 0, 0, g(Yes, No, false, false, "", "ア")},
-	{0xff72, 0, 0, 0, g(Yes, No, false, false, "", "イ")},
-	{0xff73, 0, 0, 0, g(Yes, No, false, false, "", "ウ")},
-	{0xff74, 0, 0, 0, g(Yes, No, false, false, "", "エ")},
-	{0xff75, 0, 0, 0, g(Yes, No, false, false, "", "オ")},
-	{0xff76, 0, 0, 0, g(Yes, No, false, false, "", "カ")},
-	{0xff77, 0, 0, 0, g(Yes, No, false, false, "", "キ")},
-	{0xff78, 0, 0, 0, g(Yes, No, false, false, "", "ク")},
-	{0xff79, 0, 0, 0, g(Yes, No, false, false, "", "ケ")},
-	{0xff7a, 0, 0, 0, g(Yes, No, false, false, "", "コ")},
-	{0xff7b, 0, 0, 0, g(Yes, No, false, false, "", "サ")},
-	{0xff7c, 0, 0, 0, g(Yes, No, false, false, "", "シ")},
-	{0xff7d, 0, 0, 0, g(Yes, No, false, false, "", "ス")},
-	{0xff7e, 0, 0, 0, g(Yes, No, false, false, "", "セ")},
-	{0xff7f, 0, 0, 0, g(Yes, No, false, false, "", "ソ")},
-	{0xff80, 0, 0, 0, g(Yes, No, false, false, "", "タ")},
-	{0xff81, 0, 0, 0, g(Yes, No, false, false, "", "チ")},
-	{0xff82, 0, 0, 0, g(Yes, No, false, false, "", "ツ")},
-	{0xff83, 0, 0, 0, g(Yes, No, false, false, "", "テ")},
-	{0xff84, 0, 0, 0, g(Yes, No, false, false, "", "ト")},
-	{0xff85, 0, 0, 0, g(Yes, No, false, false, "", "ナ")},
-	{0xff86, 0, 0, 0, g(Yes, No, false, false, "", "ニ")},
-	{0xff87, 0, 0, 0, g(Yes, No, false, false, "", "ヌ")},
-	{0xff88, 0, 0, 0, g(Yes, No, false, false, "", "ネ")},
-	{0xff89, 0, 0, 0, g(Yes, No, false, false, "", "ノ")},
-	{0xff8a, 0, 0, 0, g(Yes, No, false, false, "", "ハ")},
-	{0xff8b, 0, 0, 0, g(Yes, No, false, false, "", "ヒ")},
-	{0xff8c, 0, 0, 0, g(Yes, No, false, false, "", "フ")},
-	{0xff8d, 0, 0, 0, g(Yes, No, false, false, "", "ヘ")},
-	{0xff8e, 0, 0, 0, g(Yes, No, false, false, "", "ホ")},
-	{0xff8f, 0, 0, 0, g(Yes, No, false, false, "", "マ")},
-	{0xff90, 0, 0, 0, g(Yes, No, false, false, "", "ミ")},
-	{0xff91, 0, 0, 0, g(Yes, No, false, false, "", "ム")},
-	{0xff92, 0, 0, 0, g(Yes, No, false, false, "", "メ")},
-	{0xff93, 0, 0, 0, g(Yes, No, false, false, "", "モ")},
-	{0xff94, 0, 0, 0, g(Yes, No, false, false, "", "ヤ")},
-	{0xff95, 0, 0, 0, g(Yes, No, false, false, "", "ユ")},
-	{0xff96, 0, 0, 0, g(Yes, No, false, false, "", "ヨ")},
-	{0xff97, 0, 0, 0, g(Yes, No, false, false, "", "ラ")},
-	{0xff98, 0, 0, 0, g(Yes, No, false, false, "", "リ")},
-	{0xff99, 0, 0, 0, g(Yes, No, false, false, "", "ル")},
-	{0xff9a, 0, 0, 0, g(Yes, No, false, false, "", "レ")},
-	{0xff9b, 0, 0, 0, g(Yes, No, false, false, "", "ロ")},
-	{0xff9c, 0, 0, 0, g(Yes, No, false, false, "", "ワ")},
-	{0xff9d, 0, 0, 0, g(Yes, No, false, false, "", "ン")},
-	{0xff9e, 0, 1, 1, g(Yes, No, false, false, "", "゙")},
-	{0xff9f, 0, 1, 1, g(Yes, No, false, false, "", "゚")},
-	{0xffa0, 0, 0, 0, g(Yes, No, false, false, "", "ᅠ")},
-	{0xffa1, 0, 0, 0, g(Yes, No, false, false, "", "ᄀ")},
-	{0xffa2, 0, 0, 0, g(Yes, No, false, false, "", "ᄁ")},
-	{0xffa3, 0, 1, 1, g(Yes, No, false, false, "", "ᆪ")},
-	{0xffa4, 0, 0, 0, g(Yes, No, false, false, "", "ᄂ")},
-	{0xffa5, 0, 1, 1, g(Yes, No, false, false, "", "ᆬ")},
-	{0xffa6, 0, 1, 1, g(Yes, No, false, false, "", "ᆭ")},
-	{0xffa7, 0, 0, 0, g(Yes, No, false, false, "", "ᄃ")},
-	{0xffa8, 0, 0, 0, g(Yes, No, false, false, "", "ᄄ")},
-	{0xffa9, 0, 0, 0, g(Yes, No, false, false, "", "ᄅ")},
-	{0xffaa, 0, 1, 1, g(Yes, No, false, false, "", "ᆰ")},
-	{0xffab, 0, 1, 1, g(Yes, No, false, false, "", "ᆱ")},
-	{0xffac, 0, 1, 1, g(Yes, No, false, false, "", "ᆲ")},
-	{0xffad, 0, 1, 1, g(Yes, No, false, false, "", "ᆳ")},
-	{0xffae, 0, 1, 1, g(Yes, No, false, false, "", "ᆴ")},
-	{0xffaf, 0, 1, 1, g(Yes, No, false, false, "", "ᆵ")},
-	{0xffb0, 0, 0, 0, g(Yes, No, false, false, "", "ᄚ")},
-	{0xffb1, 0, 0, 0, g(Yes, No, false, false, "", "ᄆ")},
-	{0xffb2, 0, 0, 0, g(Yes, No, false, false, "", "ᄇ")},
-	{0xffb3, 0, 0, 0, g(Yes, No, false, false, "", "ᄈ")},
-	{0xffb4, 0, 0, 0, g(Yes, No, false, false, "", "ᄡ")},
-	{0xffb5, 0, 0, 0, g(Yes, No, false, false, "", "ᄉ")},
-	{0xffb6, 0, 0, 0, g(Yes, No, false, false, "", "ᄊ")},
-	{0xffb7, 0, 0, 0, g(Yes, No, false, false, "", "ᄋ")},
-	{0xffb8, 0, 0, 0, g(Yes, No, false, false, "", "ᄌ")},
-	{0xffb9, 0, 0, 0, g(Yes, No, false, false, "", "ᄍ")},
-	{0xffba, 0, 0, 0, g(Yes, No, false, false, "", "ᄎ")},
-	{0xffbb, 0, 0, 0, g(Yes, No, false, false, "", "ᄏ")},
-	{0xffbc, 0, 0, 0, g(Yes, No, false, false, "", "ᄐ")},
-	{0xffbd, 0, 0, 0, g(Yes, No, false, false, "", "ᄑ")},
-	{0xffbe, 0, 0, 0, g(Yes, No, false, false, "", "ᄒ")},
-	{0xffbf, 0, 0, 0, f(Yes, false, "")},
-	{0xffc2, 0, 1, 1, g(Yes, No, false, false, "", "ᅡ")},
-	{0xffc3, 0, 1, 1, g(Yes, No, false, false, "", "ᅢ")},
-	{0xffc4, 0, 1, 1, g(Yes, No, false, false, "", "ᅣ")},
-	{0xffc5, 0, 1, 1, g(Yes, No, false, false, "", "ᅤ")},
-	{0xffc6, 0, 1, 1, g(Yes, No, false, false, "", "ᅥ")},
-	{0xffc7, 0, 1, 1, g(Yes, No, false, false, "", "ᅦ")},
-	{0xffc8, 0, 0, 0, f(Yes, false, "")},
-	{0xffca, 0, 1, 1, g(Yes, No, false, false, "", "ᅧ")},
-	{0xffcb, 0, 1, 1, g(Yes, No, false, false, "", "ᅨ")},
-	{0xffcc, 0, 1, 1, g(Yes, No, false, false, "", "ᅩ")},
-	{0xffcd, 0, 1, 1, g(Yes, No, false, false, "", "ᅪ")},
-	{0xffce, 0, 1, 1, g(Yes, No, false, false, "", "ᅫ")},
-	{0xffcf, 0, 1, 1, g(Yes, No, false, false, "", "ᅬ")},
-	{0xffd0, 0, 0, 0, f(Yes, false, "")},
-	{0xffd2, 0, 1, 1, g(Yes, No, false, false, "", "ᅭ")},
-	{0xffd3, 0, 1, 1, g(Yes, No, false, false, "", "ᅮ")},
-	{0xffd4, 0, 1, 1, g(Yes, No, false, false, "", "ᅯ")},
-	{0xffd5, 0, 1, 1, g(Yes, No, false, false, "", "ᅰ")},
-	{0xffd6, 0, 1, 1, g(Yes, No, false, false, "", "ᅱ")},
-	{0xffd7, 0, 1, 1, g(Yes, No, false, false, "", "ᅲ")},
-	{0xffd8, 0, 0, 0, f(Yes, false, "")},
-	{0xffda, 0, 1, 1, g(Yes, No, false, false, "", "ᅳ")},
-	{0xffdb, 0, 1, 1, g(Yes, No, false, false, "", "ᅴ")},
-	{0xffdc, 0, 1, 1, g(Yes, No, false, false, "", "ᅵ")},
-	{0xffdd, 0, 0, 0, f(Yes, false, "")},
-	{0xffe0, 0, 0, 0, g(Yes, No, false, false, "", "¢")},
-	{0xffe1, 0, 0, 0, g(Yes, No, false, false, "", "£")},
-	{0xffe2, 0, 0, 0, g(Yes, No, false, false, "", "¬")},
-	{0xffe3, 0, 0, 1, g(Yes, No, false, false, "", " ̄")},
-	{0xffe4, 0, 0, 0, g(Yes, No, false, false, "", "¦")},
-	{0xffe5, 0, 0, 0, g(Yes, No, false, false, "", "¥")},
-	{0xffe6, 0, 0, 0, g(Yes, No, false, false, "", "₩")},
-	{0xffe7, 0, 0, 0, f(Yes, false, "")},
-	{0xffe8, 0, 0, 0, g(Yes, No, false, false, "", "│")},
-	{0xffe9, 0, 0, 0, g(Yes, No, false, false, "", "←")},
-	{0xffea, 0, 0, 0, g(Yes, No, false, false, "", "↑")},
-	{0xffeb, 0, 0, 0, g(Yes, No, false, false, "", "→")},
-	{0xffec, 0, 0, 0, g(Yes, No, false, false, "", "↓")},
-	{0xffed, 0, 0, 0, g(Yes, No, false, false, "", "■")},
-	{0xffee, 0, 0, 0, g(Yes, No, false, false, "", "○")},
-	{0xffef, 0, 0, 0, f(Yes, false, "")},
-	{0x101fd, 220, 1, 1, f(Yes, false, "")},
-	{0x101fe, 0, 0, 0, f(Yes, false, "")},
-	{0x102e0, 220, 1, 1, f(Yes, false, "")},
-	{0x102e1, 0, 0, 0, f(Yes, false, "")},
-	{0x10376, 230, 1, 1, f(Yes, false, "")},
-	{0x1037b, 0, 0, 0, f(Yes, false, "")},
-	{0x10a0d, 220, 1, 1, f(Yes, false, "")},
-	{0x10a0e, 0, 0, 0, f(Yes, false, "")},
-	{0x10a0f, 230, 1, 1, f(Yes, false, "")},
-	{0x10a10, 0, 0, 0, f(Yes, false, "")},
-	{0x10a38, 230, 1, 1, f(Yes, false, "")},
-	{0x10a39, 1, 1, 1, f(Yes, false, "")},
-	{0x10a3a, 220, 1, 1, f(Yes, false, "")},
-	{0x10a3b, 0, 0, 0, f(Yes, false, "")},
-	{0x10a3f, 9, 1, 1, f(Yes, false, "")},
-	{0x10a40, 0, 0, 0, f(Yes, false, "")},
-	{0x10ae5, 230, 1, 1, f(Yes, false, "")},
-	{0x10ae6, 220, 1, 1, f(Yes, false, "")},
-	{0x10ae7, 0, 0, 0, f(Yes, false, "")},
-	{0x11046, 9, 1, 1, f(Yes, false, "")},
-	{0x11047, 0, 0, 0, f(Yes, false, "")},
-	{0x1107f, 9, 1, 1, f(Yes, false, "")},
-	{0x11080, 0, 0, 0, f(Yes, false, "")},
-	{0x11099, 0, 0, 0, f(Yes, true, "")},
-	{0x1109a, 0, 0, 1, f(Yes, false, "𑂚")},
-	{0x1109b, 0, 0, 0, f(Yes, true, "")},
-	{0x1109c, 0, 0, 1, f(Yes, false, "𑂜")},
-	{0x1109d, 0, 0, 0, f(Yes, false, "")},
-	{0x110a5, 0, 0, 0, f(Yes, true, "")},
-	{0x110a6, 0, 0, 0, f(Yes, false, "")},
-	{0x110ab, 0, 0, 1, f(Yes, false, "𑂫")},
-	{0x110ac, 0, 0, 0, f(Yes, false, "")},
-	{0x110b9, 9, 1, 1, f(Yes, false, "")},
-	{0x110ba, 7, 1, 1, f(Maybe, false, "")},
-	{0x110bb, 0, 0, 0, f(Yes, false, "")},
-	{0x11100, 230, 1, 1, f(Yes, false, "")},
-	{0x11103, 0, 0, 0, f(Yes, false, "")},
-	{0x11127, 0, 1, 1, f(Maybe, false, "")},
-	{0x11128, 0, 0, 0, f(Yes, false, "")},
-	{0x1112e, 0, 0, 1, f(Yes, false, "𑄮")},
-	{0x1112f, 0, 0, 1, f(Yes, false, "𑄯")},
-	{0x11130, 0, 0, 0, f(Yes, false, "")},
-	{0x11131, 0, 0, 0, f(Yes, true, "")},
-	{0x11133, 9, 1, 1, f(Yes, false, "")},
-	{0x11135, 0, 0, 0, f(Yes, false, "")},
-	{0x11173, 7, 1, 1, f(Yes, false, "")},
-	{0x11174, 0, 0, 0, f(Yes, false, "")},
-	{0x111c0, 9, 1, 1, f(Yes, false, "")},
-	{0x111c1, 0, 0, 0, f(Yes, false, "")},
-	{0x111ca, 7, 1, 1, f(Yes, false, "")},
-	{0x111cb, 0, 0, 0, f(Yes, false, "")},
-	{0x11235, 9, 1, 1, f(Yes, false, "")},
-	{0x11236, 7, 1, 1, f(Yes, false, "")},
-	{0x11237, 0, 0, 0, f(Yes, false, "")},
-	{0x112e9, 7, 1, 1, f(Yes, false, "")},
-	{0x112ea, 9, 1, 1, f(Yes, false, "")},
-	{0x112eb, 0, 0, 0, f(Yes, false, "")},
-	{0x1133c, 7, 1, 1, f(Yes, false, "")},
-	{0x1133d, 0, 0, 0, f(Yes, false, "")},
-	{0x1133e, 0, 1, 1, f(Maybe, false, "")},
-	{0x1133f, 0, 0, 0, f(Yes, false, "")},
-	{0x11347, 0, 0, 0, f(Yes, true, "")},
-	{0x11348, 0, 0, 0, f(Yes, false, "")},
-	{0x1134b, 0, 0, 1, f(Yes, false, "𑍋")},
-	{0x1134c, 0, 0, 1, f(Yes, false, "𑍌")},
-	{0x1134d, 9, 1, 1, f(Yes, false, "")},
-	{0x1134e, 0, 0, 0, f(Yes, false, "")},
-	{0x11357, 0, 1, 1, f(Maybe, false, "")},
-	{0x11358, 0, 0, 0, f(Yes, false, "")},
-	{0x11366, 230, 1, 1, f(Yes, false, "")},
-	{0x1136d, 0, 0, 0, f(Yes, false, "")},
-	{0x11370, 230, 1, 1, f(Yes, false, "")},
-	{0x11375, 0, 0, 0, f(Yes, false, "")},
-	{0x11442, 9, 1, 1, f(Yes, false, "")},
-	{0x11443, 0, 0, 0, f(Yes, false, "")},
-	{0x11446, 7, 1, 1, f(Yes, false, "")},
-	{0x11447, 0, 0, 0, f(Yes, false, "")},
-	{0x114b0, 0, 1, 1, f(Maybe, false, "")},
-	{0x114b1, 0, 0, 0, f(Yes, false, "")},
-	{0x114b9, 0, 0, 0, f(Yes, true, "")},
-	{0x114ba, 0, 1, 1, f(Maybe, false, "")},
-	{0x114bb, 0, 0, 1, f(Yes, false, "𑒻")},
-	{0x114bc, 0, 0, 1, f(Yes, false, "𑒼")},
-	{0x114bd, 0, 1, 1, f(Maybe, false, "")},
-	{0x114be, 0, 0, 1, f(Yes, false, "𑒾")},
-	{0x114bf, 0, 0, 0, f(Yes, false, "")},
-	{0x114c2, 9, 1, 1, f(Yes, false, "")},
-	{0x114c3, 7, 1, 1, f(Yes, false, "")},
-	{0x114c4, 0, 0, 0, f(Yes, false, "")},
-	{0x115af, 0, 1, 1, f(Maybe, false, "")},
-	{0x115b0, 0, 0, 0, f(Yes, false, "")},
-	{0x115b8, 0, 0, 0, f(Yes, true, "")},
-	{0x115ba, 0, 0, 1, f(Yes, false, "𑖺")},
-	{0x115bb, 0, 0, 1, f(Yes, false, "𑖻")},
-	{0x115bc, 0, 0, 0, f(Yes, false, "")},
-	{0x115bf, 9, 1, 1, f(Yes, false, "")},
-	{0x115c0, 7, 1, 1, f(Yes, false, "")},
-	{0x115c1, 0, 0, 0, f(Yes, false, "")},
-	{0x1163f, 9, 1, 1, f(Yes, false, "")},
-	{0x11640, 0, 0, 0, f(Yes, false, "")},
-	{0x116b6, 9, 1, 1, f(Yes, false, "")},
-	{0x116b7, 7, 1, 1, f(Yes, false, "")},
-	{0x116b8, 0, 0, 0, f(Yes, false, "")},
-	{0x1172b, 9, 1, 1, f(Yes, false, "")},
-	{0x1172c, 0, 0, 0, f(Yes, false, "")},
-	{0x11a34, 9, 1, 1, f(Yes, false, "")},
-	{0x11a35, 0, 0, 0, f(Yes, false, "")},
-	{0x11a47, 9, 1, 1, f(Yes, false, "")},
-	{0x11a48, 0, 0, 0, f(Yes, false, "")},
-	{0x11a99, 9, 1, 1, f(Yes, false, "")},
-	{0x11a9a, 0, 0, 0, f(Yes, false, "")},
-	{0x11c3f, 9, 1, 1, f(Yes, false, "")},
-	{0x11c40, 0, 0, 0, f(Yes, false, "")},
-	{0x11d42, 7, 1, 1, f(Yes, false, "")},
-	{0x11d43, 0, 0, 0, f(Yes, false, "")},
-	{0x11d44, 9, 1, 1, f(Yes, false, "")},
-	{0x11d46, 0, 0, 0, f(Yes, false, "")},
-	{0x16af0, 1, 1, 1, f(Yes, false, "")},
-	{0x16af5, 0, 0, 0, f(Yes, false, "")},
-	{0x16b30, 230, 1, 1, f(Yes, false, "")},
-	{0x16b37, 0, 0, 0, f(Yes, false, "")},
-	{0x1bc9e, 1, 1, 1, f(Yes, false, "")},
-	{0x1bc9f, 0, 0, 0, f(Yes, false, "")},
-	{0x1d15e, 0, 0, 1, f(No, false, "𝅗𝅥")},
-	{0x1d15f, 0, 0, 1, f(No, false, "𝅘𝅥")},
-	{0x1d160, 0, 0, 2, f(No, false, "𝅘𝅥𝅮")},
-	{0x1d161, 0, 0, 2, f(No, false, "𝅘𝅥𝅯")},
-	{0x1d162, 0, 0, 2, f(No, false, "𝅘𝅥𝅰")},
-	{0x1d163, 0, 0, 2, f(No, false, "𝅘𝅥𝅱")},
-	{0x1d164, 0, 0, 2, f(No, false, "𝅘𝅥𝅲")},
-	{0x1d165, 216, 1, 1, f(Yes, false, "")},
-	{0x1d167, 1, 1, 1, f(Yes, false, "")},
-	{0x1d16a, 0, 0, 0, f(Yes, false, "")},
-	{0x1d16d, 226, 1, 1, f(Yes, false, "")},
-	{0x1d16e, 216, 1, 1, f(Yes, false, "")},
-	{0x1d173, 0, 0, 0, f(Yes, false, "")},
-	{0x1d17b, 220, 1, 1, f(Yes, false, "")},
-	{0x1d183, 0, 0, 0, f(Yes, false, "")},
-	{0x1d185, 230, 1, 1, f(Yes, false, "")},
-	{0x1d18a, 220, 1, 1, f(Yes, false, "")},
-	{0x1d18c, 0, 0, 0, f(Yes, false, "")},
-	{0x1d1aa, 230, 1, 1, f(Yes, false, "")},
-	{0x1d1ae, 0, 0, 0, f(Yes, false, "")},
-	{0x1d1bb, 0, 0, 1, f(No, false, "𝆹𝅥")},
-	{0x1d1bc, 0, 0, 1, f(No, false, "𝆺𝅥")},
-	{0x1d1bd, 0, 0, 2, f(No, false, "𝆹𝅥𝅮")},
-	{0x1d1be, 0, 0, 2, f(No, false, "𝆺𝅥𝅮")},
-	{0x1d1bf, 0, 0, 2, f(No, false, "𝆹𝅥𝅯")},
-	{0x1d1c0, 0, 0, 2, f(No, false, "𝆺𝅥𝅯")},
-	{0x1d1c1, 0, 0, 0, f(Yes, false, "")},
-	{0x1d242, 230, 1, 1, f(Yes, false, "")},
-	{0x1d245, 0, 0, 0, f(Yes, false, "")},
-	{0x1d400, 0, 0, 0, g(Yes, No, false, false, "", "A")},
-	{0x1d401, 0, 0, 0, g(Yes, No, false, false, "", "B")},
-	{0x1d402, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0x1d403, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x1d404, 0, 0, 0, g(Yes, No, false, false, "", "E")},
-	{0x1d405, 0, 0, 0, g(Yes, No, false, false, "", "F")},
-	{0x1d406, 0, 0, 0, g(Yes, No, false, false, "", "G")},
-	{0x1d407, 0, 0, 0, g(Yes, No, false, false, "", "H")},
-	{0x1d408, 0, 0, 0, g(Yes, No, false, false, "", "I")},
-	{0x1d409, 0, 0, 0, g(Yes, No, false, false, "", "J")},
-	{0x1d40a, 0, 0, 0, g(Yes, No, false, false, "", "K")},
-	{0x1d40b, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0x1d40c, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0x1d40d, 0, 0, 0, g(Yes, No, false, false, "", "N")},
-	{0x1d40e, 0, 0, 0, g(Yes, No, false, false, "", "O")},
-	{0x1d40f, 0, 0, 0, g(Yes, No, false, false, "", "P")},
-	{0x1d410, 0, 0, 0, g(Yes, No, false, false, "", "Q")},
-	{0x1d411, 0, 0, 0, g(Yes, No, false, false, "", "R")},
-	{0x1d412, 0, 0, 0, g(Yes, No, false, false, "", "S")},
-	{0x1d413, 0, 0, 0, g(Yes, No, false, false, "", "T")},
-	{0x1d414, 0, 0, 0, g(Yes, No, false, false, "", "U")},
-	{0x1d415, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0x1d416, 0, 0, 0, g(Yes, No, false, false, "", "W")},
-	{0x1d417, 0, 0, 0, g(Yes, No, false, false, "", "X")},
-	{0x1d418, 0, 0, 0, g(Yes, No, false, false, "", "Y")},
-	{0x1d419, 0, 0, 0, g(Yes, No, false, false, "", "Z")},
-	{0x1d41a, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0x1d41b, 0, 0, 0, g(Yes, No, false, false, "", "b")},
-	{0x1d41c, 0, 0, 0, g(Yes, No, false, false, "", "c")},
-	{0x1d41d, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0x1d41e, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0x1d41f, 0, 0, 0, g(Yes, No, false, false, "", "f")},
-	{0x1d420, 0, 0, 0, g(Yes, No, false, false, "", "g")},
-	{0x1d421, 0, 0, 0, g(Yes, No, false, false, "", "h")},
-	{0x1d422, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x1d423, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0x1d424, 0, 0, 0, g(Yes, No, false, false, "", "k")},
-	{0x1d425, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x1d426, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0x1d427, 0, 0, 0, g(Yes, No, false, false, "", "n")},
-	{0x1d428, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0x1d429, 0, 0, 0, g(Yes, No, false, false, "", "p")},
-	{0x1d42a, 0, 0, 0, g(Yes, No, false, false, "", "q")},
-	{0x1d42b, 0, 0, 0, g(Yes, No, false, false, "", "r")},
-	{0x1d42c, 0, 0, 0, g(Yes, No, false, false, "", "s")},
-	{0x1d42d, 0, 0, 0, g(Yes, No, false, false, "", "t")},
-	{0x1d42e, 0, 0, 0, g(Yes, No, false, false, "", "u")},
-	{0x1d42f, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0x1d430, 0, 0, 0, g(Yes, No, false, false, "", "w")},
-	{0x1d431, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0x1d432, 0, 0, 0, g(Yes, No, false, false, "", "y")},
-	{0x1d433, 0, 0, 0, g(Yes, No, false, false, "", "z")},
-	{0x1d434, 0, 0, 0, g(Yes, No, false, false, "", "A")},
-	{0x1d435, 0, 0, 0, g(Yes, No, false, false, "", "B")},
-	{0x1d436, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0x1d437, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x1d438, 0, 0, 0, g(Yes, No, false, false, "", "E")},
-	{0x1d439, 0, 0, 0, g(Yes, No, false, false, "", "F")},
-	{0x1d43a, 0, 0, 0, g(Yes, No, false, false, "", "G")},
-	{0x1d43b, 0, 0, 0, g(Yes, No, false, false, "", "H")},
-	{0x1d43c, 0, 0, 0, g(Yes, No, false, false, "", "I")},
-	{0x1d43d, 0, 0, 0, g(Yes, No, false, false, "", "J")},
-	{0x1d43e, 0, 0, 0, g(Yes, No, false, false, "", "K")},
-	{0x1d43f, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0x1d440, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0x1d441, 0, 0, 0, g(Yes, No, false, false, "", "N")},
-	{0x1d442, 0, 0, 0, g(Yes, No, false, false, "", "O")},
-	{0x1d443, 0, 0, 0, g(Yes, No, false, false, "", "P")},
-	{0x1d444, 0, 0, 0, g(Yes, No, false, false, "", "Q")},
-	{0x1d445, 0, 0, 0, g(Yes, No, false, false, "", "R")},
-	{0x1d446, 0, 0, 0, g(Yes, No, false, false, "", "S")},
-	{0x1d447, 0, 0, 0, g(Yes, No, false, false, "", "T")},
-	{0x1d448, 0, 0, 0, g(Yes, No, false, false, "", "U")},
-	{0x1d449, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0x1d44a, 0, 0, 0, g(Yes, No, false, false, "", "W")},
-	{0x1d44b, 0, 0, 0, g(Yes, No, false, false, "", "X")},
-	{0x1d44c, 0, 0, 0, g(Yes, No, false, false, "", "Y")},
-	{0x1d44d, 0, 0, 0, g(Yes, No, false, false, "", "Z")},
-	{0x1d44e, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0x1d44f, 0, 0, 0, g(Yes, No, false, false, "", "b")},
-	{0x1d450, 0, 0, 0, g(Yes, No, false, false, "", "c")},
-	{0x1d451, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0x1d452, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0x1d453, 0, 0, 0, g(Yes, No, false, false, "", "f")},
-	{0x1d454, 0, 0, 0, g(Yes, No, false, false, "", "g")},
-	{0x1d455, 0, 0, 0, f(Yes, false, "")},
-	{0x1d456, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x1d457, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0x1d458, 0, 0, 0, g(Yes, No, false, false, "", "k")},
-	{0x1d459, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x1d45a, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0x1d45b, 0, 0, 0, g(Yes, No, false, false, "", "n")},
-	{0x1d45c, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0x1d45d, 0, 0, 0, g(Yes, No, false, false, "", "p")},
-	{0x1d45e, 0, 0, 0, g(Yes, No, false, false, "", "q")},
-	{0x1d45f, 0, 0, 0, g(Yes, No, false, false, "", "r")},
-	{0x1d460, 0, 0, 0, g(Yes, No, false, false, "", "s")},
-	{0x1d461, 0, 0, 0, g(Yes, No, false, false, "", "t")},
-	{0x1d462, 0, 0, 0, g(Yes, No, false, false, "", "u")},
-	{0x1d463, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0x1d464, 0, 0, 0, g(Yes, No, false, false, "", "w")},
-	{0x1d465, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0x1d466, 0, 0, 0, g(Yes, No, false, false, "", "y")},
-	{0x1d467, 0, 0, 0, g(Yes, No, false, false, "", "z")},
-	{0x1d468, 0, 0, 0, g(Yes, No, false, false, "", "A")},
-	{0x1d469, 0, 0, 0, g(Yes, No, false, false, "", "B")},
-	{0x1d46a, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0x1d46b, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x1d46c, 0, 0, 0, g(Yes, No, false, false, "", "E")},
-	{0x1d46d, 0, 0, 0, g(Yes, No, false, false, "", "F")},
-	{0x1d46e, 0, 0, 0, g(Yes, No, false, false, "", "G")},
-	{0x1d46f, 0, 0, 0, g(Yes, No, false, false, "", "H")},
-	{0x1d470, 0, 0, 0, g(Yes, No, false, false, "", "I")},
-	{0x1d471, 0, 0, 0, g(Yes, No, false, false, "", "J")},
-	{0x1d472, 0, 0, 0, g(Yes, No, false, false, "", "K")},
-	{0x1d473, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0x1d474, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0x1d475, 0, 0, 0, g(Yes, No, false, false, "", "N")},
-	{0x1d476, 0, 0, 0, g(Yes, No, false, false, "", "O")},
-	{0x1d477, 0, 0, 0, g(Yes, No, false, false, "", "P")},
-	{0x1d478, 0, 0, 0, g(Yes, No, false, false, "", "Q")},
-	{0x1d479, 0, 0, 0, g(Yes, No, false, false, "", "R")},
-	{0x1d47a, 0, 0, 0, g(Yes, No, false, false, "", "S")},
-	{0x1d47b, 0, 0, 0, g(Yes, No, false, false, "", "T")},
-	{0x1d47c, 0, 0, 0, g(Yes, No, false, false, "", "U")},
-	{0x1d47d, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0x1d47e, 0, 0, 0, g(Yes, No, false, false, "", "W")},
-	{0x1d47f, 0, 0, 0, g(Yes, No, false, false, "", "X")},
-	{0x1d480, 0, 0, 0, g(Yes, No, false, false, "", "Y")},
-	{0x1d481, 0, 0, 0, g(Yes, No, false, false, "", "Z")},
-	{0x1d482, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0x1d483, 0, 0, 0, g(Yes, No, false, false, "", "b")},
-	{0x1d484, 0, 0, 0, g(Yes, No, false, false, "", "c")},
-	{0x1d485, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0x1d486, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0x1d487, 0, 0, 0, g(Yes, No, false, false, "", "f")},
-	{0x1d488, 0, 0, 0, g(Yes, No, false, false, "", "g")},
-	{0x1d489, 0, 0, 0, g(Yes, No, false, false, "", "h")},
-	{0x1d48a, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x1d48b, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0x1d48c, 0, 0, 0, g(Yes, No, false, false, "", "k")},
-	{0x1d48d, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x1d48e, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0x1d48f, 0, 0, 0, g(Yes, No, false, false, "", "n")},
-	{0x1d490, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0x1d491, 0, 0, 0, g(Yes, No, false, false, "", "p")},
-	{0x1d492, 0, 0, 0, g(Yes, No, false, false, "", "q")},
-	{0x1d493, 0, 0, 0, g(Yes, No, false, false, "", "r")},
-	{0x1d494, 0, 0, 0, g(Yes, No, false, false, "", "s")},
-	{0x1d495, 0, 0, 0, g(Yes, No, false, false, "", "t")},
-	{0x1d496, 0, 0, 0, g(Yes, No, false, false, "", "u")},
-	{0x1d497, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0x1d498, 0, 0, 0, g(Yes, No, false, false, "", "w")},
-	{0x1d499, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0x1d49a, 0, 0, 0, g(Yes, No, false, false, "", "y")},
-	{0x1d49b, 0, 0, 0, g(Yes, No, false, false, "", "z")},
-	{0x1d49c, 0, 0, 0, g(Yes, No, false, false, "", "A")},
-	{0x1d49d, 0, 0, 0, f(Yes, false, "")},
-	{0x1d49e, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0x1d49f, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x1d4a0, 0, 0, 0, f(Yes, false, "")},
-	{0x1d4a2, 0, 0, 0, g(Yes, No, false, false, "", "G")},
-	{0x1d4a3, 0, 0, 0, f(Yes, false, "")},
-	{0x1d4a5, 0, 0, 0, g(Yes, No, false, false, "", "J")},
-	{0x1d4a6, 0, 0, 0, g(Yes, No, false, false, "", "K")},
-	{0x1d4a7, 0, 0, 0, f(Yes, false, "")},
-	{0x1d4a9, 0, 0, 0, g(Yes, No, false, false, "", "N")},
-	{0x1d4aa, 0, 0, 0, g(Yes, No, false, false, "", "O")},
-	{0x1d4ab, 0, 0, 0, g(Yes, No, false, false, "", "P")},
-	{0x1d4ac, 0, 0, 0, g(Yes, No, false, false, "", "Q")},
-	{0x1d4ad, 0, 0, 0, f(Yes, false, "")},
-	{0x1d4ae, 0, 0, 0, g(Yes, No, false, false, "", "S")},
-	{0x1d4af, 0, 0, 0, g(Yes, No, false, false, "", "T")},
-	{0x1d4b0, 0, 0, 0, g(Yes, No, false, false, "", "U")},
-	{0x1d4b1, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0x1d4b2, 0, 0, 0, g(Yes, No, false, false, "", "W")},
-	{0x1d4b3, 0, 0, 0, g(Yes, No, false, false, "", "X")},
-	{0x1d4b4, 0, 0, 0, g(Yes, No, false, false, "", "Y")},
-	{0x1d4b5, 0, 0, 0, g(Yes, No, false, false, "", "Z")},
-	{0x1d4b6, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0x1d4b7, 0, 0, 0, g(Yes, No, false, false, "", "b")},
-	{0x1d4b8, 0, 0, 0, g(Yes, No, false, false, "", "c")},
-	{0x1d4b9, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0x1d4ba, 0, 0, 0, f(Yes, false, "")},
-	{0x1d4bb, 0, 0, 0, g(Yes, No, false, false, "", "f")},
-	{0x1d4bc, 0, 0, 0, f(Yes, false, "")},
-	{0x1d4bd, 0, 0, 0, g(Yes, No, false, false, "", "h")},
-	{0x1d4be, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x1d4bf, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0x1d4c0, 0, 0, 0, g(Yes, No, false, false, "", "k")},
-	{0x1d4c1, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x1d4c2, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0x1d4c3, 0, 0, 0, g(Yes, No, false, false, "", "n")},
-	{0x1d4c4, 0, 0, 0, f(Yes, false, "")},
-	{0x1d4c5, 0, 0, 0, g(Yes, No, false, false, "", "p")},
-	{0x1d4c6, 0, 0, 0, g(Yes, No, false, false, "", "q")},
-	{0x1d4c7, 0, 0, 0, g(Yes, No, false, false, "", "r")},
-	{0x1d4c8, 0, 0, 0, g(Yes, No, false, false, "", "s")},
-	{0x1d4c9, 0, 0, 0, g(Yes, No, false, false, "", "t")},
-	{0x1d4ca, 0, 0, 0, g(Yes, No, false, false, "", "u")},
-	{0x1d4cb, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0x1d4cc, 0, 0, 0, g(Yes, No, false, false, "", "w")},
-	{0x1d4cd, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0x1d4ce, 0, 0, 0, g(Yes, No, false, false, "", "y")},
-	{0x1d4cf, 0, 0, 0, g(Yes, No, false, false, "", "z")},
-	{0x1d4d0, 0, 0, 0, g(Yes, No, false, false, "", "A")},
-	{0x1d4d1, 0, 0, 0, g(Yes, No, false, false, "", "B")},
-	{0x1d4d2, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0x1d4d3, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x1d4d4, 0, 0, 0, g(Yes, No, false, false, "", "E")},
-	{0x1d4d5, 0, 0, 0, g(Yes, No, false, false, "", "F")},
-	{0x1d4d6, 0, 0, 0, g(Yes, No, false, false, "", "G")},
-	{0x1d4d7, 0, 0, 0, g(Yes, No, false, false, "", "H")},
-	{0x1d4d8, 0, 0, 0, g(Yes, No, false, false, "", "I")},
-	{0x1d4d9, 0, 0, 0, g(Yes, No, false, false, "", "J")},
-	{0x1d4da, 0, 0, 0, g(Yes, No, false, false, "", "K")},
-	{0x1d4db, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0x1d4dc, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0x1d4dd, 0, 0, 0, g(Yes, No, false, false, "", "N")},
-	{0x1d4de, 0, 0, 0, g(Yes, No, false, false, "", "O")},
-	{0x1d4df, 0, 0, 0, g(Yes, No, false, false, "", "P")},
-	{0x1d4e0, 0, 0, 0, g(Yes, No, false, false, "", "Q")},
-	{0x1d4e1, 0, 0, 0, g(Yes, No, false, false, "", "R")},
-	{0x1d4e2, 0, 0, 0, g(Yes, No, false, false, "", "S")},
-	{0x1d4e3, 0, 0, 0, g(Yes, No, false, false, "", "T")},
-	{0x1d4e4, 0, 0, 0, g(Yes, No, false, false, "", "U")},
-	{0x1d4e5, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0x1d4e6, 0, 0, 0, g(Yes, No, false, false, "", "W")},
-	{0x1d4e7, 0, 0, 0, g(Yes, No, false, false, "", "X")},
-	{0x1d4e8, 0, 0, 0, g(Yes, No, false, false, "", "Y")},
-	{0x1d4e9, 0, 0, 0, g(Yes, No, false, false, "", "Z")},
-	{0x1d4ea, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0x1d4eb, 0, 0, 0, g(Yes, No, false, false, "", "b")},
-	{0x1d4ec, 0, 0, 0, g(Yes, No, false, false, "", "c")},
-	{0x1d4ed, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0x1d4ee, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0x1d4ef, 0, 0, 0, g(Yes, No, false, false, "", "f")},
-	{0x1d4f0, 0, 0, 0, g(Yes, No, false, false, "", "g")},
-	{0x1d4f1, 0, 0, 0, g(Yes, No, false, false, "", "h")},
-	{0x1d4f2, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x1d4f3, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0x1d4f4, 0, 0, 0, g(Yes, No, false, false, "", "k")},
-	{0x1d4f5, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x1d4f6, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0x1d4f7, 0, 0, 0, g(Yes, No, false, false, "", "n")},
-	{0x1d4f8, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0x1d4f9, 0, 0, 0, g(Yes, No, false, false, "", "p")},
-	{0x1d4fa, 0, 0, 0, g(Yes, No, false, false, "", "q")},
-	{0x1d4fb, 0, 0, 0, g(Yes, No, false, false, "", "r")},
-	{0x1d4fc, 0, 0, 0, g(Yes, No, false, false, "", "s")},
-	{0x1d4fd, 0, 0, 0, g(Yes, No, false, false, "", "t")},
-	{0x1d4fe, 0, 0, 0, g(Yes, No, false, false, "", "u")},
-	{0x1d4ff, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0x1d500, 0, 0, 0, g(Yes, No, false, false, "", "w")},
-	{0x1d501, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0x1d502, 0, 0, 0, g(Yes, No, false, false, "", "y")},
-	{0x1d503, 0, 0, 0, g(Yes, No, false, false, "", "z")},
-	{0x1d504, 0, 0, 0, g(Yes, No, false, false, "", "A")},
-	{0x1d505, 0, 0, 0, g(Yes, No, false, false, "", "B")},
-	{0x1d506, 0, 0, 0, f(Yes, false, "")},
-	{0x1d507, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x1d508, 0, 0, 0, g(Yes, No, false, false, "", "E")},
-	{0x1d509, 0, 0, 0, g(Yes, No, false, false, "", "F")},
-	{0x1d50a, 0, 0, 0, g(Yes, No, false, false, "", "G")},
-	{0x1d50b, 0, 0, 0, f(Yes, false, "")},
-	{0x1d50d, 0, 0, 0, g(Yes, No, false, false, "", "J")},
-	{0x1d50e, 0, 0, 0, g(Yes, No, false, false, "", "K")},
-	{0x1d50f, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0x1d510, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0x1d511, 0, 0, 0, g(Yes, No, false, false, "", "N")},
-	{0x1d512, 0, 0, 0, g(Yes, No, false, false, "", "O")},
-	{0x1d513, 0, 0, 0, g(Yes, No, false, false, "", "P")},
-	{0x1d514, 0, 0, 0, g(Yes, No, false, false, "", "Q")},
-	{0x1d515, 0, 0, 0, f(Yes, false, "")},
-	{0x1d516, 0, 0, 0, g(Yes, No, false, false, "", "S")},
-	{0x1d517, 0, 0, 0, g(Yes, No, false, false, "", "T")},
-	{0x1d518, 0, 0, 0, g(Yes, No, false, false, "", "U")},
-	{0x1d519, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0x1d51a, 0, 0, 0, g(Yes, No, false, false, "", "W")},
-	{0x1d51b, 0, 0, 0, g(Yes, No, false, false, "", "X")},
-	{0x1d51c, 0, 0, 0, g(Yes, No, false, false, "", "Y")},
-	{0x1d51d, 0, 0, 0, f(Yes, false, "")},
-	{0x1d51e, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0x1d51f, 0, 0, 0, g(Yes, No, false, false, "", "b")},
-	{0x1d520, 0, 0, 0, g(Yes, No, false, false, "", "c")},
-	{0x1d521, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0x1d522, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0x1d523, 0, 0, 0, g(Yes, No, false, false, "", "f")},
-	{0x1d524, 0, 0, 0, g(Yes, No, false, false, "", "g")},
-	{0x1d525, 0, 0, 0, g(Yes, No, false, false, "", "h")},
-	{0x1d526, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x1d527, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0x1d528, 0, 0, 0, g(Yes, No, false, false, "", "k")},
-	{0x1d529, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x1d52a, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0x1d52b, 0, 0, 0, g(Yes, No, false, false, "", "n")},
-	{0x1d52c, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0x1d52d, 0, 0, 0, g(Yes, No, false, false, "", "p")},
-	{0x1d52e, 0, 0, 0, g(Yes, No, false, false, "", "q")},
-	{0x1d52f, 0, 0, 0, g(Yes, No, false, false, "", "r")},
-	{0x1d530, 0, 0, 0, g(Yes, No, false, false, "", "s")},
-	{0x1d531, 0, 0, 0, g(Yes, No, false, false, "", "t")},
-	{0x1d532, 0, 0, 0, g(Yes, No, false, false, "", "u")},
-	{0x1d533, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0x1d534, 0, 0, 0, g(Yes, No, false, false, "", "w")},
-	{0x1d535, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0x1d536, 0, 0, 0, g(Yes, No, false, false, "", "y")},
-	{0x1d537, 0, 0, 0, g(Yes, No, false, false, "", "z")},
-	{0x1d538, 0, 0, 0, g(Yes, No, false, false, "", "A")},
-	{0x1d539, 0, 0, 0, g(Yes, No, false, false, "", "B")},
-	{0x1d53a, 0, 0, 0, f(Yes, false, "")},
-	{0x1d53b, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x1d53c, 0, 0, 0, g(Yes, No, false, false, "", "E")},
-	{0x1d53d, 0, 0, 0, g(Yes, No, false, false, "", "F")},
-	{0x1d53e, 0, 0, 0, g(Yes, No, false, false, "", "G")},
-	{0x1d53f, 0, 0, 0, f(Yes, false, "")},
-	{0x1d540, 0, 0, 0, g(Yes, No, false, false, "", "I")},
-	{0x1d541, 0, 0, 0, g(Yes, No, false, false, "", "J")},
-	{0x1d542, 0, 0, 0, g(Yes, No, false, false, "", "K")},
-	{0x1d543, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0x1d544, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0x1d545, 0, 0, 0, f(Yes, false, "")},
-	{0x1d546, 0, 0, 0, g(Yes, No, false, false, "", "O")},
-	{0x1d547, 0, 0, 0, f(Yes, false, "")},
-	{0x1d54a, 0, 0, 0, g(Yes, No, false, false, "", "S")},
-	{0x1d54b, 0, 0, 0, g(Yes, No, false, false, "", "T")},
-	{0x1d54c, 0, 0, 0, g(Yes, No, false, false, "", "U")},
-	{0x1d54d, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0x1d54e, 0, 0, 0, g(Yes, No, false, false, "", "W")},
-	{0x1d54f, 0, 0, 0, g(Yes, No, false, false, "", "X")},
-	{0x1d550, 0, 0, 0, g(Yes, No, false, false, "", "Y")},
-	{0x1d551, 0, 0, 0, f(Yes, false, "")},
-	{0x1d552, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0x1d553, 0, 0, 0, g(Yes, No, false, false, "", "b")},
-	{0x1d554, 0, 0, 0, g(Yes, No, false, false, "", "c")},
-	{0x1d555, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0x1d556, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0x1d557, 0, 0, 0, g(Yes, No, false, false, "", "f")},
-	{0x1d558, 0, 0, 0, g(Yes, No, false, false, "", "g")},
-	{0x1d559, 0, 0, 0, g(Yes, No, false, false, "", "h")},
-	{0x1d55a, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x1d55b, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0x1d55c, 0, 0, 0, g(Yes, No, false, false, "", "k")},
-	{0x1d55d, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x1d55e, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0x1d55f, 0, 0, 0, g(Yes, No, false, false, "", "n")},
-	{0x1d560, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0x1d561, 0, 0, 0, g(Yes, No, false, false, "", "p")},
-	{0x1d562, 0, 0, 0, g(Yes, No, false, false, "", "q")},
-	{0x1d563, 0, 0, 0, g(Yes, No, false, false, "", "r")},
-	{0x1d564, 0, 0, 0, g(Yes, No, false, false, "", "s")},
-	{0x1d565, 0, 0, 0, g(Yes, No, false, false, "", "t")},
-	{0x1d566, 0, 0, 0, g(Yes, No, false, false, "", "u")},
-	{0x1d567, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0x1d568, 0, 0, 0, g(Yes, No, false, false, "", "w")},
-	{0x1d569, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0x1d56a, 0, 0, 0, g(Yes, No, false, false, "", "y")},
-	{0x1d56b, 0, 0, 0, g(Yes, No, false, false, "", "z")},
-	{0x1d56c, 0, 0, 0, g(Yes, No, false, false, "", "A")},
-	{0x1d56d, 0, 0, 0, g(Yes, No, false, false, "", "B")},
-	{0x1d56e, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0x1d56f, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x1d570, 0, 0, 0, g(Yes, No, false, false, "", "E")},
-	{0x1d571, 0, 0, 0, g(Yes, No, false, false, "", "F")},
-	{0x1d572, 0, 0, 0, g(Yes, No, false, false, "", "G")},
-	{0x1d573, 0, 0, 0, g(Yes, No, false, false, "", "H")},
-	{0x1d574, 0, 0, 0, g(Yes, No, false, false, "", "I")},
-	{0x1d575, 0, 0, 0, g(Yes, No, false, false, "", "J")},
-	{0x1d576, 0, 0, 0, g(Yes, No, false, false, "", "K")},
-	{0x1d577, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0x1d578, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0x1d579, 0, 0, 0, g(Yes, No, false, false, "", "N")},
-	{0x1d57a, 0, 0, 0, g(Yes, No, false, false, "", "O")},
-	{0x1d57b, 0, 0, 0, g(Yes, No, false, false, "", "P")},
-	{0x1d57c, 0, 0, 0, g(Yes, No, false, false, "", "Q")},
-	{0x1d57d, 0, 0, 0, g(Yes, No, false, false, "", "R")},
-	{0x1d57e, 0, 0, 0, g(Yes, No, false, false, "", "S")},
-	{0x1d57f, 0, 0, 0, g(Yes, No, false, false, "", "T")},
-	{0x1d580, 0, 0, 0, g(Yes, No, false, false, "", "U")},
-	{0x1d581, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0x1d582, 0, 0, 0, g(Yes, No, false, false, "", "W")},
-	{0x1d583, 0, 0, 0, g(Yes, No, false, false, "", "X")},
-	{0x1d584, 0, 0, 0, g(Yes, No, false, false, "", "Y")},
-	{0x1d585, 0, 0, 0, g(Yes, No, false, false, "", "Z")},
-	{0x1d586, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0x1d587, 0, 0, 0, g(Yes, No, false, false, "", "b")},
-	{0x1d588, 0, 0, 0, g(Yes, No, false, false, "", "c")},
-	{0x1d589, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0x1d58a, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0x1d58b, 0, 0, 0, g(Yes, No, false, false, "", "f")},
-	{0x1d58c, 0, 0, 0, g(Yes, No, false, false, "", "g")},
-	{0x1d58d, 0, 0, 0, g(Yes, No, false, false, "", "h")},
-	{0x1d58e, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x1d58f, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0x1d590, 0, 0, 0, g(Yes, No, false, false, "", "k")},
-	{0x1d591, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x1d592, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0x1d593, 0, 0, 0, g(Yes, No, false, false, "", "n")},
-	{0x1d594, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0x1d595, 0, 0, 0, g(Yes, No, false, false, "", "p")},
-	{0x1d596, 0, 0, 0, g(Yes, No, false, false, "", "q")},
-	{0x1d597, 0, 0, 0, g(Yes, No, false, false, "", "r")},
-	{0x1d598, 0, 0, 0, g(Yes, No, false, false, "", "s")},
-	{0x1d599, 0, 0, 0, g(Yes, No, false, false, "", "t")},
-	{0x1d59a, 0, 0, 0, g(Yes, No, false, false, "", "u")},
-	{0x1d59b, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0x1d59c, 0, 0, 0, g(Yes, No, false, false, "", "w")},
-	{0x1d59d, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0x1d59e, 0, 0, 0, g(Yes, No, false, false, "", "y")},
-	{0x1d59f, 0, 0, 0, g(Yes, No, false, false, "", "z")},
-	{0x1d5a0, 0, 0, 0, g(Yes, No, false, false, "", "A")},
-	{0x1d5a1, 0, 0, 0, g(Yes, No, false, false, "", "B")},
-	{0x1d5a2, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0x1d5a3, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x1d5a4, 0, 0, 0, g(Yes, No, false, false, "", "E")},
-	{0x1d5a5, 0, 0, 0, g(Yes, No, false, false, "", "F")},
-	{0x1d5a6, 0, 0, 0, g(Yes, No, false, false, "", "G")},
-	{0x1d5a7, 0, 0, 0, g(Yes, No, false, false, "", "H")},
-	{0x1d5a8, 0, 0, 0, g(Yes, No, false, false, "", "I")},
-	{0x1d5a9, 0, 0, 0, g(Yes, No, false, false, "", "J")},
-	{0x1d5aa, 0, 0, 0, g(Yes, No, false, false, "", "K")},
-	{0x1d5ab, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0x1d5ac, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0x1d5ad, 0, 0, 0, g(Yes, No, false, false, "", "N")},
-	{0x1d5ae, 0, 0, 0, g(Yes, No, false, false, "", "O")},
-	{0x1d5af, 0, 0, 0, g(Yes, No, false, false, "", "P")},
-	{0x1d5b0, 0, 0, 0, g(Yes, No, false, false, "", "Q")},
-	{0x1d5b1, 0, 0, 0, g(Yes, No, false, false, "", "R")},
-	{0x1d5b2, 0, 0, 0, g(Yes, No, false, false, "", "S")},
-	{0x1d5b3, 0, 0, 0, g(Yes, No, false, false, "", "T")},
-	{0x1d5b4, 0, 0, 0, g(Yes, No, false, false, "", "U")},
-	{0x1d5b5, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0x1d5b6, 0, 0, 0, g(Yes, No, false, false, "", "W")},
-	{0x1d5b7, 0, 0, 0, g(Yes, No, false, false, "", "X")},
-	{0x1d5b8, 0, 0, 0, g(Yes, No, false, false, "", "Y")},
-	{0x1d5b9, 0, 0, 0, g(Yes, No, false, false, "", "Z")},
-	{0x1d5ba, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0x1d5bb, 0, 0, 0, g(Yes, No, false, false, "", "b")},
-	{0x1d5bc, 0, 0, 0, g(Yes, No, false, false, "", "c")},
-	{0x1d5bd, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0x1d5be, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0x1d5bf, 0, 0, 0, g(Yes, No, false, false, "", "f")},
-	{0x1d5c0, 0, 0, 0, g(Yes, No, false, false, "", "g")},
-	{0x1d5c1, 0, 0, 0, g(Yes, No, false, false, "", "h")},
-	{0x1d5c2, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x1d5c3, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0x1d5c4, 0, 0, 0, g(Yes, No, false, false, "", "k")},
-	{0x1d5c5, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x1d5c6, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0x1d5c7, 0, 0, 0, g(Yes, No, false, false, "", "n")},
-	{0x1d5c8, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0x1d5c9, 0, 0, 0, g(Yes, No, false, false, "", "p")},
-	{0x1d5ca, 0, 0, 0, g(Yes, No, false, false, "", "q")},
-	{0x1d5cb, 0, 0, 0, g(Yes, No, false, false, "", "r")},
-	{0x1d5cc, 0, 0, 0, g(Yes, No, false, false, "", "s")},
-	{0x1d5cd, 0, 0, 0, g(Yes, No, false, false, "", "t")},
-	{0x1d5ce, 0, 0, 0, g(Yes, No, false, false, "", "u")},
-	{0x1d5cf, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0x1d5d0, 0, 0, 0, g(Yes, No, false, false, "", "w")},
-	{0x1d5d1, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0x1d5d2, 0, 0, 0, g(Yes, No, false, false, "", "y")},
-	{0x1d5d3, 0, 0, 0, g(Yes, No, false, false, "", "z")},
-	{0x1d5d4, 0, 0, 0, g(Yes, No, false, false, "", "A")},
-	{0x1d5d5, 0, 0, 0, g(Yes, No, false, false, "", "B")},
-	{0x1d5d6, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0x1d5d7, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x1d5d8, 0, 0, 0, g(Yes, No, false, false, "", "E")},
-	{0x1d5d9, 0, 0, 0, g(Yes, No, false, false, "", "F")},
-	{0x1d5da, 0, 0, 0, g(Yes, No, false, false, "", "G")},
-	{0x1d5db, 0, 0, 0, g(Yes, No, false, false, "", "H")},
-	{0x1d5dc, 0, 0, 0, g(Yes, No, false, false, "", "I")},
-	{0x1d5dd, 0, 0, 0, g(Yes, No, false, false, "", "J")},
-	{0x1d5de, 0, 0, 0, g(Yes, No, false, false, "", "K")},
-	{0x1d5df, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0x1d5e0, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0x1d5e1, 0, 0, 0, g(Yes, No, false, false, "", "N")},
-	{0x1d5e2, 0, 0, 0, g(Yes, No, false, false, "", "O")},
-	{0x1d5e3, 0, 0, 0, g(Yes, No, false, false, "", "P")},
-	{0x1d5e4, 0, 0, 0, g(Yes, No, false, false, "", "Q")},
-	{0x1d5e5, 0, 0, 0, g(Yes, No, false, false, "", "R")},
-	{0x1d5e6, 0, 0, 0, g(Yes, No, false, false, "", "S")},
-	{0x1d5e7, 0, 0, 0, g(Yes, No, false, false, "", "T")},
-	{0x1d5e8, 0, 0, 0, g(Yes, No, false, false, "", "U")},
-	{0x1d5e9, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0x1d5ea, 0, 0, 0, g(Yes, No, false, false, "", "W")},
-	{0x1d5eb, 0, 0, 0, g(Yes, No, false, false, "", "X")},
-	{0x1d5ec, 0, 0, 0, g(Yes, No, false, false, "", "Y")},
-	{0x1d5ed, 0, 0, 0, g(Yes, No, false, false, "", "Z")},
-	{0x1d5ee, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0x1d5ef, 0, 0, 0, g(Yes, No, false, false, "", "b")},
-	{0x1d5f0, 0, 0, 0, g(Yes, No, false, false, "", "c")},
-	{0x1d5f1, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0x1d5f2, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0x1d5f3, 0, 0, 0, g(Yes, No, false, false, "", "f")},
-	{0x1d5f4, 0, 0, 0, g(Yes, No, false, false, "", "g")},
-	{0x1d5f5, 0, 0, 0, g(Yes, No, false, false, "", "h")},
-	{0x1d5f6, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x1d5f7, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0x1d5f8, 0, 0, 0, g(Yes, No, false, false, "", "k")},
-	{0x1d5f9, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x1d5fa, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0x1d5fb, 0, 0, 0, g(Yes, No, false, false, "", "n")},
-	{0x1d5fc, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0x1d5fd, 0, 0, 0, g(Yes, No, false, false, "", "p")},
-	{0x1d5fe, 0, 0, 0, g(Yes, No, false, false, "", "q")},
-	{0x1d5ff, 0, 0, 0, g(Yes, No, false, false, "", "r")},
-	{0x1d600, 0, 0, 0, g(Yes, No, false, false, "", "s")},
-	{0x1d601, 0, 0, 0, g(Yes, No, false, false, "", "t")},
-	{0x1d602, 0, 0, 0, g(Yes, No, false, false, "", "u")},
-	{0x1d603, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0x1d604, 0, 0, 0, g(Yes, No, false, false, "", "w")},
-	{0x1d605, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0x1d606, 0, 0, 0, g(Yes, No, false, false, "", "y")},
-	{0x1d607, 0, 0, 0, g(Yes, No, false, false, "", "z")},
-	{0x1d608, 0, 0, 0, g(Yes, No, false, false, "", "A")},
-	{0x1d609, 0, 0, 0, g(Yes, No, false, false, "", "B")},
-	{0x1d60a, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0x1d60b, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x1d60c, 0, 0, 0, g(Yes, No, false, false, "", "E")},
-	{0x1d60d, 0, 0, 0, g(Yes, No, false, false, "", "F")},
-	{0x1d60e, 0, 0, 0, g(Yes, No, false, false, "", "G")},
-	{0x1d60f, 0, 0, 0, g(Yes, No, false, false, "", "H")},
-	{0x1d610, 0, 0, 0, g(Yes, No, false, false, "", "I")},
-	{0x1d611, 0, 0, 0, g(Yes, No, false, false, "", "J")},
-	{0x1d612, 0, 0, 0, g(Yes, No, false, false, "", "K")},
-	{0x1d613, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0x1d614, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0x1d615, 0, 0, 0, g(Yes, No, false, false, "", "N")},
-	{0x1d616, 0, 0, 0, g(Yes, No, false, false, "", "O")},
-	{0x1d617, 0, 0, 0, g(Yes, No, false, false, "", "P")},
-	{0x1d618, 0, 0, 0, g(Yes, No, false, false, "", "Q")},
-	{0x1d619, 0, 0, 0, g(Yes, No, false, false, "", "R")},
-	{0x1d61a, 0, 0, 0, g(Yes, No, false, false, "", "S")},
-	{0x1d61b, 0, 0, 0, g(Yes, No, false, false, "", "T")},
-	{0x1d61c, 0, 0, 0, g(Yes, No, false, false, "", "U")},
-	{0x1d61d, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0x1d61e, 0, 0, 0, g(Yes, No, false, false, "", "W")},
-	{0x1d61f, 0, 0, 0, g(Yes, No, false, false, "", "X")},
-	{0x1d620, 0, 0, 0, g(Yes, No, false, false, "", "Y")},
-	{0x1d621, 0, 0, 0, g(Yes, No, false, false, "", "Z")},
-	{0x1d622, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0x1d623, 0, 0, 0, g(Yes, No, false, false, "", "b")},
-	{0x1d624, 0, 0, 0, g(Yes, No, false, false, "", "c")},
-	{0x1d625, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0x1d626, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0x1d627, 0, 0, 0, g(Yes, No, false, false, "", "f")},
-	{0x1d628, 0, 0, 0, g(Yes, No, false, false, "", "g")},
-	{0x1d629, 0, 0, 0, g(Yes, No, false, false, "", "h")},
-	{0x1d62a, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x1d62b, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0x1d62c, 0, 0, 0, g(Yes, No, false, false, "", "k")},
-	{0x1d62d, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x1d62e, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0x1d62f, 0, 0, 0, g(Yes, No, false, false, "", "n")},
-	{0x1d630, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0x1d631, 0, 0, 0, g(Yes, No, false, false, "", "p")},
-	{0x1d632, 0, 0, 0, g(Yes, No, false, false, "", "q")},
-	{0x1d633, 0, 0, 0, g(Yes, No, false, false, "", "r")},
-	{0x1d634, 0, 0, 0, g(Yes, No, false, false, "", "s")},
-	{0x1d635, 0, 0, 0, g(Yes, No, false, false, "", "t")},
-	{0x1d636, 0, 0, 0, g(Yes, No, false, false, "", "u")},
-	{0x1d637, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0x1d638, 0, 0, 0, g(Yes, No, false, false, "", "w")},
-	{0x1d639, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0x1d63a, 0, 0, 0, g(Yes, No, false, false, "", "y")},
-	{0x1d63b, 0, 0, 0, g(Yes, No, false, false, "", "z")},
-	{0x1d63c, 0, 0, 0, g(Yes, No, false, false, "", "A")},
-	{0x1d63d, 0, 0, 0, g(Yes, No, false, false, "", "B")},
-	{0x1d63e, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0x1d63f, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x1d640, 0, 0, 0, g(Yes, No, false, false, "", "E")},
-	{0x1d641, 0, 0, 0, g(Yes, No, false, false, "", "F")},
-	{0x1d642, 0, 0, 0, g(Yes, No, false, false, "", "G")},
-	{0x1d643, 0, 0, 0, g(Yes, No, false, false, "", "H")},
-	{0x1d644, 0, 0, 0, g(Yes, No, false, false, "", "I")},
-	{0x1d645, 0, 0, 0, g(Yes, No, false, false, "", "J")},
-	{0x1d646, 0, 0, 0, g(Yes, No, false, false, "", "K")},
-	{0x1d647, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0x1d648, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0x1d649, 0, 0, 0, g(Yes, No, false, false, "", "N")},
-	{0x1d64a, 0, 0, 0, g(Yes, No, false, false, "", "O")},
-	{0x1d64b, 0, 0, 0, g(Yes, No, false, false, "", "P")},
-	{0x1d64c, 0, 0, 0, g(Yes, No, false, false, "", "Q")},
-	{0x1d64d, 0, 0, 0, g(Yes, No, false, false, "", "R")},
-	{0x1d64e, 0, 0, 0, g(Yes, No, false, false, "", "S")},
-	{0x1d64f, 0, 0, 0, g(Yes, No, false, false, "", "T")},
-	{0x1d650, 0, 0, 0, g(Yes, No, false, false, "", "U")},
-	{0x1d651, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0x1d652, 0, 0, 0, g(Yes, No, false, false, "", "W")},
-	{0x1d653, 0, 0, 0, g(Yes, No, false, false, "", "X")},
-	{0x1d654, 0, 0, 0, g(Yes, No, false, false, "", "Y")},
-	{0x1d655, 0, 0, 0, g(Yes, No, false, false, "", "Z")},
-	{0x1d656, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0x1d657, 0, 0, 0, g(Yes, No, false, false, "", "b")},
-	{0x1d658, 0, 0, 0, g(Yes, No, false, false, "", "c")},
-	{0x1d659, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0x1d65a, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0x1d65b, 0, 0, 0, g(Yes, No, false, false, "", "f")},
-	{0x1d65c, 0, 0, 0, g(Yes, No, false, false, "", "g")},
-	{0x1d65d, 0, 0, 0, g(Yes, No, false, false, "", "h")},
-	{0x1d65e, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x1d65f, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0x1d660, 0, 0, 0, g(Yes, No, false, false, "", "k")},
-	{0x1d661, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x1d662, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0x1d663, 0, 0, 0, g(Yes, No, false, false, "", "n")},
-	{0x1d664, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0x1d665, 0, 0, 0, g(Yes, No, false, false, "", "p")},
-	{0x1d666, 0, 0, 0, g(Yes, No, false, false, "", "q")},
-	{0x1d667, 0, 0, 0, g(Yes, No, false, false, "", "r")},
-	{0x1d668, 0, 0, 0, g(Yes, No, false, false, "", "s")},
-	{0x1d669, 0, 0, 0, g(Yes, No, false, false, "", "t")},
-	{0x1d66a, 0, 0, 0, g(Yes, No, false, false, "", "u")},
-	{0x1d66b, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0x1d66c, 0, 0, 0, g(Yes, No, false, false, "", "w")},
-	{0x1d66d, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0x1d66e, 0, 0, 0, g(Yes, No, false, false, "", "y")},
-	{0x1d66f, 0, 0, 0, g(Yes, No, false, false, "", "z")},
-	{0x1d670, 0, 0, 0, g(Yes, No, false, false, "", "A")},
-	{0x1d671, 0, 0, 0, g(Yes, No, false, false, "", "B")},
-	{0x1d672, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0x1d673, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x1d674, 0, 0, 0, g(Yes, No, false, false, "", "E")},
-	{0x1d675, 0, 0, 0, g(Yes, No, false, false, "", "F")},
-	{0x1d676, 0, 0, 0, g(Yes, No, false, false, "", "G")},
-	{0x1d677, 0, 0, 0, g(Yes, No, false, false, "", "H")},
-	{0x1d678, 0, 0, 0, g(Yes, No, false, false, "", "I")},
-	{0x1d679, 0, 0, 0, g(Yes, No, false, false, "", "J")},
-	{0x1d67a, 0, 0, 0, g(Yes, No, false, false, "", "K")},
-	{0x1d67b, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0x1d67c, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0x1d67d, 0, 0, 0, g(Yes, No, false, false, "", "N")},
-	{0x1d67e, 0, 0, 0, g(Yes, No, false, false, "", "O")},
-	{0x1d67f, 0, 0, 0, g(Yes, No, false, false, "", "P")},
-	{0x1d680, 0, 0, 0, g(Yes, No, false, false, "", "Q")},
-	{0x1d681, 0, 0, 0, g(Yes, No, false, false, "", "R")},
-	{0x1d682, 0, 0, 0, g(Yes, No, false, false, "", "S")},
-	{0x1d683, 0, 0, 0, g(Yes, No, false, false, "", "T")},
-	{0x1d684, 0, 0, 0, g(Yes, No, false, false, "", "U")},
-	{0x1d685, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0x1d686, 0, 0, 0, g(Yes, No, false, false, "", "W")},
-	{0x1d687, 0, 0, 0, g(Yes, No, false, false, "", "X")},
-	{0x1d688, 0, 0, 0, g(Yes, No, false, false, "", "Y")},
-	{0x1d689, 0, 0, 0, g(Yes, No, false, false, "", "Z")},
-	{0x1d68a, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0x1d68b, 0, 0, 0, g(Yes, No, false, false, "", "b")},
-	{0x1d68c, 0, 0, 0, g(Yes, No, false, false, "", "c")},
-	{0x1d68d, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0x1d68e, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0x1d68f, 0, 0, 0, g(Yes, No, false, false, "", "f")},
-	{0x1d690, 0, 0, 0, g(Yes, No, false, false, "", "g")},
-	{0x1d691, 0, 0, 0, g(Yes, No, false, false, "", "h")},
-	{0x1d692, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x1d693, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0x1d694, 0, 0, 0, g(Yes, No, false, false, "", "k")},
-	{0x1d695, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x1d696, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0x1d697, 0, 0, 0, g(Yes, No, false, false, "", "n")},
-	{0x1d698, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0x1d699, 0, 0, 0, g(Yes, No, false, false, "", "p")},
-	{0x1d69a, 0, 0, 0, g(Yes, No, false, false, "", "q")},
-	{0x1d69b, 0, 0, 0, g(Yes, No, false, false, "", "r")},
-	{0x1d69c, 0, 0, 0, g(Yes, No, false, false, "", "s")},
-	{0x1d69d, 0, 0, 0, g(Yes, No, false, false, "", "t")},
-	{0x1d69e, 0, 0, 0, g(Yes, No, false, false, "", "u")},
-	{0x1d69f, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0x1d6a0, 0, 0, 0, g(Yes, No, false, false, "", "w")},
-	{0x1d6a1, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0x1d6a2, 0, 0, 0, g(Yes, No, false, false, "", "y")},
-	{0x1d6a3, 0, 0, 0, g(Yes, No, false, false, "", "z")},
-	{0x1d6a4, 0, 0, 0, g(Yes, No, false, false, "", "ı")},
-	{0x1d6a5, 0, 0, 0, g(Yes, No, false, false, "", "ȷ")},
-	{0x1d6a6, 0, 0, 0, f(Yes, false, "")},
-	{0x1d6a8, 0, 0, 0, g(Yes, No, false, false, "", "Α")},
-	{0x1d6a9, 0, 0, 0, g(Yes, No, false, false, "", "Β")},
-	{0x1d6aa, 0, 0, 0, g(Yes, No, false, false, "", "Γ")},
-	{0x1d6ab, 0, 0, 0, g(Yes, No, false, false, "", "Δ")},
-	{0x1d6ac, 0, 0, 0, g(Yes, No, false, false, "", "Ε")},
-	{0x1d6ad, 0, 0, 0, g(Yes, No, false, false, "", "Ζ")},
-	{0x1d6ae, 0, 0, 0, g(Yes, No, false, false, "", "Η")},
-	{0x1d6af, 0, 0, 0, g(Yes, No, false, false, "", "Θ")},
-	{0x1d6b0, 0, 0, 0, g(Yes, No, false, false, "", "Ι")},
-	{0x1d6b1, 0, 0, 0, g(Yes, No, false, false, "", "Κ")},
-	{0x1d6b2, 0, 0, 0, g(Yes, No, false, false, "", "Λ")},
-	{0x1d6b3, 0, 0, 0, g(Yes, No, false, false, "", "Μ")},
-	{0x1d6b4, 0, 0, 0, g(Yes, No, false, false, "", "Ν")},
-	{0x1d6b5, 0, 0, 0, g(Yes, No, false, false, "", "Ξ")},
-	{0x1d6b6, 0, 0, 0, g(Yes, No, false, false, "", "Ο")},
-	{0x1d6b7, 0, 0, 0, g(Yes, No, false, false, "", "Π")},
-	{0x1d6b8, 0, 0, 0, g(Yes, No, false, false, "", "Ρ")},
-	{0x1d6b9, 0, 0, 0, g(Yes, No, false, false, "", "Θ")},
-	{0x1d6ba, 0, 0, 0, g(Yes, No, false, false, "", "Σ")},
-	{0x1d6bb, 0, 0, 0, g(Yes, No, false, false, "", "Τ")},
-	{0x1d6bc, 0, 0, 0, g(Yes, No, false, false, "", "Υ")},
-	{0x1d6bd, 0, 0, 0, g(Yes, No, false, false, "", "Φ")},
-	{0x1d6be, 0, 0, 0, g(Yes, No, false, false, "", "Χ")},
-	{0x1d6bf, 0, 0, 0, g(Yes, No, false, false, "", "Ψ")},
-	{0x1d6c0, 0, 0, 0, g(Yes, No, false, false, "", "Ω")},
-	{0x1d6c1, 0, 0, 0, g(Yes, No, false, false, "", "∇")},
-	{0x1d6c2, 0, 0, 0, g(Yes, No, false, false, "", "α")},
-	{0x1d6c3, 0, 0, 0, g(Yes, No, false, false, "", "β")},
-	{0x1d6c4, 0, 0, 0, g(Yes, No, false, false, "", "γ")},
-	{0x1d6c5, 0, 0, 0, g(Yes, No, false, false, "", "δ")},
-	{0x1d6c6, 0, 0, 0, g(Yes, No, false, false, "", "ε")},
-	{0x1d6c7, 0, 0, 0, g(Yes, No, false, false, "", "ζ")},
-	{0x1d6c8, 0, 0, 0, g(Yes, No, false, false, "", "η")},
-	{0x1d6c9, 0, 0, 0, g(Yes, No, false, false, "", "θ")},
-	{0x1d6ca, 0, 0, 0, g(Yes, No, false, false, "", "ι")},
-	{0x1d6cb, 0, 0, 0, g(Yes, No, false, false, "", "κ")},
-	{0x1d6cc, 0, 0, 0, g(Yes, No, false, false, "", "λ")},
-	{0x1d6cd, 0, 0, 0, g(Yes, No, false, false, "", "μ")},
-	{0x1d6ce, 0, 0, 0, g(Yes, No, false, false, "", "ν")},
-	{0x1d6cf, 0, 0, 0, g(Yes, No, false, false, "", "ξ")},
-	{0x1d6d0, 0, 0, 0, g(Yes, No, false, false, "", "ο")},
-	{0x1d6d1, 0, 0, 0, g(Yes, No, false, false, "", "π")},
-	{0x1d6d2, 0, 0, 0, g(Yes, No, false, false, "", "ρ")},
-	{0x1d6d3, 0, 0, 0, g(Yes, No, false, false, "", "ς")},
-	{0x1d6d4, 0, 0, 0, g(Yes, No, false, false, "", "σ")},
-	{0x1d6d5, 0, 0, 0, g(Yes, No, false, false, "", "τ")},
-	{0x1d6d6, 0, 0, 0, g(Yes, No, false, false, "", "υ")},
-	{0x1d6d7, 0, 0, 0, g(Yes, No, false, false, "", "φ")},
-	{0x1d6d8, 0, 0, 0, g(Yes, No, false, false, "", "χ")},
-	{0x1d6d9, 0, 0, 0, g(Yes, No, false, false, "", "ψ")},
-	{0x1d6da, 0, 0, 0, g(Yes, No, false, false, "", "ω")},
-	{0x1d6db, 0, 0, 0, g(Yes, No, false, false, "", "∂")},
-	{0x1d6dc, 0, 0, 0, g(Yes, No, false, false, "", "ε")},
-	{0x1d6dd, 0, 0, 0, g(Yes, No, false, false, "", "θ")},
-	{0x1d6de, 0, 0, 0, g(Yes, No, false, false, "", "κ")},
-	{0x1d6df, 0, 0, 0, g(Yes, No, false, false, "", "φ")},
-	{0x1d6e0, 0, 0, 0, g(Yes, No, false, false, "", "ρ")},
-	{0x1d6e1, 0, 0, 0, g(Yes, No, false, false, "", "π")},
-	{0x1d6e2, 0, 0, 0, g(Yes, No, false, false, "", "Α")},
-	{0x1d6e3, 0, 0, 0, g(Yes, No, false, false, "", "Β")},
-	{0x1d6e4, 0, 0, 0, g(Yes, No, false, false, "", "Γ")},
-	{0x1d6e5, 0, 0, 0, g(Yes, No, false, false, "", "Δ")},
-	{0x1d6e6, 0, 0, 0, g(Yes, No, false, false, "", "Ε")},
-	{0x1d6e7, 0, 0, 0, g(Yes, No, false, false, "", "Ζ")},
-	{0x1d6e8, 0, 0, 0, g(Yes, No, false, false, "", "Η")},
-	{0x1d6e9, 0, 0, 0, g(Yes, No, false, false, "", "Θ")},
-	{0x1d6ea, 0, 0, 0, g(Yes, No, false, false, "", "Ι")},
-	{0x1d6eb, 0, 0, 0, g(Yes, No, false, false, "", "Κ")},
-	{0x1d6ec, 0, 0, 0, g(Yes, No, false, false, "", "Λ")},
-	{0x1d6ed, 0, 0, 0, g(Yes, No, false, false, "", "Μ")},
-	{0x1d6ee, 0, 0, 0, g(Yes, No, false, false, "", "Ν")},
-	{0x1d6ef, 0, 0, 0, g(Yes, No, false, false, "", "Ξ")},
-	{0x1d6f0, 0, 0, 0, g(Yes, No, false, false, "", "Ο")},
-	{0x1d6f1, 0, 0, 0, g(Yes, No, false, false, "", "Π")},
-	{0x1d6f2, 0, 0, 0, g(Yes, No, false, false, "", "Ρ")},
-	{0x1d6f3, 0, 0, 0, g(Yes, No, false, false, "", "Θ")},
-	{0x1d6f4, 0, 0, 0, g(Yes, No, false, false, "", "Σ")},
-	{0x1d6f5, 0, 0, 0, g(Yes, No, false, false, "", "Τ")},
-	{0x1d6f6, 0, 0, 0, g(Yes, No, false, false, "", "Υ")},
-	{0x1d6f7, 0, 0, 0, g(Yes, No, false, false, "", "Φ")},
-	{0x1d6f8, 0, 0, 0, g(Yes, No, false, false, "", "Χ")},
-	{0x1d6f9, 0, 0, 0, g(Yes, No, false, false, "", "Ψ")},
-	{0x1d6fa, 0, 0, 0, g(Yes, No, false, false, "", "Ω")},
-	{0x1d6fb, 0, 0, 0, g(Yes, No, false, false, "", "∇")},
-	{0x1d6fc, 0, 0, 0, g(Yes, No, false, false, "", "α")},
-	{0x1d6fd, 0, 0, 0, g(Yes, No, false, false, "", "β")},
-	{0x1d6fe, 0, 0, 0, g(Yes, No, false, false, "", "γ")},
-	{0x1d6ff, 0, 0, 0, g(Yes, No, false, false, "", "δ")},
-	{0x1d700, 0, 0, 0, g(Yes, No, false, false, "", "ε")},
-	{0x1d701, 0, 0, 0, g(Yes, No, false, false, "", "ζ")},
-	{0x1d702, 0, 0, 0, g(Yes, No, false, false, "", "η")},
-	{0x1d703, 0, 0, 0, g(Yes, No, false, false, "", "θ")},
-	{0x1d704, 0, 0, 0, g(Yes, No, false, false, "", "ι")},
-	{0x1d705, 0, 0, 0, g(Yes, No, false, false, "", "κ")},
-	{0x1d706, 0, 0, 0, g(Yes, No, false, false, "", "λ")},
-	{0x1d707, 0, 0, 0, g(Yes, No, false, false, "", "μ")},
-	{0x1d708, 0, 0, 0, g(Yes, No, false, false, "", "ν")},
-	{0x1d709, 0, 0, 0, g(Yes, No, false, false, "", "ξ")},
-	{0x1d70a, 0, 0, 0, g(Yes, No, false, false, "", "ο")},
-	{0x1d70b, 0, 0, 0, g(Yes, No, false, false, "", "π")},
-	{0x1d70c, 0, 0, 0, g(Yes, No, false, false, "", "ρ")},
-	{0x1d70d, 0, 0, 0, g(Yes, No, false, false, "", "ς")},
-	{0x1d70e, 0, 0, 0, g(Yes, No, false, false, "", "σ")},
-	{0x1d70f, 0, 0, 0, g(Yes, No, false, false, "", "τ")},
-	{0x1d710, 0, 0, 0, g(Yes, No, false, false, "", "υ")},
-	{0x1d711, 0, 0, 0, g(Yes, No, false, false, "", "φ")},
-	{0x1d712, 0, 0, 0, g(Yes, No, false, false, "", "χ")},
-	{0x1d713, 0, 0, 0, g(Yes, No, false, false, "", "ψ")},
-	{0x1d714, 0, 0, 0, g(Yes, No, false, false, "", "ω")},
-	{0x1d715, 0, 0, 0, g(Yes, No, false, false, "", "∂")},
-	{0x1d716, 0, 0, 0, g(Yes, No, false, false, "", "ε")},
-	{0x1d717, 0, 0, 0, g(Yes, No, false, false, "", "θ")},
-	{0x1d718, 0, 0, 0, g(Yes, No, false, false, "", "κ")},
-	{0x1d719, 0, 0, 0, g(Yes, No, false, false, "", "φ")},
-	{0x1d71a, 0, 0, 0, g(Yes, No, false, false, "", "ρ")},
-	{0x1d71b, 0, 0, 0, g(Yes, No, false, false, "", "π")},
-	{0x1d71c, 0, 0, 0, g(Yes, No, false, false, "", "Α")},
-	{0x1d71d, 0, 0, 0, g(Yes, No, false, false, "", "Β")},
-	{0x1d71e, 0, 0, 0, g(Yes, No, false, false, "", "Γ")},
-	{0x1d71f, 0, 0, 0, g(Yes, No, false, false, "", "Δ")},
-	{0x1d720, 0, 0, 0, g(Yes, No, false, false, "", "Ε")},
-	{0x1d721, 0, 0, 0, g(Yes, No, false, false, "", "Ζ")},
-	{0x1d722, 0, 0, 0, g(Yes, No, false, false, "", "Η")},
-	{0x1d723, 0, 0, 0, g(Yes, No, false, false, "", "Θ")},
-	{0x1d724, 0, 0, 0, g(Yes, No, false, false, "", "Ι")},
-	{0x1d725, 0, 0, 0, g(Yes, No, false, false, "", "Κ")},
-	{0x1d726, 0, 0, 0, g(Yes, No, false, false, "", "Λ")},
-	{0x1d727, 0, 0, 0, g(Yes, No, false, false, "", "Μ")},
-	{0x1d728, 0, 0, 0, g(Yes, No, false, false, "", "Ν")},
-	{0x1d729, 0, 0, 0, g(Yes, No, false, false, "", "Ξ")},
-	{0x1d72a, 0, 0, 0, g(Yes, No, false, false, "", "Ο")},
-	{0x1d72b, 0, 0, 0, g(Yes, No, false, false, "", "Π")},
-	{0x1d72c, 0, 0, 0, g(Yes, No, false, false, "", "Ρ")},
-	{0x1d72d, 0, 0, 0, g(Yes, No, false, false, "", "Θ")},
-	{0x1d72e, 0, 0, 0, g(Yes, No, false, false, "", "Σ")},
-	{0x1d72f, 0, 0, 0, g(Yes, No, false, false, "", "Τ")},
-	{0x1d730, 0, 0, 0, g(Yes, No, false, false, "", "Υ")},
-	{0x1d731, 0, 0, 0, g(Yes, No, false, false, "", "Φ")},
-	{0x1d732, 0, 0, 0, g(Yes, No, false, false, "", "Χ")},
-	{0x1d733, 0, 0, 0, g(Yes, No, false, false, "", "Ψ")},
-	{0x1d734, 0, 0, 0, g(Yes, No, false, false, "", "Ω")},
-	{0x1d735, 0, 0, 0, g(Yes, No, false, false, "", "∇")},
-	{0x1d736, 0, 0, 0, g(Yes, No, false, false, "", "α")},
-	{0x1d737, 0, 0, 0, g(Yes, No, false, false, "", "β")},
-	{0x1d738, 0, 0, 0, g(Yes, No, false, false, "", "γ")},
-	{0x1d739, 0, 0, 0, g(Yes, No, false, false, "", "δ")},
-	{0x1d73a, 0, 0, 0, g(Yes, No, false, false, "", "ε")},
-	{0x1d73b, 0, 0, 0, g(Yes, No, false, false, "", "ζ")},
-	{0x1d73c, 0, 0, 0, g(Yes, No, false, false, "", "η")},
-	{0x1d73d, 0, 0, 0, g(Yes, No, false, false, "", "θ")},
-	{0x1d73e, 0, 0, 0, g(Yes, No, false, false, "", "ι")},
-	{0x1d73f, 0, 0, 0, g(Yes, No, false, false, "", "κ")},
-	{0x1d740, 0, 0, 0, g(Yes, No, false, false, "", "λ")},
-	{0x1d741, 0, 0, 0, g(Yes, No, false, false, "", "μ")},
-	{0x1d742, 0, 0, 0, g(Yes, No, false, false, "", "ν")},
-	{0x1d743, 0, 0, 0, g(Yes, No, false, false, "", "ξ")},
-	{0x1d744, 0, 0, 0, g(Yes, No, false, false, "", "ο")},
-	{0x1d745, 0, 0, 0, g(Yes, No, false, false, "", "π")},
-	{0x1d746, 0, 0, 0, g(Yes, No, false, false, "", "ρ")},
-	{0x1d747, 0, 0, 0, g(Yes, No, false, false, "", "ς")},
-	{0x1d748, 0, 0, 0, g(Yes, No, false, false, "", "σ")},
-	{0x1d749, 0, 0, 0, g(Yes, No, false, false, "", "τ")},
-	{0x1d74a, 0, 0, 0, g(Yes, No, false, false, "", "υ")},
-	{0x1d74b, 0, 0, 0, g(Yes, No, false, false, "", "φ")},
-	{0x1d74c, 0, 0, 0, g(Yes, No, false, false, "", "χ")},
-	{0x1d74d, 0, 0, 0, g(Yes, No, false, false, "", "ψ")},
-	{0x1d74e, 0, 0, 0, g(Yes, No, false, false, "", "ω")},
-	{0x1d74f, 0, 0, 0, g(Yes, No, false, false, "", "∂")},
-	{0x1d750, 0, 0, 0, g(Yes, No, false, false, "", "ε")},
-	{0x1d751, 0, 0, 0, g(Yes, No, false, false, "", "θ")},
-	{0x1d752, 0, 0, 0, g(Yes, No, false, false, "", "κ")},
-	{0x1d753, 0, 0, 0, g(Yes, No, false, false, "", "φ")},
-	{0x1d754, 0, 0, 0, g(Yes, No, false, false, "", "ρ")},
-	{0x1d755, 0, 0, 0, g(Yes, No, false, false, "", "π")},
-	{0x1d756, 0, 0, 0, g(Yes, No, false, false, "", "Α")},
-	{0x1d757, 0, 0, 0, g(Yes, No, false, false, "", "Β")},
-	{0x1d758, 0, 0, 0, g(Yes, No, false, false, "", "Γ")},
-	{0x1d759, 0, 0, 0, g(Yes, No, false, false, "", "Δ")},
-	{0x1d75a, 0, 0, 0, g(Yes, No, false, false, "", "Ε")},
-	{0x1d75b, 0, 0, 0, g(Yes, No, false, false, "", "Ζ")},
-	{0x1d75c, 0, 0, 0, g(Yes, No, false, false, "", "Η")},
-	{0x1d75d, 0, 0, 0, g(Yes, No, false, false, "", "Θ")},
-	{0x1d75e, 0, 0, 0, g(Yes, No, false, false, "", "Ι")},
-	{0x1d75f, 0, 0, 0, g(Yes, No, false, false, "", "Κ")},
-	{0x1d760, 0, 0, 0, g(Yes, No, false, false, "", "Λ")},
-	{0x1d761, 0, 0, 0, g(Yes, No, false, false, "", "Μ")},
-	{0x1d762, 0, 0, 0, g(Yes, No, false, false, "", "Ν")},
-	{0x1d763, 0, 0, 0, g(Yes, No, false, false, "", "Ξ")},
-	{0x1d764, 0, 0, 0, g(Yes, No, false, false, "", "Ο")},
-	{0x1d765, 0, 0, 0, g(Yes, No, false, false, "", "Π")},
-	{0x1d766, 0, 0, 0, g(Yes, No, false, false, "", "Ρ")},
-	{0x1d767, 0, 0, 0, g(Yes, No, false, false, "", "Θ")},
-	{0x1d768, 0, 0, 0, g(Yes, No, false, false, "", "Σ")},
-	{0x1d769, 0, 0, 0, g(Yes, No, false, false, "", "Τ")},
-	{0x1d76a, 0, 0, 0, g(Yes, No, false, false, "", "Υ")},
-	{0x1d76b, 0, 0, 0, g(Yes, No, false, false, "", "Φ")},
-	{0x1d76c, 0, 0, 0, g(Yes, No, false, false, "", "Χ")},
-	{0x1d76d, 0, 0, 0, g(Yes, No, false, false, "", "Ψ")},
-	{0x1d76e, 0, 0, 0, g(Yes, No, false, false, "", "Ω")},
-	{0x1d76f, 0, 0, 0, g(Yes, No, false, false, "", "∇")},
-	{0x1d770, 0, 0, 0, g(Yes, No, false, false, "", "α")},
-	{0x1d771, 0, 0, 0, g(Yes, No, false, false, "", "β")},
-	{0x1d772, 0, 0, 0, g(Yes, No, false, false, "", "γ")},
-	{0x1d773, 0, 0, 0, g(Yes, No, false, false, "", "δ")},
-	{0x1d774, 0, 0, 0, g(Yes, No, false, false, "", "ε")},
-	{0x1d775, 0, 0, 0, g(Yes, No, false, false, "", "ζ")},
-	{0x1d776, 0, 0, 0, g(Yes, No, false, false, "", "η")},
-	{0x1d777, 0, 0, 0, g(Yes, No, false, false, "", "θ")},
-	{0x1d778, 0, 0, 0, g(Yes, No, false, false, "", "ι")},
-	{0x1d779, 0, 0, 0, g(Yes, No, false, false, "", "κ")},
-	{0x1d77a, 0, 0, 0, g(Yes, No, false, false, "", "λ")},
-	{0x1d77b, 0, 0, 0, g(Yes, No, false, false, "", "μ")},
-	{0x1d77c, 0, 0, 0, g(Yes, No, false, false, "", "ν")},
-	{0x1d77d, 0, 0, 0, g(Yes, No, false, false, "", "ξ")},
-	{0x1d77e, 0, 0, 0, g(Yes, No, false, false, "", "ο")},
-	{0x1d77f, 0, 0, 0, g(Yes, No, false, false, "", "π")},
-	{0x1d780, 0, 0, 0, g(Yes, No, false, false, "", "ρ")},
-	{0x1d781, 0, 0, 0, g(Yes, No, false, false, "", "ς")},
-	{0x1d782, 0, 0, 0, g(Yes, No, false, false, "", "σ")},
-	{0x1d783, 0, 0, 0, g(Yes, No, false, false, "", "τ")},
-	{0x1d784, 0, 0, 0, g(Yes, No, false, false, "", "υ")},
-	{0x1d785, 0, 0, 0, g(Yes, No, false, false, "", "φ")},
-	{0x1d786, 0, 0, 0, g(Yes, No, false, false, "", "χ")},
-	{0x1d787, 0, 0, 0, g(Yes, No, false, false, "", "ψ")},
-	{0x1d788, 0, 0, 0, g(Yes, No, false, false, "", "ω")},
-	{0x1d789, 0, 0, 0, g(Yes, No, false, false, "", "∂")},
-	{0x1d78a, 0, 0, 0, g(Yes, No, false, false, "", "ε")},
-	{0x1d78b, 0, 0, 0, g(Yes, No, false, false, "", "θ")},
-	{0x1d78c, 0, 0, 0, g(Yes, No, false, false, "", "κ")},
-	{0x1d78d, 0, 0, 0, g(Yes, No, false, false, "", "φ")},
-	{0x1d78e, 0, 0, 0, g(Yes, No, false, false, "", "ρ")},
-	{0x1d78f, 0, 0, 0, g(Yes, No, false, false, "", "π")},
-	{0x1d790, 0, 0, 0, g(Yes, No, false, false, "", "Α")},
-	{0x1d791, 0, 0, 0, g(Yes, No, false, false, "", "Β")},
-	{0x1d792, 0, 0, 0, g(Yes, No, false, false, "", "Γ")},
-	{0x1d793, 0, 0, 0, g(Yes, No, false, false, "", "Δ")},
-	{0x1d794, 0, 0, 0, g(Yes, No, false, false, "", "Ε")},
-	{0x1d795, 0, 0, 0, g(Yes, No, false, false, "", "Ζ")},
-	{0x1d796, 0, 0, 0, g(Yes, No, false, false, "", "Η")},
-	{0x1d797, 0, 0, 0, g(Yes, No, false, false, "", "Θ")},
-	{0x1d798, 0, 0, 0, g(Yes, No, false, false, "", "Ι")},
-	{0x1d799, 0, 0, 0, g(Yes, No, false, false, "", "Κ")},
-	{0x1d79a, 0, 0, 0, g(Yes, No, false, false, "", "Λ")},
-	{0x1d79b, 0, 0, 0, g(Yes, No, false, false, "", "Μ")},
-	{0x1d79c, 0, 0, 0, g(Yes, No, false, false, "", "Ν")},
-	{0x1d79d, 0, 0, 0, g(Yes, No, false, false, "", "Ξ")},
-	{0x1d79e, 0, 0, 0, g(Yes, No, false, false, "", "Ο")},
-	{0x1d79f, 0, 0, 0, g(Yes, No, false, false, "", "Π")},
-	{0x1d7a0, 0, 0, 0, g(Yes, No, false, false, "", "Ρ")},
-	{0x1d7a1, 0, 0, 0, g(Yes, No, false, false, "", "Θ")},
-	{0x1d7a2, 0, 0, 0, g(Yes, No, false, false, "", "Σ")},
-	{0x1d7a3, 0, 0, 0, g(Yes, No, false, false, "", "Τ")},
-	{0x1d7a4, 0, 0, 0, g(Yes, No, false, false, "", "Υ")},
-	{0x1d7a5, 0, 0, 0, g(Yes, No, false, false, "", "Φ")},
-	{0x1d7a6, 0, 0, 0, g(Yes, No, false, false, "", "Χ")},
-	{0x1d7a7, 0, 0, 0, g(Yes, No, false, false, "", "Ψ")},
-	{0x1d7a8, 0, 0, 0, g(Yes, No, false, false, "", "Ω")},
-	{0x1d7a9, 0, 0, 0, g(Yes, No, false, false, "", "∇")},
-	{0x1d7aa, 0, 0, 0, g(Yes, No, false, false, "", "α")},
-	{0x1d7ab, 0, 0, 0, g(Yes, No, false, false, "", "β")},
-	{0x1d7ac, 0, 0, 0, g(Yes, No, false, false, "", "γ")},
-	{0x1d7ad, 0, 0, 0, g(Yes, No, false, false, "", "δ")},
-	{0x1d7ae, 0, 0, 0, g(Yes, No, false, false, "", "ε")},
-	{0x1d7af, 0, 0, 0, g(Yes, No, false, false, "", "ζ")},
-	{0x1d7b0, 0, 0, 0, g(Yes, No, false, false, "", "η")},
-	{0x1d7b1, 0, 0, 0, g(Yes, No, false, false, "", "θ")},
-	{0x1d7b2, 0, 0, 0, g(Yes, No, false, false, "", "ι")},
-	{0x1d7b3, 0, 0, 0, g(Yes, No, false, false, "", "κ")},
-	{0x1d7b4, 0, 0, 0, g(Yes, No, false, false, "", "λ")},
-	{0x1d7b5, 0, 0, 0, g(Yes, No, false, false, "", "μ")},
-	{0x1d7b6, 0, 0, 0, g(Yes, No, false, false, "", "ν")},
-	{0x1d7b7, 0, 0, 0, g(Yes, No, false, false, "", "ξ")},
-	{0x1d7b8, 0, 0, 0, g(Yes, No, false, false, "", "ο")},
-	{0x1d7b9, 0, 0, 0, g(Yes, No, false, false, "", "π")},
-	{0x1d7ba, 0, 0, 0, g(Yes, No, false, false, "", "ρ")},
-	{0x1d7bb, 0, 0, 0, g(Yes, No, false, false, "", "ς")},
-	{0x1d7bc, 0, 0, 0, g(Yes, No, false, false, "", "σ")},
-	{0x1d7bd, 0, 0, 0, g(Yes, No, false, false, "", "τ")},
-	{0x1d7be, 0, 0, 0, g(Yes, No, false, false, "", "υ")},
-	{0x1d7bf, 0, 0, 0, g(Yes, No, false, false, "", "φ")},
-	{0x1d7c0, 0, 0, 0, g(Yes, No, false, false, "", "χ")},
-	{0x1d7c1, 0, 0, 0, g(Yes, No, false, false, "", "ψ")},
-	{0x1d7c2, 0, 0, 0, g(Yes, No, false, false, "", "ω")},
-	{0x1d7c3, 0, 0, 0, g(Yes, No, false, false, "", "∂")},
-	{0x1d7c4, 0, 0, 0, g(Yes, No, false, false, "", "ε")},
-	{0x1d7c5, 0, 0, 0, g(Yes, No, false, false, "", "θ")},
-	{0x1d7c6, 0, 0, 0, g(Yes, No, false, false, "", "κ")},
-	{0x1d7c7, 0, 0, 0, g(Yes, No, false, false, "", "φ")},
-	{0x1d7c8, 0, 0, 0, g(Yes, No, false, false, "", "ρ")},
-	{0x1d7c9, 0, 0, 0, g(Yes, No, false, false, "", "π")},
-	{0x1d7ca, 0, 0, 0, g(Yes, No, false, false, "", "Ϝ")},
-	{0x1d7cb, 0, 0, 0, g(Yes, No, false, false, "", "ϝ")},
-	{0x1d7cc, 0, 0, 0, f(Yes, false, "")},
-	{0x1d7ce, 0, 0, 0, g(Yes, No, false, false, "", "0")},
-	{0x1d7cf, 0, 0, 0, g(Yes, No, false, false, "", "1")},
-	{0x1d7d0, 0, 0, 0, g(Yes, No, false, false, "", "2")},
-	{0x1d7d1, 0, 0, 0, g(Yes, No, false, false, "", "3")},
-	{0x1d7d2, 0, 0, 0, g(Yes, No, false, false, "", "4")},
-	{0x1d7d3, 0, 0, 0, g(Yes, No, false, false, "", "5")},
-	{0x1d7d4, 0, 0, 0, g(Yes, No, false, false, "", "6")},
-	{0x1d7d5, 0, 0, 0, g(Yes, No, false, false, "", "7")},
-	{0x1d7d6, 0, 0, 0, g(Yes, No, false, false, "", "8")},
-	{0x1d7d7, 0, 0, 0, g(Yes, No, false, false, "", "9")},
-	{0x1d7d8, 0, 0, 0, g(Yes, No, false, false, "", "0")},
-	{0x1d7d9, 0, 0, 0, g(Yes, No, false, false, "", "1")},
-	{0x1d7da, 0, 0, 0, g(Yes, No, false, false, "", "2")},
-	{0x1d7db, 0, 0, 0, g(Yes, No, false, false, "", "3")},
-	{0x1d7dc, 0, 0, 0, g(Yes, No, false, false, "", "4")},
-	{0x1d7dd, 0, 0, 0, g(Yes, No, false, false, "", "5")},
-	{0x1d7de, 0, 0, 0, g(Yes, No, false, false, "", "6")},
-	{0x1d7df, 0, 0, 0, g(Yes, No, false, false, "", "7")},
-	{0x1d7e0, 0, 0, 0, g(Yes, No, false, false, "", "8")},
-	{0x1d7e1, 0, 0, 0, g(Yes, No, false, false, "", "9")},
-	{0x1d7e2, 0, 0, 0, g(Yes, No, false, false, "", "0")},
-	{0x1d7e3, 0, 0, 0, g(Yes, No, false, false, "", "1")},
-	{0x1d7e4, 0, 0, 0, g(Yes, No, false, false, "", "2")},
-	{0x1d7e5, 0, 0, 0, g(Yes, No, false, false, "", "3")},
-	{0x1d7e6, 0, 0, 0, g(Yes, No, false, false, "", "4")},
-	{0x1d7e7, 0, 0, 0, g(Yes, No, false, false, "", "5")},
-	{0x1d7e8, 0, 0, 0, g(Yes, No, false, false, "", "6")},
-	{0x1d7e9, 0, 0, 0, g(Yes, No, false, false, "", "7")},
-	{0x1d7ea, 0, 0, 0, g(Yes, No, false, false, "", "8")},
-	{0x1d7eb, 0, 0, 0, g(Yes, No, false, false, "", "9")},
-	{0x1d7ec, 0, 0, 0, g(Yes, No, false, false, "", "0")},
-	{0x1d7ed, 0, 0, 0, g(Yes, No, false, false, "", "1")},
-	{0x1d7ee, 0, 0, 0, g(Yes, No, false, false, "", "2")},
-	{0x1d7ef, 0, 0, 0, g(Yes, No, false, false, "", "3")},
-	{0x1d7f0, 0, 0, 0, g(Yes, No, false, false, "", "4")},
-	{0x1d7f1, 0, 0, 0, g(Yes, No, false, false, "", "5")},
-	{0x1d7f2, 0, 0, 0, g(Yes, No, false, false, "", "6")},
-	{0x1d7f3, 0, 0, 0, g(Yes, No, false, false, "", "7")},
-	{0x1d7f4, 0, 0, 0, g(Yes, No, false, false, "", "8")},
-	{0x1d7f5, 0, 0, 0, g(Yes, No, false, false, "", "9")},
-	{0x1d7f6, 0, 0, 0, g(Yes, No, false, false, "", "0")},
-	{0x1d7f7, 0, 0, 0, g(Yes, No, false, false, "", "1")},
-	{0x1d7f8, 0, 0, 0, g(Yes, No, false, false, "", "2")},
-	{0x1d7f9, 0, 0, 0, g(Yes, No, false, false, "", "3")},
-	{0x1d7fa, 0, 0, 0, g(Yes, No, false, false, "", "4")},
-	{0x1d7fb, 0, 0, 0, g(Yes, No, false, false, "", "5")},
-	{0x1d7fc, 0, 0, 0, g(Yes, No, false, false, "", "6")},
-	{0x1d7fd, 0, 0, 0, g(Yes, No, false, false, "", "7")},
-	{0x1d7fe, 0, 0, 0, g(Yes, No, false, false, "", "8")},
-	{0x1d7ff, 0, 0, 0, g(Yes, No, false, false, "", "9")},
-	{0x1d800, 0, 0, 0, f(Yes, false, "")},
-	{0x1e000, 230, 1, 1, f(Yes, false, "")},
-	{0x1e007, 0, 0, 0, f(Yes, false, "")},
-	{0x1e008, 230, 1, 1, f(Yes, false, "")},
-	{0x1e019, 0, 0, 0, f(Yes, false, "")},
-	{0x1e01b, 230, 1, 1, f(Yes, false, "")},
-	{0x1e022, 0, 0, 0, f(Yes, false, "")},
-	{0x1e023, 230, 1, 1, f(Yes, false, "")},
-	{0x1e025, 0, 0, 0, f(Yes, false, "")},
-	{0x1e026, 230, 1, 1, f(Yes, false, "")},
-	{0x1e02b, 0, 0, 0, f(Yes, false, "")},
-	{0x1e8d0, 220, 1, 1, f(Yes, false, "")},
-	{0x1e8d7, 0, 0, 0, f(Yes, false, "")},
-	{0x1e944, 230, 1, 1, f(Yes, false, "")},
-	{0x1e94a, 7, 1, 1, f(Yes, false, "")},
-	{0x1e94b, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee00, 0, 0, 0, g(Yes, No, false, false, "", "ا")},
-	{0x1ee01, 0, 0, 0, g(Yes, No, false, false, "", "ب")},
-	{0x1ee02, 0, 0, 0, g(Yes, No, false, false, "", "ج")},
-	{0x1ee03, 0, 0, 0, g(Yes, No, false, false, "", "د")},
-	{0x1ee04, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee05, 0, 0, 0, g(Yes, No, false, false, "", "و")},
-	{0x1ee06, 0, 0, 0, g(Yes, No, false, false, "", "ز")},
-	{0x1ee07, 0, 0, 0, g(Yes, No, false, false, "", "ح")},
-	{0x1ee08, 0, 0, 0, g(Yes, No, false, false, "", "ط")},
-	{0x1ee09, 0, 0, 0, g(Yes, No, false, false, "", "ي")},
-	{0x1ee0a, 0, 0, 0, g(Yes, No, false, false, "", "ك")},
-	{0x1ee0b, 0, 0, 0, g(Yes, No, false, false, "", "ل")},
-	{0x1ee0c, 0, 0, 0, g(Yes, No, false, false, "", "م")},
-	{0x1ee0d, 0, 0, 0, g(Yes, No, false, false, "", "ن")},
-	{0x1ee0e, 0, 0, 0, g(Yes, No, false, false, "", "س")},
-	{0x1ee0f, 0, 0, 0, g(Yes, No, false, false, "", "ع")},
-	{0x1ee10, 0, 0, 0, g(Yes, No, false, false, "", "ف")},
-	{0x1ee11, 0, 0, 0, g(Yes, No, false, false, "", "ص")},
-	{0x1ee12, 0, 0, 0, g(Yes, No, false, false, "", "ق")},
-	{0x1ee13, 0, 0, 0, g(Yes, No, false, false, "", "ر")},
-	{0x1ee14, 0, 0, 0, g(Yes, No, false, false, "", "ش")},
-	{0x1ee15, 0, 0, 0, g(Yes, No, false, false, "", "ت")},
-	{0x1ee16, 0, 0, 0, g(Yes, No, false, false, "", "ث")},
-	{0x1ee17, 0, 0, 0, g(Yes, No, false, false, "", "خ")},
-	{0x1ee18, 0, 0, 0, g(Yes, No, false, false, "", "ذ")},
-	{0x1ee19, 0, 0, 0, g(Yes, No, false, false, "", "ض")},
-	{0x1ee1a, 0, 0, 0, g(Yes, No, false, false, "", "ظ")},
-	{0x1ee1b, 0, 0, 0, g(Yes, No, false, false, "", "غ")},
-	{0x1ee1c, 0, 0, 0, g(Yes, No, false, false, "", "ٮ")},
-	{0x1ee1d, 0, 0, 0, g(Yes, No, false, false, "", "ں")},
-	{0x1ee1e, 0, 0, 0, g(Yes, No, false, false, "", "ڡ")},
-	{0x1ee1f, 0, 0, 0, g(Yes, No, false, false, "", "ٯ")},
-	{0x1ee20, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee21, 0, 0, 0, g(Yes, No, false, false, "", "ب")},
-	{0x1ee22, 0, 0, 0, g(Yes, No, false, false, "", "ج")},
-	{0x1ee23, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee24, 0, 0, 0, g(Yes, No, false, false, "", "ه")},
-	{0x1ee25, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee27, 0, 0, 0, g(Yes, No, false, false, "", "ح")},
-	{0x1ee28, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee29, 0, 0, 0, g(Yes, No, false, false, "", "ي")},
-	{0x1ee2a, 0, 0, 0, g(Yes, No, false, false, "", "ك")},
-	{0x1ee2b, 0, 0, 0, g(Yes, No, false, false, "", "ل")},
-	{0x1ee2c, 0, 0, 0, g(Yes, No, false, false, "", "م")},
-	{0x1ee2d, 0, 0, 0, g(Yes, No, false, false, "", "ن")},
-	{0x1ee2e, 0, 0, 0, g(Yes, No, false, false, "", "س")},
-	{0x1ee2f, 0, 0, 0, g(Yes, No, false, false, "", "ع")},
-	{0x1ee30, 0, 0, 0, g(Yes, No, false, false, "", "ف")},
-	{0x1ee31, 0, 0, 0, g(Yes, No, false, false, "", "ص")},
-	{0x1ee32, 0, 0, 0, g(Yes, No, false, false, "", "ق")},
-	{0x1ee33, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee34, 0, 0, 0, g(Yes, No, false, false, "", "ش")},
-	{0x1ee35, 0, 0, 0, g(Yes, No, false, false, "", "ت")},
-	{0x1ee36, 0, 0, 0, g(Yes, No, false, false, "", "ث")},
-	{0x1ee37, 0, 0, 0, g(Yes, No, false, false, "", "خ")},
-	{0x1ee38, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee39, 0, 0, 0, g(Yes, No, false, false, "", "ض")},
-	{0x1ee3a, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee3b, 0, 0, 0, g(Yes, No, false, false, "", "غ")},
-	{0x1ee3c, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee42, 0, 0, 0, g(Yes, No, false, false, "", "ج")},
-	{0x1ee43, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee47, 0, 0, 0, g(Yes, No, false, false, "", "ح")},
-	{0x1ee48, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee49, 0, 0, 0, g(Yes, No, false, false, "", "ي")},
-	{0x1ee4a, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee4b, 0, 0, 0, g(Yes, No, false, false, "", "ل")},
-	{0x1ee4c, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee4d, 0, 0, 0, g(Yes, No, false, false, "", "ن")},
-	{0x1ee4e, 0, 0, 0, g(Yes, No, false, false, "", "س")},
-	{0x1ee4f, 0, 0, 0, g(Yes, No, false, false, "", "ع")},
-	{0x1ee50, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee51, 0, 0, 0, g(Yes, No, false, false, "", "ص")},
-	{0x1ee52, 0, 0, 0, g(Yes, No, false, false, "", "ق")},
-	{0x1ee53, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee54, 0, 0, 0, g(Yes, No, false, false, "", "ش")},
-	{0x1ee55, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee57, 0, 0, 0, g(Yes, No, false, false, "", "خ")},
-	{0x1ee58, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee59, 0, 0, 0, g(Yes, No, false, false, "", "ض")},
-	{0x1ee5a, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee5b, 0, 0, 0, g(Yes, No, false, false, "", "غ")},
-	{0x1ee5c, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee5d, 0, 0, 0, g(Yes, No, false, false, "", "ں")},
-	{0x1ee5e, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee5f, 0, 0, 0, g(Yes, No, false, false, "", "ٯ")},
-	{0x1ee60, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee61, 0, 0, 0, g(Yes, No, false, false, "", "ب")},
-	{0x1ee62, 0, 0, 0, g(Yes, No, false, false, "", "ج")},
-	{0x1ee63, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee64, 0, 0, 0, g(Yes, No, false, false, "", "ه")},
-	{0x1ee65, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee67, 0, 0, 0, g(Yes, No, false, false, "", "ح")},
-	{0x1ee68, 0, 0, 0, g(Yes, No, false, false, "", "ط")},
-	{0x1ee69, 0, 0, 0, g(Yes, No, false, false, "", "ي")},
-	{0x1ee6a, 0, 0, 0, g(Yes, No, false, false, "", "ك")},
-	{0x1ee6b, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee6c, 0, 0, 0, g(Yes, No, false, false, "", "م")},
-	{0x1ee6d, 0, 0, 0, g(Yes, No, false, false, "", "ن")},
-	{0x1ee6e, 0, 0, 0, g(Yes, No, false, false, "", "س")},
-	{0x1ee6f, 0, 0, 0, g(Yes, No, false, false, "", "ع")},
-	{0x1ee70, 0, 0, 0, g(Yes, No, false, false, "", "ف")},
-	{0x1ee71, 0, 0, 0, g(Yes, No, false, false, "", "ص")},
-	{0x1ee72, 0, 0, 0, g(Yes, No, false, false, "", "ق")},
-	{0x1ee73, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee74, 0, 0, 0, g(Yes, No, false, false, "", "ش")},
-	{0x1ee75, 0, 0, 0, g(Yes, No, false, false, "", "ت")},
-	{0x1ee76, 0, 0, 0, g(Yes, No, false, false, "", "ث")},
-	{0x1ee77, 0, 0, 0, g(Yes, No, false, false, "", "خ")},
-	{0x1ee78, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee79, 0, 0, 0, g(Yes, No, false, false, "", "ض")},
-	{0x1ee7a, 0, 0, 0, g(Yes, No, false, false, "", "ظ")},
-	{0x1ee7b, 0, 0, 0, g(Yes, No, false, false, "", "غ")},
-	{0x1ee7c, 0, 0, 0, g(Yes, No, false, false, "", "ٮ")},
-	{0x1ee7d, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee7e, 0, 0, 0, g(Yes, No, false, false, "", "ڡ")},
-	{0x1ee7f, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee80, 0, 0, 0, g(Yes, No, false, false, "", "ا")},
-	{0x1ee81, 0, 0, 0, g(Yes, No, false, false, "", "ب")},
-	{0x1ee82, 0, 0, 0, g(Yes, No, false, false, "", "ج")},
-	{0x1ee83, 0, 0, 0, g(Yes, No, false, false, "", "د")},
-	{0x1ee84, 0, 0, 0, g(Yes, No, false, false, "", "ه")},
-	{0x1ee85, 0, 0, 0, g(Yes, No, false, false, "", "و")},
-	{0x1ee86, 0, 0, 0, g(Yes, No, false, false, "", "ز")},
-	{0x1ee87, 0, 0, 0, g(Yes, No, false, false, "", "ح")},
-	{0x1ee88, 0, 0, 0, g(Yes, No, false, false, "", "ط")},
-	{0x1ee89, 0, 0, 0, g(Yes, No, false, false, "", "ي")},
-	{0x1ee8a, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee8b, 0, 0, 0, g(Yes, No, false, false, "", "ل")},
-	{0x1ee8c, 0, 0, 0, g(Yes, No, false, false, "", "م")},
-	{0x1ee8d, 0, 0, 0, g(Yes, No, false, false, "", "ن")},
-	{0x1ee8e, 0, 0, 0, g(Yes, No, false, false, "", "س")},
-	{0x1ee8f, 0, 0, 0, g(Yes, No, false, false, "", "ع")},
-	{0x1ee90, 0, 0, 0, g(Yes, No, false, false, "", "ف")},
-	{0x1ee91, 0, 0, 0, g(Yes, No, false, false, "", "ص")},
-	{0x1ee92, 0, 0, 0, g(Yes, No, false, false, "", "ق")},
-	{0x1ee93, 0, 0, 0, g(Yes, No, false, false, "", "ر")},
-	{0x1ee94, 0, 0, 0, g(Yes, No, false, false, "", "ش")},
-	{0x1ee95, 0, 0, 0, g(Yes, No, false, false, "", "ت")},
-	{0x1ee96, 0, 0, 0, g(Yes, No, false, false, "", "ث")},
-	{0x1ee97, 0, 0, 0, g(Yes, No, false, false, "", "خ")},
-	{0x1ee98, 0, 0, 0, g(Yes, No, false, false, "", "ذ")},
-	{0x1ee99, 0, 0, 0, g(Yes, No, false, false, "", "ض")},
-	{0x1ee9a, 0, 0, 0, g(Yes, No, false, false, "", "ظ")},
-	{0x1ee9b, 0, 0, 0, g(Yes, No, false, false, "", "غ")},
-	{0x1ee9c, 0, 0, 0, f(Yes, false, "")},
-	{0x1eea1, 0, 0, 0, g(Yes, No, false, false, "", "ب")},
-	{0x1eea2, 0, 0, 0, g(Yes, No, false, false, "", "ج")},
-	{0x1eea3, 0, 0, 0, g(Yes, No, false, false, "", "د")},
-	{0x1eea4, 0, 0, 0, f(Yes, false, "")},
-	{0x1eea5, 0, 0, 0, g(Yes, No, false, false, "", "و")},
-	{0x1eea6, 0, 0, 0, g(Yes, No, false, false, "", "ز")},
-	{0x1eea7, 0, 0, 0, g(Yes, No, false, false, "", "ح")},
-	{0x1eea8, 0, 0, 0, g(Yes, No, false, false, "", "ط")},
-	{0x1eea9, 0, 0, 0, g(Yes, No, false, false, "", "ي")},
-	{0x1eeaa, 0, 0, 0, f(Yes, false, "")},
-	{0x1eeab, 0, 0, 0, g(Yes, No, false, false, "", "ل")},
-	{0x1eeac, 0, 0, 0, g(Yes, No, false, false, "", "م")},
-	{0x1eead, 0, 0, 0, g(Yes, No, false, false, "", "ن")},
-	{0x1eeae, 0, 0, 0, g(Yes, No, false, false, "", "س")},
-	{0x1eeaf, 0, 0, 0, g(Yes, No, false, false, "", "ع")},
-	{0x1eeb0, 0, 0, 0, g(Yes, No, false, false, "", "ف")},
-	{0x1eeb1, 0, 0, 0, g(Yes, No, false, false, "", "ص")},
-	{0x1eeb2, 0, 0, 0, g(Yes, No, false, false, "", "ق")},
-	{0x1eeb3, 0, 0, 0, g(Yes, No, false, false, "", "ر")},
-	{0x1eeb4, 0, 0, 0, g(Yes, No, false, false, "", "ش")},
-	{0x1eeb5, 0, 0, 0, g(Yes, No, false, false, "", "ت")},
-	{0x1eeb6, 0, 0, 0, g(Yes, No, false, false, "", "ث")},
-	{0x1eeb7, 0, 0, 0, g(Yes, No, false, false, "", "خ")},
-	{0x1eeb8, 0, 0, 0, g(Yes, No, false, false, "", "ذ")},
-	{0x1eeb9, 0, 0, 0, g(Yes, No, false, false, "", "ض")},
-	{0x1eeba, 0, 0, 0, g(Yes, No, false, false, "", "ظ")},
-	{0x1eebb, 0, 0, 0, g(Yes, No, false, false, "", "غ")},
-	{0x1eebc, 0, 0, 0, f(Yes, false, "")},
-	{0x1f100, 0, 0, 0, g(Yes, No, false, false, "", "0.")},
-	{0x1f101, 0, 0, 0, g(Yes, No, false, false, "", "0,")},
-	{0x1f102, 0, 0, 0, g(Yes, No, false, false, "", "1,")},
-	{0x1f103, 0, 0, 0, g(Yes, No, false, false, "", "2,")},
-	{0x1f104, 0, 0, 0, g(Yes, No, false, false, "", "3,")},
-	{0x1f105, 0, 0, 0, g(Yes, No, false, false, "", "4,")},
-	{0x1f106, 0, 0, 0, g(Yes, No, false, false, "", "5,")},
-	{0x1f107, 0, 0, 0, g(Yes, No, false, false, "", "6,")},
-	{0x1f108, 0, 0, 0, g(Yes, No, false, false, "", "7,")},
-	{0x1f109, 0, 0, 0, g(Yes, No, false, false, "", "8,")},
-	{0x1f10a, 0, 0, 0, g(Yes, No, false, false, "", "9,")},
-	{0x1f10b, 0, 0, 0, f(Yes, false, "")},
-	{0x1f110, 0, 0, 0, g(Yes, No, false, false, "", "(A)")},
-	{0x1f111, 0, 0, 0, g(Yes, No, false, false, "", "(B)")},
-	{0x1f112, 0, 0, 0, g(Yes, No, false, false, "", "(C)")},
-	{0x1f113, 0, 0, 0, g(Yes, No, false, false, "", "(D)")},
-	{0x1f114, 0, 0, 0, g(Yes, No, false, false, "", "(E)")},
-	{0x1f115, 0, 0, 0, g(Yes, No, false, false, "", "(F)")},
-	{0x1f116, 0, 0, 0, g(Yes, No, false, false, "", "(G)")},
-	{0x1f117, 0, 0, 0, g(Yes, No, false, false, "", "(H)")},
-	{0x1f118, 0, 0, 0, g(Yes, No, false, false, "", "(I)")},
-	{0x1f119, 0, 0, 0, g(Yes, No, false, false, "", "(J)")},
-	{0x1f11a, 0, 0, 0, g(Yes, No, false, false, "", "(K)")},
-	{0x1f11b, 0, 0, 0, g(Yes, No, false, false, "", "(L)")},
-	{0x1f11c, 0, 0, 0, g(Yes, No, false, false, "", "(M)")},
-	{0x1f11d, 0, 0, 0, g(Yes, No, false, false, "", "(N)")},
-	{0x1f11e, 0, 0, 0, g(Yes, No, false, false, "", "(O)")},
-	{0x1f11f, 0, 0, 0, g(Yes, No, false, false, "", "(P)")},
-	{0x1f120, 0, 0, 0, g(Yes, No, false, false, "", "(Q)")},
-	{0x1f121, 0, 0, 0, g(Yes, No, false, false, "", "(R)")},
-	{0x1f122, 0, 0, 0, g(Yes, No, false, false, "", "(S)")},
-	{0x1f123, 0, 0, 0, g(Yes, No, false, false, "", "(T)")},
-	{0x1f124, 0, 0, 0, g(Yes, No, false, false, "", "(U)")},
-	{0x1f125, 0, 0, 0, g(Yes, No, false, false, "", "(V)")},
-	{0x1f126, 0, 0, 0, g(Yes, No, false, false, "", "(W)")},
-	{0x1f127, 0, 0, 0, g(Yes, No, false, false, "", "(X)")},
-	{0x1f128, 0, 0, 0, g(Yes, No, false, false, "", "(Y)")},
-	{0x1f129, 0, 0, 0, g(Yes, No, false, false, "", "(Z)")},
-	{0x1f12a, 0, 0, 0, g(Yes, No, false, false, "", "〔S〕")},
-	{0x1f12b, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0x1f12c, 0, 0, 0, g(Yes, No, false, false, "", "R")},
-	{0x1f12d, 0, 0, 0, g(Yes, No, false, false, "", "CD")},
-	{0x1f12e, 0, 0, 0, g(Yes, No, false, false, "", "WZ")},
-	{0x1f12f, 0, 0, 0, f(Yes, false, "")},
-	{0x1f130, 0, 0, 0, g(Yes, No, false, false, "", "A")},
-	{0x1f131, 0, 0, 0, g(Yes, No, false, false, "", "B")},
-	{0x1f132, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0x1f133, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x1f134, 0, 0, 0, g(Yes, No, false, false, "", "E")},
-	{0x1f135, 0, 0, 0, g(Yes, No, false, false, "", "F")},
-	{0x1f136, 0, 0, 0, g(Yes, No, false, false, "", "G")},
-	{0x1f137, 0, 0, 0, g(Yes, No, false, false, "", "H")},
-	{0x1f138, 0, 0, 0, g(Yes, No, false, false, "", "I")},
-	{0x1f139, 0, 0, 0, g(Yes, No, false, false, "", "J")},
-	{0x1f13a, 0, 0, 0, g(Yes, No, false, false, "", "K")},
-	{0x1f13b, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0x1f13c, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0x1f13d, 0, 0, 0, g(Yes, No, false, false, "", "N")},
-	{0x1f13e, 0, 0, 0, g(Yes, No, false, false, "", "O")},
-	{0x1f13f, 0, 0, 0, g(Yes, No, false, false, "", "P")},
-	{0x1f140, 0, 0, 0, g(Yes, No, false, false, "", "Q")},
-	{0x1f141, 0, 0, 0, g(Yes, No, false, false, "", "R")},
-	{0x1f142, 0, 0, 0, g(Yes, No, false, false, "", "S")},
-	{0x1f143, 0, 0, 0, g(Yes, No, false, false, "", "T")},
-	{0x1f144, 0, 0, 0, g(Yes, No, false, false, "", "U")},
-	{0x1f145, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0x1f146, 0, 0, 0, g(Yes, No, false, false, "", "W")},
-	{0x1f147, 0, 0, 0, g(Yes, No, false, false, "", "X")},
-	{0x1f148, 0, 0, 0, g(Yes, No, false, false, "", "Y")},
-	{0x1f149, 0, 0, 0, g(Yes, No, false, false, "", "Z")},
-	{0x1f14a, 0, 0, 0, g(Yes, No, false, false, "", "HV")},
-	{0x1f14b, 0, 0, 0, g(Yes, No, false, false, "", "MV")},
-	{0x1f14c, 0, 0, 0, g(Yes, No, false, false, "", "SD")},
-	{0x1f14d, 0, 0, 0, g(Yes, No, false, false, "", "SS")},
-	{0x1f14e, 0, 0, 0, g(Yes, No, false, false, "", "PPV")},
-	{0x1f14f, 0, 0, 0, g(Yes, No, false, false, "", "WC")},
-	{0x1f150, 0, 0, 0, f(Yes, false, "")},
-	{0x1f16a, 0, 0, 0, g(Yes, No, false, false, "", "MC")},
-	{0x1f16b, 0, 0, 0, g(Yes, No, false, false, "", "MD")},
-	{0x1f16c, 0, 0, 0, f(Yes, false, "")},
-	{0x1f190, 0, 0, 0, g(Yes, No, false, false, "", "DJ")},
-	{0x1f191, 0, 0, 0, f(Yes, false, "")},
-	{0x1f200, 0, 0, 0, g(Yes, No, false, false, "", "ほか")},
-	{0x1f201, 0, 0, 0, g(Yes, No, false, false, "", "ココ")},
-	{0x1f202, 0, 0, 0, g(Yes, No, false, false, "", "サ")},
-	{0x1f203, 0, 0, 0, f(Yes, false, "")},
-	{0x1f210, 0, 0, 0, g(Yes, No, false, false, "", "手")},
-	{0x1f211, 0, 0, 0, g(Yes, No, false, false, "", "字")},
-	{0x1f212, 0, 0, 0, g(Yes, No, false, false, "", "双")},
-	{0x1f213, 0, 0, 1, g(Yes, No, false, false, "", "デ")},
-	{0x1f214, 0, 0, 0, g(Yes, No, false, false, "", "二")},
-	{0x1f215, 0, 0, 0, g(Yes, No, false, false, "", "多")},
-	{0x1f216, 0, 0, 0, g(Yes, No, false, false, "", "解")},
-	{0x1f217, 0, 0, 0, g(Yes, No, false, false, "", "天")},
-	{0x1f218, 0, 0, 0, g(Yes, No, false, false, "", "交")},
-	{0x1f219, 0, 0, 0, g(Yes, No, false, false, "", "映")},
-	{0x1f21a, 0, 0, 0, g(Yes, No, false, false, "", "無")},
-	{0x1f21b, 0, 0, 0, g(Yes, No, false, false, "", "料")},
-	{0x1f21c, 0, 0, 0, g(Yes, No, false, false, "", "前")},
-	{0x1f21d, 0, 0, 0, g(Yes, No, false, false, "", "後")},
-	{0x1f21e, 0, 0, 0, g(Yes, No, false, false, "", "再")},
-	{0x1f21f, 0, 0, 0, g(Yes, No, false, false, "", "新")},
-	{0x1f220, 0, 0, 0, g(Yes, No, false, false, "", "初")},
-	{0x1f221, 0, 0, 0, g(Yes, No, false, false, "", "終")},
-	{0x1f222, 0, 0, 0, g(Yes, No, false, false, "", "生")},
-	{0x1f223, 0, 0, 0, g(Yes, No, false, false, "", "販")},
-	{0x1f224, 0, 0, 0, g(Yes, No, false, false, "", "声")},
-	{0x1f225, 0, 0, 0, g(Yes, No, false, false, "", "吹")},
-	{0x1f226, 0, 0, 0, g(Yes, No, false, false, "", "演")},
-	{0x1f227, 0, 0, 0, g(Yes, No, false, false, "", "投")},
-	{0x1f228, 0, 0, 0, g(Yes, No, false, false, "", "捕")},
-	{0x1f229, 0, 0, 0, g(Yes, No, false, false, "", "一")},
-	{0x1f22a, 0, 0, 0, g(Yes, No, false, false, "", "三")},
-	{0x1f22b, 0, 0, 0, g(Yes, No, false, false, "", "遊")},
-	{0x1f22c, 0, 0, 0, g(Yes, No, false, false, "", "左")},
-	{0x1f22d, 0, 0, 0, g(Yes, No, false, false, "", "中")},
-	{0x1f22e, 0, 0, 0, g(Yes, No, false, false, "", "右")},
-	{0x1f22f, 0, 0, 0, g(Yes, No, false, false, "", "指")},
-	{0x1f230, 0, 0, 0, g(Yes, No, false, false, "", "走")},
-	{0x1f231, 0, 0, 0, g(Yes, No, false, false, "", "打")},
-	{0x1f232, 0, 0, 0, g(Yes, No, false, false, "", "禁")},
-	{0x1f233, 0, 0, 0, g(Yes, No, false, false, "", "空")},
-	{0x1f234, 0, 0, 0, g(Yes, No, false, false, "", "合")},
-	{0x1f235, 0, 0, 0, g(Yes, No, false, false, "", "満")},
-	{0x1f236, 0, 0, 0, g(Yes, No, false, false, "", "有")},
-	{0x1f237, 0, 0, 0, g(Yes, No, false, false, "", "月")},
-	{0x1f238, 0, 0, 0, g(Yes, No, false, false, "", "申")},
-	{0x1f239, 0, 0, 0, g(Yes, No, false, false, "", "割")},
-	{0x1f23a, 0, 0, 0, g(Yes, No, false, false, "", "営")},
-	{0x1f23b, 0, 0, 0, g(Yes, No, false, false, "", "配")},
-	{0x1f23c, 0, 0, 0, f(Yes, false, "")},
-	{0x1f240, 0, 0, 0, g(Yes, No, false, false, "", "〔本〕")},
-	{0x1f241, 0, 0, 0, g(Yes, No, false, false, "", "〔三〕")},
-	{0x1f242, 0, 0, 0, g(Yes, No, false, false, "", "〔二〕")},
-	{0x1f243, 0, 0, 0, g(Yes, No, false, false, "", "〔安〕")},
-	{0x1f244, 0, 0, 0, g(Yes, No, false, false, "", "〔点〕")},
-	{0x1f245, 0, 0, 0, g(Yes, No, false, false, "", "〔打〕")},
-	{0x1f246, 0, 0, 0, g(Yes, No, false, false, "", "〔盗〕")},
-	{0x1f247, 0, 0, 0, g(Yes, No, false, false, "", "〔勝〕")},
-	{0x1f248, 0, 0, 0, g(Yes, No, false, false, "", "〔敗〕")},
-	{0x1f249, 0, 0, 0, f(Yes, false, "")},
-	{0x1f250, 0, 0, 0, g(Yes, No, false, false, "", "得")},
-	{0x1f251, 0, 0, 0, g(Yes, No, false, false, "", "可")},
-	{0x1f252, 0, 0, 0, f(Yes, false, "")},
-	{0x2f800, 0, 0, 0, f(No, false, "丽")},
-	{0x2f801, 0, 0, 0, f(No, false, "丸")},
-	{0x2f802, 0, 0, 0, f(No, false, "乁")},
-	{0x2f803, 0, 0, 0, f(No, false, "𠄢")},
-	{0x2f804, 0, 0, 0, f(No, false, "你")},
-	{0x2f805, 0, 0, 0, f(No, false, "侮")},
-	{0x2f806, 0, 0, 0, f(No, false, "侻")},
-	{0x2f807, 0, 0, 0, f(No, false, "倂")},
-	{0x2f808, 0, 0, 0, f(No, false, "偺")},
-	{0x2f809, 0, 0, 0, f(No, false, "備")},
-	{0x2f80a, 0, 0, 0, f(No, false, "僧")},
-	{0x2f80b, 0, 0, 0, f(No, false, "像")},
-	{0x2f80c, 0, 0, 0, f(No, false, "㒞")},
-	{0x2f80d, 0, 0, 0, f(No, false, "𠘺")},
-	{0x2f80e, 0, 0, 0, f(No, false, "免")},
-	{0x2f80f, 0, 0, 0, f(No, false, "兔")},
-	{0x2f810, 0, 0, 0, f(No, false, "兤")},
-	{0x2f811, 0, 0, 0, f(No, false, "具")},
-	{0x2f812, 0, 0, 0, f(No, false, "𠔜")},
-	{0x2f813, 0, 0, 0, f(No, false, "㒹")},
-	{0x2f814, 0, 0, 0, f(No, false, "內")},
-	{0x2f815, 0, 0, 0, f(No, false, "再")},
-	{0x2f816, 0, 0, 0, f(No, false, "𠕋")},
-	{0x2f817, 0, 0, 0, f(No, false, "冗")},
-	{0x2f818, 0, 0, 0, f(No, false, "冤")},
-	{0x2f819, 0, 0, 0, f(No, false, "仌")},
-	{0x2f81a, 0, 0, 0, f(No, false, "冬")},
-	{0x2f81b, 0, 0, 0, f(No, false, "况")},
-	{0x2f81c, 0, 0, 0, f(No, false, "𩇟")},
-	{0x2f81d, 0, 0, 0, f(No, false, "凵")},
-	{0x2f81e, 0, 0, 0, f(No, false, "刃")},
-	{0x2f81f, 0, 0, 0, f(No, false, "㓟")},
-	{0x2f820, 0, 0, 0, f(No, false, "刻")},
-	{0x2f821, 0, 0, 0, f(No, false, "剆")},
-	{0x2f822, 0, 0, 0, f(No, false, "割")},
-	{0x2f823, 0, 0, 0, f(No, false, "剷")},
-	{0x2f824, 0, 0, 0, f(No, false, "㔕")},
-	{0x2f825, 0, 0, 0, f(No, false, "勇")},
-	{0x2f826, 0, 0, 0, f(No, false, "勉")},
-	{0x2f827, 0, 0, 0, f(No, false, "勤")},
-	{0x2f828, 0, 0, 0, f(No, false, "勺")},
-	{0x2f829, 0, 0, 0, f(No, false, "包")},
-	{0x2f82a, 0, 0, 0, f(No, false, "匆")},
-	{0x2f82b, 0, 0, 0, f(No, false, "北")},
-	{0x2f82c, 0, 0, 0, f(No, false, "卉")},
-	{0x2f82d, 0, 0, 0, f(No, false, "卑")},
-	{0x2f82e, 0, 0, 0, f(No, false, "博")},
-	{0x2f82f, 0, 0, 0, f(No, false, "即")},
-	{0x2f830, 0, 0, 0, f(No, false, "卽")},
-	{0x2f831, 0, 0, 0, f(No, false, "卿")},
-	{0x2f834, 0, 0, 0, f(No, false, "𠨬")},
-	{0x2f835, 0, 0, 0, f(No, false, "灰")},
-	{0x2f836, 0, 0, 0, f(No, false, "及")},
-	{0x2f837, 0, 0, 0, f(No, false, "叟")},
-	{0x2f838, 0, 0, 0, f(No, false, "𠭣")},
-	{0x2f839, 0, 0, 0, f(No, false, "叫")},
-	{0x2f83a, 0, 0, 0, f(No, false, "叱")},
-	{0x2f83b, 0, 0, 0, f(No, false, "吆")},
-	{0x2f83c, 0, 0, 0, f(No, false, "咞")},
-	{0x2f83d, 0, 0, 0, f(No, false, "吸")},
-	{0x2f83e, 0, 0, 0, f(No, false, "呈")},
-	{0x2f83f, 0, 0, 0, f(No, false, "周")},
-	{0x2f840, 0, 0, 0, f(No, false, "咢")},
-	{0x2f841, 0, 0, 0, f(No, false, "哶")},
-	{0x2f842, 0, 0, 0, f(No, false, "唐")},
-	{0x2f843, 0, 0, 0, f(No, false, "啓")},
-	{0x2f844, 0, 0, 0, f(No, false, "啣")},
-	{0x2f845, 0, 0, 0, f(No, false, "善")},
-	{0x2f847, 0, 0, 0, f(No, false, "喙")},
-	{0x2f848, 0, 0, 0, f(No, false, "喫")},
-	{0x2f849, 0, 0, 0, f(No, false, "喳")},
-	{0x2f84a, 0, 0, 0, f(No, false, "嗂")},
-	{0x2f84b, 0, 0, 0, f(No, false, "圖")},
-	{0x2f84c, 0, 0, 0, f(No, false, "嘆")},
-	{0x2f84d, 0, 0, 0, f(No, false, "圗")},
-	{0x2f84e, 0, 0, 0, f(No, false, "噑")},
-	{0x2f84f, 0, 0, 0, f(No, false, "噴")},
-	{0x2f850, 0, 0, 0, f(No, false, "切")},
-	{0x2f851, 0, 0, 0, f(No, false, "壮")},
-	{0x2f852, 0, 0, 0, f(No, false, "城")},
-	{0x2f853, 0, 0, 0, f(No, false, "埴")},
-	{0x2f854, 0, 0, 0, f(No, false, "堍")},
-	{0x2f855, 0, 0, 0, f(No, false, "型")},
-	{0x2f856, 0, 0, 0, f(No, false, "堲")},
-	{0x2f857, 0, 0, 0, f(No, false, "報")},
-	{0x2f858, 0, 0, 0, f(No, false, "墬")},
-	{0x2f859, 0, 0, 0, f(No, false, "𡓤")},
-	{0x2f85a, 0, 0, 0, f(No, false, "売")},
-	{0x2f85b, 0, 0, 0, f(No, false, "壷")},
-	{0x2f85c, 0, 0, 0, f(No, false, "夆")},
-	{0x2f85d, 0, 0, 0, f(No, false, "多")},
-	{0x2f85e, 0, 0, 0, f(No, false, "夢")},
-	{0x2f85f, 0, 0, 0, f(No, false, "奢")},
-	{0x2f860, 0, 0, 0, f(No, false, "𡚨")},
-	{0x2f861, 0, 0, 0, f(No, false, "𡛪")},
-	{0x2f862, 0, 0, 0, f(No, false, "姬")},
-	{0x2f863, 0, 0, 0, f(No, false, "娛")},
-	{0x2f864, 0, 0, 0, f(No, false, "娧")},
-	{0x2f865, 0, 0, 0, f(No, false, "姘")},
-	{0x2f866, 0, 0, 0, f(No, false, "婦")},
-	{0x2f867, 0, 0, 0, f(No, false, "㛮")},
-	{0x2f868, 0, 0, 0, f(No, false, "㛼")},
-	{0x2f869, 0, 0, 0, f(No, false, "嬈")},
-	{0x2f86a, 0, 0, 0, f(No, false, "嬾")},
-	{0x2f86c, 0, 0, 0, f(No, false, "𡧈")},
-	{0x2f86d, 0, 0, 0, f(No, false, "寃")},
-	{0x2f86e, 0, 0, 0, f(No, false, "寘")},
-	{0x2f86f, 0, 0, 0, f(No, false, "寧")},
-	{0x2f870, 0, 0, 0, f(No, false, "寳")},
-	{0x2f871, 0, 0, 0, f(No, false, "𡬘")},
-	{0x2f872, 0, 0, 0, f(No, false, "寿")},
-	{0x2f873, 0, 0, 0, f(No, false, "将")},
-	{0x2f874, 0, 0, 0, f(No, false, "当")},
-	{0x2f875, 0, 0, 0, f(No, false, "尢")},
-	{0x2f876, 0, 0, 0, f(No, false, "㞁")},
-	{0x2f877, 0, 0, 0, f(No, false, "屠")},
-	{0x2f878, 0, 0, 0, f(No, false, "屮")},
-	{0x2f879, 0, 0, 0, f(No, false, "峀")},
-	{0x2f87a, 0, 0, 0, f(No, false, "岍")},
-	{0x2f87b, 0, 0, 0, f(No, false, "𡷤")},
-	{0x2f87c, 0, 0, 0, f(No, false, "嵃")},
-	{0x2f87d, 0, 0, 0, f(No, false, "𡷦")},
-	{0x2f87e, 0, 0, 0, f(No, false, "嵮")},
-	{0x2f87f, 0, 0, 0, f(No, false, "嵫")},
-	{0x2f880, 0, 0, 0, f(No, false, "嵼")},
-	{0x2f881, 0, 0, 0, f(No, false, "巡")},
-	{0x2f882, 0, 0, 0, f(No, false, "巢")},
-	{0x2f883, 0, 0, 0, f(No, false, "㠯")},
-	{0x2f884, 0, 0, 0, f(No, false, "巽")},
-	{0x2f885, 0, 0, 0, f(No, false, "帨")},
-	{0x2f886, 0, 0, 0, f(No, false, "帽")},
-	{0x2f887, 0, 0, 0, f(No, false, "幩")},
-	{0x2f888, 0, 0, 0, f(No, false, "㡢")},
-	{0x2f889, 0, 0, 0, f(No, false, "𢆃")},
-	{0x2f88a, 0, 0, 0, f(No, false, "㡼")},
-	{0x2f88b, 0, 0, 0, f(No, false, "庰")},
-	{0x2f88c, 0, 0, 0, f(No, false, "庳")},
-	{0x2f88d, 0, 0, 0, f(No, false, "庶")},
-	{0x2f88e, 0, 0, 0, f(No, false, "廊")},
-	{0x2f88f, 0, 0, 0, f(No, false, "𪎒")},
-	{0x2f890, 0, 0, 0, f(No, false, "廾")},
-	{0x2f891, 0, 0, 0, f(No, false, "𢌱")},
-	{0x2f893, 0, 0, 0, f(No, false, "舁")},
-	{0x2f894, 0, 0, 0, f(No, false, "弢")},
-	{0x2f896, 0, 0, 0, f(No, false, "㣇")},
-	{0x2f897, 0, 0, 0, f(No, false, "𣊸")},
-	{0x2f898, 0, 0, 0, f(No, false, "𦇚")},
-	{0x2f899, 0, 0, 0, f(No, false, "形")},
-	{0x2f89a, 0, 0, 0, f(No, false, "彫")},
-	{0x2f89b, 0, 0, 0, f(No, false, "㣣")},
-	{0x2f89c, 0, 0, 0, f(No, false, "徚")},
-	{0x2f89d, 0, 0, 0, f(No, false, "忍")},
-	{0x2f89e, 0, 0, 0, f(No, false, "志")},
-	{0x2f89f, 0, 0, 0, f(No, false, "忹")},
-	{0x2f8a0, 0, 0, 0, f(No, false, "悁")},
-	{0x2f8a1, 0, 0, 0, f(No, false, "㤺")},
-	{0x2f8a2, 0, 0, 0, f(No, false, "㤜")},
-	{0x2f8a3, 0, 0, 0, f(No, false, "悔")},
-	{0x2f8a4, 0, 0, 0, f(No, false, "𢛔")},
-	{0x2f8a5, 0, 0, 0, f(No, false, "惇")},
-	{0x2f8a6, 0, 0, 0, f(No, false, "慈")},
-	{0x2f8a7, 0, 0, 0, f(No, false, "慌")},
-	{0x2f8a8, 0, 0, 0, f(No, false, "慎")},
-	{0x2f8a9, 0, 0, 0, f(No, false, "慌")},
-	{0x2f8aa, 0, 0, 0, f(No, false, "慺")},
-	{0x2f8ab, 0, 0, 0, f(No, false, "憎")},
-	{0x2f8ac, 0, 0, 0, f(No, false, "憲")},
-	{0x2f8ad, 0, 0, 0, f(No, false, "憤")},
-	{0x2f8ae, 0, 0, 0, f(No, false, "憯")},
-	{0x2f8af, 0, 0, 0, f(No, false, "懞")},
-	{0x2f8b0, 0, 0, 0, f(No, false, "懲")},
-	{0x2f8b1, 0, 0, 0, f(No, false, "懶")},
-	{0x2f8b2, 0, 0, 0, f(No, false, "成")},
-	{0x2f8b3, 0, 0, 0, f(No, false, "戛")},
-	{0x2f8b4, 0, 0, 0, f(No, false, "扝")},
-	{0x2f8b5, 0, 0, 0, f(No, false, "抱")},
-	{0x2f8b6, 0, 0, 0, f(No, false, "拔")},
-	{0x2f8b7, 0, 0, 0, f(No, false, "捐")},
-	{0x2f8b8, 0, 0, 0, f(No, false, "𢬌")},
-	{0x2f8b9, 0, 0, 0, f(No, false, "挽")},
-	{0x2f8ba, 0, 0, 0, f(No, false, "拼")},
-	{0x2f8bb, 0, 0, 0, f(No, false, "捨")},
-	{0x2f8bc, 0, 0, 0, f(No, false, "掃")},
-	{0x2f8bd, 0, 0, 0, f(No, false, "揤")},
-	{0x2f8be, 0, 0, 0, f(No, false, "𢯱")},
-	{0x2f8bf, 0, 0, 0, f(No, false, "搢")},
-	{0x2f8c0, 0, 0, 0, f(No, false, "揅")},
-	{0x2f8c1, 0, 0, 0, f(No, false, "掩")},
-	{0x2f8c2, 0, 0, 0, f(No, false, "㨮")},
-	{0x2f8c3, 0, 0, 0, f(No, false, "摩")},
-	{0x2f8c4, 0, 0, 0, f(No, false, "摾")},
-	{0x2f8c5, 0, 0, 0, f(No, false, "撝")},
-	{0x2f8c6, 0, 0, 0, f(No, false, "摷")},
-	{0x2f8c7, 0, 0, 0, f(No, false, "㩬")},
-	{0x2f8c8, 0, 0, 0, f(No, false, "敏")},
-	{0x2f8c9, 0, 0, 0, f(No, false, "敬")},
-	{0x2f8ca, 0, 0, 0, f(No, false, "𣀊")},
-	{0x2f8cb, 0, 0, 0, f(No, false, "旣")},
-	{0x2f8cc, 0, 0, 0, f(No, false, "書")},
-	{0x2f8cd, 0, 0, 0, f(No, false, "晉")},
-	{0x2f8ce, 0, 0, 0, f(No, false, "㬙")},
-	{0x2f8cf, 0, 0, 0, f(No, false, "暑")},
-	{0x2f8d0, 0, 0, 0, f(No, false, "㬈")},
-	{0x2f8d1, 0, 0, 0, f(No, false, "㫤")},
-	{0x2f8d2, 0, 0, 0, f(No, false, "冒")},
-	{0x2f8d3, 0, 0, 0, f(No, false, "冕")},
-	{0x2f8d4, 0, 0, 0, f(No, false, "最")},
-	{0x2f8d5, 0, 0, 0, f(No, false, "暜")},
-	{0x2f8d6, 0, 0, 0, f(No, false, "肭")},
-	{0x2f8d7, 0, 0, 0, f(No, false, "䏙")},
-	{0x2f8d8, 0, 0, 0, f(No, false, "朗")},
-	{0x2f8d9, 0, 0, 0, f(No, false, "望")},
-	{0x2f8da, 0, 0, 0, f(No, false, "朡")},
-	{0x2f8db, 0, 0, 0, f(No, false, "杞")},
-	{0x2f8dc, 0, 0, 0, f(No, false, "杓")},
-	{0x2f8dd, 0, 0, 0, f(No, false, "𣏃")},
-	{0x2f8de, 0, 0, 0, f(No, false, "㭉")},
-	{0x2f8df, 0, 0, 0, f(No, false, "柺")},
-	{0x2f8e0, 0, 0, 0, f(No, false, "枅")},
-	{0x2f8e1, 0, 0, 0, f(No, false, "桒")},
-	{0x2f8e2, 0, 0, 0, f(No, false, "梅")},
-	{0x2f8e3, 0, 0, 0, f(No, false, "𣑭")},
-	{0x2f8e4, 0, 0, 0, f(No, false, "梎")},
-	{0x2f8e5, 0, 0, 0, f(No, false, "栟")},
-	{0x2f8e6, 0, 0, 0, f(No, false, "椔")},
-	{0x2f8e7, 0, 0, 0, f(No, false, "㮝")},
-	{0x2f8e8, 0, 0, 0, f(No, false, "楂")},
-	{0x2f8e9, 0, 0, 0, f(No, false, "榣")},
-	{0x2f8ea, 0, 0, 0, f(No, false, "槪")},
-	{0x2f8eb, 0, 0, 0, f(No, false, "檨")},
-	{0x2f8ec, 0, 0, 0, f(No, false, "𣚣")},
-	{0x2f8ed, 0, 0, 0, f(No, false, "櫛")},
-	{0x2f8ee, 0, 0, 0, f(No, false, "㰘")},
-	{0x2f8ef, 0, 0, 0, f(No, false, "次")},
-	{0x2f8f0, 0, 0, 0, f(No, false, "𣢧")},
-	{0x2f8f1, 0, 0, 0, f(No, false, "歔")},
-	{0x2f8f2, 0, 0, 0, f(No, false, "㱎")},
-	{0x2f8f3, 0, 0, 0, f(No, false, "歲")},
-	{0x2f8f4, 0, 0, 0, f(No, false, "殟")},
-	{0x2f8f5, 0, 0, 0, f(No, false, "殺")},
-	{0x2f8f6, 0, 0, 0, f(No, false, "殻")},
-	{0x2f8f7, 0, 0, 0, f(No, false, "𣪍")},
-	{0x2f8f8, 0, 0, 0, f(No, false, "𡴋")},
-	{0x2f8f9, 0, 0, 0, f(No, false, "𣫺")},
-	{0x2f8fa, 0, 0, 0, f(No, false, "汎")},
-	{0x2f8fb, 0, 0, 0, f(No, false, "𣲼")},
-	{0x2f8fc, 0, 0, 0, f(No, false, "沿")},
-	{0x2f8fd, 0, 0, 0, f(No, false, "泍")},
-	{0x2f8fe, 0, 0, 0, f(No, false, "汧")},
-	{0x2f8ff, 0, 0, 0, f(No, false, "洖")},
-	{0x2f900, 0, 0, 0, f(No, false, "派")},
-	{0x2f901, 0, 0, 0, f(No, false, "海")},
-	{0x2f902, 0, 0, 0, f(No, false, "流")},
-	{0x2f903, 0, 0, 0, f(No, false, "浩")},
-	{0x2f904, 0, 0, 0, f(No, false, "浸")},
-	{0x2f905, 0, 0, 0, f(No, false, "涅")},
-	{0x2f906, 0, 0, 0, f(No, false, "𣴞")},
-	{0x2f907, 0, 0, 0, f(No, false, "洴")},
-	{0x2f908, 0, 0, 0, f(No, false, "港")},
-	{0x2f909, 0, 0, 0, f(No, false, "湮")},
-	{0x2f90a, 0, 0, 0, f(No, false, "㴳")},
-	{0x2f90b, 0, 0, 0, f(No, false, "滋")},
-	{0x2f90c, 0, 0, 0, f(No, false, "滇")},
-	{0x2f90d, 0, 0, 0, f(No, false, "𣻑")},
-	{0x2f90e, 0, 0, 0, f(No, false, "淹")},
-	{0x2f90f, 0, 0, 0, f(No, false, "潮")},
-	{0x2f910, 0, 0, 0, f(No, false, "𣽞")},
-	{0x2f911, 0, 0, 0, f(No, false, "𣾎")},
-	{0x2f912, 0, 0, 0, f(No, false, "濆")},
-	{0x2f913, 0, 0, 0, f(No, false, "瀹")},
-	{0x2f914, 0, 0, 0, f(No, false, "瀞")},
-	{0x2f915, 0, 0, 0, f(No, false, "瀛")},
-	{0x2f916, 0, 0, 0, f(No, false, "㶖")},
-	{0x2f917, 0, 0, 0, f(No, false, "灊")},
-	{0x2f918, 0, 0, 0, f(No, false, "災")},
-	{0x2f919, 0, 0, 0, f(No, false, "灷")},
-	{0x2f91a, 0, 0, 0, f(No, false, "炭")},
-	{0x2f91b, 0, 0, 0, f(No, false, "𠔥")},
-	{0x2f91c, 0, 0, 0, f(No, false, "煅")},
-	{0x2f91d, 0, 0, 0, f(No, false, "𤉣")},
-	{0x2f91e, 0, 0, 0, f(No, false, "熜")},
-	{0x2f91f, 0, 0, 0, f(No, false, "𤎫")},
-	{0x2f920, 0, 0, 0, f(No, false, "爨")},
-	{0x2f921, 0, 0, 0, f(No, false, "爵")},
-	{0x2f922, 0, 0, 0, f(No, false, "牐")},
-	{0x2f923, 0, 0, 0, f(No, false, "𤘈")},
-	{0x2f924, 0, 0, 0, f(No, false, "犀")},
-	{0x2f925, 0, 0, 0, f(No, false, "犕")},
-	{0x2f926, 0, 0, 0, f(No, false, "𤜵")},
-	{0x2f927, 0, 0, 0, f(No, false, "𤠔")},
-	{0x2f928, 0, 0, 0, f(No, false, "獺")},
-	{0x2f929, 0, 0, 0, f(No, false, "王")},
-	{0x2f92a, 0, 0, 0, f(No, false, "㺬")},
-	{0x2f92b, 0, 0, 0, f(No, false, "玥")},
-	{0x2f92c, 0, 0, 0, f(No, false, "㺸")},
-	{0x2f92e, 0, 0, 0, f(No, false, "瑇")},
-	{0x2f92f, 0, 0, 0, f(No, false, "瑜")},
-	{0x2f930, 0, 0, 0, f(No, false, "瑱")},
-	{0x2f931, 0, 0, 0, f(No, false, "璅")},
-	{0x2f932, 0, 0, 0, f(No, false, "瓊")},
-	{0x2f933, 0, 0, 0, f(No, false, "㼛")},
-	{0x2f934, 0, 0, 0, f(No, false, "甤")},
-	{0x2f935, 0, 0, 0, f(No, false, "𤰶")},
-	{0x2f936, 0, 0, 0, f(No, false, "甾")},
-	{0x2f937, 0, 0, 0, f(No, false, "𤲒")},
-	{0x2f938, 0, 0, 0, f(No, false, "異")},
-	{0x2f939, 0, 0, 0, f(No, false, "𢆟")},
-	{0x2f93a, 0, 0, 0, f(No, false, "瘐")},
-	{0x2f93b, 0, 0, 0, f(No, false, "𤾡")},
-	{0x2f93c, 0, 0, 0, f(No, false, "𤾸")},
-	{0x2f93d, 0, 0, 0, f(No, false, "𥁄")},
-	{0x2f93e, 0, 0, 0, f(No, false, "㿼")},
-	{0x2f93f, 0, 0, 0, f(No, false, "䀈")},
-	{0x2f940, 0, 0, 0, f(No, false, "直")},
-	{0x2f941, 0, 0, 0, f(No, false, "𥃳")},
-	{0x2f942, 0, 0, 0, f(No, false, "𥃲")},
-	{0x2f943, 0, 0, 0, f(No, false, "𥄙")},
-	{0x2f944, 0, 0, 0, f(No, false, "𥄳")},
-	{0x2f945, 0, 0, 0, f(No, false, "眞")},
-	{0x2f946, 0, 0, 0, f(No, false, "真")},
-	{0x2f948, 0, 0, 0, f(No, false, "睊")},
-	{0x2f949, 0, 0, 0, f(No, false, "䀹")},
-	{0x2f94a, 0, 0, 0, f(No, false, "瞋")},
-	{0x2f94b, 0, 0, 0, f(No, false, "䁆")},
-	{0x2f94c, 0, 0, 0, f(No, false, "䂖")},
-	{0x2f94d, 0, 0, 0, f(No, false, "𥐝")},
-	{0x2f94e, 0, 0, 0, f(No, false, "硎")},
-	{0x2f94f, 0, 0, 0, f(No, false, "碌")},
-	{0x2f950, 0, 0, 0, f(No, false, "磌")},
-	{0x2f951, 0, 0, 0, f(No, false, "䃣")},
-	{0x2f952, 0, 0, 0, f(No, false, "𥘦")},
-	{0x2f953, 0, 0, 0, f(No, false, "祖")},
-	{0x2f954, 0, 0, 0, f(No, false, "𥚚")},
-	{0x2f955, 0, 0, 0, f(No, false, "𥛅")},
-	{0x2f956, 0, 0, 0, f(No, false, "福")},
-	{0x2f957, 0, 0, 0, f(No, false, "秫")},
-	{0x2f958, 0, 0, 0, f(No, false, "䄯")},
-	{0x2f959, 0, 0, 0, f(No, false, "穀")},
-	{0x2f95a, 0, 0, 0, f(No, false, "穊")},
-	{0x2f95b, 0, 0, 0, f(No, false, "穏")},
-	{0x2f95c, 0, 0, 0, f(No, false, "𥥼")},
-	{0x2f95d, 0, 0, 0, f(No, false, "𥪧")},
-	{0x2f95f, 0, 0, 0, f(No, false, "竮")},
-	{0x2f960, 0, 0, 0, f(No, false, "䈂")},
-	{0x2f961, 0, 0, 0, f(No, false, "𥮫")},
-	{0x2f962, 0, 0, 0, f(No, false, "篆")},
-	{0x2f963, 0, 0, 0, f(No, false, "築")},
-	{0x2f964, 0, 0, 0, f(No, false, "䈧")},
-	{0x2f965, 0, 0, 0, f(No, false, "𥲀")},
-	{0x2f966, 0, 0, 0, f(No, false, "糒")},
-	{0x2f967, 0, 0, 0, f(No, false, "䊠")},
-	{0x2f968, 0, 0, 0, f(No, false, "糨")},
-	{0x2f969, 0, 0, 0, f(No, false, "糣")},
-	{0x2f96a, 0, 0, 0, f(No, false, "紀")},
-	{0x2f96b, 0, 0, 0, f(No, false, "𥾆")},
-	{0x2f96c, 0, 0, 0, f(No, false, "絣")},
-	{0x2f96d, 0, 0, 0, f(No, false, "䌁")},
-	{0x2f96e, 0, 0, 0, f(No, false, "緇")},
-	{0x2f96f, 0, 0, 0, f(No, false, "縂")},
-	{0x2f970, 0, 0, 0, f(No, false, "繅")},
-	{0x2f971, 0, 0, 0, f(No, false, "䌴")},
-	{0x2f972, 0, 0, 0, f(No, false, "𦈨")},
-	{0x2f973, 0, 0, 0, f(No, false, "𦉇")},
-	{0x2f974, 0, 0, 0, f(No, false, "䍙")},
-	{0x2f975, 0, 0, 0, f(No, false, "𦋙")},
-	{0x2f976, 0, 0, 0, f(No, false, "罺")},
-	{0x2f977, 0, 0, 0, f(No, false, "𦌾")},
-	{0x2f978, 0, 0, 0, f(No, false, "羕")},
-	{0x2f979, 0, 0, 0, f(No, false, "翺")},
-	{0x2f97a, 0, 0, 0, f(No, false, "者")},
-	{0x2f97b, 0, 0, 0, f(No, false, "𦓚")},
-	{0x2f97c, 0, 0, 0, f(No, false, "𦔣")},
-	{0x2f97d, 0, 0, 0, f(No, false, "聠")},
-	{0x2f97e, 0, 0, 0, f(No, false, "𦖨")},
-	{0x2f97f, 0, 0, 0, f(No, false, "聰")},
-	{0x2f980, 0, 0, 0, f(No, false, "𣍟")},
-	{0x2f981, 0, 0, 0, f(No, false, "䏕")},
-	{0x2f982, 0, 0, 0, f(No, false, "育")},
-	{0x2f983, 0, 0, 0, f(No, false, "脃")},
-	{0x2f984, 0, 0, 0, f(No, false, "䐋")},
-	{0x2f985, 0, 0, 0, f(No, false, "脾")},
-	{0x2f986, 0, 0, 0, f(No, false, "媵")},
-	{0x2f987, 0, 0, 0, f(No, false, "𦞧")},
-	{0x2f988, 0, 0, 0, f(No, false, "𦞵")},
-	{0x2f989, 0, 0, 0, f(No, false, "𣎓")},
-	{0x2f98a, 0, 0, 0, f(No, false, "𣎜")},
-	{0x2f98b, 0, 0, 0, f(No, false, "舁")},
-	{0x2f98c, 0, 0, 0, f(No, false, "舄")},
-	{0x2f98d, 0, 0, 0, f(No, false, "辞")},
-	{0x2f98e, 0, 0, 0, f(No, false, "䑫")},
-	{0x2f98f, 0, 0, 0, f(No, false, "芑")},
-	{0x2f990, 0, 0, 0, f(No, false, "芋")},
-	{0x2f991, 0, 0, 0, f(No, false, "芝")},
-	{0x2f992, 0, 0, 0, f(No, false, "劳")},
-	{0x2f993, 0, 0, 0, f(No, false, "花")},
-	{0x2f994, 0, 0, 0, f(No, false, "芳")},
-	{0x2f995, 0, 0, 0, f(No, false, "芽")},
-	{0x2f996, 0, 0, 0, f(No, false, "苦")},
-	{0x2f997, 0, 0, 0, f(No, false, "𦬼")},
-	{0x2f998, 0, 0, 0, f(No, false, "若")},
-	{0x2f999, 0, 0, 0, f(No, false, "茝")},
-	{0x2f99a, 0, 0, 0, f(No, false, "荣")},
-	{0x2f99b, 0, 0, 0, f(No, false, "莭")},
-	{0x2f99c, 0, 0, 0, f(No, false, "茣")},
-	{0x2f99d, 0, 0, 0, f(No, false, "莽")},
-	{0x2f99e, 0, 0, 0, f(No, false, "菧")},
-	{0x2f99f, 0, 0, 0, f(No, false, "著")},
-	{0x2f9a0, 0, 0, 0, f(No, false, "荓")},
-	{0x2f9a1, 0, 0, 0, f(No, false, "菊")},
-	{0x2f9a2, 0, 0, 0, f(No, false, "菌")},
-	{0x2f9a3, 0, 0, 0, f(No, false, "菜")},
-	{0x2f9a4, 0, 0, 0, f(No, false, "𦰶")},
-	{0x2f9a5, 0, 0, 0, f(No, false, "𦵫")},
-	{0x2f9a6, 0, 0, 0, f(No, false, "𦳕")},
-	{0x2f9a7, 0, 0, 0, f(No, false, "䔫")},
-	{0x2f9a8, 0, 0, 0, f(No, false, "蓱")},
-	{0x2f9a9, 0, 0, 0, f(No, false, "蓳")},
-	{0x2f9aa, 0, 0, 0, f(No, false, "蔖")},
-	{0x2f9ab, 0, 0, 0, f(No, false, "𧏊")},
-	{0x2f9ac, 0, 0, 0, f(No, false, "蕤")},
-	{0x2f9ad, 0, 0, 0, f(No, false, "𦼬")},
-	{0x2f9ae, 0, 0, 0, f(No, false, "䕝")},
-	{0x2f9af, 0, 0, 0, f(No, false, "䕡")},
-	{0x2f9b0, 0, 0, 0, f(No, false, "𦾱")},
-	{0x2f9b1, 0, 0, 0, f(No, false, "𧃒")},
-	{0x2f9b2, 0, 0, 0, f(No, false, "䕫")},
-	{0x2f9b3, 0, 0, 0, f(No, false, "虐")},
-	{0x2f9b4, 0, 0, 0, f(No, false, "虜")},
-	{0x2f9b5, 0, 0, 0, f(No, false, "虧")},
-	{0x2f9b6, 0, 0, 0, f(No, false, "虩")},
-	{0x2f9b7, 0, 0, 0, f(No, false, "蚩")},
-	{0x2f9b8, 0, 0, 0, f(No, false, "蚈")},
-	{0x2f9b9, 0, 0, 0, f(No, false, "蜎")},
-	{0x2f9ba, 0, 0, 0, f(No, false, "蛢")},
-	{0x2f9bb, 0, 0, 0, f(No, false, "蝹")},
-	{0x2f9bc, 0, 0, 0, f(No, false, "蜨")},
-	{0x2f9bd, 0, 0, 0, f(No, false, "蝫")},
-	{0x2f9be, 0, 0, 0, f(No, false, "螆")},
-	{0x2f9bf, 0, 0, 0, f(No, false, "䗗")},
-	{0x2f9c0, 0, 0, 0, f(No, false, "蟡")},
-	{0x2f9c1, 0, 0, 0, f(No, false, "蠁")},
-	{0x2f9c2, 0, 0, 0, f(No, false, "䗹")},
-	{0x2f9c3, 0, 0, 0, f(No, false, "衠")},
-	{0x2f9c4, 0, 0, 0, f(No, false, "衣")},
-	{0x2f9c5, 0, 0, 0, f(No, false, "𧙧")},
-	{0x2f9c6, 0, 0, 0, f(No, false, "裗")},
-	{0x2f9c7, 0, 0, 0, f(No, false, "裞")},
-	{0x2f9c8, 0, 0, 0, f(No, false, "䘵")},
-	{0x2f9c9, 0, 0, 0, f(No, false, "裺")},
-	{0x2f9ca, 0, 0, 0, f(No, false, "㒻")},
-	{0x2f9cb, 0, 0, 0, f(No, false, "𧢮")},
-	{0x2f9cc, 0, 0, 0, f(No, false, "𧥦")},
-	{0x2f9cd, 0, 0, 0, f(No, false, "䚾")},
-	{0x2f9ce, 0, 0, 0, f(No, false, "䛇")},
-	{0x2f9cf, 0, 0, 0, f(No, false, "誠")},
-	{0x2f9d0, 0, 0, 0, f(No, false, "諭")},
-	{0x2f9d1, 0, 0, 0, f(No, false, "變")},
-	{0x2f9d2, 0, 0, 0, f(No, false, "豕")},
-	{0x2f9d3, 0, 0, 0, f(No, false, "𧲨")},
-	{0x2f9d4, 0, 0, 0, f(No, false, "貫")},
-	{0x2f9d5, 0, 0, 0, f(No, false, "賁")},
-	{0x2f9d6, 0, 0, 0, f(No, false, "贛")},
-	{0x2f9d7, 0, 0, 0, f(No, false, "起")},
-	{0x2f9d8, 0, 0, 0, f(No, false, "𧼯")},
-	{0x2f9d9, 0, 0, 0, f(No, false, "𠠄")},
-	{0x2f9da, 0, 0, 0, f(No, false, "跋")},
-	{0x2f9db, 0, 0, 0, f(No, false, "趼")},
-	{0x2f9dc, 0, 0, 0, f(No, false, "跰")},
-	{0x2f9dd, 0, 0, 0, f(No, false, "𠣞")},
-	{0x2f9de, 0, 0, 0, f(No, false, "軔")},
-	{0x2f9df, 0, 0, 0, f(No, false, "輸")},
-	{0x2f9e0, 0, 0, 0, f(No, false, "𨗒")},
-	{0x2f9e1, 0, 0, 0, f(No, false, "𨗭")},
-	{0x2f9e2, 0, 0, 0, f(No, false, "邔")},
-	{0x2f9e3, 0, 0, 0, f(No, false, "郱")},
-	{0x2f9e4, 0, 0, 0, f(No, false, "鄑")},
-	{0x2f9e5, 0, 0, 0, f(No, false, "𨜮")},
-	{0x2f9e6, 0, 0, 0, f(No, false, "鄛")},
-	{0x2f9e7, 0, 0, 0, f(No, false, "鈸")},
-	{0x2f9e8, 0, 0, 0, f(No, false, "鋗")},
-	{0x2f9e9, 0, 0, 0, f(No, false, "鋘")},
-	{0x2f9ea, 0, 0, 0, f(No, false, "鉼")},
-	{0x2f9eb, 0, 0, 0, f(No, false, "鏹")},
-	{0x2f9ec, 0, 0, 0, f(No, false, "鐕")},
-	{0x2f9ed, 0, 0, 0, f(No, false, "𨯺")},
-	{0x2f9ee, 0, 0, 0, f(No, false, "開")},
-	{0x2f9ef, 0, 0, 0, f(No, false, "䦕")},
-	{0x2f9f0, 0, 0, 0, f(No, false, "閷")},
-	{0x2f9f1, 0, 0, 0, f(No, false, "𨵷")},
-	{0x2f9f2, 0, 0, 0, f(No, false, "䧦")},
-	{0x2f9f3, 0, 0, 0, f(No, false, "雃")},
-	{0x2f9f4, 0, 0, 0, f(No, false, "嶲")},
-	{0x2f9f5, 0, 0, 0, f(No, false, "霣")},
-	{0x2f9f6, 0, 0, 0, f(No, false, "𩅅")},
-	{0x2f9f7, 0, 0, 0, f(No, false, "𩈚")},
-	{0x2f9f8, 0, 0, 0, f(No, false, "䩮")},
-	{0x2f9f9, 0, 0, 0, f(No, false, "䩶")},
-	{0x2f9fa, 0, 0, 0, f(No, false, "韠")},
-	{0x2f9fb, 0, 0, 0, f(No, false, "𩐊")},
-	{0x2f9fc, 0, 0, 0, f(No, false, "䪲")},
-	{0x2f9fd, 0, 0, 0, f(No, false, "𩒖")},
-	{0x2f9fe, 0, 0, 0, f(No, false, "頋")},
-	{0x2fa00, 0, 0, 0, f(No, false, "頩")},
-	{0x2fa01, 0, 0, 0, f(No, false, "𩖶")},
-	{0x2fa02, 0, 0, 0, f(No, false, "飢")},
-	{0x2fa03, 0, 0, 0, f(No, false, "䬳")},
-	{0x2fa04, 0, 0, 0, f(No, false, "餩")},
-	{0x2fa05, 0, 0, 0, f(No, false, "馧")},
-	{0x2fa06, 0, 0, 0, f(No, false, "駂")},
-	{0x2fa07, 0, 0, 0, f(No, false, "駾")},
-	{0x2fa08, 0, 0, 0, f(No, false, "䯎")},
-	{0x2fa09, 0, 0, 0, f(No, false, "𩬰")},
-	{0x2fa0a, 0, 0, 0, f(No, false, "鬒")},
-	{0x2fa0b, 0, 0, 0, f(No, false, "鱀")},
-	{0x2fa0c, 0, 0, 0, f(No, false, "鳽")},
-	{0x2fa0d, 0, 0, 0, f(No, false, "䳎")},
-	{0x2fa0e, 0, 0, 0, f(No, false, "䳭")},
-	{0x2fa0f, 0, 0, 0, f(No, false, "鵧")},
-	{0x2fa10, 0, 0, 0, f(No, false, "𪃎")},
-	{0x2fa11, 0, 0, 0, f(No, false, "䳸")},
-	{0x2fa12, 0, 0, 0, f(No, false, "𪄅")},
-	{0x2fa13, 0, 0, 0, f(No, false, "𪈎")},
-	{0x2fa14, 0, 0, 0, f(No, false, "𪊑")},
-	{0x2fa15, 0, 0, 0, f(No, false, "麻")},
-	{0x2fa16, 0, 0, 0, f(No, false, "䵖")},
-	{0x2fa17, 0, 0, 0, f(No, false, "黹")},
-	{0x2fa18, 0, 0, 0, f(No, false, "黾")},
-	{0x2fa19, 0, 0, 0, f(No, false, "鼅")},
-	{0x2fa1a, 0, 0, 0, f(No, false, "鼏")},
-	{0x2fa1b, 0, 0, 0, f(No, false, "鼖")},
-	{0x2fa1c, 0, 0, 0, f(No, false, "鼻")},
-	{0x2fa1d, 0, 0, 0, f(No, false, "𪘀")},
-	{0x2fa1e, 0, 0, 0, f(Yes, false, "")},
-}
diff --git a/vendor/golang.org/x/text/unicode/norm/data9.0.0_test.go b/vendor/golang.org/x/text/unicode/norm/data9.0.0_test.go
deleted file mode 100644
index b1be64d5..00000000
--- a/vendor/golang.org/x/text/unicode/norm/data9.0.0_test.go
+++ /dev/null
@@ -1,7409 +0,0 @@
-// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
-
-// +build !go1.10
-
-package norm
-
-const (
-	Yes = iota
-	No
-	Maybe
-)
-
-type formData struct {
-	qc              uint8
-	combinesForward bool
-	decomposition   string
-}
-
-type runeData struct {
-	r      rune
-	ccc    uint8
-	nLead  uint8
-	nTrail uint8
-	f      [2]formData // 0: canonical; 1: compatibility
-}
-
-func f(qc uint8, cf bool, dec string) [2]formData {
-	return [2]formData{{qc, cf, dec}, {qc, cf, dec}}
-}
-
-func g(qc, qck uint8, cf, cfk bool, d, dk string) [2]formData {
-	return [2]formData{{qc, cf, d}, {qck, cfk, dk}}
-}
-
-var testData = []runeData{
-	{0x0, 0, 0, 0, f(Yes, false, "")},
-	{0x3c, 0, 0, 0, f(Yes, true, "")},
-	{0x3f, 0, 0, 0, f(Yes, false, "")},
-	{0x41, 0, 0, 0, f(Yes, true, "")},
-	{0x51, 0, 0, 0, f(Yes, false, "")},
-	{0x52, 0, 0, 0, f(Yes, true, "")},
-	{0x5b, 0, 0, 0, f(Yes, false, "")},
-	{0x61, 0, 0, 0, f(Yes, true, "")},
-	{0x71, 0, 0, 0, f(Yes, false, "")},
-	{0x72, 0, 0, 0, f(Yes, true, "")},
-	{0x7b, 0, 0, 0, f(Yes, false, "")},
-	{0xa0, 0, 0, 0, g(Yes, No, false, false, "", " ")},
-	{0xa1, 0, 0, 0, f(Yes, false, "")},
-	{0xa8, 0, 0, 1, g(Yes, No, true, false, "", " ̈")},
-	{0xa9, 0, 0, 0, f(Yes, false, "")},
-	{0xaa, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0xab, 0, 0, 0, f(Yes, false, "")},
-	{0xaf, 0, 0, 1, g(Yes, No, false, false, "", " ̄")},
-	{0xb0, 0, 0, 0, f(Yes, false, "")},
-	{0xb2, 0, 0, 0, g(Yes, No, false, false, "", "2")},
-	{0xb3, 0, 0, 0, g(Yes, No, false, false, "", "3")},
-	{0xb4, 0, 0, 1, g(Yes, No, false, false, "", " ́")},
-	{0xb5, 0, 0, 0, g(Yes, No, false, false, "", "μ")},
-	{0xb6, 0, 0, 0, f(Yes, false, "")},
-	{0xb8, 0, 0, 1, g(Yes, No, false, false, "", " ̧")},
-	{0xb9, 0, 0, 0, g(Yes, No, false, false, "", "1")},
-	{0xba, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0xbb, 0, 0, 0, f(Yes, false, "")},
-	{0xbc, 0, 0, 0, g(Yes, No, false, false, "", "1⁄4")},
-	{0xbd, 0, 0, 0, g(Yes, No, false, false, "", "1⁄2")},
-	{0xbe, 0, 0, 0, g(Yes, No, false, false, "", "3⁄4")},
-	{0xbf, 0, 0, 0, f(Yes, false, "")},
-	{0xc0, 0, 0, 1, f(Yes, false, "À")},
-	{0xc1, 0, 0, 1, f(Yes, false, "Á")},
-	{0xc2, 0, 0, 1, f(Yes, true, "Â")},
-	{0xc3, 0, 0, 1, f(Yes, false, "Ã")},
-	{0xc4, 0, 0, 1, f(Yes, true, "Ä")},
-	{0xc5, 0, 0, 1, f(Yes, true, "Å")},
-	{0xc6, 0, 0, 0, f(Yes, true, "")},
-	{0xc7, 0, 0, 1, f(Yes, true, "Ç")},
-	{0xc8, 0, 0, 1, f(Yes, false, "È")},
-	{0xc9, 0, 0, 1, f(Yes, false, "É")},
-	{0xca, 0, 0, 1, f(Yes, true, "Ê")},
-	{0xcb, 0, 0, 1, f(Yes, false, "Ë")},
-	{0xcc, 0, 0, 1, f(Yes, false, "Ì")},
-	{0xcd, 0, 0, 1, f(Yes, false, "Í")},
-	{0xce, 0, 0, 1, f(Yes, false, "Î")},
-	{0xcf, 0, 0, 1, f(Yes, true, "Ï")},
-	{0xd0, 0, 0, 0, f(Yes, false, "")},
-	{0xd1, 0, 0, 1, f(Yes, false, "Ñ")},
-	{0xd2, 0, 0, 1, f(Yes, false, "Ò")},
-	{0xd3, 0, 0, 1, f(Yes, false, "Ó")},
-	{0xd4, 0, 0, 1, f(Yes, true, "Ô")},
-	{0xd5, 0, 0, 1, f(Yes, true, "Õ")},
-	{0xd6, 0, 0, 1, f(Yes, true, "Ö")},
-	{0xd7, 0, 0, 0, f(Yes, false, "")},
-	{0xd8, 0, 0, 0, f(Yes, true, "")},
-	{0xd9, 0, 0, 1, f(Yes, false, "Ù")},
-	{0xda, 0, 0, 1, f(Yes, false, "Ú")},
-	{0xdb, 0, 0, 1, f(Yes, false, "Û")},
-	{0xdc, 0, 0, 1, f(Yes, true, "Ü")},
-	{0xdd, 0, 0, 1, f(Yes, false, "Ý")},
-	{0xde, 0, 0, 0, f(Yes, false, "")},
-	{0xe0, 0, 0, 1, f(Yes, false, "à")},
-	{0xe1, 0, 0, 1, f(Yes, false, "á")},
-	{0xe2, 0, 0, 1, f(Yes, true, "â")},
-	{0xe3, 0, 0, 1, f(Yes, false, "ã")},
-	{0xe4, 0, 0, 1, f(Yes, true, "ä")},
-	{0xe5, 0, 0, 1, f(Yes, true, "å")},
-	{0xe6, 0, 0, 0, f(Yes, true, "")},
-	{0xe7, 0, 0, 1, f(Yes, true, "ç")},
-	{0xe8, 0, 0, 1, f(Yes, false, "è")},
-	{0xe9, 0, 0, 1, f(Yes, false, "é")},
-	{0xea, 0, 0, 1, f(Yes, true, "ê")},
-	{0xeb, 0, 0, 1, f(Yes, false, "ë")},
-	{0xec, 0, 0, 1, f(Yes, false, "ì")},
-	{0xed, 0, 0, 1, f(Yes, false, "í")},
-	{0xee, 0, 0, 1, f(Yes, false, "î")},
-	{0xef, 0, 0, 1, f(Yes, true, "ï")},
-	{0xf0, 0, 0, 0, f(Yes, false, "")},
-	{0xf1, 0, 0, 1, f(Yes, false, "ñ")},
-	{0xf2, 0, 0, 1, f(Yes, false, "ò")},
-	{0xf3, 0, 0, 1, f(Yes, false, "ó")},
-	{0xf4, 0, 0, 1, f(Yes, true, "ô")},
-	{0xf5, 0, 0, 1, f(Yes, true, "õ")},
-	{0xf6, 0, 0, 1, f(Yes, true, "ö")},
-	{0xf7, 0, 0, 0, f(Yes, false, "")},
-	{0xf8, 0, 0, 0, f(Yes, true, "")},
-	{0xf9, 0, 0, 1, f(Yes, false, "ù")},
-	{0xfa, 0, 0, 1, f(Yes, false, "ú")},
-	{0xfb, 0, 0, 1, f(Yes, false, "û")},
-	{0xfc, 0, 0, 1, f(Yes, true, "ü")},
-	{0xfd, 0, 0, 1, f(Yes, false, "ý")},
-	{0xfe, 0, 0, 0, f(Yes, false, "")},
-	{0xff, 0, 0, 1, f(Yes, false, "ÿ")},
-	{0x100, 0, 0, 1, f(Yes, false, "Ā")},
-	{0x101, 0, 0, 1, f(Yes, false, "ā")},
-	{0x102, 0, 0, 1, f(Yes, true, "Ă")},
-	{0x103, 0, 0, 1, f(Yes, true, "ă")},
-	{0x104, 0, 0, 1, f(Yes, false, "Ą")},
-	{0x105, 0, 0, 1, f(Yes, false, "ą")},
-	{0x106, 0, 0, 1, f(Yes, false, "Ć")},
-	{0x107, 0, 0, 1, f(Yes, false, "ć")},
-	{0x108, 0, 0, 1, f(Yes, false, "Ĉ")},
-	{0x109, 0, 0, 1, f(Yes, false, "ĉ")},
-	{0x10a, 0, 0, 1, f(Yes, false, "Ċ")},
-	{0x10b, 0, 0, 1, f(Yes, false, "ċ")},
-	{0x10c, 0, 0, 1, f(Yes, false, "Č")},
-	{0x10d, 0, 0, 1, f(Yes, false, "č")},
-	{0x10e, 0, 0, 1, f(Yes, false, "Ď")},
-	{0x10f, 0, 0, 1, f(Yes, false, "ď")},
-	{0x110, 0, 0, 0, f(Yes, false, "")},
-	{0x112, 0, 0, 1, f(Yes, true, "Ē")},
-	{0x113, 0, 0, 1, f(Yes, true, "ē")},
-	{0x114, 0, 0, 1, f(Yes, false, "Ĕ")},
-	{0x115, 0, 0, 1, f(Yes, false, "ĕ")},
-	{0x116, 0, 0, 1, f(Yes, false, "Ė")},
-	{0x117, 0, 0, 1, f(Yes, false, "ė")},
-	{0x118, 0, 0, 1, f(Yes, false, "Ę")},
-	{0x119, 0, 0, 1, f(Yes, false, "ę")},
-	{0x11a, 0, 0, 1, f(Yes, false, "Ě")},
-	{0x11b, 0, 0, 1, f(Yes, false, "ě")},
-	{0x11c, 0, 0, 1, f(Yes, false, "Ĝ")},
-	{0x11d, 0, 0, 1, f(Yes, false, "ĝ")},
-	{0x11e, 0, 0, 1, f(Yes, false, "Ğ")},
-	{0x11f, 0, 0, 1, f(Yes, false, "ğ")},
-	{0x120, 0, 0, 1, f(Yes, false, "Ġ")},
-	{0x121, 0, 0, 1, f(Yes, false, "ġ")},
-	{0x122, 0, 0, 1, f(Yes, false, "Ģ")},
-	{0x123, 0, 0, 1, f(Yes, false, "ģ")},
-	{0x124, 0, 0, 1, f(Yes, false, "Ĥ")},
-	{0x125, 0, 0, 1, f(Yes, false, "ĥ")},
-	{0x126, 0, 0, 0, f(Yes, false, "")},
-	{0x128, 0, 0, 1, f(Yes, false, "Ĩ")},
-	{0x129, 0, 0, 1, f(Yes, false, "ĩ")},
-	{0x12a, 0, 0, 1, f(Yes, false, "Ī")},
-	{0x12b, 0, 0, 1, f(Yes, false, "ī")},
-	{0x12c, 0, 0, 1, f(Yes, false, "Ĭ")},
-	{0x12d, 0, 0, 1, f(Yes, false, "ĭ")},
-	{0x12e, 0, 0, 1, f(Yes, false, "Į")},
-	{0x12f, 0, 0, 1, f(Yes, false, "į")},
-	{0x130, 0, 0, 1, f(Yes, false, "İ")},
-	{0x131, 0, 0, 0, f(Yes, false, "")},
-	{0x132, 0, 0, 0, g(Yes, No, false, false, "", "IJ")},
-	{0x133, 0, 0, 0, g(Yes, No, false, false, "", "ij")},
-	{0x134, 0, 0, 1, f(Yes, false, "Ĵ")},
-	{0x135, 0, 0, 1, f(Yes, false, "ĵ")},
-	{0x136, 0, 0, 1, f(Yes, false, "Ķ")},
-	{0x137, 0, 0, 1, f(Yes, false, "ķ")},
-	{0x138, 0, 0, 0, f(Yes, false, "")},
-	{0x139, 0, 0, 1, f(Yes, false, "Ĺ")},
-	{0x13a, 0, 0, 1, f(Yes, false, "ĺ")},
-	{0x13b, 0, 0, 1, f(Yes, false, "Ļ")},
-	{0x13c, 0, 0, 1, f(Yes, false, "ļ")},
-	{0x13d, 0, 0, 1, f(Yes, false, "Ľ")},
-	{0x13e, 0, 0, 1, f(Yes, false, "ľ")},
-	{0x13f, 0, 0, 0, g(Yes, No, false, false, "", "L·")},
-	{0x140, 0, 0, 0, g(Yes, No, false, false, "", "l·")},
-	{0x141, 0, 0, 0, f(Yes, false, "")},
-	{0x143, 0, 0, 1, f(Yes, false, "Ń")},
-	{0x144, 0, 0, 1, f(Yes, false, "ń")},
-	{0x145, 0, 0, 1, f(Yes, false, "Ņ")},
-	{0x146, 0, 0, 1, f(Yes, false, "ņ")},
-	{0x147, 0, 0, 1, f(Yes, false, "Ň")},
-	{0x148, 0, 0, 1, f(Yes, false, "ň")},
-	{0x149, 0, 0, 0, g(Yes, No, false, false, "", "ʼn")},
-	{0x14a, 0, 0, 0, f(Yes, false, "")},
-	{0x14c, 0, 0, 1, f(Yes, true, "Ō")},
-	{0x14d, 0, 0, 1, f(Yes, true, "ō")},
-	{0x14e, 0, 0, 1, f(Yes, false, "Ŏ")},
-	{0x14f, 0, 0, 1, f(Yes, false, "ŏ")},
-	{0x150, 0, 0, 1, f(Yes, false, "Ő")},
-	{0x151, 0, 0, 1, f(Yes, false, "ő")},
-	{0x152, 0, 0, 0, f(Yes, false, "")},
-	{0x154, 0, 0, 1, f(Yes, false, "Ŕ")},
-	{0x155, 0, 0, 1, f(Yes, false, "ŕ")},
-	{0x156, 0, 0, 1, f(Yes, false, "Ŗ")},
-	{0x157, 0, 0, 1, f(Yes, false, "ŗ")},
-	{0x158, 0, 0, 1, f(Yes, false, "Ř")},
-	{0x159, 0, 0, 1, f(Yes, false, "ř")},
-	{0x15a, 0, 0, 1, f(Yes, true, "Ś")},
-	{0x15b, 0, 0, 1, f(Yes, true, "ś")},
-	{0x15c, 0, 0, 1, f(Yes, false, "Ŝ")},
-	{0x15d, 0, 0, 1, f(Yes, false, "ŝ")},
-	{0x15e, 0, 0, 1, f(Yes, false, "Ş")},
-	{0x15f, 0, 0, 1, f(Yes, false, "ş")},
-	{0x160, 0, 0, 1, f(Yes, true, "Š")},
-	{0x161, 0, 0, 1, f(Yes, true, "š")},
-	{0x162, 0, 0, 1, f(Yes, false, "Ţ")},
-	{0x163, 0, 0, 1, f(Yes, false, "ţ")},
-	{0x164, 0, 0, 1, f(Yes, false, "Ť")},
-	{0x165, 0, 0, 1, f(Yes, false, "ť")},
-	{0x166, 0, 0, 0, f(Yes, false, "")},
-	{0x168, 0, 0, 1, f(Yes, true, "Ũ")},
-	{0x169, 0, 0, 1, f(Yes, true, "ũ")},
-	{0x16a, 0, 0, 1, f(Yes, true, "Ū")},
-	{0x16b, 0, 0, 1, f(Yes, true, "ū")},
-	{0x16c, 0, 0, 1, f(Yes, false, "Ŭ")},
-	{0x16d, 0, 0, 1, f(Yes, false, "ŭ")},
-	{0x16e, 0, 0, 1, f(Yes, false, "Ů")},
-	{0x16f, 0, 0, 1, f(Yes, false, "ů")},
-	{0x170, 0, 0, 1, f(Yes, false, "Ű")},
-	{0x171, 0, 0, 1, f(Yes, false, "ű")},
-	{0x172, 0, 0, 1, f(Yes, false, "Ų")},
-	{0x173, 0, 0, 1, f(Yes, false, "ų")},
-	{0x174, 0, 0, 1, f(Yes, false, "Ŵ")},
-	{0x175, 0, 0, 1, f(Yes, false, "ŵ")},
-	{0x176, 0, 0, 1, f(Yes, false, "Ŷ")},
-	{0x177, 0, 0, 1, f(Yes, false, "ŷ")},
-	{0x178, 0, 0, 1, f(Yes, false, "Ÿ")},
-	{0x179, 0, 0, 1, f(Yes, false, "Ź")},
-	{0x17a, 0, 0, 1, f(Yes, false, "ź")},
-	{0x17b, 0, 0, 1, f(Yes, false, "Ż")},
-	{0x17c, 0, 0, 1, f(Yes, false, "ż")},
-	{0x17d, 0, 0, 1, f(Yes, false, "Ž")},
-	{0x17e, 0, 0, 1, f(Yes, false, "ž")},
-	{0x17f, 0, 0, 0, g(Yes, No, true, false, "", "s")},
-	{0x180, 0, 0, 0, f(Yes, false, "")},
-	{0x1a0, 0, 0, 1, f(Yes, true, "Ơ")},
-	{0x1a1, 0, 0, 1, f(Yes, true, "ơ")},
-	{0x1a2, 0, 0, 0, f(Yes, false, "")},
-	{0x1af, 0, 0, 1, f(Yes, true, "Ư")},
-	{0x1b0, 0, 0, 1, f(Yes, true, "ư")},
-	{0x1b1, 0, 0, 0, f(Yes, false, "")},
-	{0x1b7, 0, 0, 0, f(Yes, true, "")},
-	{0x1b8, 0, 0, 0, f(Yes, false, "")},
-	{0x1c4, 0, 0, 1, g(Yes, No, false, false, "", "DŽ")},
-	{0x1c5, 0, 0, 1, g(Yes, No, false, false, "", "Dž")},
-	{0x1c6, 0, 0, 1, g(Yes, No, false, false, "", "dž")},
-	{0x1c7, 0, 0, 0, g(Yes, No, false, false, "", "LJ")},
-	{0x1c8, 0, 0, 0, g(Yes, No, false, false, "", "Lj")},
-	{0x1c9, 0, 0, 0, g(Yes, No, false, false, "", "lj")},
-	{0x1ca, 0, 0, 0, g(Yes, No, false, false, "", "NJ")},
-	{0x1cb, 0, 0, 0, g(Yes, No, false, false, "", "Nj")},
-	{0x1cc, 0, 0, 0, g(Yes, No, false, false, "", "nj")},
-	{0x1cd, 0, 0, 1, f(Yes, false, "Ǎ")},
-	{0x1ce, 0, 0, 1, f(Yes, false, "ǎ")},
-	{0x1cf, 0, 0, 1, f(Yes, false, "Ǐ")},
-	{0x1d0, 0, 0, 1, f(Yes, false, "ǐ")},
-	{0x1d1, 0, 0, 1, f(Yes, false, "Ǒ")},
-	{0x1d2, 0, 0, 1, f(Yes, false, "ǒ")},
-	{0x1d3, 0, 0, 1, f(Yes, false, "Ǔ")},
-	{0x1d4, 0, 0, 1, f(Yes, false, "ǔ")},
-	{0x1d5, 0, 0, 2, f(Yes, false, "Ǖ")},
-	{0x1d6, 0, 0, 2, f(Yes, false, "ǖ")},
-	{0x1d7, 0, 0, 2, f(Yes, false, "Ǘ")},
-	{0x1d8, 0, 0, 2, f(Yes, false, "ǘ")},
-	{0x1d9, 0, 0, 2, f(Yes, false, "Ǚ")},
-	{0x1da, 0, 0, 2, f(Yes, false, "ǚ")},
-	{0x1db, 0, 0, 2, f(Yes, false, "Ǜ")},
-	{0x1dc, 0, 0, 2, f(Yes, false, "ǜ")},
-	{0x1dd, 0, 0, 0, f(Yes, false, "")},
-	{0x1de, 0, 0, 2, f(Yes, false, "Ǟ")},
-	{0x1df, 0, 0, 2, f(Yes, false, "ǟ")},
-	{0x1e0, 0, 0, 2, f(Yes, false, "Ǡ")},
-	{0x1e1, 0, 0, 2, f(Yes, false, "ǡ")},
-	{0x1e2, 0, 0, 1, f(Yes, false, "Ǣ")},
-	{0x1e3, 0, 0, 1, f(Yes, false, "ǣ")},
-	{0x1e4, 0, 0, 0, f(Yes, false, "")},
-	{0x1e6, 0, 0, 1, f(Yes, false, "Ǧ")},
-	{0x1e7, 0, 0, 1, f(Yes, false, "ǧ")},
-	{0x1e8, 0, 0, 1, f(Yes, false, "Ǩ")},
-	{0x1e9, 0, 0, 1, f(Yes, false, "ǩ")},
-	{0x1ea, 0, 0, 1, f(Yes, true, "Ǫ")},
-	{0x1eb, 0, 0, 1, f(Yes, true, "ǫ")},
-	{0x1ec, 0, 0, 2, f(Yes, false, "Ǭ")},
-	{0x1ed, 0, 0, 2, f(Yes, false, "ǭ")},
-	{0x1ee, 0, 0, 1, f(Yes, false, "Ǯ")},
-	{0x1ef, 0, 0, 1, f(Yes, false, "ǯ")},
-	{0x1f0, 0, 0, 1, f(Yes, false, "ǰ")},
-	{0x1f1, 0, 0, 0, g(Yes, No, false, false, "", "DZ")},
-	{0x1f2, 0, 0, 0, g(Yes, No, false, false, "", "Dz")},
-	{0x1f3, 0, 0, 0, g(Yes, No, false, false, "", "dz")},
-	{0x1f4, 0, 0, 1, f(Yes, false, "Ǵ")},
-	{0x1f5, 0, 0, 1, f(Yes, false, "ǵ")},
-	{0x1f6, 0, 0, 0, f(Yes, false, "")},
-	{0x1f8, 0, 0, 1, f(Yes, false, "Ǹ")},
-	{0x1f9, 0, 0, 1, f(Yes, false, "ǹ")},
-	{0x1fa, 0, 0, 2, f(Yes, false, "Ǻ")},
-	{0x1fb, 0, 0, 2, f(Yes, false, "ǻ")},
-	{0x1fc, 0, 0, 1, f(Yes, false, "Ǽ")},
-	{0x1fd, 0, 0, 1, f(Yes, false, "ǽ")},
-	{0x1fe, 0, 0, 1, f(Yes, false, "Ǿ")},
-	{0x1ff, 0, 0, 1, f(Yes, false, "ǿ")},
-	{0x200, 0, 0, 1, f(Yes, false, "Ȁ")},
-	{0x201, 0, 0, 1, f(Yes, false, "ȁ")},
-	{0x202, 0, 0, 1, f(Yes, false, "Ȃ")},
-	{0x203, 0, 0, 1, f(Yes, false, "ȃ")},
-	{0x204, 0, 0, 1, f(Yes, false, "Ȅ")},
-	{0x205, 0, 0, 1, f(Yes, false, "ȅ")},
-	{0x206, 0, 0, 1, f(Yes, false, "Ȇ")},
-	{0x207, 0, 0, 1, f(Yes, false, "ȇ")},
-	{0x208, 0, 0, 1, f(Yes, false, "Ȉ")},
-	{0x209, 0, 0, 1, f(Yes, false, "ȉ")},
-	{0x20a, 0, 0, 1, f(Yes, false, "Ȋ")},
-	{0x20b, 0, 0, 1, f(Yes, false, "ȋ")},
-	{0x20c, 0, 0, 1, f(Yes, false, "Ȍ")},
-	{0x20d, 0, 0, 1, f(Yes, false, "ȍ")},
-	{0x20e, 0, 0, 1, f(Yes, false, "Ȏ")},
-	{0x20f, 0, 0, 1, f(Yes, false, "ȏ")},
-	{0x210, 0, 0, 1, f(Yes, false, "Ȑ")},
-	{0x211, 0, 0, 1, f(Yes, false, "ȑ")},
-	{0x212, 0, 0, 1, f(Yes, false, "Ȓ")},
-	{0x213, 0, 0, 1, f(Yes, false, "ȓ")},
-	{0x214, 0, 0, 1, f(Yes, false, "Ȕ")},
-	{0x215, 0, 0, 1, f(Yes, false, "ȕ")},
-	{0x216, 0, 0, 1, f(Yes, false, "Ȗ")},
-	{0x217, 0, 0, 1, f(Yes, false, "ȗ")},
-	{0x218, 0, 0, 1, f(Yes, false, "Ș")},
-	{0x219, 0, 0, 1, f(Yes, false, "ș")},
-	{0x21a, 0, 0, 1, f(Yes, false, "Ț")},
-	{0x21b, 0, 0, 1, f(Yes, false, "ț")},
-	{0x21c, 0, 0, 0, f(Yes, false, "")},
-	{0x21e, 0, 0, 1, f(Yes, false, "Ȟ")},
-	{0x21f, 0, 0, 1, f(Yes, false, "ȟ")},
-	{0x220, 0, 0, 0, f(Yes, false, "")},
-	{0x226, 0, 0, 1, f(Yes, true, "Ȧ")},
-	{0x227, 0, 0, 1, f(Yes, true, "ȧ")},
-	{0x228, 0, 0, 1, f(Yes, true, "Ȩ")},
-	{0x229, 0, 0, 1, f(Yes, true, "ȩ")},
-	{0x22a, 0, 0, 2, f(Yes, false, "Ȫ")},
-	{0x22b, 0, 0, 2, f(Yes, false, "ȫ")},
-	{0x22c, 0, 0, 2, f(Yes, false, "Ȭ")},
-	{0x22d, 0, 0, 2, f(Yes, false, "ȭ")},
-	{0x22e, 0, 0, 1, f(Yes, true, "Ȯ")},
-	{0x22f, 0, 0, 1, f(Yes, true, "ȯ")},
-	{0x230, 0, 0, 2, f(Yes, false, "Ȱ")},
-	{0x231, 0, 0, 2, f(Yes, false, "ȱ")},
-	{0x232, 0, 0, 1, f(Yes, false, "Ȳ")},
-	{0x233, 0, 0, 1, f(Yes, false, "ȳ")},
-	{0x234, 0, 0, 0, f(Yes, false, "")},
-	{0x292, 0, 0, 0, f(Yes, true, "")},
-	{0x293, 0, 0, 0, f(Yes, false, "")},
-	{0x2b0, 0, 0, 0, g(Yes, No, false, false, "", "h")},
-	{0x2b1, 0, 0, 0, g(Yes, No, false, false, "", "ɦ")},
-	{0x2b2, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0x2b3, 0, 0, 0, g(Yes, No, false, false, "", "r")},
-	{0x2b4, 0, 0, 0, g(Yes, No, false, false, "", "ɹ")},
-	{0x2b5, 0, 0, 0, g(Yes, No, false, false, "", "ɻ")},
-	{0x2b6, 0, 0, 0, g(Yes, No, false, false, "", "ʁ")},
-	{0x2b7, 0, 0, 0, g(Yes, No, false, false, "", "w")},
-	{0x2b8, 0, 0, 0, g(Yes, No, false, false, "", "y")},
-	{0x2b9, 0, 0, 0, f(Yes, false, "")},
-	{0x2d8, 0, 0, 1, g(Yes, No, false, false, "", " ̆")},
-	{0x2d9, 0, 0, 1, g(Yes, No, false, false, "", " ̇")},
-	{0x2da, 0, 0, 1, g(Yes, No, false, false, "", " ̊")},
-	{0x2db, 0, 0, 1, g(Yes, No, false, false, "", " ̨")},
-	{0x2dc, 0, 0, 1, g(Yes, No, false, false, "", " ̃")},
-	{0x2dd, 0, 0, 1, g(Yes, No, false, false, "", " ̋")},
-	{0x2de, 0, 0, 0, f(Yes, false, "")},
-	{0x2e0, 0, 0, 0, g(Yes, No, false, false, "", "ɣ")},
-	{0x2e1, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x2e2, 0, 0, 0, g(Yes, No, false, false, "", "s")},
-	{0x2e3, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0x2e4, 0, 0, 0, g(Yes, No, false, false, "", "ʕ")},
-	{0x2e5, 0, 0, 0, f(Yes, false, "")},
-	{0x300, 230, 1, 1, f(Maybe, false, "")},
-	{0x305, 230, 1, 1, f(Yes, false, "")},
-	{0x306, 230, 1, 1, f(Maybe, false, "")},
-	{0x30d, 230, 1, 1, f(Yes, false, "")},
-	{0x30f, 230, 1, 1, f(Maybe, false, "")},
-	{0x310, 230, 1, 1, f(Yes, false, "")},
-	{0x311, 230, 1, 1, f(Maybe, false, "")},
-	{0x312, 230, 1, 1, f(Yes, false, "")},
-	{0x313, 230, 1, 1, f(Maybe, false, "")},
-	{0x315, 232, 1, 1, f(Yes, false, "")},
-	{0x316, 220, 1, 1, f(Yes, false, "")},
-	{0x31a, 232, 1, 1, f(Yes, false, "")},
-	{0x31b, 216, 1, 1, f(Maybe, false, "")},
-	{0x31c, 220, 1, 1, f(Yes, false, "")},
-	{0x321, 202, 1, 1, f(Yes, false, "")},
-	{0x323, 220, 1, 1, f(Maybe, false, "")},
-	{0x327, 202, 1, 1, f(Maybe, false, "")},
-	{0x329, 220, 1, 1, f(Yes, false, "")},
-	{0x32d, 220, 1, 1, f(Maybe, false, "")},
-	{0x32f, 220, 1, 1, f(Yes, false, "")},
-	{0x330, 220, 1, 1, f(Maybe, false, "")},
-	{0x332, 220, 1, 1, f(Yes, false, "")},
-	{0x334, 1, 1, 1, f(Yes, false, "")},
-	{0x338, 1, 1, 1, f(Maybe, false, "")},
-	{0x339, 220, 1, 1, f(Yes, false, "")},
-	{0x33d, 230, 1, 1, f(Yes, false, "")},
-	{0x340, 230, 1, 1, f(No, false, "̀")},
-	{0x341, 230, 1, 1, f(No, false, "́")},
-	{0x342, 230, 1, 1, f(Maybe, false, "")},
-	{0x343, 230, 1, 1, f(No, false, "̓")},
-	{0x344, 230, 2, 2, f(No, false, "̈́")},
-	{0x345, 240, 1, 1, f(Maybe, false, "")},
-	{0x346, 230, 1, 1, f(Yes, false, "")},
-	{0x347, 220, 1, 1, f(Yes, false, "")},
-	{0x34a, 230, 1, 1, f(Yes, false, "")},
-	{0x34d, 220, 1, 1, f(Yes, false, "")},
-	{0x34f, 0, 0, 0, f(Yes, false, "")},
-	{0x350, 230, 1, 1, f(Yes, false, "")},
-	{0x353, 220, 1, 1, f(Yes, false, "")},
-	{0x357, 230, 1, 1, f(Yes, false, "")},
-	{0x358, 232, 1, 1, f(Yes, false, "")},
-	{0x359, 220, 1, 1, f(Yes, false, "")},
-	{0x35b, 230, 1, 1, f(Yes, false, "")},
-	{0x35c, 233, 1, 1, f(Yes, false, "")},
-	{0x35d, 234, 1, 1, f(Yes, false, "")},
-	{0x35f, 233, 1, 1, f(Yes, false, "")},
-	{0x360, 234, 1, 1, f(Yes, false, "")},
-	{0x362, 233, 1, 1, f(Yes, false, "")},
-	{0x363, 230, 1, 1, f(Yes, false, "")},
-	{0x370, 0, 0, 0, f(Yes, false, "")},
-	{0x374, 0, 0, 0, f(No, false, "ʹ")},
-	{0x375, 0, 0, 0, f(Yes, false, "")},
-	{0x37a, 0, 0, 1, g(Yes, No, false, false, "", " ͅ")},
-	{0x37b, 0, 0, 0, f(Yes, false, "")},
-	{0x37e, 0, 0, 0, f(No, false, ";")},
-	{0x37f, 0, 0, 0, f(Yes, false, "")},
-	{0x384, 0, 0, 1, g(Yes, No, false, false, "", " ́")},
-	{0x385, 0, 0, 2, g(Yes, No, false, false, "΅", " ̈́")},
-	{0x386, 0, 0, 1, f(Yes, false, "Ά")},
-	{0x387, 0, 0, 0, f(No, false, "·")},
-	{0x388, 0, 0, 1, f(Yes, false, "Έ")},
-	{0x389, 0, 0, 1, f(Yes, false, "Ή")},
-	{0x38a, 0, 0, 1, f(Yes, false, "Ί")},
-	{0x38b, 0, 0, 0, f(Yes, false, "")},
-	{0x38c, 0, 0, 1, f(Yes, false, "Ό")},
-	{0x38d, 0, 0, 0, f(Yes, false, "")},
-	{0x38e, 0, 0, 1, f(Yes, false, "Ύ")},
-	{0x38f, 0, 0, 1, f(Yes, false, "Ώ")},
-	{0x390, 0, 0, 2, f(Yes, false, "ΐ")},
-	{0x391, 0, 0, 0, f(Yes, true, "")},
-	{0x392, 0, 0, 0, f(Yes, false, "")},
-	{0x395, 0, 0, 0, f(Yes, true, "")},
-	{0x396, 0, 0, 0, f(Yes, false, "")},
-	{0x397, 0, 0, 0, f(Yes, true, "")},
-	{0x398, 0, 0, 0, f(Yes, false, "")},
-	{0x399, 0, 0, 0, f(Yes, true, "")},
-	{0x39a, 0, 0, 0, f(Yes, false, "")},
-	{0x39f, 0, 0, 0, f(Yes, true, "")},
-	{0x3a0, 0, 0, 0, f(Yes, false, "")},
-	{0x3a1, 0, 0, 0, f(Yes, true, "")},
-	{0x3a2, 0, 0, 0, f(Yes, false, "")},
-	{0x3a5, 0, 0, 0, f(Yes, true, "")},
-	{0x3a6, 0, 0, 0, f(Yes, false, "")},
-	{0x3a9, 0, 0, 0, f(Yes, true, "")},
-	{0x3aa, 0, 0, 1, f(Yes, false, "Ϊ")},
-	{0x3ab, 0, 0, 1, f(Yes, false, "Ϋ")},
-	{0x3ac, 0, 0, 1, f(Yes, true, "ά")},
-	{0x3ad, 0, 0, 1, f(Yes, false, "έ")},
-	{0x3ae, 0, 0, 1, f(Yes, true, "ή")},
-	{0x3af, 0, 0, 1, f(Yes, false, "ί")},
-	{0x3b0, 0, 0, 2, f(Yes, false, "ΰ")},
-	{0x3b1, 0, 0, 0, f(Yes, true, "")},
-	{0x3b2, 0, 0, 0, f(Yes, false, "")},
-	{0x3b5, 0, 0, 0, f(Yes, true, "")},
-	{0x3b6, 0, 0, 0, f(Yes, false, "")},
-	{0x3b7, 0, 0, 0, f(Yes, true, "")},
-	{0x3b8, 0, 0, 0, f(Yes, false, "")},
-	{0x3b9, 0, 0, 0, f(Yes, true, "")},
-	{0x3ba, 0, 0, 0, f(Yes, false, "")},
-	{0x3bf, 0, 0, 0, f(Yes, true, "")},
-	{0x3c0, 0, 0, 0, f(Yes, false, "")},
-	{0x3c1, 0, 0, 0, f(Yes, true, "")},
-	{0x3c2, 0, 0, 0, f(Yes, false, "")},
-	{0x3c5, 0, 0, 0, f(Yes, true, "")},
-	{0x3c6, 0, 0, 0, f(Yes, false, "")},
-	{0x3c9, 0, 0, 0, f(Yes, true, "")},
-	{0x3ca, 0, 0, 1, f(Yes, true, "ϊ")},
-	{0x3cb, 0, 0, 1, f(Yes, true, "ϋ")},
-	{0x3cc, 0, 0, 1, f(Yes, false, "ό")},
-	{0x3cd, 0, 0, 1, f(Yes, false, "ύ")},
-	{0x3ce, 0, 0, 1, f(Yes, true, "ώ")},
-	{0x3cf, 0, 0, 0, f(Yes, false, "")},
-	{0x3d0, 0, 0, 0, g(Yes, No, false, false, "", "β")},
-	{0x3d1, 0, 0, 0, g(Yes, No, false, false, "", "θ")},
-	{0x3d2, 0, 0, 0, g(Yes, No, true, false, "", "Υ")},
-	{0x3d3, 0, 0, 1, g(Yes, No, false, false, "ϓ", "Ύ")},
-	{0x3d4, 0, 0, 1, g(Yes, No, false, false, "ϔ", "Ϋ")},
-	{0x3d5, 0, 0, 0, g(Yes, No, false, false, "", "φ")},
-	{0x3d6, 0, 0, 0, g(Yes, No, false, false, "", "π")},
-	{0x3d7, 0, 0, 0, f(Yes, false, "")},
-	{0x3f0, 0, 0, 0, g(Yes, No, false, false, "", "κ")},
-	{0x3f1, 0, 0, 0, g(Yes, No, false, false, "", "ρ")},
-	{0x3f2, 0, 0, 0, g(Yes, No, false, false, "", "ς")},
-	{0x3f3, 0, 0, 0, f(Yes, false, "")},
-	{0x3f4, 0, 0, 0, g(Yes, No, false, false, "", "Θ")},
-	{0x3f5, 0, 0, 0, g(Yes, No, false, false, "", "ε")},
-	{0x3f6, 0, 0, 0, f(Yes, false, "")},
-	{0x3f9, 0, 0, 0, g(Yes, No, false, false, "", "Σ")},
-	{0x3fa, 0, 0, 0, f(Yes, false, "")},
-	{0x400, 0, 0, 1, f(Yes, false, "Ѐ")},
-	{0x401, 0, 0, 1, f(Yes, false, "Ё")},
-	{0x402, 0, 0, 0, f(Yes, false, "")},
-	{0x403, 0, 0, 1, f(Yes, false, "Ѓ")},
-	{0x404, 0, 0, 0, f(Yes, false, "")},
-	{0x406, 0, 0, 0, f(Yes, true, "")},
-	{0x407, 0, 0, 1, f(Yes, false, "Ї")},
-	{0x408, 0, 0, 0, f(Yes, false, "")},
-	{0x40c, 0, 0, 1, f(Yes, false, "Ќ")},
-	{0x40d, 0, 0, 1, f(Yes, false, "Ѝ")},
-	{0x40e, 0, 0, 1, f(Yes, false, "Ў")},
-	{0x40f, 0, 0, 0, f(Yes, false, "")},
-	{0x410, 0, 0, 0, f(Yes, true, "")},
-	{0x411, 0, 0, 0, f(Yes, false, "")},
-	{0x413, 0, 0, 0, f(Yes, true, "")},
-	{0x414, 0, 0, 0, f(Yes, false, "")},
-	{0x415, 0, 0, 0, f(Yes, true, "")},
-	{0x419, 0, 0, 1, f(Yes, false, "Й")},
-	{0x41a, 0, 0, 0, f(Yes, true, "")},
-	{0x41b, 0, 0, 0, f(Yes, false, "")},
-	{0x41e, 0, 0, 0, f(Yes, true, "")},
-	{0x41f, 0, 0, 0, f(Yes, false, "")},
-	{0x423, 0, 0, 0, f(Yes, true, "")},
-	{0x424, 0, 0, 0, f(Yes, false, "")},
-	{0x427, 0, 0, 0, f(Yes, true, "")},
-	{0x428, 0, 0, 0, f(Yes, false, "")},
-	{0x42b, 0, 0, 0, f(Yes, true, "")},
-	{0x42c, 0, 0, 0, f(Yes, false, "")},
-	{0x42d, 0, 0, 0, f(Yes, true, "")},
-	{0x42e, 0, 0, 0, f(Yes, false, "")},
-	{0x430, 0, 0, 0, f(Yes, true, "")},
-	{0x431, 0, 0, 0, f(Yes, false, "")},
-	{0x433, 0, 0, 0, f(Yes, true, "")},
-	{0x434, 0, 0, 0, f(Yes, false, "")},
-	{0x435, 0, 0, 0, f(Yes, true, "")},
-	{0x439, 0, 0, 1, f(Yes, false, "й")},
-	{0x43a, 0, 0, 0, f(Yes, true, "")},
-	{0x43b, 0, 0, 0, f(Yes, false, "")},
-	{0x43e, 0, 0, 0, f(Yes, true, "")},
-	{0x43f, 0, 0, 0, f(Yes, false, "")},
-	{0x443, 0, 0, 0, f(Yes, true, "")},
-	{0x444, 0, 0, 0, f(Yes, false, "")},
-	{0x447, 0, 0, 0, f(Yes, true, "")},
-	{0x448, 0, 0, 0, f(Yes, false, "")},
-	{0x44b, 0, 0, 0, f(Yes, true, "")},
-	{0x44c, 0, 0, 0, f(Yes, false, "")},
-	{0x44d, 0, 0, 0, f(Yes, true, "")},
-	{0x44e, 0, 0, 0, f(Yes, false, "")},
-	{0x450, 0, 0, 1, f(Yes, false, "ѐ")},
-	{0x451, 0, 0, 1, f(Yes, false, "ё")},
-	{0x452, 0, 0, 0, f(Yes, false, "")},
-	{0x453, 0, 0, 1, f(Yes, false, "ѓ")},
-	{0x454, 0, 0, 0, f(Yes, false, "")},
-	{0x456, 0, 0, 0, f(Yes, true, "")},
-	{0x457, 0, 0, 1, f(Yes, false, "ї")},
-	{0x458, 0, 0, 0, f(Yes, false, "")},
-	{0x45c, 0, 0, 1, f(Yes, false, "ќ")},
-	{0x45d, 0, 0, 1, f(Yes, false, "ѝ")},
-	{0x45e, 0, 0, 1, f(Yes, false, "ў")},
-	{0x45f, 0, 0, 0, f(Yes, false, "")},
-	{0x474, 0, 0, 0, f(Yes, true, "")},
-	{0x476, 0, 0, 1, f(Yes, false, "Ѷ")},
-	{0x477, 0, 0, 1, f(Yes, false, "ѷ")},
-	{0x478, 0, 0, 0, f(Yes, false, "")},
-	{0x483, 230, 1, 1, f(Yes, false, "")},
-	{0x488, 0, 0, 0, f(Yes, false, "")},
-	{0x4c1, 0, 0, 1, f(Yes, false, "Ӂ")},
-	{0x4c2, 0, 0, 1, f(Yes, false, "ӂ")},
-	{0x4c3, 0, 0, 0, f(Yes, false, "")},
-	{0x4d0, 0, 0, 1, f(Yes, false, "Ӑ")},
-	{0x4d1, 0, 0, 1, f(Yes, false, "ӑ")},
-	{0x4d2, 0, 0, 1, f(Yes, false, "Ӓ")},
-	{0x4d3, 0, 0, 1, f(Yes, false, "ӓ")},
-	{0x4d4, 0, 0, 0, f(Yes, false, "")},
-	{0x4d6, 0, 0, 1, f(Yes, false, "Ӗ")},
-	{0x4d7, 0, 0, 1, f(Yes, false, "ӗ")},
-	{0x4d8, 0, 0, 0, f(Yes, true, "")},
-	{0x4da, 0, 0, 1, f(Yes, false, "Ӛ")},
-	{0x4db, 0, 0, 1, f(Yes, false, "ӛ")},
-	{0x4dc, 0, 0, 1, f(Yes, false, "Ӝ")},
-	{0x4dd, 0, 0, 1, f(Yes, false, "ӝ")},
-	{0x4de, 0, 0, 1, f(Yes, false, "Ӟ")},
-	{0x4df, 0, 0, 1, f(Yes, false, "ӟ")},
-	{0x4e0, 0, 0, 0, f(Yes, false, "")},
-	{0x4e2, 0, 0, 1, f(Yes, false, "Ӣ")},
-	{0x4e3, 0, 0, 1, f(Yes, false, "ӣ")},
-	{0x4e4, 0, 0, 1, f(Yes, false, "Ӥ")},
-	{0x4e5, 0, 0, 1, f(Yes, false, "ӥ")},
-	{0x4e6, 0, 0, 1, f(Yes, false, "Ӧ")},
-	{0x4e7, 0, 0, 1, f(Yes, false, "ӧ")},
-	{0x4e8, 0, 0, 0, f(Yes, true, "")},
-	{0x4ea, 0, 0, 1, f(Yes, false, "Ӫ")},
-	{0x4eb, 0, 0, 1, f(Yes, false, "ӫ")},
-	{0x4ec, 0, 0, 1, f(Yes, false, "Ӭ")},
-	{0x4ed, 0, 0, 1, f(Yes, false, "ӭ")},
-	{0x4ee, 0, 0, 1, f(Yes, false, "Ӯ")},
-	{0x4ef, 0, 0, 1, f(Yes, false, "ӯ")},
-	{0x4f0, 0, 0, 1, f(Yes, false, "Ӱ")},
-	{0x4f1, 0, 0, 1, f(Yes, false, "ӱ")},
-	{0x4f2, 0, 0, 1, f(Yes, false, "Ӳ")},
-	{0x4f3, 0, 0, 1, f(Yes, false, "ӳ")},
-	{0x4f4, 0, 0, 1, f(Yes, false, "Ӵ")},
-	{0x4f5, 0, 0, 1, f(Yes, false, "ӵ")},
-	{0x4f6, 0, 0, 0, f(Yes, false, "")},
-	{0x4f8, 0, 0, 1, f(Yes, false, "Ӹ")},
-	{0x4f9, 0, 0, 1, f(Yes, false, "ӹ")},
-	{0x4fa, 0, 0, 0, f(Yes, false, "")},
-	{0x587, 0, 0, 0, g(Yes, No, false, false, "", "եւ")},
-	{0x588, 0, 0, 0, f(Yes, false, "")},
-	{0x591, 220, 1, 1, f(Yes, false, "")},
-	{0x592, 230, 1, 1, f(Yes, false, "")},
-	{0x596, 220, 1, 1, f(Yes, false, "")},
-	{0x597, 230, 1, 1, f(Yes, false, "")},
-	{0x59a, 222, 1, 1, f(Yes, false, "")},
-	{0x59b, 220, 1, 1, f(Yes, false, "")},
-	{0x59c, 230, 1, 1, f(Yes, false, "")},
-	{0x5a2, 220, 1, 1, f(Yes, false, "")},
-	{0x5a8, 230, 1, 1, f(Yes, false, "")},
-	{0x5aa, 220, 1, 1, f(Yes, false, "")},
-	{0x5ab, 230, 1, 1, f(Yes, false, "")},
-	{0x5ad, 222, 1, 1, f(Yes, false, "")},
-	{0x5ae, 228, 1, 1, f(Yes, false, "")},
-	{0x5af, 230, 1, 1, f(Yes, false, "")},
-	{0x5b0, 10, 1, 1, f(Yes, false, "")},
-	{0x5b1, 11, 1, 1, f(Yes, false, "")},
-	{0x5b2, 12, 1, 1, f(Yes, false, "")},
-	{0x5b3, 13, 1, 1, f(Yes, false, "")},
-	{0x5b4, 14, 1, 1, f(Yes, false, "")},
-	{0x5b5, 15, 1, 1, f(Yes, false, "")},
-	{0x5b6, 16, 1, 1, f(Yes, false, "")},
-	{0x5b7, 17, 1, 1, f(Yes, false, "")},
-	{0x5b8, 18, 1, 1, f(Yes, false, "")},
-	{0x5b9, 19, 1, 1, f(Yes, false, "")},
-	{0x5bb, 20, 1, 1, f(Yes, false, "")},
-	{0x5bc, 21, 1, 1, f(Yes, false, "")},
-	{0x5bd, 22, 1, 1, f(Yes, false, "")},
-	{0x5be, 0, 0, 0, f(Yes, false, "")},
-	{0x5bf, 23, 1, 1, f(Yes, false, "")},
-	{0x5c0, 0, 0, 0, f(Yes, false, "")},
-	{0x5c1, 24, 1, 1, f(Yes, false, "")},
-	{0x5c2, 25, 1, 1, f(Yes, false, "")},
-	{0x5c3, 0, 0, 0, f(Yes, false, "")},
-	{0x5c4, 230, 1, 1, f(Yes, false, "")},
-	{0x5c5, 220, 1, 1, f(Yes, false, "")},
-	{0x5c6, 0, 0, 0, f(Yes, false, "")},
-	{0x5c7, 18, 1, 1, f(Yes, false, "")},
-	{0x5c8, 0, 0, 0, f(Yes, false, "")},
-	{0x610, 230, 1, 1, f(Yes, false, "")},
-	{0x618, 30, 1, 1, f(Yes, false, "")},
-	{0x619, 31, 1, 1, f(Yes, false, "")},
-	{0x61a, 32, 1, 1, f(Yes, false, "")},
-	{0x61b, 0, 0, 0, f(Yes, false, "")},
-	{0x622, 0, 0, 1, f(Yes, false, "آ")},
-	{0x623, 0, 0, 1, f(Yes, false, "أ")},
-	{0x624, 0, 0, 1, f(Yes, false, "ؤ")},
-	{0x625, 0, 0, 1, f(Yes, false, "إ")},
-	{0x626, 0, 0, 1, f(Yes, false, "ئ")},
-	{0x627, 0, 0, 0, f(Yes, true, "")},
-	{0x628, 0, 0, 0, f(Yes, false, "")},
-	{0x648, 0, 0, 0, f(Yes, true, "")},
-	{0x649, 0, 0, 0, f(Yes, false, "")},
-	{0x64a, 0, 0, 0, f(Yes, true, "")},
-	{0x64b, 27, 1, 1, f(Yes, false, "")},
-	{0x64c, 28, 1, 1, f(Yes, false, "")},
-	{0x64d, 29, 1, 1, f(Yes, false, "")},
-	{0x64e, 30, 1, 1, f(Yes, false, "")},
-	{0x64f, 31, 1, 1, f(Yes, false, "")},
-	{0x650, 32, 1, 1, f(Yes, false, "")},
-	{0x651, 33, 1, 1, f(Yes, false, "")},
-	{0x652, 34, 1, 1, f(Yes, false, "")},
-	{0x653, 230, 1, 1, f(Maybe, false, "")},
-	{0x655, 220, 1, 1, f(Maybe, false, "")},
-	{0x656, 220, 1, 1, f(Yes, false, "")},
-	{0x657, 230, 1, 1, f(Yes, false, "")},
-	{0x65c, 220, 1, 1, f(Yes, false, "")},
-	{0x65d, 230, 1, 1, f(Yes, false, "")},
-	{0x65f, 220, 1, 1, f(Yes, false, "")},
-	{0x660, 0, 0, 0, f(Yes, false, "")},
-	{0x670, 35, 1, 1, f(Yes, false, "")},
-	{0x671, 0, 0, 0, f(Yes, false, "")},
-	{0x675, 0, 0, 0, g(Yes, No, false, false, "", "اٴ")},
-	{0x676, 0, 0, 0, g(Yes, No, false, false, "", "وٴ")},
-	{0x677, 0, 0, 0, g(Yes, No, false, false, "", "ۇٴ")},
-	{0x678, 0, 0, 0, g(Yes, No, false, false, "", "يٴ")},
-	{0x679, 0, 0, 0, f(Yes, false, "")},
-	{0x6c0, 0, 0, 1, f(Yes, false, "ۀ")},
-	{0x6c1, 0, 0, 0, f(Yes, true, "")},
-	{0x6c2, 0, 0, 1, f(Yes, false, "ۂ")},
-	{0x6c3, 0, 0, 0, f(Yes, false, "")},
-	{0x6d2, 0, 0, 0, f(Yes, true, "")},
-	{0x6d3, 0, 0, 1, f(Yes, false, "ۓ")},
-	{0x6d4, 0, 0, 0, f(Yes, false, "")},
-	{0x6d5, 0, 0, 0, f(Yes, true, "")},
-	{0x6d6, 230, 1, 1, f(Yes, false, "")},
-	{0x6dd, 0, 0, 0, f(Yes, false, "")},
-	{0x6df, 230, 1, 1, f(Yes, false, "")},
-	{0x6e3, 220, 1, 1, f(Yes, false, "")},
-	{0x6e4, 230, 1, 1, f(Yes, false, "")},
-	{0x6e5, 0, 0, 0, f(Yes, false, "")},
-	{0x6e7, 230, 1, 1, f(Yes, false, "")},
-	{0x6e9, 0, 0, 0, f(Yes, false, "")},
-	{0x6ea, 220, 1, 1, f(Yes, false, "")},
-	{0x6eb, 230, 1, 1, f(Yes, false, "")},
-	{0x6ed, 220, 1, 1, f(Yes, false, "")},
-	{0x6ee, 0, 0, 0, f(Yes, false, "")},
-	{0x711, 36, 1, 1, f(Yes, false, "")},
-	{0x712, 0, 0, 0, f(Yes, false, "")},
-	{0x730, 230, 1, 1, f(Yes, false, "")},
-	{0x731, 220, 1, 1, f(Yes, false, "")},
-	{0x732, 230, 1, 1, f(Yes, false, "")},
-	{0x734, 220, 1, 1, f(Yes, false, "")},
-	{0x735, 230, 1, 1, f(Yes, false, "")},
-	{0x737, 220, 1, 1, f(Yes, false, "")},
-	{0x73a, 230, 1, 1, f(Yes, false, "")},
-	{0x73b, 220, 1, 1, f(Yes, false, "")},
-	{0x73d, 230, 1, 1, f(Yes, false, "")},
-	{0x73e, 220, 1, 1, f(Yes, false, "")},
-	{0x73f, 230, 1, 1, f(Yes, false, "")},
-	{0x742, 220, 1, 1, f(Yes, false, "")},
-	{0x743, 230, 1, 1, f(Yes, false, "")},
-	{0x744, 220, 1, 1, f(Yes, false, "")},
-	{0x745, 230, 1, 1, f(Yes, false, "")},
-	{0x746, 220, 1, 1, f(Yes, false, "")},
-	{0x747, 230, 1, 1, f(Yes, false, "")},
-	{0x748, 220, 1, 1, f(Yes, false, "")},
-	{0x749, 230, 1, 1, f(Yes, false, "")},
-	{0x74b, 0, 0, 0, f(Yes, false, "")},
-	{0x7eb, 230, 1, 1, f(Yes, false, "")},
-	{0x7f2, 220, 1, 1, f(Yes, false, "")},
-	{0x7f3, 230, 1, 1, f(Yes, false, "")},
-	{0x7f4, 0, 0, 0, f(Yes, false, "")},
-	{0x816, 230, 1, 1, f(Yes, false, "")},
-	{0x81a, 0, 0, 0, f(Yes, false, "")},
-	{0x81b, 230, 1, 1, f(Yes, false, "")},
-	{0x824, 0, 0, 0, f(Yes, false, "")},
-	{0x825, 230, 1, 1, f(Yes, false, "")},
-	{0x828, 0, 0, 0, f(Yes, false, "")},
-	{0x829, 230, 1, 1, f(Yes, false, "")},
-	{0x82e, 0, 0, 0, f(Yes, false, "")},
-	{0x859, 220, 1, 1, f(Yes, false, "")},
-	{0x85c, 0, 0, 0, f(Yes, false, "")},
-	{0x8d4, 230, 1, 1, f(Yes, false, "")},
-	{0x8e2, 0, 0, 0, f(Yes, false, "")},
-	{0x8e3, 220, 1, 1, f(Yes, false, "")},
-	{0x8e4, 230, 1, 1, f(Yes, false, "")},
-	{0x8e6, 220, 1, 1, f(Yes, false, "")},
-	{0x8e7, 230, 1, 1, f(Yes, false, "")},
-	{0x8e9, 220, 1, 1, f(Yes, false, "")},
-	{0x8ea, 230, 1, 1, f(Yes, false, "")},
-	{0x8ed, 220, 1, 1, f(Yes, false, "")},
-	{0x8f0, 27, 1, 1, f(Yes, false, "")},
-	{0x8f1, 28, 1, 1, f(Yes, false, "")},
-	{0x8f2, 29, 1, 1, f(Yes, false, "")},
-	{0x8f3, 230, 1, 1, f(Yes, false, "")},
-	{0x8f6, 220, 1, 1, f(Yes, false, "")},
-	{0x8f7, 230, 1, 1, f(Yes, false, "")},
-	{0x8f9, 220, 1, 1, f(Yes, false, "")},
-	{0x8fb, 230, 1, 1, f(Yes, false, "")},
-	{0x900, 0, 0, 0, f(Yes, false, "")},
-	{0x928, 0, 0, 0, f(Yes, true, "")},
-	{0x929, 0, 0, 1, f(Yes, false, "ऩ")},
-	{0x92a, 0, 0, 0, f(Yes, false, "")},
-	{0x930, 0, 0, 0, f(Yes, true, "")},
-	{0x931, 0, 0, 1, f(Yes, false, "ऱ")},
-	{0x932, 0, 0, 0, f(Yes, false, "")},
-	{0x933, 0, 0, 0, f(Yes, true, "")},
-	{0x934, 0, 0, 1, f(Yes, false, "ऴ")},
-	{0x935, 0, 0, 0, f(Yes, false, "")},
-	{0x93c, 7, 1, 1, f(Maybe, false, "")},
-	{0x93d, 0, 0, 0, f(Yes, false, "")},
-	{0x94d, 9, 1, 1, f(Yes, false, "")},
-	{0x94e, 0, 0, 0, f(Yes, false, "")},
-	{0x951, 230, 1, 1, f(Yes, false, "")},
-	{0x952, 220, 1, 1, f(Yes, false, "")},
-	{0x953, 230, 1, 1, f(Yes, false, "")},
-	{0x955, 0, 0, 0, f(Yes, false, "")},
-	{0x958, 0, 0, 1, f(No, false, "क़")},
-	{0x959, 0, 0, 1, f(No, false, "ख़")},
-	{0x95a, 0, 0, 1, f(No, false, "ग़")},
-	{0x95b, 0, 0, 1, f(No, false, "ज़")},
-	{0x95c, 0, 0, 1, f(No, false, "ड़")},
-	{0x95d, 0, 0, 1, f(No, false, "ढ़")},
-	{0x95e, 0, 0, 1, f(No, false, "फ़")},
-	{0x95f, 0, 0, 1, f(No, false, "य़")},
-	{0x960, 0, 0, 0, f(Yes, false, "")},
-	{0x9bc, 7, 1, 1, f(Yes, false, "")},
-	{0x9bd, 0, 0, 0, f(Yes, false, "")},
-	{0x9be, 0, 1, 1, f(Maybe, false, "")},
-	{0x9bf, 0, 0, 0, f(Yes, false, "")},
-	{0x9c7, 0, 0, 0, f(Yes, true, "")},
-	{0x9c8, 0, 0, 0, f(Yes, false, "")},
-	{0x9cb, 0, 0, 1, f(Yes, false, "ো")},
-	{0x9cc, 0, 0, 1, f(Yes, false, "ৌ")},
-	{0x9cd, 9, 1, 1, f(Yes, false, "")},
-	{0x9ce, 0, 0, 0, f(Yes, false, "")},
-	{0x9d7, 0, 1, 1, f(Maybe, false, "")},
-	{0x9d8, 0, 0, 0, f(Yes, false, "")},
-	{0x9dc, 0, 0, 1, f(No, false, "ড়")},
-	{0x9dd, 0, 0, 1, f(No, false, "ঢ়")},
-	{0x9de, 0, 0, 0, f(Yes, false, "")},
-	{0x9df, 0, 0, 1, f(No, false, "য়")},
-	{0x9e0, 0, 0, 0, f(Yes, false, "")},
-	{0xa33, 0, 0, 1, f(No, false, "ਲ਼")},
-	{0xa34, 0, 0, 0, f(Yes, false, "")},
-	{0xa36, 0, 0, 1, f(No, false, "ਸ਼")},
-	{0xa37, 0, 0, 0, f(Yes, false, "")},
-	{0xa3c, 7, 1, 1, f(Yes, false, "")},
-	{0xa3d, 0, 0, 0, f(Yes, false, "")},
-	{0xa4d, 9, 1, 1, f(Yes, false, "")},
-	{0xa4e, 0, 0, 0, f(Yes, false, "")},
-	{0xa59, 0, 0, 1, f(No, false, "ਖ਼")},
-	{0xa5a, 0, 0, 1, f(No, false, "ਗ਼")},
-	{0xa5b, 0, 0, 1, f(No, false, "ਜ਼")},
-	{0xa5c, 0, 0, 0, f(Yes, false, "")},
-	{0xa5e, 0, 0, 1, f(No, false, "ਫ਼")},
-	{0xa5f, 0, 0, 0, f(Yes, false, "")},
-	{0xabc, 7, 1, 1, f(Yes, false, "")},
-	{0xabd, 0, 0, 0, f(Yes, false, "")},
-	{0xacd, 9, 1, 1, f(Yes, false, "")},
-	{0xace, 0, 0, 0, f(Yes, false, "")},
-	{0xb3c, 7, 1, 1, f(Yes, false, "")},
-	{0xb3d, 0, 0, 0, f(Yes, false, "")},
-	{0xb3e, 0, 1, 1, f(Maybe, false, "")},
-	{0xb3f, 0, 0, 0, f(Yes, false, "")},
-	{0xb47, 0, 0, 0, f(Yes, true, "")},
-	{0xb48, 0, 0, 1, f(Yes, false, "ୈ")},
-	{0xb49, 0, 0, 0, f(Yes, false, "")},
-	{0xb4b, 0, 0, 1, f(Yes, false, "ୋ")},
-	{0xb4c, 0, 0, 1, f(Yes, false, "ୌ")},
-	{0xb4d, 9, 1, 1, f(Yes, false, "")},
-	{0xb4e, 0, 0, 0, f(Yes, false, "")},
-	{0xb56, 0, 1, 1, f(Maybe, false, "")},
-	{0xb58, 0, 0, 0, f(Yes, false, "")},
-	{0xb5c, 0, 0, 1, f(No, false, "ଡ଼")},
-	{0xb5d, 0, 0, 1, f(No, false, "ଢ଼")},
-	{0xb5e, 0, 0, 0, f(Yes, false, "")},
-	{0xb92, 0, 0, 0, f(Yes, true, "")},
-	{0xb93, 0, 0, 0, f(Yes, false, "")},
-	{0xb94, 0, 0, 1, f(Yes, false, "ஔ")},
-	{0xb95, 0, 0, 0, f(Yes, false, "")},
-	{0xbbe, 0, 1, 1, f(Maybe, false, "")},
-	{0xbbf, 0, 0, 0, f(Yes, false, "")},
-	{0xbc6, 0, 0, 0, f(Yes, true, "")},
-	{0xbc8, 0, 0, 0, f(Yes, false, "")},
-	{0xbca, 0, 0, 1, f(Yes, false, "ொ")},
-	{0xbcb, 0, 0, 1, f(Yes, false, "ோ")},
-	{0xbcc, 0, 0, 1, f(Yes, false, "ௌ")},
-	{0xbcd, 9, 1, 1, f(Yes, false, "")},
-	{0xbce, 0, 0, 0, f(Yes, false, "")},
-	{0xbd7, 0, 1, 1, f(Maybe, false, "")},
-	{0xbd8, 0, 0, 0, f(Yes, false, "")},
-	{0xc46, 0, 0, 0, f(Yes, true, "")},
-	{0xc47, 0, 0, 0, f(Yes, false, "")},
-	{0xc48, 0, 0, 1, f(Yes, false, "ై")},
-	{0xc49, 0, 0, 0, f(Yes, false, "")},
-	{0xc4d, 9, 1, 1, f(Yes, false, "")},
-	{0xc4e, 0, 0, 0, f(Yes, false, "")},
-	{0xc55, 84, 1, 1, f(Yes, false, "")},
-	{0xc56, 91, 1, 1, f(Maybe, false, "")},
-	{0xc57, 0, 0, 0, f(Yes, false, "")},
-	{0xcbc, 7, 1, 1, f(Yes, false, "")},
-	{0xcbd, 0, 0, 0, f(Yes, false, "")},
-	{0xcbf, 0, 0, 0, f(Yes, true, "")},
-	{0xcc0, 0, 0, 1, f(Yes, false, "ೀ")},
-	{0xcc1, 0, 0, 0, f(Yes, false, "")},
-	{0xcc2, 0, 1, 1, f(Maybe, false, "")},
-	{0xcc3, 0, 0, 0, f(Yes, false, "")},
-	{0xcc6, 0, 0, 0, f(Yes, true, "")},
-	{0xcc7, 0, 0, 1, f(Yes, false, "ೇ")},
-	{0xcc8, 0, 0, 1, f(Yes, false, "ೈ")},
-	{0xcc9, 0, 0, 0, f(Yes, false, "")},
-	{0xcca, 0, 0, 1, f(Yes, true, "ೊ")},
-	{0xccb, 0, 0, 2, f(Yes, false, "ೋ")},
-	{0xccc, 0, 0, 0, f(Yes, false, "")},
-	{0xccd, 9, 1, 1, f(Yes, false, "")},
-	{0xcce, 0, 0, 0, f(Yes, false, "")},
-	{0xcd5, 0, 1, 1, f(Maybe, false, "")},
-	{0xcd7, 0, 0, 0, f(Yes, false, "")},
-	{0xd3e, 0, 1, 1, f(Maybe, false, "")},
-	{0xd3f, 0, 0, 0, f(Yes, false, "")},
-	{0xd46, 0, 0, 0, f(Yes, true, "")},
-	{0xd48, 0, 0, 0, f(Yes, false, "")},
-	{0xd4a, 0, 0, 1, f(Yes, false, "ൊ")},
-	{0xd4b, 0, 0, 1, f(Yes, false, "ോ")},
-	{0xd4c, 0, 0, 1, f(Yes, false, "ൌ")},
-	{0xd4d, 9, 1, 1, f(Yes, false, "")},
-	{0xd4e, 0, 0, 0, f(Yes, false, "")},
-	{0xd57, 0, 1, 1, f(Maybe, false, "")},
-	{0xd58, 0, 0, 0, f(Yes, false, "")},
-	{0xdca, 9, 1, 1, f(Maybe, false, "")},
-	{0xdcb, 0, 0, 0, f(Yes, false, "")},
-	{0xdcf, 0, 1, 1, f(Maybe, false, "")},
-	{0xdd0, 0, 0, 0, f(Yes, false, "")},
-	{0xdd9, 0, 0, 0, f(Yes, true, "")},
-	{0xdda, 0, 0, 1, f(Yes, false, "ේ")},
-	{0xddb, 0, 0, 0, f(Yes, false, "")},
-	{0xddc, 0, 0, 1, f(Yes, true, "ො")},
-	{0xddd, 0, 0, 2, f(Yes, false, "ෝ")},
-	{0xdde, 0, 0, 1, f(Yes, false, "ෞ")},
-	{0xddf, 0, 1, 1, f(Maybe, false, "")},
-	{0xde0, 0, 0, 0, f(Yes, false, "")},
-	{0xe33, 0, 0, 0, g(Yes, No, false, false, "", "ํา")},
-	{0xe34, 0, 0, 0, f(Yes, false, "")},
-	{0xe38, 103, 1, 1, f(Yes, false, "")},
-	{0xe3a, 9, 1, 1, f(Yes, false, "")},
-	{0xe3b, 0, 0, 0, f(Yes, false, "")},
-	{0xe48, 107, 1, 1, f(Yes, false, "")},
-	{0xe4c, 0, 0, 0, f(Yes, false, "")},
-	{0xeb3, 0, 0, 0, g(Yes, No, false, false, "", "ໍາ")},
-	{0xeb4, 0, 0, 0, f(Yes, false, "")},
-	{0xeb8, 118, 1, 1, f(Yes, false, "")},
-	{0xeba, 0, 0, 0, f(Yes, false, "")},
-	{0xec8, 122, 1, 1, f(Yes, false, "")},
-	{0xecc, 0, 0, 0, f(Yes, false, "")},
-	{0xedc, 0, 0, 0, g(Yes, No, false, false, "", "ຫນ")},
-	{0xedd, 0, 0, 0, g(Yes, No, false, false, "", "ຫມ")},
-	{0xede, 0, 0, 0, f(Yes, false, "")},
-	{0xf0c, 0, 0, 0, g(Yes, No, false, false, "", "་")},
-	{0xf0d, 0, 0, 0, f(Yes, false, "")},
-	{0xf18, 220, 1, 1, f(Yes, false, "")},
-	{0xf1a, 0, 0, 0, f(Yes, false, "")},
-	{0xf35, 220, 1, 1, f(Yes, false, "")},
-	{0xf36, 0, 0, 0, f(Yes, false, "")},
-	{0xf37, 220, 1, 1, f(Yes, false, "")},
-	{0xf38, 0, 0, 0, f(Yes, false, "")},
-	{0xf39, 216, 1, 1, f(Yes, false, "")},
-	{0xf3a, 0, 0, 0, f(Yes, false, "")},
-	{0xf43, 0, 0, 0, f(No, false, "གྷ")},
-	{0xf44, 0, 0, 0, f(Yes, false, "")},
-	{0xf4d, 0, 0, 0, f(No, false, "ཌྷ")},
-	{0xf4e, 0, 0, 0, f(Yes, false, "")},
-	{0xf52, 0, 0, 0, f(No, false, "དྷ")},
-	{0xf53, 0, 0, 0, f(Yes, false, "")},
-	{0xf57, 0, 0, 0, f(No, false, "བྷ")},
-	{0xf58, 0, 0, 0, f(Yes, false, "")},
-	{0xf5c, 0, 0, 0, f(No, false, "ཛྷ")},
-	{0xf5d, 0, 0, 0, f(Yes, false, "")},
-	{0xf69, 0, 0, 0, f(No, false, "ཀྵ")},
-	{0xf6a, 0, 0, 0, f(Yes, false, "")},
-	{0xf71, 129, 1, 1, f(Yes, false, "")},
-	{0xf72, 130, 1, 1, f(Yes, false, "")},
-	{0xf73, 0, 2, 2, f(No, false, "ཱི")},
-	{0xf74, 132, 1, 1, f(Yes, false, "")},
-	{0xf75, 0, 2, 2, f(No, false, "ཱུ")},
-	{0xf76, 0, 0, 1, f(No, false, "ྲྀ")},
-	{0xf77, 0, 0, 2, g(Yes, No, false, false, "", "ྲཱྀ")},
-	{0xf78, 0, 0, 1, f(No, false, "ླྀ")},
-	{0xf79, 0, 0, 2, g(Yes, No, false, false, "", "ླཱྀ")},
-	{0xf7a, 130, 1, 1, f(Yes, false, "")},
-	{0xf7e, 0, 0, 0, f(Yes, false, "")},
-	{0xf80, 130, 1, 1, f(Yes, false, "")},
-	{0xf81, 0, 2, 2, f(No, false, "ཱྀ")},
-	{0xf82, 230, 1, 1, f(Yes, false, "")},
-	{0xf84, 9, 1, 1, f(Yes, false, "")},
-	{0xf85, 0, 0, 0, f(Yes, false, "")},
-	{0xf86, 230, 1, 1, f(Yes, false, "")},
-	{0xf88, 0, 0, 0, f(Yes, false, "")},
-	{0xf93, 0, 0, 0, f(No, false, "ྒྷ")},
-	{0xf94, 0, 0, 0, f(Yes, false, "")},
-	{0xf9d, 0, 0, 0, f(No, false, "ྜྷ")},
-	{0xf9e, 0, 0, 0, f(Yes, false, "")},
-	{0xfa2, 0, 0, 0, f(No, false, "ྡྷ")},
-	{0xfa3, 0, 0, 0, f(Yes, false, "")},
-	{0xfa7, 0, 0, 0, f(No, false, "ྦྷ")},
-	{0xfa8, 0, 0, 0, f(Yes, false, "")},
-	{0xfac, 0, 0, 0, f(No, false, "ྫྷ")},
-	{0xfad, 0, 0, 0, f(Yes, false, "")},
-	{0xfb9, 0, 0, 0, f(No, false, "ྐྵ")},
-	{0xfba, 0, 0, 0, f(Yes, false, "")},
-	{0xfc6, 220, 1, 1, f(Yes, false, "")},
-	{0xfc7, 0, 0, 0, f(Yes, false, "")},
-	{0x1025, 0, 0, 0, f(Yes, true, "")},
-	{0x1026, 0, 0, 1, f(Yes, false, "ဦ")},
-	{0x1027, 0, 0, 0, f(Yes, false, "")},
-	{0x102e, 0, 1, 1, f(Maybe, false, "")},
-	{0x102f, 0, 0, 0, f(Yes, false, "")},
-	{0x1037, 7, 1, 1, f(Yes, false, "")},
-	{0x1038, 0, 0, 0, f(Yes, false, "")},
-	{0x1039, 9, 1, 1, f(Yes, false, "")},
-	{0x103b, 0, 0, 0, f(Yes, false, "")},
-	{0x108d, 220, 1, 1, f(Yes, false, "")},
-	{0x108e, 0, 0, 0, f(Yes, false, "")},
-	{0x10fc, 0, 0, 0, g(Yes, No, false, false, "", "ნ")},
-	{0x10fd, 0, 0, 0, f(Yes, false, "")},
-	{0x1100, 0, 0, 0, f(Yes, true, "")},
-	{0x1113, 0, 0, 0, f(Yes, false, "")},
-	{0x1161, 0, 1, 1, f(Maybe, true, "")},
-	{0x1176, 0, 0, 0, f(Yes, false, "")},
-	{0x11a8, 0, 1, 1, f(Maybe, false, "")},
-	{0x11c3, 0, 0, 0, f(Yes, false, "")},
-	{0x135d, 230, 1, 1, f(Yes, false, "")},
-	{0x1360, 0, 0, 0, f(Yes, false, "")},
-	{0x1714, 9, 1, 1, f(Yes, false, "")},
-	{0x1715, 0, 0, 0, f(Yes, false, "")},
-	{0x1734, 9, 1, 1, f(Yes, false, "")},
-	{0x1735, 0, 0, 0, f(Yes, false, "")},
-	{0x17d2, 9, 1, 1, f(Yes, false, "")},
-	{0x17d3, 0, 0, 0, f(Yes, false, "")},
-	{0x17dd, 230, 1, 1, f(Yes, false, "")},
-	{0x17de, 0, 0, 0, f(Yes, false, "")},
-	{0x18a9, 228, 1, 1, f(Yes, false, "")},
-	{0x18aa, 0, 0, 0, f(Yes, false, "")},
-	{0x1939, 222, 1, 1, f(Yes, false, "")},
-	{0x193a, 230, 1, 1, f(Yes, false, "")},
-	{0x193b, 220, 1, 1, f(Yes, false, "")},
-	{0x193c, 0, 0, 0, f(Yes, false, "")},
-	{0x1a17, 230, 1, 1, f(Yes, false, "")},
-	{0x1a18, 220, 1, 1, f(Yes, false, "")},
-	{0x1a19, 0, 0, 0, f(Yes, false, "")},
-	{0x1a60, 9, 1, 1, f(Yes, false, "")},
-	{0x1a61, 0, 0, 0, f(Yes, false, "")},
-	{0x1a75, 230, 1, 1, f(Yes, false, "")},
-	{0x1a7d, 0, 0, 0, f(Yes, false, "")},
-	{0x1a7f, 220, 1, 1, f(Yes, false, "")},
-	{0x1a80, 0, 0, 0, f(Yes, false, "")},
-	{0x1ab0, 230, 1, 1, f(Yes, false, "")},
-	{0x1ab5, 220, 1, 1, f(Yes, false, "")},
-	{0x1abb, 230, 1, 1, f(Yes, false, "")},
-	{0x1abd, 220, 1, 1, f(Yes, false, "")},
-	{0x1abe, 0, 0, 0, f(Yes, false, "")},
-	{0x1b05, 0, 0, 0, f(Yes, true, "")},
-	{0x1b06, 0, 0, 1, f(Yes, false, "ᬆ")},
-	{0x1b07, 0, 0, 0, f(Yes, true, "")},
-	{0x1b08, 0, 0, 1, f(Yes, false, "ᬈ")},
-	{0x1b09, 0, 0, 0, f(Yes, true, "")},
-	{0x1b0a, 0, 0, 1, f(Yes, false, "ᬊ")},
-	{0x1b0b, 0, 0, 0, f(Yes, true, "")},
-	{0x1b0c, 0, 0, 1, f(Yes, false, "ᬌ")},
-	{0x1b0d, 0, 0, 0, f(Yes, true, "")},
-	{0x1b0e, 0, 0, 1, f(Yes, false, "ᬎ")},
-	{0x1b0f, 0, 0, 0, f(Yes, false, "")},
-	{0x1b11, 0, 0, 0, f(Yes, true, "")},
-	{0x1b12, 0, 0, 1, f(Yes, false, "ᬒ")},
-	{0x1b13, 0, 0, 0, f(Yes, false, "")},
-	{0x1b34, 7, 1, 1, f(Yes, false, "")},
-	{0x1b35, 0, 1, 1, f(Maybe, false, "")},
-	{0x1b36, 0, 0, 0, f(Yes, false, "")},
-	{0x1b3a, 0, 0, 0, f(Yes, true, "")},
-	{0x1b3b, 0, 0, 1, f(Yes, false, "ᬻ")},
-	{0x1b3c, 0, 0, 0, f(Yes, true, "")},
-	{0x1b3d, 0, 0, 1, f(Yes, false, "ᬽ")},
-	{0x1b3e, 0, 0, 0, f(Yes, true, "")},
-	{0x1b40, 0, 0, 1, f(Yes, false, "ᭀ")},
-	{0x1b41, 0, 0, 1, f(Yes, false, "ᭁ")},
-	{0x1b42, 0, 0, 0, f(Yes, true, "")},
-	{0x1b43, 0, 0, 1, f(Yes, false, "ᭃ")},
-	{0x1b44, 9, 1, 1, f(Yes, false, "")},
-	{0x1b45, 0, 0, 0, f(Yes, false, "")},
-	{0x1b6b, 230, 1, 1, f(Yes, false, "")},
-	{0x1b6c, 220, 1, 1, f(Yes, false, "")},
-	{0x1b6d, 230, 1, 1, f(Yes, false, "")},
-	{0x1b74, 0, 0, 0, f(Yes, false, "")},
-	{0x1baa, 9, 1, 1, f(Yes, false, "")},
-	{0x1bac, 0, 0, 0, f(Yes, false, "")},
-	{0x1be6, 7, 1, 1, f(Yes, false, "")},
-	{0x1be7, 0, 0, 0, f(Yes, false, "")},
-	{0x1bf2, 9, 1, 1, f(Yes, false, "")},
-	{0x1bf4, 0, 0, 0, f(Yes, false, "")},
-	{0x1c37, 7, 1, 1, f(Yes, false, "")},
-	{0x1c38, 0, 0, 0, f(Yes, false, "")},
-	{0x1cd0, 230, 1, 1, f(Yes, false, "")},
-	{0x1cd3, 0, 0, 0, f(Yes, false, "")},
-	{0x1cd4, 1, 1, 1, f(Yes, false, "")},
-	{0x1cd5, 220, 1, 1, f(Yes, false, "")},
-	{0x1cda, 230, 1, 1, f(Yes, false, "")},
-	{0x1cdc, 220, 1, 1, f(Yes, false, "")},
-	{0x1ce0, 230, 1, 1, f(Yes, false, "")},
-	{0x1ce1, 0, 0, 0, f(Yes, false, "")},
-	{0x1ce2, 1, 1, 1, f(Yes, false, "")},
-	{0x1ce9, 0, 0, 0, f(Yes, false, "")},
-	{0x1ced, 220, 1, 1, f(Yes, false, "")},
-	{0x1cee, 0, 0, 0, f(Yes, false, "")},
-	{0x1cf4, 230, 1, 1, f(Yes, false, "")},
-	{0x1cf5, 0, 0, 0, f(Yes, false, "")},
-	{0x1cf8, 230, 1, 1, f(Yes, false, "")},
-	{0x1cfa, 0, 0, 0, f(Yes, false, "")},
-	{0x1d2c, 0, 0, 0, g(Yes, No, false, false, "", "A")},
-	{0x1d2d, 0, 0, 0, g(Yes, No, false, false, "", "Æ")},
-	{0x1d2e, 0, 0, 0, g(Yes, No, false, false, "", "B")},
-	{0x1d2f, 0, 0, 0, f(Yes, false, "")},
-	{0x1d30, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x1d31, 0, 0, 0, g(Yes, No, false, false, "", "E")},
-	{0x1d32, 0, 0, 0, g(Yes, No, false, false, "", "Ǝ")},
-	{0x1d33, 0, 0, 0, g(Yes, No, false, false, "", "G")},
-	{0x1d34, 0, 0, 0, g(Yes, No, false, false, "", "H")},
-	{0x1d35, 0, 0, 0, g(Yes, No, false, false, "", "I")},
-	{0x1d36, 0, 0, 0, g(Yes, No, false, false, "", "J")},
-	{0x1d37, 0, 0, 0, g(Yes, No, false, false, "", "K")},
-	{0x1d38, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0x1d39, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0x1d3a, 0, 0, 0, g(Yes, No, false, false, "", "N")},
-	{0x1d3b, 0, 0, 0, f(Yes, false, "")},
-	{0x1d3c, 0, 0, 0, g(Yes, No, false, false, "", "O")},
-	{0x1d3d, 0, 0, 0, g(Yes, No, false, false, "", "Ȣ")},
-	{0x1d3e, 0, 0, 0, g(Yes, No, false, false, "", "P")},
-	{0x1d3f, 0, 0, 0, g(Yes, No, false, false, "", "R")},
-	{0x1d40, 0, 0, 0, g(Yes, No, false, false, "", "T")},
-	{0x1d41, 0, 0, 0, g(Yes, No, false, false, "", "U")},
-	{0x1d42, 0, 0, 0, g(Yes, No, false, false, "", "W")},
-	{0x1d43, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0x1d44, 0, 0, 0, g(Yes, No, false, false, "", "ɐ")},
-	{0x1d45, 0, 0, 0, g(Yes, No, false, false, "", "ɑ")},
-	{0x1d46, 0, 0, 0, g(Yes, No, false, false, "", "ᴂ")},
-	{0x1d47, 0, 0, 0, g(Yes, No, false, false, "", "b")},
-	{0x1d48, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0x1d49, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0x1d4a, 0, 0, 0, g(Yes, No, false, false, "", "ə")},
-	{0x1d4b, 0, 0, 0, g(Yes, No, false, false, "", "ɛ")},
-	{0x1d4c, 0, 0, 0, g(Yes, No, false, false, "", "ɜ")},
-	{0x1d4d, 0, 0, 0, g(Yes, No, false, false, "", "g")},
-	{0x1d4e, 0, 0, 0, f(Yes, false, "")},
-	{0x1d4f, 0, 0, 0, g(Yes, No, false, false, "", "k")},
-	{0x1d50, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0x1d51, 0, 0, 0, g(Yes, No, false, false, "", "ŋ")},
-	{0x1d52, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0x1d53, 0, 0, 0, g(Yes, No, false, false, "", "ɔ")},
-	{0x1d54, 0, 0, 0, g(Yes, No, false, false, "", "ᴖ")},
-	{0x1d55, 0, 0, 0, g(Yes, No, false, false, "", "ᴗ")},
-	{0x1d56, 0, 0, 0, g(Yes, No, false, false, "", "p")},
-	{0x1d57, 0, 0, 0, g(Yes, No, false, false, "", "t")},
-	{0x1d58, 0, 0, 0, g(Yes, No, false, false, "", "u")},
-	{0x1d59, 0, 0, 0, g(Yes, No, false, false, "", "ᴝ")},
-	{0x1d5a, 0, 0, 0, g(Yes, No, false, false, "", "ɯ")},
-	{0x1d5b, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0x1d5c, 0, 0, 0, g(Yes, No, false, false, "", "ᴥ")},
-	{0x1d5d, 0, 0, 0, g(Yes, No, false, false, "", "β")},
-	{0x1d5e, 0, 0, 0, g(Yes, No, false, false, "", "γ")},
-	{0x1d5f, 0, 0, 0, g(Yes, No, false, false, "", "δ")},
-	{0x1d60, 0, 0, 0, g(Yes, No, false, false, "", "φ")},
-	{0x1d61, 0, 0, 0, g(Yes, No, false, false, "", "χ")},
-	{0x1d62, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x1d63, 0, 0, 0, g(Yes, No, false, false, "", "r")},
-	{0x1d64, 0, 0, 0, g(Yes, No, false, false, "", "u")},
-	{0x1d65, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0x1d66, 0, 0, 0, g(Yes, No, false, false, "", "β")},
-	{0x1d67, 0, 0, 0, g(Yes, No, false, false, "", "γ")},
-	{0x1d68, 0, 0, 0, g(Yes, No, false, false, "", "ρ")},
-	{0x1d69, 0, 0, 0, g(Yes, No, false, false, "", "φ")},
-	{0x1d6a, 0, 0, 0, g(Yes, No, false, false, "", "χ")},
-	{0x1d6b, 0, 0, 0, f(Yes, false, "")},
-	{0x1d78, 0, 0, 0, g(Yes, No, false, false, "", "н")},
-	{0x1d79, 0, 0, 0, f(Yes, false, "")},
-	{0x1d9b, 0, 0, 0, g(Yes, No, false, false, "", "ɒ")},
-	{0x1d9c, 0, 0, 0, g(Yes, No, false, false, "", "c")},
-	{0x1d9d, 0, 0, 0, g(Yes, No, false, false, "", "ɕ")},
-	{0x1d9e, 0, 0, 0, g(Yes, No, false, false, "", "ð")},
-	{0x1d9f, 0, 0, 0, g(Yes, No, false, false, "", "ɜ")},
-	{0x1da0, 0, 0, 0, g(Yes, No, false, false, "", "f")},
-	{0x1da1, 0, 0, 0, g(Yes, No, false, false, "", "ɟ")},
-	{0x1da2, 0, 0, 0, g(Yes, No, false, false, "", "ɡ")},
-	{0x1da3, 0, 0, 0, g(Yes, No, false, false, "", "ɥ")},
-	{0x1da4, 0, 0, 0, g(Yes, No, false, false, "", "ɨ")},
-	{0x1da5, 0, 0, 0, g(Yes, No, false, false, "", "ɩ")},
-	{0x1da6, 0, 0, 0, g(Yes, No, false, false, "", "ɪ")},
-	{0x1da7, 0, 0, 0, g(Yes, No, false, false, "", "ᵻ")},
-	{0x1da8, 0, 0, 0, g(Yes, No, false, false, "", "ʝ")},
-	{0x1da9, 0, 0, 0, g(Yes, No, false, false, "", "ɭ")},
-	{0x1daa, 0, 0, 0, g(Yes, No, false, false, "", "ᶅ")},
-	{0x1dab, 0, 0, 0, g(Yes, No, false, false, "", "ʟ")},
-	{0x1dac, 0, 0, 0, g(Yes, No, false, false, "", "ɱ")},
-	{0x1dad, 0, 0, 0, g(Yes, No, false, false, "", "ɰ")},
-	{0x1dae, 0, 0, 0, g(Yes, No, false, false, "", "ɲ")},
-	{0x1daf, 0, 0, 0, g(Yes, No, false, false, "", "ɳ")},
-	{0x1db0, 0, 0, 0, g(Yes, No, false, false, "", "ɴ")},
-	{0x1db1, 0, 0, 0, g(Yes, No, false, false, "", "ɵ")},
-	{0x1db2, 0, 0, 0, g(Yes, No, false, false, "", "ɸ")},
-	{0x1db3, 0, 0, 0, g(Yes, No, false, false, "", "ʂ")},
-	{0x1db4, 0, 0, 0, g(Yes, No, false, false, "", "ʃ")},
-	{0x1db5, 0, 0, 0, g(Yes, No, false, false, "", "ƫ")},
-	{0x1db6, 0, 0, 0, g(Yes, No, false, false, "", "ʉ")},
-	{0x1db7, 0, 0, 0, g(Yes, No, false, false, "", "ʊ")},
-	{0x1db8, 0, 0, 0, g(Yes, No, false, false, "", "ᴜ")},
-	{0x1db9, 0, 0, 0, g(Yes, No, false, false, "", "ʋ")},
-	{0x1dba, 0, 0, 0, g(Yes, No, false, false, "", "ʌ")},
-	{0x1dbb, 0, 0, 0, g(Yes, No, false, false, "", "z")},
-	{0x1dbc, 0, 0, 0, g(Yes, No, false, false, "", "ʐ")},
-	{0x1dbd, 0, 0, 0, g(Yes, No, false, false, "", "ʑ")},
-	{0x1dbe, 0, 0, 0, g(Yes, No, false, false, "", "ʒ")},
-	{0x1dbf, 0, 0, 0, g(Yes, No, false, false, "", "θ")},
-	{0x1dc0, 230, 1, 1, f(Yes, false, "")},
-	{0x1dc2, 220, 1, 1, f(Yes, false, "")},
-	{0x1dc3, 230, 1, 1, f(Yes, false, "")},
-	{0x1dca, 220, 1, 1, f(Yes, false, "")},
-	{0x1dcb, 230, 1, 1, f(Yes, false, "")},
-	{0x1dcd, 234, 1, 1, f(Yes, false, "")},
-	{0x1dce, 214, 1, 1, f(Yes, false, "")},
-	{0x1dcf, 220, 1, 1, f(Yes, false, "")},
-	{0x1dd0, 202, 1, 1, f(Yes, false, "")},
-	{0x1dd1, 230, 1, 1, f(Yes, false, "")},
-	{0x1df6, 0, 0, 0, f(Yes, false, "")},
-	{0x1dfb, 230, 1, 1, f(Yes, false, "")},
-	{0x1dfc, 233, 1, 1, f(Yes, false, "")},
-	{0x1dfd, 220, 1, 1, f(Yes, false, "")},
-	{0x1dfe, 230, 1, 1, f(Yes, false, "")},
-	{0x1dff, 220, 1, 1, f(Yes, false, "")},
-	{0x1e00, 0, 0, 1, f(Yes, false, "Ḁ")},
-	{0x1e01, 0, 0, 1, f(Yes, false, "ḁ")},
-	{0x1e02, 0, 0, 1, f(Yes, false, "Ḃ")},
-	{0x1e03, 0, 0, 1, f(Yes, false, "ḃ")},
-	{0x1e04, 0, 0, 1, f(Yes, false, "Ḅ")},
-	{0x1e05, 0, 0, 1, f(Yes, false, "ḅ")},
-	{0x1e06, 0, 0, 1, f(Yes, false, "Ḇ")},
-	{0x1e07, 0, 0, 1, f(Yes, false, "ḇ")},
-	{0x1e08, 0, 0, 2, f(Yes, false, "Ḉ")},
-	{0x1e09, 0, 0, 2, f(Yes, false, "ḉ")},
-	{0x1e0a, 0, 0, 1, f(Yes, false, "Ḋ")},
-	{0x1e0b, 0, 0, 1, f(Yes, false, "ḋ")},
-	{0x1e0c, 0, 0, 1, f(Yes, false, "Ḍ")},
-	{0x1e0d, 0, 0, 1, f(Yes, false, "ḍ")},
-	{0x1e0e, 0, 0, 1, f(Yes, false, "Ḏ")},
-	{0x1e0f, 0, 0, 1, f(Yes, false, "ḏ")},
-	{0x1e10, 0, 0, 1, f(Yes, false, "Ḑ")},
-	{0x1e11, 0, 0, 1, f(Yes, false, "ḑ")},
-	{0x1e12, 0, 0, 1, f(Yes, false, "Ḓ")},
-	{0x1e13, 0, 0, 1, f(Yes, false, "ḓ")},
-	{0x1e14, 0, 0, 2, f(Yes, false, "Ḕ")},
-	{0x1e15, 0, 0, 2, f(Yes, false, "ḕ")},
-	{0x1e16, 0, 0, 2, f(Yes, false, "Ḗ")},
-	{0x1e17, 0, 0, 2, f(Yes, false, "ḗ")},
-	{0x1e18, 0, 0, 1, f(Yes, false, "Ḙ")},
-	{0x1e19, 0, 0, 1, f(Yes, false, "ḙ")},
-	{0x1e1a, 0, 0, 1, f(Yes, false, "Ḛ")},
-	{0x1e1b, 0, 0, 1, f(Yes, false, "ḛ")},
-	{0x1e1c, 0, 0, 2, f(Yes, false, "Ḝ")},
-	{0x1e1d, 0, 0, 2, f(Yes, false, "ḝ")},
-	{0x1e1e, 0, 0, 1, f(Yes, false, "Ḟ")},
-	{0x1e1f, 0, 0, 1, f(Yes, false, "ḟ")},
-	{0x1e20, 0, 0, 1, f(Yes, false, "Ḡ")},
-	{0x1e21, 0, 0, 1, f(Yes, false, "ḡ")},
-	{0x1e22, 0, 0, 1, f(Yes, false, "Ḣ")},
-	{0x1e23, 0, 0, 1, f(Yes, false, "ḣ")},
-	{0x1e24, 0, 0, 1, f(Yes, false, "Ḥ")},
-	{0x1e25, 0, 0, 1, f(Yes, false, "ḥ")},
-	{0x1e26, 0, 0, 1, f(Yes, false, "Ḧ")},
-	{0x1e27, 0, 0, 1, f(Yes, false, "ḧ")},
-	{0x1e28, 0, 0, 1, f(Yes, false, "Ḩ")},
-	{0x1e29, 0, 0, 1, f(Yes, false, "ḩ")},
-	{0x1e2a, 0, 0, 1, f(Yes, false, "Ḫ")},
-	{0x1e2b, 0, 0, 1, f(Yes, false, "ḫ")},
-	{0x1e2c, 0, 0, 1, f(Yes, false, "Ḭ")},
-	{0x1e2d, 0, 0, 1, f(Yes, false, "ḭ")},
-	{0x1e2e, 0, 0, 2, f(Yes, false, "Ḯ")},
-	{0x1e2f, 0, 0, 2, f(Yes, false, "ḯ")},
-	{0x1e30, 0, 0, 1, f(Yes, false, "Ḱ")},
-	{0x1e31, 0, 0, 1, f(Yes, false, "ḱ")},
-	{0x1e32, 0, 0, 1, f(Yes, false, "Ḳ")},
-	{0x1e33, 0, 0, 1, f(Yes, false, "ḳ")},
-	{0x1e34, 0, 0, 1, f(Yes, false, "Ḵ")},
-	{0x1e35, 0, 0, 1, f(Yes, false, "ḵ")},
-	{0x1e36, 0, 0, 1, f(Yes, true, "Ḷ")},
-	{0x1e37, 0, 0, 1, f(Yes, true, "ḷ")},
-	{0x1e38, 0, 0, 2, f(Yes, false, "Ḹ")},
-	{0x1e39, 0, 0, 2, f(Yes, false, "ḹ")},
-	{0x1e3a, 0, 0, 1, f(Yes, false, "Ḻ")},
-	{0x1e3b, 0, 0, 1, f(Yes, false, "ḻ")},
-	{0x1e3c, 0, 0, 1, f(Yes, false, "Ḽ")},
-	{0x1e3d, 0, 0, 1, f(Yes, false, "ḽ")},
-	{0x1e3e, 0, 0, 1, f(Yes, false, "Ḿ")},
-	{0x1e3f, 0, 0, 1, f(Yes, false, "ḿ")},
-	{0x1e40, 0, 0, 1, f(Yes, false, "Ṁ")},
-	{0x1e41, 0, 0, 1, f(Yes, false, "ṁ")},
-	{0x1e42, 0, 0, 1, f(Yes, false, "Ṃ")},
-	{0x1e43, 0, 0, 1, f(Yes, false, "ṃ")},
-	{0x1e44, 0, 0, 1, f(Yes, false, "Ṅ")},
-	{0x1e45, 0, 0, 1, f(Yes, false, "ṅ")},
-	{0x1e46, 0, 0, 1, f(Yes, false, "Ṇ")},
-	{0x1e47, 0, 0, 1, f(Yes, false, "ṇ")},
-	{0x1e48, 0, 0, 1, f(Yes, false, "Ṉ")},
-	{0x1e49, 0, 0, 1, f(Yes, false, "ṉ")},
-	{0x1e4a, 0, 0, 1, f(Yes, false, "Ṋ")},
-	{0x1e4b, 0, 0, 1, f(Yes, false, "ṋ")},
-	{0x1e4c, 0, 0, 2, f(Yes, false, "Ṍ")},
-	{0x1e4d, 0, 0, 2, f(Yes, false, "ṍ")},
-	{0x1e4e, 0, 0, 2, f(Yes, false, "Ṏ")},
-	{0x1e4f, 0, 0, 2, f(Yes, false, "ṏ")},
-	{0x1e50, 0, 0, 2, f(Yes, false, "Ṑ")},
-	{0x1e51, 0, 0, 2, f(Yes, false, "ṑ")},
-	{0x1e52, 0, 0, 2, f(Yes, false, "Ṓ")},
-	{0x1e53, 0, 0, 2, f(Yes, false, "ṓ")},
-	{0x1e54, 0, 0, 1, f(Yes, false, "Ṕ")},
-	{0x1e55, 0, 0, 1, f(Yes, false, "ṕ")},
-	{0x1e56, 0, 0, 1, f(Yes, false, "Ṗ")},
-	{0x1e57, 0, 0, 1, f(Yes, false, "ṗ")},
-	{0x1e58, 0, 0, 1, f(Yes, false, "Ṙ")},
-	{0x1e59, 0, 0, 1, f(Yes, false, "ṙ")},
-	{0x1e5a, 0, 0, 1, f(Yes, true, "Ṛ")},
-	{0x1e5b, 0, 0, 1, f(Yes, true, "ṛ")},
-	{0x1e5c, 0, 0, 2, f(Yes, false, "Ṝ")},
-	{0x1e5d, 0, 0, 2, f(Yes, false, "ṝ")},
-	{0x1e5e, 0, 0, 1, f(Yes, false, "Ṟ")},
-	{0x1e5f, 0, 0, 1, f(Yes, false, "ṟ")},
-	{0x1e60, 0, 0, 1, f(Yes, false, "Ṡ")},
-	{0x1e61, 0, 0, 1, f(Yes, false, "ṡ")},
-	{0x1e62, 0, 0, 1, f(Yes, true, "Ṣ")},
-	{0x1e63, 0, 0, 1, f(Yes, true, "ṣ")},
-	{0x1e64, 0, 0, 2, f(Yes, false, "Ṥ")},
-	{0x1e65, 0, 0, 2, f(Yes, false, "ṥ")},
-	{0x1e66, 0, 0, 2, f(Yes, false, "Ṧ")},
-	{0x1e67, 0, 0, 2, f(Yes, false, "ṧ")},
-	{0x1e68, 0, 0, 2, f(Yes, false, "Ṩ")},
-	{0x1e69, 0, 0, 2, f(Yes, false, "ṩ")},
-	{0x1e6a, 0, 0, 1, f(Yes, false, "Ṫ")},
-	{0x1e6b, 0, 0, 1, f(Yes, false, "ṫ")},
-	{0x1e6c, 0, 0, 1, f(Yes, false, "Ṭ")},
-	{0x1e6d, 0, 0, 1, f(Yes, false, "ṭ")},
-	{0x1e6e, 0, 0, 1, f(Yes, false, "Ṯ")},
-	{0x1e6f, 0, 0, 1, f(Yes, false, "ṯ")},
-	{0x1e70, 0, 0, 1, f(Yes, false, "Ṱ")},
-	{0x1e71, 0, 0, 1, f(Yes, false, "ṱ")},
-	{0x1e72, 0, 0, 1, f(Yes, false, "Ṳ")},
-	{0x1e73, 0, 0, 1, f(Yes, false, "ṳ")},
-	{0x1e74, 0, 0, 1, f(Yes, false, "Ṵ")},
-	{0x1e75, 0, 0, 1, f(Yes, false, "ṵ")},
-	{0x1e76, 0, 0, 1, f(Yes, false, "Ṷ")},
-	{0x1e77, 0, 0, 1, f(Yes, false, "ṷ")},
-	{0x1e78, 0, 0, 2, f(Yes, false, "Ṹ")},
-	{0x1e79, 0, 0, 2, f(Yes, false, "ṹ")},
-	{0x1e7a, 0, 0, 2, f(Yes, false, "Ṻ")},
-	{0x1e7b, 0, 0, 2, f(Yes, false, "ṻ")},
-	{0x1e7c, 0, 0, 1, f(Yes, false, "Ṽ")},
-	{0x1e7d, 0, 0, 1, f(Yes, false, "ṽ")},
-	{0x1e7e, 0, 0, 1, f(Yes, false, "Ṿ")},
-	{0x1e7f, 0, 0, 1, f(Yes, false, "ṿ")},
-	{0x1e80, 0, 0, 1, f(Yes, false, "Ẁ")},
-	{0x1e81, 0, 0, 1, f(Yes, false, "ẁ")},
-	{0x1e82, 0, 0, 1, f(Yes, false, "Ẃ")},
-	{0x1e83, 0, 0, 1, f(Yes, false, "ẃ")},
-	{0x1e84, 0, 0, 1, f(Yes, false, "Ẅ")},
-	{0x1e85, 0, 0, 1, f(Yes, false, "ẅ")},
-	{0x1e86, 0, 0, 1, f(Yes, false, "Ẇ")},
-	{0x1e87, 0, 0, 1, f(Yes, false, "ẇ")},
-	{0x1e88, 0, 0, 1, f(Yes, false, "Ẉ")},
-	{0x1e89, 0, 0, 1, f(Yes, false, "ẉ")},
-	{0x1e8a, 0, 0, 1, f(Yes, false, "Ẋ")},
-	{0x1e8b, 0, 0, 1, f(Yes, false, "ẋ")},
-	{0x1e8c, 0, 0, 1, f(Yes, false, "Ẍ")},
-	{0x1e8d, 0, 0, 1, f(Yes, false, "ẍ")},
-	{0x1e8e, 0, 0, 1, f(Yes, false, "Ẏ")},
-	{0x1e8f, 0, 0, 1, f(Yes, false, "ẏ")},
-	{0x1e90, 0, 0, 1, f(Yes, false, "Ẑ")},
-	{0x1e91, 0, 0, 1, f(Yes, false, "ẑ")},
-	{0x1e92, 0, 0, 1, f(Yes, false, "Ẓ")},
-	{0x1e93, 0, 0, 1, f(Yes, false, "ẓ")},
-	{0x1e94, 0, 0, 1, f(Yes, false, "Ẕ")},
-	{0x1e95, 0, 0, 1, f(Yes, false, "ẕ")},
-	{0x1e96, 0, 0, 1, f(Yes, false, "ẖ")},
-	{0x1e97, 0, 0, 1, f(Yes, false, "ẗ")},
-	{0x1e98, 0, 0, 1, f(Yes, false, "ẘ")},
-	{0x1e99, 0, 0, 1, f(Yes, false, "ẙ")},
-	{0x1e9a, 0, 0, 0, g(Yes, No, false, false, "", "aʾ")},
-	{0x1e9b, 0, 0, 1, g(Yes, No, false, false, "ẛ", "ṡ")},
-	{0x1e9c, 0, 0, 0, f(Yes, false, "")},
-	{0x1ea0, 0, 0, 1, f(Yes, true, "Ạ")},
-	{0x1ea1, 0, 0, 1, f(Yes, true, "ạ")},
-	{0x1ea2, 0, 0, 1, f(Yes, false, "Ả")},
-	{0x1ea3, 0, 0, 1, f(Yes, false, "ả")},
-	{0x1ea4, 0, 0, 2, f(Yes, false, "Ấ")},
-	{0x1ea5, 0, 0, 2, f(Yes, false, "ấ")},
-	{0x1ea6, 0, 0, 2, f(Yes, false, "Ầ")},
-	{0x1ea7, 0, 0, 2, f(Yes, false, "ầ")},
-	{0x1ea8, 0, 0, 2, f(Yes, false, "Ẩ")},
-	{0x1ea9, 0, 0, 2, f(Yes, false, "ẩ")},
-	{0x1eaa, 0, 0, 2, f(Yes, false, "Ẫ")},
-	{0x1eab, 0, 0, 2, f(Yes, false, "ẫ")},
-	{0x1eac, 0, 0, 2, f(Yes, false, "Ậ")},
-	{0x1ead, 0, 0, 2, f(Yes, false, "ậ")},
-	{0x1eae, 0, 0, 2, f(Yes, false, "Ắ")},
-	{0x1eaf, 0, 0, 2, f(Yes, false, "ắ")},
-	{0x1eb0, 0, 0, 2, f(Yes, false, "Ằ")},
-	{0x1eb1, 0, 0, 2, f(Yes, false, "ằ")},
-	{0x1eb2, 0, 0, 2, f(Yes, false, "Ẳ")},
-	{0x1eb3, 0, 0, 2, f(Yes, false, "ẳ")},
-	{0x1eb4, 0, 0, 2, f(Yes, false, "Ẵ")},
-	{0x1eb5, 0, 0, 2, f(Yes, false, "ẵ")},
-	{0x1eb6, 0, 0, 2, f(Yes, false, "Ặ")},
-	{0x1eb7, 0, 0, 2, f(Yes, false, "ặ")},
-	{0x1eb8, 0, 0, 1, f(Yes, true, "Ẹ")},
-	{0x1eb9, 0, 0, 1, f(Yes, true, "ẹ")},
-	{0x1eba, 0, 0, 1, f(Yes, false, "Ẻ")},
-	{0x1ebb, 0, 0, 1, f(Yes, false, "ẻ")},
-	{0x1ebc, 0, 0, 1, f(Yes, false, "Ẽ")},
-	{0x1ebd, 0, 0, 1, f(Yes, false, "ẽ")},
-	{0x1ebe, 0, 0, 2, f(Yes, false, "Ế")},
-	{0x1ebf, 0, 0, 2, f(Yes, false, "ế")},
-	{0x1ec0, 0, 0, 2, f(Yes, false, "Ề")},
-	{0x1ec1, 0, 0, 2, f(Yes, false, "ề")},
-	{0x1ec2, 0, 0, 2, f(Yes, false, "Ể")},
-	{0x1ec3, 0, 0, 2, f(Yes, false, "ể")},
-	{0x1ec4, 0, 0, 2, f(Yes, false, "Ễ")},
-	{0x1ec5, 0, 0, 2, f(Yes, false, "ễ")},
-	{0x1ec6, 0, 0, 2, f(Yes, false, "Ệ")},
-	{0x1ec7, 0, 0, 2, f(Yes, false, "ệ")},
-	{0x1ec8, 0, 0, 1, f(Yes, false, "Ỉ")},
-	{0x1ec9, 0, 0, 1, f(Yes, false, "ỉ")},
-	{0x1eca, 0, 0, 1, f(Yes, false, "Ị")},
-	{0x1ecb, 0, 0, 1, f(Yes, false, "ị")},
-	{0x1ecc, 0, 0, 1, f(Yes, true, "Ọ")},
-	{0x1ecd, 0, 0, 1, f(Yes, true, "ọ")},
-	{0x1ece, 0, 0, 1, f(Yes, false, "Ỏ")},
-	{0x1ecf, 0, 0, 1, f(Yes, false, "ỏ")},
-	{0x1ed0, 0, 0, 2, f(Yes, false, "Ố")},
-	{0x1ed1, 0, 0, 2, f(Yes, false, "ố")},
-	{0x1ed2, 0, 0, 2, f(Yes, false, "Ồ")},
-	{0x1ed3, 0, 0, 2, f(Yes, false, "ồ")},
-	{0x1ed4, 0, 0, 2, f(Yes, false, "Ổ")},
-	{0x1ed5, 0, 0, 2, f(Yes, false, "ổ")},
-	{0x1ed6, 0, 0, 2, f(Yes, false, "Ỗ")},
-	{0x1ed7, 0, 0, 2, f(Yes, false, "ỗ")},
-	{0x1ed8, 0, 0, 2, f(Yes, false, "Ộ")},
-	{0x1ed9, 0, 0, 2, f(Yes, false, "ộ")},
-	{0x1eda, 0, 0, 2, f(Yes, false, "Ớ")},
-	{0x1edb, 0, 0, 2, f(Yes, false, "ớ")},
-	{0x1edc, 0, 0, 2, f(Yes, false, "Ờ")},
-	{0x1edd, 0, 0, 2, f(Yes, false, "ờ")},
-	{0x1ede, 0, 0, 2, f(Yes, false, "Ở")},
-	{0x1edf, 0, 0, 2, f(Yes, false, "ở")},
-	{0x1ee0, 0, 0, 2, f(Yes, false, "Ỡ")},
-	{0x1ee1, 0, 0, 2, f(Yes, false, "ỡ")},
-	{0x1ee2, 0, 0, 2, f(Yes, false, "Ợ")},
-	{0x1ee3, 0, 0, 2, f(Yes, false, "ợ")},
-	{0x1ee4, 0, 0, 1, f(Yes, false, "Ụ")},
-	{0x1ee5, 0, 0, 1, f(Yes, false, "ụ")},
-	{0x1ee6, 0, 0, 1, f(Yes, false, "Ủ")},
-	{0x1ee7, 0, 0, 1, f(Yes, false, "ủ")},
-	{0x1ee8, 0, 0, 2, f(Yes, false, "Ứ")},
-	{0x1ee9, 0, 0, 2, f(Yes, false, "ứ")},
-	{0x1eea, 0, 0, 2, f(Yes, false, "Ừ")},
-	{0x1eeb, 0, 0, 2, f(Yes, false, "ừ")},
-	{0x1eec, 0, 0, 2, f(Yes, false, "Ử")},
-	{0x1eed, 0, 0, 2, f(Yes, false, "ử")},
-	{0x1eee, 0, 0, 2, f(Yes, false, "Ữ")},
-	{0x1eef, 0, 0, 2, f(Yes, false, "ữ")},
-	{0x1ef0, 0, 0, 2, f(Yes, false, "Ự")},
-	{0x1ef1, 0, 0, 2, f(Yes, false, "ự")},
-	{0x1ef2, 0, 0, 1, f(Yes, false, "Ỳ")},
-	{0x1ef3, 0, 0, 1, f(Yes, false, "ỳ")},
-	{0x1ef4, 0, 0, 1, f(Yes, false, "Ỵ")},
-	{0x1ef5, 0, 0, 1, f(Yes, false, "ỵ")},
-	{0x1ef6, 0, 0, 1, f(Yes, false, "Ỷ")},
-	{0x1ef7, 0, 0, 1, f(Yes, false, "ỷ")},
-	{0x1ef8, 0, 0, 1, f(Yes, false, "Ỹ")},
-	{0x1ef9, 0, 0, 1, f(Yes, false, "ỹ")},
-	{0x1efa, 0, 0, 0, f(Yes, false, "")},
-	{0x1f00, 0, 0, 1, f(Yes, true, "ἀ")},
-	{0x1f01, 0, 0, 1, f(Yes, true, "ἁ")},
-	{0x1f02, 0, 0, 2, f(Yes, true, "ἂ")},
-	{0x1f03, 0, 0, 2, f(Yes, true, "ἃ")},
-	{0x1f04, 0, 0, 2, f(Yes, true, "ἄ")},
-	{0x1f05, 0, 0, 2, f(Yes, true, "ἅ")},
-	{0x1f06, 0, 0, 2, f(Yes, true, "ἆ")},
-	{0x1f07, 0, 0, 2, f(Yes, true, "ἇ")},
-	{0x1f08, 0, 0, 1, f(Yes, true, "Ἀ")},
-	{0x1f09, 0, 0, 1, f(Yes, true, "Ἁ")},
-	{0x1f0a, 0, 0, 2, f(Yes, true, "Ἂ")},
-	{0x1f0b, 0, 0, 2, f(Yes, true, "Ἃ")},
-	{0x1f0c, 0, 0, 2, f(Yes, true, "Ἄ")},
-	{0x1f0d, 0, 0, 2, f(Yes, true, "Ἅ")},
-	{0x1f0e, 0, 0, 2, f(Yes, true, "Ἆ")},
-	{0x1f0f, 0, 0, 2, f(Yes, true, "Ἇ")},
-	{0x1f10, 0, 0, 1, f(Yes, true, "ἐ")},
-	{0x1f11, 0, 0, 1, f(Yes, true, "ἑ")},
-	{0x1f12, 0, 0, 2, f(Yes, false, "ἒ")},
-	{0x1f13, 0, 0, 2, f(Yes, false, "ἓ")},
-	{0x1f14, 0, 0, 2, f(Yes, false, "ἔ")},
-	{0x1f15, 0, 0, 2, f(Yes, false, "ἕ")},
-	{0x1f16, 0, 0, 0, f(Yes, false, "")},
-	{0x1f18, 0, 0, 1, f(Yes, true, "Ἐ")},
-	{0x1f19, 0, 0, 1, f(Yes, true, "Ἑ")},
-	{0x1f1a, 0, 0, 2, f(Yes, false, "Ἒ")},
-	{0x1f1b, 0, 0, 2, f(Yes, false, "Ἓ")},
-	{0x1f1c, 0, 0, 2, f(Yes, false, "Ἔ")},
-	{0x1f1d, 0, 0, 2, f(Yes, false, "Ἕ")},
-	{0x1f1e, 0, 0, 0, f(Yes, false, "")},
-	{0x1f20, 0, 0, 1, f(Yes, true, "ἠ")},
-	{0x1f21, 0, 0, 1, f(Yes, true, "ἡ")},
-	{0x1f22, 0, 0, 2, f(Yes, true, "ἢ")},
-	{0x1f23, 0, 0, 2, f(Yes, true, "ἣ")},
-	{0x1f24, 0, 0, 2, f(Yes, true, "ἤ")},
-	{0x1f25, 0, 0, 2, f(Yes, true, "ἥ")},
-	{0x1f26, 0, 0, 2, f(Yes, true, "ἦ")},
-	{0x1f27, 0, 0, 2, f(Yes, true, "ἧ")},
-	{0x1f28, 0, 0, 1, f(Yes, true, "Ἠ")},
-	{0x1f29, 0, 0, 1, f(Yes, true, "Ἡ")},
-	{0x1f2a, 0, 0, 2, f(Yes, true, "Ἢ")},
-	{0x1f2b, 0, 0, 2, f(Yes, true, "Ἣ")},
-	{0x1f2c, 0, 0, 2, f(Yes, true, "Ἤ")},
-	{0x1f2d, 0, 0, 2, f(Yes, true, "Ἥ")},
-	{0x1f2e, 0, 0, 2, f(Yes, true, "Ἦ")},
-	{0x1f2f, 0, 0, 2, f(Yes, true, "Ἧ")},
-	{0x1f30, 0, 0, 1, f(Yes, true, "ἰ")},
-	{0x1f31, 0, 0, 1, f(Yes, true, "ἱ")},
-	{0x1f32, 0, 0, 2, f(Yes, false, "ἲ")},
-	{0x1f33, 0, 0, 2, f(Yes, false, "ἳ")},
-	{0x1f34, 0, 0, 2, f(Yes, false, "ἴ")},
-	{0x1f35, 0, 0, 2, f(Yes, false, "ἵ")},
-	{0x1f36, 0, 0, 2, f(Yes, false, "ἶ")},
-	{0x1f37, 0, 0, 2, f(Yes, false, "ἷ")},
-	{0x1f38, 0, 0, 1, f(Yes, true, "Ἰ")},
-	{0x1f39, 0, 0, 1, f(Yes, true, "Ἱ")},
-	{0x1f3a, 0, 0, 2, f(Yes, false, "Ἲ")},
-	{0x1f3b, 0, 0, 2, f(Yes, false, "Ἳ")},
-	{0x1f3c, 0, 0, 2, f(Yes, false, "Ἴ")},
-	{0x1f3d, 0, 0, 2, f(Yes, false, "Ἵ")},
-	{0x1f3e, 0, 0, 2, f(Yes, false, "Ἶ")},
-	{0x1f3f, 0, 0, 2, f(Yes, false, "Ἷ")},
-	{0x1f40, 0, 0, 1, f(Yes, true, "ὀ")},
-	{0x1f41, 0, 0, 1, f(Yes, true, "ὁ")},
-	{0x1f42, 0, 0, 2, f(Yes, false, "ὂ")},
-	{0x1f43, 0, 0, 2, f(Yes, false, "ὃ")},
-	{0x1f44, 0, 0, 2, f(Yes, false, "ὄ")},
-	{0x1f45, 0, 0, 2, f(Yes, false, "ὅ")},
-	{0x1f46, 0, 0, 0, f(Yes, false, "")},
-	{0x1f48, 0, 0, 1, f(Yes, true, "Ὀ")},
-	{0x1f49, 0, 0, 1, f(Yes, true, "Ὁ")},
-	{0x1f4a, 0, 0, 2, f(Yes, false, "Ὂ")},
-	{0x1f4b, 0, 0, 2, f(Yes, false, "Ὃ")},
-	{0x1f4c, 0, 0, 2, f(Yes, false, "Ὄ")},
-	{0x1f4d, 0, 0, 2, f(Yes, false, "Ὅ")},
-	{0x1f4e, 0, 0, 0, f(Yes, false, "")},
-	{0x1f50, 0, 0, 1, f(Yes, true, "ὐ")},
-	{0x1f51, 0, 0, 1, f(Yes, true, "ὑ")},
-	{0x1f52, 0, 0, 2, f(Yes, false, "ὒ")},
-	{0x1f53, 0, 0, 2, f(Yes, false, "ὓ")},
-	{0x1f54, 0, 0, 2, f(Yes, false, "ὔ")},
-	{0x1f55, 0, 0, 2, f(Yes, false, "ὕ")},
-	{0x1f56, 0, 0, 2, f(Yes, false, "ὖ")},
-	{0x1f57, 0, 0, 2, f(Yes, false, "ὗ")},
-	{0x1f58, 0, 0, 0, f(Yes, false, "")},
-	{0x1f59, 0, 0, 1, f(Yes, true, "Ὑ")},
-	{0x1f5a, 0, 0, 0, f(Yes, false, "")},
-	{0x1f5b, 0, 0, 2, f(Yes, false, "Ὓ")},
-	{0x1f5c, 0, 0, 0, f(Yes, false, "")},
-	{0x1f5d, 0, 0, 2, f(Yes, false, "Ὕ")},
-	{0x1f5e, 0, 0, 0, f(Yes, false, "")},
-	{0x1f5f, 0, 0, 2, f(Yes, false, "Ὗ")},
-	{0x1f60, 0, 0, 1, f(Yes, true, "ὠ")},
-	{0x1f61, 0, 0, 1, f(Yes, true, "ὡ")},
-	{0x1f62, 0, 0, 2, f(Yes, true, "ὢ")},
-	{0x1f63, 0, 0, 2, f(Yes, true, "ὣ")},
-	{0x1f64, 0, 0, 2, f(Yes, true, "ὤ")},
-	{0x1f65, 0, 0, 2, f(Yes, true, "ὥ")},
-	{0x1f66, 0, 0, 2, f(Yes, true, "ὦ")},
-	{0x1f67, 0, 0, 2, f(Yes, true, "ὧ")},
-	{0x1f68, 0, 0, 1, f(Yes, true, "Ὠ")},
-	{0x1f69, 0, 0, 1, f(Yes, true, "Ὡ")},
-	{0x1f6a, 0, 0, 2, f(Yes, true, "Ὢ")},
-	{0x1f6b, 0, 0, 2, f(Yes, true, "Ὣ")},
-	{0x1f6c, 0, 0, 2, f(Yes, true, "Ὤ")},
-	{0x1f6d, 0, 0, 2, f(Yes, true, "Ὥ")},
-	{0x1f6e, 0, 0, 2, f(Yes, true, "Ὦ")},
-	{0x1f6f, 0, 0, 2, f(Yes, true, "Ὧ")},
-	{0x1f70, 0, 0, 1, f(Yes, true, "ὰ")},
-	{0x1f71, 0, 0, 1, f(No, false, "ά")},
-	{0x1f72, 0, 0, 1, f(Yes, false, "ὲ")},
-	{0x1f73, 0, 0, 1, f(No, false, "έ")},
-	{0x1f74, 0, 0, 1, f(Yes, true, "ὴ")},
-	{0x1f75, 0, 0, 1, f(No, false, "ή")},
-	{0x1f76, 0, 0, 1, f(Yes, false, "ὶ")},
-	{0x1f77, 0, 0, 1, f(No, false, "ί")},
-	{0x1f78, 0, 0, 1, f(Yes, false, "ὸ")},
-	{0x1f79, 0, 0, 1, f(No, false, "ό")},
-	{0x1f7a, 0, 0, 1, f(Yes, false, "ὺ")},
-	{0x1f7b, 0, 0, 1, f(No, false, "ύ")},
-	{0x1f7c, 0, 0, 1, f(Yes, true, "ὼ")},
-	{0x1f7d, 0, 0, 1, f(No, false, "ώ")},
-	{0x1f7e, 0, 0, 0, f(Yes, false, "")},
-	{0x1f80, 0, 0, 2, f(Yes, false, "ᾀ")},
-	{0x1f81, 0, 0, 2, f(Yes, false, "ᾁ")},
-	{0x1f82, 0, 0, 3, f(Yes, false, "ᾂ")},
-	{0x1f83, 0, 0, 3, f(Yes, false, "ᾃ")},
-	{0x1f84, 0, 0, 3, f(Yes, false, "ᾄ")},
-	{0x1f85, 0, 0, 3, f(Yes, false, "ᾅ")},
-	{0x1f86, 0, 0, 3, f(Yes, false, "ᾆ")},
-	{0x1f87, 0, 0, 3, f(Yes, false, "ᾇ")},
-	{0x1f88, 0, 0, 2, f(Yes, false, "ᾈ")},
-	{0x1f89, 0, 0, 2, f(Yes, false, "ᾉ")},
-	{0x1f8a, 0, 0, 3, f(Yes, false, "ᾊ")},
-	{0x1f8b, 0, 0, 3, f(Yes, false, "ᾋ")},
-	{0x1f8c, 0, 0, 3, f(Yes, false, "ᾌ")},
-	{0x1f8d, 0, 0, 3, f(Yes, false, "ᾍ")},
-	{0x1f8e, 0, 0, 3, f(Yes, false, "ᾎ")},
-	{0x1f8f, 0, 0, 3, f(Yes, false, "ᾏ")},
-	{0x1f90, 0, 0, 2, f(Yes, false, "ᾐ")},
-	{0x1f91, 0, 0, 2, f(Yes, false, "ᾑ")},
-	{0x1f92, 0, 0, 3, f(Yes, false, "ᾒ")},
-	{0x1f93, 0, 0, 3, f(Yes, false, "ᾓ")},
-	{0x1f94, 0, 0, 3, f(Yes, false, "ᾔ")},
-	{0x1f95, 0, 0, 3, f(Yes, false, "ᾕ")},
-	{0x1f96, 0, 0, 3, f(Yes, false, "ᾖ")},
-	{0x1f97, 0, 0, 3, f(Yes, false, "ᾗ")},
-	{0x1f98, 0, 0, 2, f(Yes, false, "ᾘ")},
-	{0x1f99, 0, 0, 2, f(Yes, false, "ᾙ")},
-	{0x1f9a, 0, 0, 3, f(Yes, false, "ᾚ")},
-	{0x1f9b, 0, 0, 3, f(Yes, false, "ᾛ")},
-	{0x1f9c, 0, 0, 3, f(Yes, false, "ᾜ")},
-	{0x1f9d, 0, 0, 3, f(Yes, false, "ᾝ")},
-	{0x1f9e, 0, 0, 3, f(Yes, false, "ᾞ")},
-	{0x1f9f, 0, 0, 3, f(Yes, false, "ᾟ")},
-	{0x1fa0, 0, 0, 2, f(Yes, false, "ᾠ")},
-	{0x1fa1, 0, 0, 2, f(Yes, false, "ᾡ")},
-	{0x1fa2, 0, 0, 3, f(Yes, false, "ᾢ")},
-	{0x1fa3, 0, 0, 3, f(Yes, false, "ᾣ")},
-	{0x1fa4, 0, 0, 3, f(Yes, false, "ᾤ")},
-	{0x1fa5, 0, 0, 3, f(Yes, false, "ᾥ")},
-	{0x1fa6, 0, 0, 3, f(Yes, false, "ᾦ")},
-	{0x1fa7, 0, 0, 3, f(Yes, false, "ᾧ")},
-	{0x1fa8, 0, 0, 2, f(Yes, false, "ᾨ")},
-	{0x1fa9, 0, 0, 2, f(Yes, false, "ᾩ")},
-	{0x1faa, 0, 0, 3, f(Yes, false, "ᾪ")},
-	{0x1fab, 0, 0, 3, f(Yes, false, "ᾫ")},
-	{0x1fac, 0, 0, 3, f(Yes, false, "ᾬ")},
-	{0x1fad, 0, 0, 3, f(Yes, false, "ᾭ")},
-	{0x1fae, 0, 0, 3, f(Yes, false, "ᾮ")},
-	{0x1faf, 0, 0, 3, f(Yes, false, "ᾯ")},
-	{0x1fb0, 0, 0, 1, f(Yes, false, "ᾰ")},
-	{0x1fb1, 0, 0, 1, f(Yes, false, "ᾱ")},
-	{0x1fb2, 0, 0, 2, f(Yes, false, "ᾲ")},
-	{0x1fb3, 0, 0, 1, f(Yes, false, "ᾳ")},
-	{0x1fb4, 0, 0, 2, f(Yes, false, "ᾴ")},
-	{0x1fb5, 0, 0, 0, f(Yes, false, "")},
-	{0x1fb6, 0, 0, 1, f(Yes, true, "ᾶ")},
-	{0x1fb7, 0, 0, 2, f(Yes, false, "ᾷ")},
-	{0x1fb8, 0, 0, 1, f(Yes, false, "Ᾰ")},
-	{0x1fb9, 0, 0, 1, f(Yes, false, "Ᾱ")},
-	{0x1fba, 0, 0, 1, f(Yes, false, "Ὰ")},
-	{0x1fbb, 0, 0, 1, f(No, false, "Ά")},
-	{0x1fbc, 0, 0, 1, f(Yes, false, "ᾼ")},
-	{0x1fbd, 0, 0, 1, g(Yes, No, false, false, "", " ̓")},
-	{0x1fbe, 0, 0, 0, f(No, false, "ι")},
-	{0x1fbf, 0, 0, 1, g(Yes, No, true, false, "", " ̓")},
-	{0x1fc0, 0, 0, 1, g(Yes, No, false, false, "", " ͂")},
-	{0x1fc1, 0, 0, 2, g(Yes, No, false, false, "῁", " ̈͂")},
-	{0x1fc2, 0, 0, 2, f(Yes, false, "ῂ")},
-	{0x1fc3, 0, 0, 1, f(Yes, false, "ῃ")},
-	{0x1fc4, 0, 0, 2, f(Yes, false, "ῄ")},
-	{0x1fc5, 0, 0, 0, f(Yes, false, "")},
-	{0x1fc6, 0, 0, 1, f(Yes, true, "ῆ")},
-	{0x1fc7, 0, 0, 2, f(Yes, false, "ῇ")},
-	{0x1fc8, 0, 0, 1, f(Yes, false, "Ὲ")},
-	{0x1fc9, 0, 0, 1, f(No, false, "Έ")},
-	{0x1fca, 0, 0, 1, f(Yes, false, "Ὴ")},
-	{0x1fcb, 0, 0, 1, f(No, false, "Ή")},
-	{0x1fcc, 0, 0, 1, f(Yes, false, "ῌ")},
-	{0x1fcd, 0, 0, 2, g(Yes, No, false, false, "῍", " ̓̀")},
-	{0x1fce, 0, 0, 2, g(Yes, No, false, false, "῎", " ̓́")},
-	{0x1fcf, 0, 0, 2, g(Yes, No, false, false, "῏", " ̓͂")},
-	{0x1fd0, 0, 0, 1, f(Yes, false, "ῐ")},
-	{0x1fd1, 0, 0, 1, f(Yes, false, "ῑ")},
-	{0x1fd2, 0, 0, 2, f(Yes, false, "ῒ")},
-	{0x1fd3, 0, 0, 2, f(No, false, "ΐ")},
-	{0x1fd4, 0, 0, 0, f(Yes, false, "")},
-	{0x1fd6, 0, 0, 1, f(Yes, false, "ῖ")},
-	{0x1fd7, 0, 0, 2, f(Yes, false, "ῗ")},
-	{0x1fd8, 0, 0, 1, f(Yes, false, "Ῐ")},
-	{0x1fd9, 0, 0, 1, f(Yes, false, "Ῑ")},
-	{0x1fda, 0, 0, 1, f(Yes, false, "Ὶ")},
-	{0x1fdb, 0, 0, 1, f(No, false, "Ί")},
-	{0x1fdc, 0, 0, 0, f(Yes, false, "")},
-	{0x1fdd, 0, 0, 2, g(Yes, No, false, false, "῝", " ̔̀")},
-	{0x1fde, 0, 0, 2, g(Yes, No, false, false, "῞", " ̔́")},
-	{0x1fdf, 0, 0, 2, g(Yes, No, false, false, "῟", " ̔͂")},
-	{0x1fe0, 0, 0, 1, f(Yes, false, "ῠ")},
-	{0x1fe1, 0, 0, 1, f(Yes, false, "ῡ")},
-	{0x1fe2, 0, 0, 2, f(Yes, false, "ῢ")},
-	{0x1fe3, 0, 0, 2, f(No, false, "ΰ")},
-	{0x1fe4, 0, 0, 1, f(Yes, false, "ῤ")},
-	{0x1fe5, 0, 0, 1, f(Yes, false, "ῥ")},
-	{0x1fe6, 0, 0, 1, f(Yes, false, "ῦ")},
-	{0x1fe7, 0, 0, 2, f(Yes, false, "ῧ")},
-	{0x1fe8, 0, 0, 1, f(Yes, false, "Ῠ")},
-	{0x1fe9, 0, 0, 1, f(Yes, false, "Ῡ")},
-	{0x1fea, 0, 0, 1, f(Yes, false, "Ὺ")},
-	{0x1feb, 0, 0, 1, f(No, false, "Ύ")},
-	{0x1fec, 0, 0, 1, f(Yes, false, "Ῥ")},
-	{0x1fed, 0, 0, 2, g(Yes, No, false, false, "῭", " ̈̀")},
-	{0x1fee, 0, 0, 2, g(No, No, false, false, "΅", " ̈́")},
-	{0x1fef, 0, 0, 0, f(No, false, "`")},
-	{0x1ff0, 0, 0, 0, f(Yes, false, "")},
-	{0x1ff2, 0, 0, 2, f(Yes, false, "ῲ")},
-	{0x1ff3, 0, 0, 1, f(Yes, false, "ῳ")},
-	{0x1ff4, 0, 0, 2, f(Yes, false, "ῴ")},
-	{0x1ff5, 0, 0, 0, f(Yes, false, "")},
-	{0x1ff6, 0, 0, 1, f(Yes, true, "ῶ")},
-	{0x1ff7, 0, 0, 2, f(Yes, false, "ῷ")},
-	{0x1ff8, 0, 0, 1, f(Yes, false, "Ὸ")},
-	{0x1ff9, 0, 0, 1, f(No, false, "Ό")},
-	{0x1ffa, 0, 0, 1, f(Yes, false, "Ὼ")},
-	{0x1ffb, 0, 0, 1, f(No, false, "Ώ")},
-	{0x1ffc, 0, 0, 1, f(Yes, false, "ῼ")},
-	{0x1ffd, 0, 0, 1, g(No, No, false, false, "´", " ́")},
-	{0x1ffe, 0, 0, 1, g(Yes, No, true, false, "", " ̔")},
-	{0x1fff, 0, 0, 0, f(Yes, false, "")},
-	{0x2000, 0, 0, 0, g(No, No, false, false, "\u2002", " ")},
-	{0x2001, 0, 0, 0, g(No, No, false, false, "\u2003", " ")},
-	{0x2002, 0, 0, 0, g(Yes, No, false, false, "", " ")},
-	{0x200b, 0, 0, 0, f(Yes, false, "")},
-	{0x2011, 0, 0, 0, g(Yes, No, false, false, "", "‐")},
-	{0x2012, 0, 0, 0, f(Yes, false, "")},
-	{0x2017, 0, 0, 1, g(Yes, No, false, false, "", " ̳")},
-	{0x2018, 0, 0, 0, f(Yes, false, "")},
-	{0x2024, 0, 0, 0, g(Yes, No, false, false, "", ".")},
-	{0x2025, 0, 0, 0, g(Yes, No, false, false, "", "..")},
-	{0x2026, 0, 0, 0, g(Yes, No, false, false, "", "...")},
-	{0x2027, 0, 0, 0, f(Yes, false, "")},
-	{0x202f, 0, 0, 0, g(Yes, No, false, false, "", " ")},
-	{0x2030, 0, 0, 0, f(Yes, false, "")},
-	{0x2033, 0, 0, 0, g(Yes, No, false, false, "", "′′")},
-	{0x2034, 0, 0, 0, g(Yes, No, false, false, "", "′′′")},
-	{0x2035, 0, 0, 0, f(Yes, false, "")},
-	{0x2036, 0, 0, 0, g(Yes, No, false, false, "", "‵‵")},
-	{0x2037, 0, 0, 0, g(Yes, No, false, false, "", "‵‵‵")},
-	{0x2038, 0, 0, 0, f(Yes, false, "")},
-	{0x203c, 0, 0, 0, g(Yes, No, false, false, "", "!!")},
-	{0x203d, 0, 0, 0, f(Yes, false, "")},
-	{0x203e, 0, 0, 1, g(Yes, No, false, false, "", " ̅")},
-	{0x203f, 0, 0, 0, f(Yes, false, "")},
-	{0x2047, 0, 0, 0, g(Yes, No, false, false, "", "??")},
-	{0x2048, 0, 0, 0, g(Yes, No, false, false, "", "?!")},
-	{0x2049, 0, 0, 0, g(Yes, No, false, false, "", "!?")},
-	{0x204a, 0, 0, 0, f(Yes, false, "")},
-	{0x2057, 0, 0, 0, g(Yes, No, false, false, "", "′′′′")},
-	{0x2058, 0, 0, 0, f(Yes, false, "")},
-	{0x205f, 0, 0, 0, g(Yes, No, false, false, "", " ")},
-	{0x2060, 0, 0, 0, f(Yes, false, "")},
-	{0x2070, 0, 0, 0, g(Yes, No, false, false, "", "0")},
-	{0x2071, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x2072, 0, 0, 0, f(Yes, false, "")},
-	{0x2074, 0, 0, 0, g(Yes, No, false, false, "", "4")},
-	{0x2075, 0, 0, 0, g(Yes, No, false, false, "", "5")},
-	{0x2076, 0, 0, 0, g(Yes, No, false, false, "", "6")},
-	{0x2077, 0, 0, 0, g(Yes, No, false, false, "", "7")},
-	{0x2078, 0, 0, 0, g(Yes, No, false, false, "", "8")},
-	{0x2079, 0, 0, 0, g(Yes, No, false, false, "", "9")},
-	{0x207a, 0, 0, 0, g(Yes, No, false, false, "", "+")},
-	{0x207b, 0, 0, 0, g(Yes, No, false, false, "", "−")},
-	{0x207c, 0, 0, 0, g(Yes, No, false, false, "", "=")},
-	{0x207d, 0, 0, 0, g(Yes, No, false, false, "", "(")},
-	{0x207e, 0, 0, 0, g(Yes, No, false, false, "", ")")},
-	{0x207f, 0, 0, 0, g(Yes, No, false, false, "", "n")},
-	{0x2080, 0, 0, 0, g(Yes, No, false, false, "", "0")},
-	{0x2081, 0, 0, 0, g(Yes, No, false, false, "", "1")},
-	{0x2082, 0, 0, 0, g(Yes, No, false, false, "", "2")},
-	{0x2083, 0, 0, 0, g(Yes, No, false, false, "", "3")},
-	{0x2084, 0, 0, 0, g(Yes, No, false, false, "", "4")},
-	{0x2085, 0, 0, 0, g(Yes, No, false, false, "", "5")},
-	{0x2086, 0, 0, 0, g(Yes, No, false, false, "", "6")},
-	{0x2087, 0, 0, 0, g(Yes, No, false, false, "", "7")},
-	{0x2088, 0, 0, 0, g(Yes, No, false, false, "", "8")},
-	{0x2089, 0, 0, 0, g(Yes, No, false, false, "", "9")},
-	{0x208a, 0, 0, 0, g(Yes, No, false, false, "", "+")},
-	{0x208b, 0, 0, 0, g(Yes, No, false, false, "", "−")},
-	{0x208c, 0, 0, 0, g(Yes, No, false, false, "", "=")},
-	{0x208d, 0, 0, 0, g(Yes, No, false, false, "", "(")},
-	{0x208e, 0, 0, 0, g(Yes, No, false, false, "", ")")},
-	{0x208f, 0, 0, 0, f(Yes, false, "")},
-	{0x2090, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0x2091, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0x2092, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0x2093, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0x2094, 0, 0, 0, g(Yes, No, false, false, "", "ə")},
-	{0x2095, 0, 0, 0, g(Yes, No, false, false, "", "h")},
-	{0x2096, 0, 0, 0, g(Yes, No, false, false, "", "k")},
-	{0x2097, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x2098, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0x2099, 0, 0, 0, g(Yes, No, false, false, "", "n")},
-	{0x209a, 0, 0, 0, g(Yes, No, false, false, "", "p")},
-	{0x209b, 0, 0, 0, g(Yes, No, false, false, "", "s")},
-	{0x209c, 0, 0, 0, g(Yes, No, false, false, "", "t")},
-	{0x209d, 0, 0, 0, f(Yes, false, "")},
-	{0x20a8, 0, 0, 0, g(Yes, No, false, false, "", "Rs")},
-	{0x20a9, 0, 0, 0, f(Yes, false, "")},
-	{0x20d0, 230, 1, 1, f(Yes, false, "")},
-	{0x20d2, 1, 1, 1, f(Yes, false, "")},
-	{0x20d4, 230, 1, 1, f(Yes, false, "")},
-	{0x20d8, 1, 1, 1, f(Yes, false, "")},
-	{0x20db, 230, 1, 1, f(Yes, false, "")},
-	{0x20dd, 0, 0, 0, f(Yes, false, "")},
-	{0x20e1, 230, 1, 1, f(Yes, false, "")},
-	{0x20e2, 0, 0, 0, f(Yes, false, "")},
-	{0x20e5, 1, 1, 1, f(Yes, false, "")},
-	{0x20e7, 230, 1, 1, f(Yes, false, "")},
-	{0x20e8, 220, 1, 1, f(Yes, false, "")},
-	{0x20e9, 230, 1, 1, f(Yes, false, "")},
-	{0x20ea, 1, 1, 1, f(Yes, false, "")},
-	{0x20ec, 220, 1, 1, f(Yes, false, "")},
-	{0x20f0, 230, 1, 1, f(Yes, false, "")},
-	{0x20f1, 0, 0, 0, f(Yes, false, "")},
-	{0x2100, 0, 0, 0, g(Yes, No, false, false, "", "a/c")},
-	{0x2101, 0, 0, 0, g(Yes, No, false, false, "", "a/s")},
-	{0x2102, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0x2103, 0, 0, 0, g(Yes, No, false, false, "", "°C")},
-	{0x2104, 0, 0, 0, f(Yes, false, "")},
-	{0x2105, 0, 0, 0, g(Yes, No, false, false, "", "c/o")},
-	{0x2106, 0, 0, 0, g(Yes, No, false, false, "", "c/u")},
-	{0x2107, 0, 0, 0, g(Yes, No, false, false, "", "Ɛ")},
-	{0x2108, 0, 0, 0, f(Yes, false, "")},
-	{0x2109, 0, 0, 0, g(Yes, No, false, false, "", "°F")},
-	{0x210a, 0, 0, 0, g(Yes, No, false, false, "", "g")},
-	{0x210b, 0, 0, 0, g(Yes, No, false, false, "", "H")},
-	{0x210e, 0, 0, 0, g(Yes, No, false, false, "", "h")},
-	{0x210f, 0, 0, 0, g(Yes, No, false, false, "", "ħ")},
-	{0x2110, 0, 0, 0, g(Yes, No, false, false, "", "I")},
-	{0x2112, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0x2113, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x2114, 0, 0, 0, f(Yes, false, "")},
-	{0x2115, 0, 0, 0, g(Yes, No, false, false, "", "N")},
-	{0x2116, 0, 0, 0, g(Yes, No, false, false, "", "No")},
-	{0x2117, 0, 0, 0, f(Yes, false, "")},
-	{0x2119, 0, 0, 0, g(Yes, No, false, false, "", "P")},
-	{0x211a, 0, 0, 0, g(Yes, No, false, false, "", "Q")},
-	{0x211b, 0, 0, 0, g(Yes, No, false, false, "", "R")},
-	{0x211e, 0, 0, 0, f(Yes, false, "")},
-	{0x2120, 0, 0, 0, g(Yes, No, false, false, "", "SM")},
-	{0x2121, 0, 0, 0, g(Yes, No, false, false, "", "TEL")},
-	{0x2122, 0, 0, 0, g(Yes, No, false, false, "", "TM")},
-	{0x2123, 0, 0, 0, f(Yes, false, "")},
-	{0x2124, 0, 0, 0, g(Yes, No, false, false, "", "Z")},
-	{0x2125, 0, 0, 0, f(Yes, false, "")},
-	{0x2126, 0, 0, 0, f(No, false, "Ω")},
-	{0x2127, 0, 0, 0, f(Yes, false, "")},
-	{0x2128, 0, 0, 0, g(Yes, No, false, false, "", "Z")},
-	{0x2129, 0, 0, 0, f(Yes, false, "")},
-	{0x212a, 0, 0, 0, f(No, false, "K")},
-	{0x212b, 0, 0, 1, f(No, false, "Å")},
-	{0x212c, 0, 0, 0, g(Yes, No, false, false, "", "B")},
-	{0x212d, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0x212e, 0, 0, 0, f(Yes, false, "")},
-	{0x212f, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0x2130, 0, 0, 0, g(Yes, No, false, false, "", "E")},
-	{0x2131, 0, 0, 0, g(Yes, No, false, false, "", "F")},
-	{0x2132, 0, 0, 0, f(Yes, false, "")},
-	{0x2133, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0x2134, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0x2135, 0, 0, 0, g(Yes, No, false, false, "", "א")},
-	{0x2136, 0, 0, 0, g(Yes, No, false, false, "", "ב")},
-	{0x2137, 0, 0, 0, g(Yes, No, false, false, "", "ג")},
-	{0x2138, 0, 0, 0, g(Yes, No, false, false, "", "ד")},
-	{0x2139, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x213a, 0, 0, 0, f(Yes, false, "")},
-	{0x213b, 0, 0, 0, g(Yes, No, false, false, "", "FAX")},
-	{0x213c, 0, 0, 0, g(Yes, No, false, false, "", "π")},
-	{0x213d, 0, 0, 0, g(Yes, No, false, false, "", "γ")},
-	{0x213e, 0, 0, 0, g(Yes, No, false, false, "", "Γ")},
-	{0x213f, 0, 0, 0, g(Yes, No, false, false, "", "Π")},
-	{0x2140, 0, 0, 0, g(Yes, No, false, false, "", "∑")},
-	{0x2141, 0, 0, 0, f(Yes, false, "")},
-	{0x2145, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x2146, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0x2147, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0x2148, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x2149, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0x214a, 0, 0, 0, f(Yes, false, "")},
-	{0x2150, 0, 0, 0, g(Yes, No, false, false, "", "1⁄7")},
-	{0x2151, 0, 0, 0, g(Yes, No, false, false, "", "1⁄9")},
-	{0x2152, 0, 0, 0, g(Yes, No, false, false, "", "1⁄10")},
-	{0x2153, 0, 0, 0, g(Yes, No, false, false, "", "1⁄3")},
-	{0x2154, 0, 0, 0, g(Yes, No, false, false, "", "2⁄3")},
-	{0x2155, 0, 0, 0, g(Yes, No, false, false, "", "1⁄5")},
-	{0x2156, 0, 0, 0, g(Yes, No, false, false, "", "2⁄5")},
-	{0x2157, 0, 0, 0, g(Yes, No, false, false, "", "3⁄5")},
-	{0x2158, 0, 0, 0, g(Yes, No, false, false, "", "4⁄5")},
-	{0x2159, 0, 0, 0, g(Yes, No, false, false, "", "1⁄6")},
-	{0x215a, 0, 0, 0, g(Yes, No, false, false, "", "5⁄6")},
-	{0x215b, 0, 0, 0, g(Yes, No, false, false, "", "1⁄8")},
-	{0x215c, 0, 0, 0, g(Yes, No, false, false, "", "3⁄8")},
-	{0x215d, 0, 0, 0, g(Yes, No, false, false, "", "5⁄8")},
-	{0x215e, 0, 0, 0, g(Yes, No, false, false, "", "7⁄8")},
-	{0x215f, 0, 0, 0, g(Yes, No, false, false, "", "1⁄")},
-	{0x2160, 0, 0, 0, g(Yes, No, false, false, "", "I")},
-	{0x2161, 0, 0, 0, g(Yes, No, false, false, "", "II")},
-	{0x2162, 0, 0, 0, g(Yes, No, false, false, "", "III")},
-	{0x2163, 0, 0, 0, g(Yes, No, false, false, "", "IV")},
-	{0x2164, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0x2165, 0, 0, 0, g(Yes, No, false, false, "", "VI")},
-	{0x2166, 0, 0, 0, g(Yes, No, false, false, "", "VII")},
-	{0x2167, 0, 0, 0, g(Yes, No, false, false, "", "VIII")},
-	{0x2168, 0, 0, 0, g(Yes, No, false, false, "", "IX")},
-	{0x2169, 0, 0, 0, g(Yes, No, false, false, "", "X")},
-	{0x216a, 0, 0, 0, g(Yes, No, false, false, "", "XI")},
-	{0x216b, 0, 0, 0, g(Yes, No, false, false, "", "XII")},
-	{0x216c, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0x216d, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0x216e, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x216f, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0x2170, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x2171, 0, 0, 0, g(Yes, No, false, false, "", "ii")},
-	{0x2172, 0, 0, 0, g(Yes, No, false, false, "", "iii")},
-	{0x2173, 0, 0, 0, g(Yes, No, false, false, "", "iv")},
-	{0x2174, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0x2175, 0, 0, 0, g(Yes, No, false, false, "", "vi")},
-	{0x2176, 0, 0, 0, g(Yes, No, false, false, "", "vii")},
-	{0x2177, 0, 0, 0, g(Yes, No, false, false, "", "viii")},
-	{0x2178, 0, 0, 0, g(Yes, No, false, false, "", "ix")},
-	{0x2179, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0x217a, 0, 0, 0, g(Yes, No, false, false, "", "xi")},
-	{0x217b, 0, 0, 0, g(Yes, No, false, false, "", "xii")},
-	{0x217c, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x217d, 0, 0, 0, g(Yes, No, false, false, "", "c")},
-	{0x217e, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0x217f, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0x2180, 0, 0, 0, f(Yes, false, "")},
-	{0x2189, 0, 0, 0, g(Yes, No, false, false, "", "0⁄3")},
-	{0x218a, 0, 0, 0, f(Yes, false, "")},
-	{0x2190, 0, 0, 0, f(Yes, true, "")},
-	{0x2191, 0, 0, 0, f(Yes, false, "")},
-	{0x2192, 0, 0, 0, f(Yes, true, "")},
-	{0x2193, 0, 0, 0, f(Yes, false, "")},
-	{0x2194, 0, 0, 0, f(Yes, true, "")},
-	{0x2195, 0, 0, 0, f(Yes, false, "")},
-	{0x219a, 0, 0, 1, f(Yes, false, "↚")},
-	{0x219b, 0, 0, 1, f(Yes, false, "↛")},
-	{0x219c, 0, 0, 0, f(Yes, false, "")},
-	{0x21ae, 0, 0, 1, f(Yes, false, "↮")},
-	{0x21af, 0, 0, 0, f(Yes, false, "")},
-	{0x21cd, 0, 0, 1, f(Yes, false, "⇍")},
-	{0x21ce, 0, 0, 1, f(Yes, false, "⇎")},
-	{0x21cf, 0, 0, 1, f(Yes, false, "⇏")},
-	{0x21d0, 0, 0, 0, f(Yes, true, "")},
-	{0x21d1, 0, 0, 0, f(Yes, false, "")},
-	{0x21d2, 0, 0, 0, f(Yes, true, "")},
-	{0x21d3, 0, 0, 0, f(Yes, false, "")},
-	{0x21d4, 0, 0, 0, f(Yes, true, "")},
-	{0x21d5, 0, 0, 0, f(Yes, false, "")},
-	{0x2203, 0, 0, 0, f(Yes, true, "")},
-	{0x2204, 0, 0, 1, f(Yes, false, "∄")},
-	{0x2205, 0, 0, 0, f(Yes, false, "")},
-	{0x2208, 0, 0, 0, f(Yes, true, "")},
-	{0x2209, 0, 0, 1, f(Yes, false, "∉")},
-	{0x220a, 0, 0, 0, f(Yes, false, "")},
-	{0x220b, 0, 0, 0, f(Yes, true, "")},
-	{0x220c, 0, 0, 1, f(Yes, false, "∌")},
-	{0x220d, 0, 0, 0, f(Yes, false, "")},
-	{0x2223, 0, 0, 0, f(Yes, true, "")},
-	{0x2224, 0, 0, 1, f(Yes, false, "∤")},
-	{0x2225, 0, 0, 0, f(Yes, true, "")},
-	{0x2226, 0, 0, 1, f(Yes, false, "∦")},
-	{0x2227, 0, 0, 0, f(Yes, false, "")},
-	{0x222c, 0, 0, 0, g(Yes, No, false, false, "", "∫∫")},
-	{0x222d, 0, 0, 0, g(Yes, No, false, false, "", "∫∫∫")},
-	{0x222e, 0, 0, 0, f(Yes, false, "")},
-	{0x222f, 0, 0, 0, g(Yes, No, false, false, "", "∮∮")},
-	{0x2230, 0, 0, 0, g(Yes, No, false, false, "", "∮∮∮")},
-	{0x2231, 0, 0, 0, f(Yes, false, "")},
-	{0x223c, 0, 0, 0, f(Yes, true, "")},
-	{0x223d, 0, 0, 0, f(Yes, false, "")},
-	{0x2241, 0, 0, 1, f(Yes, false, "≁")},
-	{0x2242, 0, 0, 0, f(Yes, false, "")},
-	{0x2243, 0, 0, 0, f(Yes, true, "")},
-	{0x2244, 0, 0, 1, f(Yes, false, "≄")},
-	{0x2245, 0, 0, 0, f(Yes, true, "")},
-	{0x2246, 0, 0, 0, f(Yes, false, "")},
-	{0x2247, 0, 0, 1, f(Yes, false, "≇")},
-	{0x2248, 0, 0, 0, f(Yes, true, "")},
-	{0x2249, 0, 0, 1, f(Yes, false, "≉")},
-	{0x224a, 0, 0, 0, f(Yes, false, "")},
-	{0x224d, 0, 0, 0, f(Yes, true, "")},
-	{0x224e, 0, 0, 0, f(Yes, false, "")},
-	{0x2260, 0, 0, 1, f(Yes, false, "≠")},
-	{0x2261, 0, 0, 0, f(Yes, true, "")},
-	{0x2262, 0, 0, 1, f(Yes, false, "≢")},
-	{0x2263, 0, 0, 0, f(Yes, false, "")},
-	{0x2264, 0, 0, 0, f(Yes, true, "")},
-	{0x2266, 0, 0, 0, f(Yes, false, "")},
-	{0x226d, 0, 0, 1, f(Yes, false, "≭")},
-	{0x226e, 0, 0, 1, f(Yes, false, "≮")},
-	{0x226f, 0, 0, 1, f(Yes, false, "≯")},
-	{0x2270, 0, 0, 1, f(Yes, false, "≰")},
-	{0x2271, 0, 0, 1, f(Yes, false, "≱")},
-	{0x2272, 0, 0, 0, f(Yes, true, "")},
-	{0x2274, 0, 0, 1, f(Yes, false, "≴")},
-	{0x2275, 0, 0, 1, f(Yes, false, "≵")},
-	{0x2276, 0, 0, 0, f(Yes, true, "")},
-	{0x2278, 0, 0, 1, f(Yes, false, "≸")},
-	{0x2279, 0, 0, 1, f(Yes, false, "≹")},
-	{0x227a, 0, 0, 0, f(Yes, true, "")},
-	{0x227e, 0, 0, 0, f(Yes, false, "")},
-	{0x2280, 0, 0, 1, f(Yes, false, "⊀")},
-	{0x2281, 0, 0, 1, f(Yes, false, "⊁")},
-	{0x2282, 0, 0, 0, f(Yes, true, "")},
-	{0x2284, 0, 0, 1, f(Yes, false, "⊄")},
-	{0x2285, 0, 0, 1, f(Yes, false, "⊅")},
-	{0x2286, 0, 0, 0, f(Yes, true, "")},
-	{0x2288, 0, 0, 1, f(Yes, false, "⊈")},
-	{0x2289, 0, 0, 1, f(Yes, false, "⊉")},
-	{0x228a, 0, 0, 0, f(Yes, false, "")},
-	{0x2291, 0, 0, 0, f(Yes, true, "")},
-	{0x2293, 0, 0, 0, f(Yes, false, "")},
-	{0x22a2, 0, 0, 0, f(Yes, true, "")},
-	{0x22a3, 0, 0, 0, f(Yes, false, "")},
-	{0x22a8, 0, 0, 0, f(Yes, true, "")},
-	{0x22aa, 0, 0, 0, f(Yes, false, "")},
-	{0x22ab, 0, 0, 0, f(Yes, true, "")},
-	{0x22ac, 0, 0, 1, f(Yes, false, "⊬")},
-	{0x22ad, 0, 0, 1, f(Yes, false, "⊭")},
-	{0x22ae, 0, 0, 1, f(Yes, false, "⊮")},
-	{0x22af, 0, 0, 1, f(Yes, false, "⊯")},
-	{0x22b0, 0, 0, 0, f(Yes, false, "")},
-	{0x22b2, 0, 0, 0, f(Yes, true, "")},
-	{0x22b6, 0, 0, 0, f(Yes, false, "")},
-	{0x22e0, 0, 0, 1, f(Yes, false, "⋠")},
-	{0x22e1, 0, 0, 1, f(Yes, false, "⋡")},
-	{0x22e2, 0, 0, 1, f(Yes, false, "⋢")},
-	{0x22e3, 0, 0, 1, f(Yes, false, "⋣")},
-	{0x22e4, 0, 0, 0, f(Yes, false, "")},
-	{0x22ea, 0, 0, 1, f(Yes, false, "⋪")},
-	{0x22eb, 0, 0, 1, f(Yes, false, "⋫")},
-	{0x22ec, 0, 0, 1, f(Yes, false, "⋬")},
-	{0x22ed, 0, 0, 1, f(Yes, false, "⋭")},
-	{0x22ee, 0, 0, 0, f(Yes, false, "")},
-	{0x2329, 0, 0, 0, f(No, false, "〈")},
-	{0x232a, 0, 0, 0, f(No, false, "〉")},
-	{0x232b, 0, 0, 0, f(Yes, false, "")},
-	{0x2460, 0, 0, 0, g(Yes, No, false, false, "", "1")},
-	{0x2461, 0, 0, 0, g(Yes, No, false, false, "", "2")},
-	{0x2462, 0, 0, 0, g(Yes, No, false, false, "", "3")},
-	{0x2463, 0, 0, 0, g(Yes, No, false, false, "", "4")},
-	{0x2464, 0, 0, 0, g(Yes, No, false, false, "", "5")},
-	{0x2465, 0, 0, 0, g(Yes, No, false, false, "", "6")},
-	{0x2466, 0, 0, 0, g(Yes, No, false, false, "", "7")},
-	{0x2467, 0, 0, 0, g(Yes, No, false, false, "", "8")},
-	{0x2468, 0, 0, 0, g(Yes, No, false, false, "", "9")},
-	{0x2469, 0, 0, 0, g(Yes, No, false, false, "", "10")},
-	{0x246a, 0, 0, 0, g(Yes, No, false, false, "", "11")},
-	{0x246b, 0, 0, 0, g(Yes, No, false, false, "", "12")},
-	{0x246c, 0, 0, 0, g(Yes, No, false, false, "", "13")},
-	{0x246d, 0, 0, 0, g(Yes, No, false, false, "", "14")},
-	{0x246e, 0, 0, 0, g(Yes, No, false, false, "", "15")},
-	{0x246f, 0, 0, 0, g(Yes, No, false, false, "", "16")},
-	{0x2470, 0, 0, 0, g(Yes, No, false, false, "", "17")},
-	{0x2471, 0, 0, 0, g(Yes, No, false, false, "", "18")},
-	{0x2472, 0, 0, 0, g(Yes, No, false, false, "", "19")},
-	{0x2473, 0, 0, 0, g(Yes, No, false, false, "", "20")},
-	{0x2474, 0, 0, 0, g(Yes, No, false, false, "", "(1)")},
-	{0x2475, 0, 0, 0, g(Yes, No, false, false, "", "(2)")},
-	{0x2476, 0, 0, 0, g(Yes, No, false, false, "", "(3)")},
-	{0x2477, 0, 0, 0, g(Yes, No, false, false, "", "(4)")},
-	{0x2478, 0, 0, 0, g(Yes, No, false, false, "", "(5)")},
-	{0x2479, 0, 0, 0, g(Yes, No, false, false, "", "(6)")},
-	{0x247a, 0, 0, 0, g(Yes, No, false, false, "", "(7)")},
-	{0x247b, 0, 0, 0, g(Yes, No, false, false, "", "(8)")},
-	{0x247c, 0, 0, 0, g(Yes, No, false, false, "", "(9)")},
-	{0x247d, 0, 0, 0, g(Yes, No, false, false, "", "(10)")},
-	{0x247e, 0, 0, 0, g(Yes, No, false, false, "", "(11)")},
-	{0x247f, 0, 0, 0, g(Yes, No, false, false, "", "(12)")},
-	{0x2480, 0, 0, 0, g(Yes, No, false, false, "", "(13)")},
-	{0x2481, 0, 0, 0, g(Yes, No, false, false, "", "(14)")},
-	{0x2482, 0, 0, 0, g(Yes, No, false, false, "", "(15)")},
-	{0x2483, 0, 0, 0, g(Yes, No, false, false, "", "(16)")},
-	{0x2484, 0, 0, 0, g(Yes, No, false, false, "", "(17)")},
-	{0x2485, 0, 0, 0, g(Yes, No, false, false, "", "(18)")},
-	{0x2486, 0, 0, 0, g(Yes, No, false, false, "", "(19)")},
-	{0x2487, 0, 0, 0, g(Yes, No, false, false, "", "(20)")},
-	{0x2488, 0, 0, 0, g(Yes, No, false, false, "", "1.")},
-	{0x2489, 0, 0, 0, g(Yes, No, false, false, "", "2.")},
-	{0x248a, 0, 0, 0, g(Yes, No, false, false, "", "3.")},
-	{0x248b, 0, 0, 0, g(Yes, No, false, false, "", "4.")},
-	{0x248c, 0, 0, 0, g(Yes, No, false, false, "", "5.")},
-	{0x248d, 0, 0, 0, g(Yes, No, false, false, "", "6.")},
-	{0x248e, 0, 0, 0, g(Yes, No, false, false, "", "7.")},
-	{0x248f, 0, 0, 0, g(Yes, No, false, false, "", "8.")},
-	{0x2490, 0, 0, 0, g(Yes, No, false, false, "", "9.")},
-	{0x2491, 0, 0, 0, g(Yes, No, false, false, "", "10.")},
-	{0x2492, 0, 0, 0, g(Yes, No, false, false, "", "11.")},
-	{0x2493, 0, 0, 0, g(Yes, No, false, false, "", "12.")},
-	{0x2494, 0, 0, 0, g(Yes, No, false, false, "", "13.")},
-	{0x2495, 0, 0, 0, g(Yes, No, false, false, "", "14.")},
-	{0x2496, 0, 0, 0, g(Yes, No, false, false, "", "15.")},
-	{0x2497, 0, 0, 0, g(Yes, No, false, false, "", "16.")},
-	{0x2498, 0, 0, 0, g(Yes, No, false, false, "", "17.")},
-	{0x2499, 0, 0, 0, g(Yes, No, false, false, "", "18.")},
-	{0x249a, 0, 0, 0, g(Yes, No, false, false, "", "19.")},
-	{0x249b, 0, 0, 0, g(Yes, No, false, false, "", "20.")},
-	{0x249c, 0, 0, 0, g(Yes, No, false, false, "", "(a)")},
-	{0x249d, 0, 0, 0, g(Yes, No, false, false, "", "(b)")},
-	{0x249e, 0, 0, 0, g(Yes, No, false, false, "", "(c)")},
-	{0x249f, 0, 0, 0, g(Yes, No, false, false, "", "(d)")},
-	{0x24a0, 0, 0, 0, g(Yes, No, false, false, "", "(e)")},
-	{0x24a1, 0, 0, 0, g(Yes, No, false, false, "", "(f)")},
-	{0x24a2, 0, 0, 0, g(Yes, No, false, false, "", "(g)")},
-	{0x24a3, 0, 0, 0, g(Yes, No, false, false, "", "(h)")},
-	{0x24a4, 0, 0, 0, g(Yes, No, false, false, "", "(i)")},
-	{0x24a5, 0, 0, 0, g(Yes, No, false, false, "", "(j)")},
-	{0x24a6, 0, 0, 0, g(Yes, No, false, false, "", "(k)")},
-	{0x24a7, 0, 0, 0, g(Yes, No, false, false, "", "(l)")},
-	{0x24a8, 0, 0, 0, g(Yes, No, false, false, "", "(m)")},
-	{0x24a9, 0, 0, 0, g(Yes, No, false, false, "", "(n)")},
-	{0x24aa, 0, 0, 0, g(Yes, No, false, false, "", "(o)")},
-	{0x24ab, 0, 0, 0, g(Yes, No, false, false, "", "(p)")},
-	{0x24ac, 0, 0, 0, g(Yes, No, false, false, "", "(q)")},
-	{0x24ad, 0, 0, 0, g(Yes, No, false, false, "", "(r)")},
-	{0x24ae, 0, 0, 0, g(Yes, No, false, false, "", "(s)")},
-	{0x24af, 0, 0, 0, g(Yes, No, false, false, "", "(t)")},
-	{0x24b0, 0, 0, 0, g(Yes, No, false, false, "", "(u)")},
-	{0x24b1, 0, 0, 0, g(Yes, No, false, false, "", "(v)")},
-	{0x24b2, 0, 0, 0, g(Yes, No, false, false, "", "(w)")},
-	{0x24b3, 0, 0, 0, g(Yes, No, false, false, "", "(x)")},
-	{0x24b4, 0, 0, 0, g(Yes, No, false, false, "", "(y)")},
-	{0x24b5, 0, 0, 0, g(Yes, No, false, false, "", "(z)")},
-	{0x24b6, 0, 0, 0, g(Yes, No, false, false, "", "A")},
-	{0x24b7, 0, 0, 0, g(Yes, No, false, false, "", "B")},
-	{0x24b8, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0x24b9, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x24ba, 0, 0, 0, g(Yes, No, false, false, "", "E")},
-	{0x24bb, 0, 0, 0, g(Yes, No, false, false, "", "F")},
-	{0x24bc, 0, 0, 0, g(Yes, No, false, false, "", "G")},
-	{0x24bd, 0, 0, 0, g(Yes, No, false, false, "", "H")},
-	{0x24be, 0, 0, 0, g(Yes, No, false, false, "", "I")},
-	{0x24bf, 0, 0, 0, g(Yes, No, false, false, "", "J")},
-	{0x24c0, 0, 0, 0, g(Yes, No, false, false, "", "K")},
-	{0x24c1, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0x24c2, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0x24c3, 0, 0, 0, g(Yes, No, false, false, "", "N")},
-	{0x24c4, 0, 0, 0, g(Yes, No, false, false, "", "O")},
-	{0x24c5, 0, 0, 0, g(Yes, No, false, false, "", "P")},
-	{0x24c6, 0, 0, 0, g(Yes, No, false, false, "", "Q")},
-	{0x24c7, 0, 0, 0, g(Yes, No, false, false, "", "R")},
-	{0x24c8, 0, 0, 0, g(Yes, No, false, false, "", "S")},
-	{0x24c9, 0, 0, 0, g(Yes, No, false, false, "", "T")},
-	{0x24ca, 0, 0, 0, g(Yes, No, false, false, "", "U")},
-	{0x24cb, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0x24cc, 0, 0, 0, g(Yes, No, false, false, "", "W")},
-	{0x24cd, 0, 0, 0, g(Yes, No, false, false, "", "X")},
-	{0x24ce, 0, 0, 0, g(Yes, No, false, false, "", "Y")},
-	{0x24cf, 0, 0, 0, g(Yes, No, false, false, "", "Z")},
-	{0x24d0, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0x24d1, 0, 0, 0, g(Yes, No, false, false, "", "b")},
-	{0x24d2, 0, 0, 0, g(Yes, No, false, false, "", "c")},
-	{0x24d3, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0x24d4, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0x24d5, 0, 0, 0, g(Yes, No, false, false, "", "f")},
-	{0x24d6, 0, 0, 0, g(Yes, No, false, false, "", "g")},
-	{0x24d7, 0, 0, 0, g(Yes, No, false, false, "", "h")},
-	{0x24d8, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x24d9, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0x24da, 0, 0, 0, g(Yes, No, false, false, "", "k")},
-	{0x24db, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x24dc, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0x24dd, 0, 0, 0, g(Yes, No, false, false, "", "n")},
-	{0x24de, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0x24df, 0, 0, 0, g(Yes, No, false, false, "", "p")},
-	{0x24e0, 0, 0, 0, g(Yes, No, false, false, "", "q")},
-	{0x24e1, 0, 0, 0, g(Yes, No, false, false, "", "r")},
-	{0x24e2, 0, 0, 0, g(Yes, No, false, false, "", "s")},
-	{0x24e3, 0, 0, 0, g(Yes, No, false, false, "", "t")},
-	{0x24e4, 0, 0, 0, g(Yes, No, false, false, "", "u")},
-	{0x24e5, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0x24e6, 0, 0, 0, g(Yes, No, false, false, "", "w")},
-	{0x24e7, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0x24e8, 0, 0, 0, g(Yes, No, false, false, "", "y")},
-	{0x24e9, 0, 0, 0, g(Yes, No, false, false, "", "z")},
-	{0x24ea, 0, 0, 0, g(Yes, No, false, false, "", "0")},
-	{0x24eb, 0, 0, 0, f(Yes, false, "")},
-	{0x2a0c, 0, 0, 0, g(Yes, No, false, false, "", "∫∫∫∫")},
-	{0x2a0d, 0, 0, 0, f(Yes, false, "")},
-	{0x2a74, 0, 0, 0, g(Yes, No, false, false, "", "::=")},
-	{0x2a75, 0, 0, 0, g(Yes, No, false, false, "", "==")},
-	{0x2a76, 0, 0, 0, g(Yes, No, false, false, "", "===")},
-	{0x2a77, 0, 0, 0, f(Yes, false, "")},
-	{0x2adc, 0, 0, 1, f(No, false, "⫝̸")},
-	{0x2add, 0, 0, 0, f(Yes, false, "")},
-	{0x2c7c, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0x2c7d, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0x2c7e, 0, 0, 0, f(Yes, false, "")},
-	{0x2cef, 230, 1, 1, f(Yes, false, "")},
-	{0x2cf2, 0, 0, 0, f(Yes, false, "")},
-	{0x2d6f, 0, 0, 0, g(Yes, No, false, false, "", "ⵡ")},
-	{0x2d70, 0, 0, 0, f(Yes, false, "")},
-	{0x2d7f, 9, 1, 1, f(Yes, false, "")},
-	{0x2d80, 0, 0, 0, f(Yes, false, "")},
-	{0x2de0, 230, 1, 1, f(Yes, false, "")},
-	{0x2e00, 0, 0, 0, f(Yes, false, "")},
-	{0x2e9f, 0, 0, 0, g(Yes, No, false, false, "", "母")},
-	{0x2ea0, 0, 0, 0, f(Yes, false, "")},
-	{0x2ef3, 0, 0, 0, g(Yes, No, false, false, "", "龟")},
-	{0x2ef4, 0, 0, 0, f(Yes, false, "")},
-	{0x2f00, 0, 0, 0, g(Yes, No, false, false, "", "一")},
-	{0x2f01, 0, 0, 0, g(Yes, No, false, false, "", "丨")},
-	{0x2f02, 0, 0, 0, g(Yes, No, false, false, "", "丶")},
-	{0x2f03, 0, 0, 0, g(Yes, No, false, false, "", "丿")},
-	{0x2f04, 0, 0, 0, g(Yes, No, false, false, "", "乙")},
-	{0x2f05, 0, 0, 0, g(Yes, No, false, false, "", "亅")},
-	{0x2f06, 0, 0, 0, g(Yes, No, false, false, "", "二")},
-	{0x2f07, 0, 0, 0, g(Yes, No, false, false, "", "亠")},
-	{0x2f08, 0, 0, 0, g(Yes, No, false, false, "", "人")},
-	{0x2f09, 0, 0, 0, g(Yes, No, false, false, "", "儿")},
-	{0x2f0a, 0, 0, 0, g(Yes, No, false, false, "", "入")},
-	{0x2f0b, 0, 0, 0, g(Yes, No, false, false, "", "八")},
-	{0x2f0c, 0, 0, 0, g(Yes, No, false, false, "", "冂")},
-	{0x2f0d, 0, 0, 0, g(Yes, No, false, false, "", "冖")},
-	{0x2f0e, 0, 0, 0, g(Yes, No, false, false, "", "冫")},
-	{0x2f0f, 0, 0, 0, g(Yes, No, false, false, "", "几")},
-	{0x2f10, 0, 0, 0, g(Yes, No, false, false, "", "凵")},
-	{0x2f11, 0, 0, 0, g(Yes, No, false, false, "", "刀")},
-	{0x2f12, 0, 0, 0, g(Yes, No, false, false, "", "力")},
-	{0x2f13, 0, 0, 0, g(Yes, No, false, false, "", "勹")},
-	{0x2f14, 0, 0, 0, g(Yes, No, false, false, "", "匕")},
-	{0x2f15, 0, 0, 0, g(Yes, No, false, false, "", "匚")},
-	{0x2f16, 0, 0, 0, g(Yes, No, false, false, "", "匸")},
-	{0x2f17, 0, 0, 0, g(Yes, No, false, false, "", "十")},
-	{0x2f18, 0, 0, 0, g(Yes, No, false, false, "", "卜")},
-	{0x2f19, 0, 0, 0, g(Yes, No, false, false, "", "卩")},
-	{0x2f1a, 0, 0, 0, g(Yes, No, false, false, "", "厂")},
-	{0x2f1b, 0, 0, 0, g(Yes, No, false, false, "", "厶")},
-	{0x2f1c, 0, 0, 0, g(Yes, No, false, false, "", "又")},
-	{0x2f1d, 0, 0, 0, g(Yes, No, false, false, "", "口")},
-	{0x2f1e, 0, 0, 0, g(Yes, No, false, false, "", "囗")},
-	{0x2f1f, 0, 0, 0, g(Yes, No, false, false, "", "土")},
-	{0x2f20, 0, 0, 0, g(Yes, No, false, false, "", "士")},
-	{0x2f21, 0, 0, 0, g(Yes, No, false, false, "", "夂")},
-	{0x2f22, 0, 0, 0, g(Yes, No, false, false, "", "夊")},
-	{0x2f23, 0, 0, 0, g(Yes, No, false, false, "", "夕")},
-	{0x2f24, 0, 0, 0, g(Yes, No, false, false, "", "大")},
-	{0x2f25, 0, 0, 0, g(Yes, No, false, false, "", "女")},
-	{0x2f26, 0, 0, 0, g(Yes, No, false, false, "", "子")},
-	{0x2f27, 0, 0, 0, g(Yes, No, false, false, "", "宀")},
-	{0x2f28, 0, 0, 0, g(Yes, No, false, false, "", "寸")},
-	{0x2f29, 0, 0, 0, g(Yes, No, false, false, "", "小")},
-	{0x2f2a, 0, 0, 0, g(Yes, No, false, false, "", "尢")},
-	{0x2f2b, 0, 0, 0, g(Yes, No, false, false, "", "尸")},
-	{0x2f2c, 0, 0, 0, g(Yes, No, false, false, "", "屮")},
-	{0x2f2d, 0, 0, 0, g(Yes, No, false, false, "", "山")},
-	{0x2f2e, 0, 0, 0, g(Yes, No, false, false, "", "巛")},
-	{0x2f2f, 0, 0, 0, g(Yes, No, false, false, "", "工")},
-	{0x2f30, 0, 0, 0, g(Yes, No, false, false, "", "己")},
-	{0x2f31, 0, 0, 0, g(Yes, No, false, false, "", "巾")},
-	{0x2f32, 0, 0, 0, g(Yes, No, false, false, "", "干")},
-	{0x2f33, 0, 0, 0, g(Yes, No, false, false, "", "幺")},
-	{0x2f34, 0, 0, 0, g(Yes, No, false, false, "", "广")},
-	{0x2f35, 0, 0, 0, g(Yes, No, false, false, "", "廴")},
-	{0x2f36, 0, 0, 0, g(Yes, No, false, false, "", "廾")},
-	{0x2f37, 0, 0, 0, g(Yes, No, false, false, "", "弋")},
-	{0x2f38, 0, 0, 0, g(Yes, No, false, false, "", "弓")},
-	{0x2f39, 0, 0, 0, g(Yes, No, false, false, "", "彐")},
-	{0x2f3a, 0, 0, 0, g(Yes, No, false, false, "", "彡")},
-	{0x2f3b, 0, 0, 0, g(Yes, No, false, false, "", "彳")},
-	{0x2f3c, 0, 0, 0, g(Yes, No, false, false, "", "心")},
-	{0x2f3d, 0, 0, 0, g(Yes, No, false, false, "", "戈")},
-	{0x2f3e, 0, 0, 0, g(Yes, No, false, false, "", "戶")},
-	{0x2f3f, 0, 0, 0, g(Yes, No, false, false, "", "手")},
-	{0x2f40, 0, 0, 0, g(Yes, No, false, false, "", "支")},
-	{0x2f41, 0, 0, 0, g(Yes, No, false, false, "", "攴")},
-	{0x2f42, 0, 0, 0, g(Yes, No, false, false, "", "文")},
-	{0x2f43, 0, 0, 0, g(Yes, No, false, false, "", "斗")},
-	{0x2f44, 0, 0, 0, g(Yes, No, false, false, "", "斤")},
-	{0x2f45, 0, 0, 0, g(Yes, No, false, false, "", "方")},
-	{0x2f46, 0, 0, 0, g(Yes, No, false, false, "", "无")},
-	{0x2f47, 0, 0, 0, g(Yes, No, false, false, "", "日")},
-	{0x2f48, 0, 0, 0, g(Yes, No, false, false, "", "曰")},
-	{0x2f49, 0, 0, 0, g(Yes, No, false, false, "", "月")},
-	{0x2f4a, 0, 0, 0, g(Yes, No, false, false, "", "木")},
-	{0x2f4b, 0, 0, 0, g(Yes, No, false, false, "", "欠")},
-	{0x2f4c, 0, 0, 0, g(Yes, No, false, false, "", "止")},
-	{0x2f4d, 0, 0, 0, g(Yes, No, false, false, "", "歹")},
-	{0x2f4e, 0, 0, 0, g(Yes, No, false, false, "", "殳")},
-	{0x2f4f, 0, 0, 0, g(Yes, No, false, false, "", "毋")},
-	{0x2f50, 0, 0, 0, g(Yes, No, false, false, "", "比")},
-	{0x2f51, 0, 0, 0, g(Yes, No, false, false, "", "毛")},
-	{0x2f52, 0, 0, 0, g(Yes, No, false, false, "", "氏")},
-	{0x2f53, 0, 0, 0, g(Yes, No, false, false, "", "气")},
-	{0x2f54, 0, 0, 0, g(Yes, No, false, false, "", "水")},
-	{0x2f55, 0, 0, 0, g(Yes, No, false, false, "", "火")},
-	{0x2f56, 0, 0, 0, g(Yes, No, false, false, "", "爪")},
-	{0x2f57, 0, 0, 0, g(Yes, No, false, false, "", "父")},
-	{0x2f58, 0, 0, 0, g(Yes, No, false, false, "", "爻")},
-	{0x2f59, 0, 0, 0, g(Yes, No, false, false, "", "爿")},
-	{0x2f5a, 0, 0, 0, g(Yes, No, false, false, "", "片")},
-	{0x2f5b, 0, 0, 0, g(Yes, No, false, false, "", "牙")},
-	{0x2f5c, 0, 0, 0, g(Yes, No, false, false, "", "牛")},
-	{0x2f5d, 0, 0, 0, g(Yes, No, false, false, "", "犬")},
-	{0x2f5e, 0, 0, 0, g(Yes, No, false, false, "", "玄")},
-	{0x2f5f, 0, 0, 0, g(Yes, No, false, false, "", "玉")},
-	{0x2f60, 0, 0, 0, g(Yes, No, false, false, "", "瓜")},
-	{0x2f61, 0, 0, 0, g(Yes, No, false, false, "", "瓦")},
-	{0x2f62, 0, 0, 0, g(Yes, No, false, false, "", "甘")},
-	{0x2f63, 0, 0, 0, g(Yes, No, false, false, "", "生")},
-	{0x2f64, 0, 0, 0, g(Yes, No, false, false, "", "用")},
-	{0x2f65, 0, 0, 0, g(Yes, No, false, false, "", "田")},
-	{0x2f66, 0, 0, 0, g(Yes, No, false, false, "", "疋")},
-	{0x2f67, 0, 0, 0, g(Yes, No, false, false, "", "疒")},
-	{0x2f68, 0, 0, 0, g(Yes, No, false, false, "", "癶")},
-	{0x2f69, 0, 0, 0, g(Yes, No, false, false, "", "白")},
-	{0x2f6a, 0, 0, 0, g(Yes, No, false, false, "", "皮")},
-	{0x2f6b, 0, 0, 0, g(Yes, No, false, false, "", "皿")},
-	{0x2f6c, 0, 0, 0, g(Yes, No, false, false, "", "目")},
-	{0x2f6d, 0, 0, 0, g(Yes, No, false, false, "", "矛")},
-	{0x2f6e, 0, 0, 0, g(Yes, No, false, false, "", "矢")},
-	{0x2f6f, 0, 0, 0, g(Yes, No, false, false, "", "石")},
-	{0x2f70, 0, 0, 0, g(Yes, No, false, false, "", "示")},
-	{0x2f71, 0, 0, 0, g(Yes, No, false, false, "", "禸")},
-	{0x2f72, 0, 0, 0, g(Yes, No, false, false, "", "禾")},
-	{0x2f73, 0, 0, 0, g(Yes, No, false, false, "", "穴")},
-	{0x2f74, 0, 0, 0, g(Yes, No, false, false, "", "立")},
-	{0x2f75, 0, 0, 0, g(Yes, No, false, false, "", "竹")},
-	{0x2f76, 0, 0, 0, g(Yes, No, false, false, "", "米")},
-	{0x2f77, 0, 0, 0, g(Yes, No, false, false, "", "糸")},
-	{0x2f78, 0, 0, 0, g(Yes, No, false, false, "", "缶")},
-	{0x2f79, 0, 0, 0, g(Yes, No, false, false, "", "网")},
-	{0x2f7a, 0, 0, 0, g(Yes, No, false, false, "", "羊")},
-	{0x2f7b, 0, 0, 0, g(Yes, No, false, false, "", "羽")},
-	{0x2f7c, 0, 0, 0, g(Yes, No, false, false, "", "老")},
-	{0x2f7d, 0, 0, 0, g(Yes, No, false, false, "", "而")},
-	{0x2f7e, 0, 0, 0, g(Yes, No, false, false, "", "耒")},
-	{0x2f7f, 0, 0, 0, g(Yes, No, false, false, "", "耳")},
-	{0x2f80, 0, 0, 0, g(Yes, No, false, false, "", "聿")},
-	{0x2f81, 0, 0, 0, g(Yes, No, false, false, "", "肉")},
-	{0x2f82, 0, 0, 0, g(Yes, No, false, false, "", "臣")},
-	{0x2f83, 0, 0, 0, g(Yes, No, false, false, "", "自")},
-	{0x2f84, 0, 0, 0, g(Yes, No, false, false, "", "至")},
-	{0x2f85, 0, 0, 0, g(Yes, No, false, false, "", "臼")},
-	{0x2f86, 0, 0, 0, g(Yes, No, false, false, "", "舌")},
-	{0x2f87, 0, 0, 0, g(Yes, No, false, false, "", "舛")},
-	{0x2f88, 0, 0, 0, g(Yes, No, false, false, "", "舟")},
-	{0x2f89, 0, 0, 0, g(Yes, No, false, false, "", "艮")},
-	{0x2f8a, 0, 0, 0, g(Yes, No, false, false, "", "色")},
-	{0x2f8b, 0, 0, 0, g(Yes, No, false, false, "", "艸")},
-	{0x2f8c, 0, 0, 0, g(Yes, No, false, false, "", "虍")},
-	{0x2f8d, 0, 0, 0, g(Yes, No, false, false, "", "虫")},
-	{0x2f8e, 0, 0, 0, g(Yes, No, false, false, "", "血")},
-	{0x2f8f, 0, 0, 0, g(Yes, No, false, false, "", "行")},
-	{0x2f90, 0, 0, 0, g(Yes, No, false, false, "", "衣")},
-	{0x2f91, 0, 0, 0, g(Yes, No, false, false, "", "襾")},
-	{0x2f92, 0, 0, 0, g(Yes, No, false, false, "", "見")},
-	{0x2f93, 0, 0, 0, g(Yes, No, false, false, "", "角")},
-	{0x2f94, 0, 0, 0, g(Yes, No, false, false, "", "言")},
-	{0x2f95, 0, 0, 0, g(Yes, No, false, false, "", "谷")},
-	{0x2f96, 0, 0, 0, g(Yes, No, false, false, "", "豆")},
-	{0x2f97, 0, 0, 0, g(Yes, No, false, false, "", "豕")},
-	{0x2f98, 0, 0, 0, g(Yes, No, false, false, "", "豸")},
-	{0x2f99, 0, 0, 0, g(Yes, No, false, false, "", "貝")},
-	{0x2f9a, 0, 0, 0, g(Yes, No, false, false, "", "赤")},
-	{0x2f9b, 0, 0, 0, g(Yes, No, false, false, "", "走")},
-	{0x2f9c, 0, 0, 0, g(Yes, No, false, false, "", "足")},
-	{0x2f9d, 0, 0, 0, g(Yes, No, false, false, "", "身")},
-	{0x2f9e, 0, 0, 0, g(Yes, No, false, false, "", "車")},
-	{0x2f9f, 0, 0, 0, g(Yes, No, false, false, "", "辛")},
-	{0x2fa0, 0, 0, 0, g(Yes, No, false, false, "", "辰")},
-	{0x2fa1, 0, 0, 0, g(Yes, No, false, false, "", "辵")},
-	{0x2fa2, 0, 0, 0, g(Yes, No, false, false, "", "邑")},
-	{0x2fa3, 0, 0, 0, g(Yes, No, false, false, "", "酉")},
-	{0x2fa4, 0, 0, 0, g(Yes, No, false, false, "", "釆")},
-	{0x2fa5, 0, 0, 0, g(Yes, No, false, false, "", "里")},
-	{0x2fa6, 0, 0, 0, g(Yes, No, false, false, "", "金")},
-	{0x2fa7, 0, 0, 0, g(Yes, No, false, false, "", "長")},
-	{0x2fa8, 0, 0, 0, g(Yes, No, false, false, "", "門")},
-	{0x2fa9, 0, 0, 0, g(Yes, No, false, false, "", "阜")},
-	{0x2faa, 0, 0, 0, g(Yes, No, false, false, "", "隶")},
-	{0x2fab, 0, 0, 0, g(Yes, No, false, false, "", "隹")},
-	{0x2fac, 0, 0, 0, g(Yes, No, false, false, "", "雨")},
-	{0x2fad, 0, 0, 0, g(Yes, No, false, false, "", "靑")},
-	{0x2fae, 0, 0, 0, g(Yes, No, false, false, "", "非")},
-	{0x2faf, 0, 0, 0, g(Yes, No, false, false, "", "面")},
-	{0x2fb0, 0, 0, 0, g(Yes, No, false, false, "", "革")},
-	{0x2fb1, 0, 0, 0, g(Yes, No, false, false, "", "韋")},
-	{0x2fb2, 0, 0, 0, g(Yes, No, false, false, "", "韭")},
-	{0x2fb3, 0, 0, 0, g(Yes, No, false, false, "", "音")},
-	{0x2fb4, 0, 0, 0, g(Yes, No, false, false, "", "頁")},
-	{0x2fb5, 0, 0, 0, g(Yes, No, false, false, "", "風")},
-	{0x2fb6, 0, 0, 0, g(Yes, No, false, false, "", "飛")},
-	{0x2fb7, 0, 0, 0, g(Yes, No, false, false, "", "食")},
-	{0x2fb8, 0, 0, 0, g(Yes, No, false, false, "", "首")},
-	{0x2fb9, 0, 0, 0, g(Yes, No, false, false, "", "香")},
-	{0x2fba, 0, 0, 0, g(Yes, No, false, false, "", "馬")},
-	{0x2fbb, 0, 0, 0, g(Yes, No, false, false, "", "骨")},
-	{0x2fbc, 0, 0, 0, g(Yes, No, false, false, "", "高")},
-	{0x2fbd, 0, 0, 0, g(Yes, No, false, false, "", "髟")},
-	{0x2fbe, 0, 0, 0, g(Yes, No, false, false, "", "鬥")},
-	{0x2fbf, 0, 0, 0, g(Yes, No, false, false, "", "鬯")},
-	{0x2fc0, 0, 0, 0, g(Yes, No, false, false, "", "鬲")},
-	{0x2fc1, 0, 0, 0, g(Yes, No, false, false, "", "鬼")},
-	{0x2fc2, 0, 0, 0, g(Yes, No, false, false, "", "魚")},
-	{0x2fc3, 0, 0, 0, g(Yes, No, false, false, "", "鳥")},
-	{0x2fc4, 0, 0, 0, g(Yes, No, false, false, "", "鹵")},
-	{0x2fc5, 0, 0, 0, g(Yes, No, false, false, "", "鹿")},
-	{0x2fc6, 0, 0, 0, g(Yes, No, false, false, "", "麥")},
-	{0x2fc7, 0, 0, 0, g(Yes, No, false, false, "", "麻")},
-	{0x2fc8, 0, 0, 0, g(Yes, No, false, false, "", "黃")},
-	{0x2fc9, 0, 0, 0, g(Yes, No, false, false, "", "黍")},
-	{0x2fca, 0, 0, 0, g(Yes, No, false, false, "", "黑")},
-	{0x2fcb, 0, 0, 0, g(Yes, No, false, false, "", "黹")},
-	{0x2fcc, 0, 0, 0, g(Yes, No, false, false, "", "黽")},
-	{0x2fcd, 0, 0, 0, g(Yes, No, false, false, "", "鼎")},
-	{0x2fce, 0, 0, 0, g(Yes, No, false, false, "", "鼓")},
-	{0x2fcf, 0, 0, 0, g(Yes, No, false, false, "", "鼠")},
-	{0x2fd0, 0, 0, 0, g(Yes, No, false, false, "", "鼻")},
-	{0x2fd1, 0, 0, 0, g(Yes, No, false, false, "", "齊")},
-	{0x2fd2, 0, 0, 0, g(Yes, No, false, false, "", "齒")},
-	{0x2fd3, 0, 0, 0, g(Yes, No, false, false, "", "龍")},
-	{0x2fd4, 0, 0, 0, g(Yes, No, false, false, "", "龜")},
-	{0x2fd5, 0, 0, 0, g(Yes, No, false, false, "", "龠")},
-	{0x2fd6, 0, 0, 0, f(Yes, false, "")},
-	{0x3000, 0, 0, 0, g(Yes, No, false, false, "", " ")},
-	{0x3001, 0, 0, 0, f(Yes, false, "")},
-	{0x302a, 218, 1, 1, f(Yes, false, "")},
-	{0x302b, 228, 1, 1, f(Yes, false, "")},
-	{0x302c, 232, 1, 1, f(Yes, false, "")},
-	{0x302d, 222, 1, 1, f(Yes, false, "")},
-	{0x302e, 224, 1, 1, f(Yes, false, "")},
-	{0x3030, 0, 0, 0, f(Yes, false, "")},
-	{0x3036, 0, 0, 0, g(Yes, No, false, false, "", "〒")},
-	{0x3037, 0, 0, 0, f(Yes, false, "")},
-	{0x3038, 0, 0, 0, g(Yes, No, false, false, "", "十")},
-	{0x3039, 0, 0, 0, g(Yes, No, false, false, "", "卄")},
-	{0x303a, 0, 0, 0, g(Yes, No, false, false, "", "卅")},
-	{0x303b, 0, 0, 0, f(Yes, false, "")},
-	{0x3046, 0, 0, 0, f(Yes, true, "")},
-	{0x3047, 0, 0, 0, f(Yes, false, "")},
-	{0x304b, 0, 0, 0, f(Yes, true, "")},
-	{0x304c, 0, 0, 1, f(Yes, false, "が")},
-	{0x304d, 0, 0, 0, f(Yes, true, "")},
-	{0x304e, 0, 0, 1, f(Yes, false, "ぎ")},
-	{0x304f, 0, 0, 0, f(Yes, true, "")},
-	{0x3050, 0, 0, 1, f(Yes, false, "ぐ")},
-	{0x3051, 0, 0, 0, f(Yes, true, "")},
-	{0x3052, 0, 0, 1, f(Yes, false, "げ")},
-	{0x3053, 0, 0, 0, f(Yes, true, "")},
-	{0x3054, 0, 0, 1, f(Yes, false, "ご")},
-	{0x3055, 0, 0, 0, f(Yes, true, "")},
-	{0x3056, 0, 0, 1, f(Yes, false, "ざ")},
-	{0x3057, 0, 0, 0, f(Yes, true, "")},
-	{0x3058, 0, 0, 1, f(Yes, false, "じ")},
-	{0x3059, 0, 0, 0, f(Yes, true, "")},
-	{0x305a, 0, 0, 1, f(Yes, false, "ず")},
-	{0x305b, 0, 0, 0, f(Yes, true, "")},
-	{0x305c, 0, 0, 1, f(Yes, false, "ぜ")},
-	{0x305d, 0, 0, 0, f(Yes, true, "")},
-	{0x305e, 0, 0, 1, f(Yes, false, "ぞ")},
-	{0x305f, 0, 0, 0, f(Yes, true, "")},
-	{0x3060, 0, 0, 1, f(Yes, false, "だ")},
-	{0x3061, 0, 0, 0, f(Yes, true, "")},
-	{0x3062, 0, 0, 1, f(Yes, false, "ぢ")},
-	{0x3063, 0, 0, 0, f(Yes, false, "")},
-	{0x3064, 0, 0, 0, f(Yes, true, "")},
-	{0x3065, 0, 0, 1, f(Yes, false, "づ")},
-	{0x3066, 0, 0, 0, f(Yes, true, "")},
-	{0x3067, 0, 0, 1, f(Yes, false, "で")},
-	{0x3068, 0, 0, 0, f(Yes, true, "")},
-	{0x3069, 0, 0, 1, f(Yes, false, "ど")},
-	{0x306a, 0, 0, 0, f(Yes, false, "")},
-	{0x306f, 0, 0, 0, f(Yes, true, "")},
-	{0x3070, 0, 0, 1, f(Yes, false, "ば")},
-	{0x3071, 0, 0, 1, f(Yes, false, "ぱ")},
-	{0x3072, 0, 0, 0, f(Yes, true, "")},
-	{0x3073, 0, 0, 1, f(Yes, false, "び")},
-	{0x3074, 0, 0, 1, f(Yes, false, "ぴ")},
-	{0x3075, 0, 0, 0, f(Yes, true, "")},
-	{0x3076, 0, 0, 1, f(Yes, false, "ぶ")},
-	{0x3077, 0, 0, 1, f(Yes, false, "ぷ")},
-	{0x3078, 0, 0, 0, f(Yes, true, "")},
-	{0x3079, 0, 0, 1, f(Yes, false, "べ")},
-	{0x307a, 0, 0, 1, f(Yes, false, "ぺ")},
-	{0x307b, 0, 0, 0, f(Yes, true, "")},
-	{0x307c, 0, 0, 1, f(Yes, false, "ぼ")},
-	{0x307d, 0, 0, 1, f(Yes, false, "ぽ")},
-	{0x307e, 0, 0, 0, f(Yes, false, "")},
-	{0x3094, 0, 0, 1, f(Yes, false, "ゔ")},
-	{0x3095, 0, 0, 0, f(Yes, false, "")},
-	{0x3099, 8, 1, 1, f(Maybe, false, "")},
-	{0x309b, 0, 0, 1, g(Yes, No, false, false, "", " ゙")},
-	{0x309c, 0, 0, 1, g(Yes, No, false, false, "", " ゚")},
-	{0x309d, 0, 0, 0, f(Yes, true, "")},
-	{0x309e, 0, 0, 1, f(Yes, false, "ゞ")},
-	{0x309f, 0, 0, 0, g(Yes, No, false, false, "", "より")},
-	{0x30a0, 0, 0, 0, f(Yes, false, "")},
-	{0x30a6, 0, 0, 0, f(Yes, true, "")},
-	{0x30a7, 0, 0, 0, f(Yes, false, "")},
-	{0x30ab, 0, 0, 0, f(Yes, true, "")},
-	{0x30ac, 0, 0, 1, f(Yes, false, "ガ")},
-	{0x30ad, 0, 0, 0, f(Yes, true, "")},
-	{0x30ae, 0, 0, 1, f(Yes, false, "ギ")},
-	{0x30af, 0, 0, 0, f(Yes, true, "")},
-	{0x30b0, 0, 0, 1, f(Yes, false, "グ")},
-	{0x30b1, 0, 0, 0, f(Yes, true, "")},
-	{0x30b2, 0, 0, 1, f(Yes, false, "ゲ")},
-	{0x30b3, 0, 0, 0, f(Yes, true, "")},
-	{0x30b4, 0, 0, 1, f(Yes, false, "ゴ")},
-	{0x30b5, 0, 0, 0, f(Yes, true, "")},
-	{0x30b6, 0, 0, 1, f(Yes, false, "ザ")},
-	{0x30b7, 0, 0, 0, f(Yes, true, "")},
-	{0x30b8, 0, 0, 1, f(Yes, false, "ジ")},
-	{0x30b9, 0, 0, 0, f(Yes, true, "")},
-	{0x30ba, 0, 0, 1, f(Yes, false, "ズ")},
-	{0x30bb, 0, 0, 0, f(Yes, true, "")},
-	{0x30bc, 0, 0, 1, f(Yes, false, "ゼ")},
-	{0x30bd, 0, 0, 0, f(Yes, true, "")},
-	{0x30be, 0, 0, 1, f(Yes, false, "ゾ")},
-	{0x30bf, 0, 0, 0, f(Yes, true, "")},
-	{0x30c0, 0, 0, 1, f(Yes, false, "ダ")},
-	{0x30c1, 0, 0, 0, f(Yes, true, "")},
-	{0x30c2, 0, 0, 1, f(Yes, false, "ヂ")},
-	{0x30c3, 0, 0, 0, f(Yes, false, "")},
-	{0x30c4, 0, 0, 0, f(Yes, true, "")},
-	{0x30c5, 0, 0, 1, f(Yes, false, "ヅ")},
-	{0x30c6, 0, 0, 0, f(Yes, true, "")},
-	{0x30c7, 0, 0, 1, f(Yes, false, "デ")},
-	{0x30c8, 0, 0, 0, f(Yes, true, "")},
-	{0x30c9, 0, 0, 1, f(Yes, false, "ド")},
-	{0x30ca, 0, 0, 0, f(Yes, false, "")},
-	{0x30cf, 0, 0, 0, f(Yes, true, "")},
-	{0x30d0, 0, 0, 1, f(Yes, false, "バ")},
-	{0x30d1, 0, 0, 1, f(Yes, false, "パ")},
-	{0x30d2, 0, 0, 0, f(Yes, true, "")},
-	{0x30d3, 0, 0, 1, f(Yes, false, "ビ")},
-	{0x30d4, 0, 0, 1, f(Yes, false, "ピ")},
-	{0x30d5, 0, 0, 0, f(Yes, true, "")},
-	{0x30d6, 0, 0, 1, f(Yes, false, "ブ")},
-	{0x30d7, 0, 0, 1, f(Yes, false, "プ")},
-	{0x30d8, 0, 0, 0, f(Yes, true, "")},
-	{0x30d9, 0, 0, 1, f(Yes, false, "ベ")},
-	{0x30da, 0, 0, 1, f(Yes, false, "ペ")},
-	{0x30db, 0, 0, 0, f(Yes, true, "")},
-	{0x30dc, 0, 0, 1, f(Yes, false, "ボ")},
-	{0x30dd, 0, 0, 1, f(Yes, false, "ポ")},
-	{0x30de, 0, 0, 0, f(Yes, false, "")},
-	{0x30ef, 0, 0, 0, f(Yes, true, "")},
-	{0x30f3, 0, 0, 0, f(Yes, false, "")},
-	{0x30f4, 0, 0, 1, f(Yes, false, "ヴ")},
-	{0x30f5, 0, 0, 0, f(Yes, false, "")},
-	{0x30f7, 0, 0, 1, f(Yes, false, "ヷ")},
-	{0x30f8, 0, 0, 1, f(Yes, false, "ヸ")},
-	{0x30f9, 0, 0, 1, f(Yes, false, "ヹ")},
-	{0x30fa, 0, 0, 1, f(Yes, false, "ヺ")},
-	{0x30fb, 0, 0, 0, f(Yes, false, "")},
-	{0x30fd, 0, 0, 0, f(Yes, true, "")},
-	{0x30fe, 0, 0, 1, f(Yes, false, "ヾ")},
-	{0x30ff, 0, 0, 0, g(Yes, No, false, false, "", "コト")},
-	{0x3100, 0, 0, 0, f(Yes, false, "")},
-	{0x3131, 0, 0, 0, g(Yes, No, false, false, "", "ᄀ")},
-	{0x3132, 0, 0, 0, g(Yes, No, false, false, "", "ᄁ")},
-	{0x3133, 0, 1, 1, g(Yes, No, false, false, "", "ᆪ")},
-	{0x3134, 0, 0, 0, g(Yes, No, false, false, "", "ᄂ")},
-	{0x3135, 0, 1, 1, g(Yes, No, false, false, "", "ᆬ")},
-	{0x3136, 0, 1, 1, g(Yes, No, false, false, "", "ᆭ")},
-	{0x3137, 0, 0, 0, g(Yes, No, false, false, "", "ᄃ")},
-	{0x3138, 0, 0, 0, g(Yes, No, false, false, "", "ᄄ")},
-	{0x3139, 0, 0, 0, g(Yes, No, false, false, "", "ᄅ")},
-	{0x313a, 0, 1, 1, g(Yes, No, false, false, "", "ᆰ")},
-	{0x313b, 0, 1, 1, g(Yes, No, false, false, "", "ᆱ")},
-	{0x313c, 0, 1, 1, g(Yes, No, false, false, "", "ᆲ")},
-	{0x313d, 0, 1, 1, g(Yes, No, false, false, "", "ᆳ")},
-	{0x313e, 0, 1, 1, g(Yes, No, false, false, "", "ᆴ")},
-	{0x313f, 0, 1, 1, g(Yes, No, false, false, "", "ᆵ")},
-	{0x3140, 0, 0, 0, g(Yes, No, false, false, "", "ᄚ")},
-	{0x3141, 0, 0, 0, g(Yes, No, false, false, "", "ᄆ")},
-	{0x3142, 0, 0, 0, g(Yes, No, false, false, "", "ᄇ")},
-	{0x3143, 0, 0, 0, g(Yes, No, false, false, "", "ᄈ")},
-	{0x3144, 0, 0, 0, g(Yes, No, false, false, "", "ᄡ")},
-	{0x3145, 0, 0, 0, g(Yes, No, false, false, "", "ᄉ")},
-	{0x3146, 0, 0, 0, g(Yes, No, false, false, "", "ᄊ")},
-	{0x3147, 0, 0, 0, g(Yes, No, false, false, "", "ᄋ")},
-	{0x3148, 0, 0, 0, g(Yes, No, false, false, "", "ᄌ")},
-	{0x3149, 0, 0, 0, g(Yes, No, false, false, "", "ᄍ")},
-	{0x314a, 0, 0, 0, g(Yes, No, false, false, "", "ᄎ")},
-	{0x314b, 0, 0, 0, g(Yes, No, false, false, "", "ᄏ")},
-	{0x314c, 0, 0, 0, g(Yes, No, false, false, "", "ᄐ")},
-	{0x314d, 0, 0, 0, g(Yes, No, false, false, "", "ᄑ")},
-	{0x314e, 0, 0, 0, g(Yes, No, false, false, "", "ᄒ")},
-	{0x314f, 0, 1, 1, g(Yes, No, false, false, "", "ᅡ")},
-	{0x3150, 0, 1, 1, g(Yes, No, false, false, "", "ᅢ")},
-	{0x3151, 0, 1, 1, g(Yes, No, false, false, "", "ᅣ")},
-	{0x3152, 0, 1, 1, g(Yes, No, false, false, "", "ᅤ")},
-	{0x3153, 0, 1, 1, g(Yes, No, false, false, "", "ᅥ")},
-	{0x3154, 0, 1, 1, g(Yes, No, false, false, "", "ᅦ")},
-	{0x3155, 0, 1, 1, g(Yes, No, false, false, "", "ᅧ")},
-	{0x3156, 0, 1, 1, g(Yes, No, false, false, "", "ᅨ")},
-	{0x3157, 0, 1, 1, g(Yes, No, false, false, "", "ᅩ")},
-	{0x3158, 0, 1, 1, g(Yes, No, false, false, "", "ᅪ")},
-	{0x3159, 0, 1, 1, g(Yes, No, false, false, "", "ᅫ")},
-	{0x315a, 0, 1, 1, g(Yes, No, false, false, "", "ᅬ")},
-	{0x315b, 0, 1, 1, g(Yes, No, false, false, "", "ᅭ")},
-	{0x315c, 0, 1, 1, g(Yes, No, false, false, "", "ᅮ")},
-	{0x315d, 0, 1, 1, g(Yes, No, false, false, "", "ᅯ")},
-	{0x315e, 0, 1, 1, g(Yes, No, false, false, "", "ᅰ")},
-	{0x315f, 0, 1, 1, g(Yes, No, false, false, "", "ᅱ")},
-	{0x3160, 0, 1, 1, g(Yes, No, false, false, "", "ᅲ")},
-	{0x3161, 0, 1, 1, g(Yes, No, false, false, "", "ᅳ")},
-	{0x3162, 0, 1, 1, g(Yes, No, false, false, "", "ᅴ")},
-	{0x3163, 0, 1, 1, g(Yes, No, false, false, "", "ᅵ")},
-	{0x3164, 0, 0, 0, g(Yes, No, false, false, "", "ᅠ")},
-	{0x3165, 0, 0, 0, g(Yes, No, false, false, "", "ᄔ")},
-	{0x3166, 0, 0, 0, g(Yes, No, false, false, "", "ᄕ")},
-	{0x3167, 0, 0, 0, g(Yes, No, false, false, "", "ᇇ")},
-	{0x3168, 0, 0, 0, g(Yes, No, false, false, "", "ᇈ")},
-	{0x3169, 0, 0, 0, g(Yes, No, false, false, "", "ᇌ")},
-	{0x316a, 0, 0, 0, g(Yes, No, false, false, "", "ᇎ")},
-	{0x316b, 0, 0, 0, g(Yes, No, false, false, "", "ᇓ")},
-	{0x316c, 0, 0, 0, g(Yes, No, false, false, "", "ᇗ")},
-	{0x316d, 0, 0, 0, g(Yes, No, false, false, "", "ᇙ")},
-	{0x316e, 0, 0, 0, g(Yes, No, false, false, "", "ᄜ")},
-	{0x316f, 0, 0, 0, g(Yes, No, false, false, "", "ᇝ")},
-	{0x3170, 0, 0, 0, g(Yes, No, false, false, "", "ᇟ")},
-	{0x3171, 0, 0, 0, g(Yes, No, false, false, "", "ᄝ")},
-	{0x3172, 0, 0, 0, g(Yes, No, false, false, "", "ᄞ")},
-	{0x3173, 0, 0, 0, g(Yes, No, false, false, "", "ᄠ")},
-	{0x3174, 0, 0, 0, g(Yes, No, false, false, "", "ᄢ")},
-	{0x3175, 0, 0, 0, g(Yes, No, false, false, "", "ᄣ")},
-	{0x3176, 0, 0, 0, g(Yes, No, false, false, "", "ᄧ")},
-	{0x3177, 0, 0, 0, g(Yes, No, false, false, "", "ᄩ")},
-	{0x3178, 0, 0, 0, g(Yes, No, false, false, "", "ᄫ")},
-	{0x3179, 0, 0, 0, g(Yes, No, false, false, "", "ᄬ")},
-	{0x317a, 0, 0, 0, g(Yes, No, false, false, "", "ᄭ")},
-	{0x317b, 0, 0, 0, g(Yes, No, false, false, "", "ᄮ")},
-	{0x317c, 0, 0, 0, g(Yes, No, false, false, "", "ᄯ")},
-	{0x317d, 0, 0, 0, g(Yes, No, false, false, "", "ᄲ")},
-	{0x317e, 0, 0, 0, g(Yes, No, false, false, "", "ᄶ")},
-	{0x317f, 0, 0, 0, g(Yes, No, false, false, "", "ᅀ")},
-	{0x3180, 0, 0, 0, g(Yes, No, false, false, "", "ᅇ")},
-	{0x3181, 0, 0, 0, g(Yes, No, false, false, "", "ᅌ")},
-	{0x3182, 0, 0, 0, g(Yes, No, false, false, "", "ᇱ")},
-	{0x3183, 0, 0, 0, g(Yes, No, false, false, "", "ᇲ")},
-	{0x3184, 0, 0, 0, g(Yes, No, false, false, "", "ᅗ")},
-	{0x3185, 0, 0, 0, g(Yes, No, false, false, "", "ᅘ")},
-	{0x3186, 0, 0, 0, g(Yes, No, false, false, "", "ᅙ")},
-	{0x3187, 0, 0, 0, g(Yes, No, false, false, "", "ᆄ")},
-	{0x3188, 0, 0, 0, g(Yes, No, false, false, "", "ᆅ")},
-	{0x3189, 0, 0, 0, g(Yes, No, false, false, "", "ᆈ")},
-	{0x318a, 0, 0, 0, g(Yes, No, false, false, "", "ᆑ")},
-	{0x318b, 0, 0, 0, g(Yes, No, false, false, "", "ᆒ")},
-	{0x318c, 0, 0, 0, g(Yes, No, false, false, "", "ᆔ")},
-	{0x318d, 0, 0, 0, g(Yes, No, false, false, "", "ᆞ")},
-	{0x318e, 0, 0, 0, g(Yes, No, false, false, "", "ᆡ")},
-	{0x318f, 0, 0, 0, f(Yes, false, "")},
-	{0x3192, 0, 0, 0, g(Yes, No, false, false, "", "一")},
-	{0x3193, 0, 0, 0, g(Yes, No, false, false, "", "二")},
-	{0x3194, 0, 0, 0, g(Yes, No, false, false, "", "三")},
-	{0x3195, 0, 0, 0, g(Yes, No, false, false, "", "四")},
-	{0x3196, 0, 0, 0, g(Yes, No, false, false, "", "上")},
-	{0x3197, 0, 0, 0, g(Yes, No, false, false, "", "中")},
-	{0x3198, 0, 0, 0, g(Yes, No, false, false, "", "下")},
-	{0x3199, 0, 0, 0, g(Yes, No, false, false, "", "甲")},
-	{0x319a, 0, 0, 0, g(Yes, No, false, false, "", "乙")},
-	{0x319b, 0, 0, 0, g(Yes, No, false, false, "", "丙")},
-	{0x319c, 0, 0, 0, g(Yes, No, false, false, "", "丁")},
-	{0x319d, 0, 0, 0, g(Yes, No, false, false, "", "天")},
-	{0x319e, 0, 0, 0, g(Yes, No, false, false, "", "地")},
-	{0x319f, 0, 0, 0, g(Yes, No, false, false, "", "人")},
-	{0x31a0, 0, 0, 0, f(Yes, false, "")},
-	{0x3200, 0, 0, 0, g(Yes, No, false, false, "", "(ᄀ)")},
-	{0x3201, 0, 0, 0, g(Yes, No, false, false, "", "(ᄂ)")},
-	{0x3202, 0, 0, 0, g(Yes, No, false, false, "", "(ᄃ)")},
-	{0x3203, 0, 0, 0, g(Yes, No, false, false, "", "(ᄅ)")},
-	{0x3204, 0, 0, 0, g(Yes, No, false, false, "", "(ᄆ)")},
-	{0x3205, 0, 0, 0, g(Yes, No, false, false, "", "(ᄇ)")},
-	{0x3206, 0, 0, 0, g(Yes, No, false, false, "", "(ᄉ)")},
-	{0x3207, 0, 0, 0, g(Yes, No, false, false, "", "(ᄋ)")},
-	{0x3208, 0, 0, 0, g(Yes, No, false, false, "", "(ᄌ)")},
-	{0x3209, 0, 0, 0, g(Yes, No, false, false, "", "(ᄎ)")},
-	{0x320a, 0, 0, 0, g(Yes, No, false, false, "", "(ᄏ)")},
-	{0x320b, 0, 0, 0, g(Yes, No, false, false, "", "(ᄐ)")},
-	{0x320c, 0, 0, 0, g(Yes, No, false, false, "", "(ᄑ)")},
-	{0x320d, 0, 0, 0, g(Yes, No, false, false, "", "(ᄒ)")},
-	{0x320e, 0, 0, 0, g(Yes, No, false, false, "", "(가)")},
-	{0x320f, 0, 0, 0, g(Yes, No, false, false, "", "(나)")},
-	{0x3210, 0, 0, 0, g(Yes, No, false, false, "", "(다)")},
-	{0x3211, 0, 0, 0, g(Yes, No, false, false, "", "(라)")},
-	{0x3212, 0, 0, 0, g(Yes, No, false, false, "", "(마)")},
-	{0x3213, 0, 0, 0, g(Yes, No, false, false, "", "(바)")},
-	{0x3214, 0, 0, 0, g(Yes, No, false, false, "", "(사)")},
-	{0x3215, 0, 0, 0, g(Yes, No, false, false, "", "(아)")},
-	{0x3216, 0, 0, 0, g(Yes, No, false, false, "", "(자)")},
-	{0x3217, 0, 0, 0, g(Yes, No, false, false, "", "(차)")},
-	{0x3218, 0, 0, 0, g(Yes, No, false, false, "", "(카)")},
-	{0x3219, 0, 0, 0, g(Yes, No, false, false, "", "(타)")},
-	{0x321a, 0, 0, 0, g(Yes, No, false, false, "", "(파)")},
-	{0x321b, 0, 0, 0, g(Yes, No, false, false, "", "(하)")},
-	{0x321c, 0, 0, 0, g(Yes, No, false, false, "", "(주)")},
-	{0x321d, 0, 0, 0, g(Yes, No, false, false, "", "(오전)")},
-	{0x321e, 0, 0, 0, g(Yes, No, false, false, "", "(오후)")},
-	{0x321f, 0, 0, 0, f(Yes, false, "")},
-	{0x3220, 0, 0, 0, g(Yes, No, false, false, "", "(一)")},
-	{0x3221, 0, 0, 0, g(Yes, No, false, false, "", "(二)")},
-	{0x3222, 0, 0, 0, g(Yes, No, false, false, "", "(三)")},
-	{0x3223, 0, 0, 0, g(Yes, No, false, false, "", "(四)")},
-	{0x3224, 0, 0, 0, g(Yes, No, false, false, "", "(五)")},
-	{0x3225, 0, 0, 0, g(Yes, No, false, false, "", "(六)")},
-	{0x3226, 0, 0, 0, g(Yes, No, false, false, "", "(七)")},
-	{0x3227, 0, 0, 0, g(Yes, No, false, false, "", "(八)")},
-	{0x3228, 0, 0, 0, g(Yes, No, false, false, "", "(九)")},
-	{0x3229, 0, 0, 0, g(Yes, No, false, false, "", "(十)")},
-	{0x322a, 0, 0, 0, g(Yes, No, false, false, "", "(月)")},
-	{0x322b, 0, 0, 0, g(Yes, No, false, false, "", "(火)")},
-	{0x322c, 0, 0, 0, g(Yes, No, false, false, "", "(水)")},
-	{0x322d, 0, 0, 0, g(Yes, No, false, false, "", "(木)")},
-	{0x322e, 0, 0, 0, g(Yes, No, false, false, "", "(金)")},
-	{0x322f, 0, 0, 0, g(Yes, No, false, false, "", "(土)")},
-	{0x3230, 0, 0, 0, g(Yes, No, false, false, "", "(日)")},
-	{0x3231, 0, 0, 0, g(Yes, No, false, false, "", "(株)")},
-	{0x3232, 0, 0, 0, g(Yes, No, false, false, "", "(有)")},
-	{0x3233, 0, 0, 0, g(Yes, No, false, false, "", "(社)")},
-	{0x3234, 0, 0, 0, g(Yes, No, false, false, "", "(名)")},
-	{0x3235, 0, 0, 0, g(Yes, No, false, false, "", "(特)")},
-	{0x3236, 0, 0, 0, g(Yes, No, false, false, "", "(財)")},
-	{0x3237, 0, 0, 0, g(Yes, No, false, false, "", "(祝)")},
-	{0x3238, 0, 0, 0, g(Yes, No, false, false, "", "(労)")},
-	{0x3239, 0, 0, 0, g(Yes, No, false, false, "", "(代)")},
-	{0x323a, 0, 0, 0, g(Yes, No, false, false, "", "(呼)")},
-	{0x323b, 0, 0, 0, g(Yes, No, false, false, "", "(学)")},
-	{0x323c, 0, 0, 0, g(Yes, No, false, false, "", "(監)")},
-	{0x323d, 0, 0, 0, g(Yes, No, false, false, "", "(企)")},
-	{0x323e, 0, 0, 0, g(Yes, No, false, false, "", "(資)")},
-	{0x323f, 0, 0, 0, g(Yes, No, false, false, "", "(協)")},
-	{0x3240, 0, 0, 0, g(Yes, No, false, false, "", "(祭)")},
-	{0x3241, 0, 0, 0, g(Yes, No, false, false, "", "(休)")},
-	{0x3242, 0, 0, 0, g(Yes, No, false, false, "", "(自)")},
-	{0x3243, 0, 0, 0, g(Yes, No, false, false, "", "(至)")},
-	{0x3244, 0, 0, 0, g(Yes, No, false, false, "", "問")},
-	{0x3245, 0, 0, 0, g(Yes, No, false, false, "", "幼")},
-	{0x3246, 0, 0, 0, g(Yes, No, false, false, "", "文")},
-	{0x3247, 0, 0, 0, g(Yes, No, false, false, "", "箏")},
-	{0x3248, 0, 0, 0, f(Yes, false, "")},
-	{0x3250, 0, 0, 0, g(Yes, No, false, false, "", "PTE")},
-	{0x3251, 0, 0, 0, g(Yes, No, false, false, "", "21")},
-	{0x3252, 0, 0, 0, g(Yes, No, false, false, "", "22")},
-	{0x3253, 0, 0, 0, g(Yes, No, false, false, "", "23")},
-	{0x3254, 0, 0, 0, g(Yes, No, false, false, "", "24")},
-	{0x3255, 0, 0, 0, g(Yes, No, false, false, "", "25")},
-	{0x3256, 0, 0, 0, g(Yes, No, false, false, "", "26")},
-	{0x3257, 0, 0, 0, g(Yes, No, false, false, "", "27")},
-	{0x3258, 0, 0, 0, g(Yes, No, false, false, "", "28")},
-	{0x3259, 0, 0, 0, g(Yes, No, false, false, "", "29")},
-	{0x325a, 0, 0, 0, g(Yes, No, false, false, "", "30")},
-	{0x325b, 0, 0, 0, g(Yes, No, false, false, "", "31")},
-	{0x325c, 0, 0, 0, g(Yes, No, false, false, "", "32")},
-	{0x325d, 0, 0, 0, g(Yes, No, false, false, "", "33")},
-	{0x325e, 0, 0, 0, g(Yes, No, false, false, "", "34")},
-	{0x325f, 0, 0, 0, g(Yes, No, false, false, "", "35")},
-	{0x3260, 0, 0, 0, g(Yes, No, false, false, "", "ᄀ")},
-	{0x3261, 0, 0, 0, g(Yes, No, false, false, "", "ᄂ")},
-	{0x3262, 0, 0, 0, g(Yes, No, false, false, "", "ᄃ")},
-	{0x3263, 0, 0, 0, g(Yes, No, false, false, "", "ᄅ")},
-	{0x3264, 0, 0, 0, g(Yes, No, false, false, "", "ᄆ")},
-	{0x3265, 0, 0, 0, g(Yes, No, false, false, "", "ᄇ")},
-	{0x3266, 0, 0, 0, g(Yes, No, false, false, "", "ᄉ")},
-	{0x3267, 0, 0, 0, g(Yes, No, false, false, "", "ᄋ")},
-	{0x3268, 0, 0, 0, g(Yes, No, false, false, "", "ᄌ")},
-	{0x3269, 0, 0, 0, g(Yes, No, false, false, "", "ᄎ")},
-	{0x326a, 0, 0, 0, g(Yes, No, false, false, "", "ᄏ")},
-	{0x326b, 0, 0, 0, g(Yes, No, false, false, "", "ᄐ")},
-	{0x326c, 0, 0, 0, g(Yes, No, false, false, "", "ᄑ")},
-	{0x326d, 0, 0, 0, g(Yes, No, false, false, "", "ᄒ")},
-	{0x326e, 0, 0, 1, g(Yes, No, false, false, "", "가")},
-	{0x326f, 0, 0, 1, g(Yes, No, false, false, "", "나")},
-	{0x3270, 0, 0, 1, g(Yes, No, false, false, "", "다")},
-	{0x3271, 0, 0, 1, g(Yes, No, false, false, "", "라")},
-	{0x3272, 0, 0, 1, g(Yes, No, false, false, "", "마")},
-	{0x3273, 0, 0, 1, g(Yes, No, false, false, "", "바")},
-	{0x3274, 0, 0, 1, g(Yes, No, false, false, "", "사")},
-	{0x3275, 0, 0, 1, g(Yes, No, false, false, "", "아")},
-	{0x3276, 0, 0, 1, g(Yes, No, false, false, "", "자")},
-	{0x3277, 0, 0, 1, g(Yes, No, false, false, "", "차")},
-	{0x3278, 0, 0, 1, g(Yes, No, false, false, "", "카")},
-	{0x3279, 0, 0, 1, g(Yes, No, false, false, "", "타")},
-	{0x327a, 0, 0, 1, g(Yes, No, false, false, "", "파")},
-	{0x327b, 0, 0, 1, g(Yes, No, false, false, "", "하")},
-	{0x327c, 0, 0, 1, g(Yes, No, false, false, "", "참고")},
-	{0x327d, 0, 0, 1, g(Yes, No, false, false, "", "주의")},
-	{0x327e, 0, 0, 1, g(Yes, No, false, false, "", "우")},
-	{0x327f, 0, 0, 0, f(Yes, false, "")},
-	{0x3280, 0, 0, 0, g(Yes, No, false, false, "", "一")},
-	{0x3281, 0, 0, 0, g(Yes, No, false, false, "", "二")},
-	{0x3282, 0, 0, 0, g(Yes, No, false, false, "", "三")},
-	{0x3283, 0, 0, 0, g(Yes, No, false, false, "", "四")},
-	{0x3284, 0, 0, 0, g(Yes, No, false, false, "", "五")},
-	{0x3285, 0, 0, 0, g(Yes, No, false, false, "", "六")},
-	{0x3286, 0, 0, 0, g(Yes, No, false, false, "", "七")},
-	{0x3287, 0, 0, 0, g(Yes, No, false, false, "", "八")},
-	{0x3288, 0, 0, 0, g(Yes, No, false, false, "", "九")},
-	{0x3289, 0, 0, 0, g(Yes, No, false, false, "", "十")},
-	{0x328a, 0, 0, 0, g(Yes, No, false, false, "", "月")},
-	{0x328b, 0, 0, 0, g(Yes, No, false, false, "", "火")},
-	{0x328c, 0, 0, 0, g(Yes, No, false, false, "", "水")},
-	{0x328d, 0, 0, 0, g(Yes, No, false, false, "", "木")},
-	{0x328e, 0, 0, 0, g(Yes, No, false, false, "", "金")},
-	{0x328f, 0, 0, 0, g(Yes, No, false, false, "", "土")},
-	{0x3290, 0, 0, 0, g(Yes, No, false, false, "", "日")},
-	{0x3291, 0, 0, 0, g(Yes, No, false, false, "", "株")},
-	{0x3292, 0, 0, 0, g(Yes, No, false, false, "", "有")},
-	{0x3293, 0, 0, 0, g(Yes, No, false, false, "", "社")},
-	{0x3294, 0, 0, 0, g(Yes, No, false, false, "", "名")},
-	{0x3295, 0, 0, 0, g(Yes, No, false, false, "", "特")},
-	{0x3296, 0, 0, 0, g(Yes, No, false, false, "", "財")},
-	{0x3297, 0, 0, 0, g(Yes, No, false, false, "", "祝")},
-	{0x3298, 0, 0, 0, g(Yes, No, false, false, "", "労")},
-	{0x3299, 0, 0, 0, g(Yes, No, false, false, "", "秘")},
-	{0x329a, 0, 0, 0, g(Yes, No, false, false, "", "男")},
-	{0x329b, 0, 0, 0, g(Yes, No, false, false, "", "女")},
-	{0x329c, 0, 0, 0, g(Yes, No, false, false, "", "適")},
-	{0x329d, 0, 0, 0, g(Yes, No, false, false, "", "優")},
-	{0x329e, 0, 0, 0, g(Yes, No, false, false, "", "印")},
-	{0x329f, 0, 0, 0, g(Yes, No, false, false, "", "注")},
-	{0x32a0, 0, 0, 0, g(Yes, No, false, false, "", "項")},
-	{0x32a1, 0, 0, 0, g(Yes, No, false, false, "", "休")},
-	{0x32a2, 0, 0, 0, g(Yes, No, false, false, "", "写")},
-	{0x32a3, 0, 0, 0, g(Yes, No, false, false, "", "正")},
-	{0x32a4, 0, 0, 0, g(Yes, No, false, false, "", "上")},
-	{0x32a5, 0, 0, 0, g(Yes, No, false, false, "", "中")},
-	{0x32a6, 0, 0, 0, g(Yes, No, false, false, "", "下")},
-	{0x32a7, 0, 0, 0, g(Yes, No, false, false, "", "左")},
-	{0x32a8, 0, 0, 0, g(Yes, No, false, false, "", "右")},
-	{0x32a9, 0, 0, 0, g(Yes, No, false, false, "", "医")},
-	{0x32aa, 0, 0, 0, g(Yes, No, false, false, "", "宗")},
-	{0x32ab, 0, 0, 0, g(Yes, No, false, false, "", "学")},
-	{0x32ac, 0, 0, 0, g(Yes, No, false, false, "", "監")},
-	{0x32ad, 0, 0, 0, g(Yes, No, false, false, "", "企")},
-	{0x32ae, 0, 0, 0, g(Yes, No, false, false, "", "資")},
-	{0x32af, 0, 0, 0, g(Yes, No, false, false, "", "協")},
-	{0x32b0, 0, 0, 0, g(Yes, No, false, false, "", "夜")},
-	{0x32b1, 0, 0, 0, g(Yes, No, false, false, "", "36")},
-	{0x32b2, 0, 0, 0, g(Yes, No, false, false, "", "37")},
-	{0x32b3, 0, 0, 0, g(Yes, No, false, false, "", "38")},
-	{0x32b4, 0, 0, 0, g(Yes, No, false, false, "", "39")},
-	{0x32b5, 0, 0, 0, g(Yes, No, false, false, "", "40")},
-	{0x32b6, 0, 0, 0, g(Yes, No, false, false, "", "41")},
-	{0x32b7, 0, 0, 0, g(Yes, No, false, false, "", "42")},
-	{0x32b8, 0, 0, 0, g(Yes, No, false, false, "", "43")},
-	{0x32b9, 0, 0, 0, g(Yes, No, false, false, "", "44")},
-	{0x32ba, 0, 0, 0, g(Yes, No, false, false, "", "45")},
-	{0x32bb, 0, 0, 0, g(Yes, No, false, false, "", "46")},
-	{0x32bc, 0, 0, 0, g(Yes, No, false, false, "", "47")},
-	{0x32bd, 0, 0, 0, g(Yes, No, false, false, "", "48")},
-	{0x32be, 0, 0, 0, g(Yes, No, false, false, "", "49")},
-	{0x32bf, 0, 0, 0, g(Yes, No, false, false, "", "50")},
-	{0x32c0, 0, 0, 0, g(Yes, No, false, false, "", "1月")},
-	{0x32c1, 0, 0, 0, g(Yes, No, false, false, "", "2月")},
-	{0x32c2, 0, 0, 0, g(Yes, No, false, false, "", "3月")},
-	{0x32c3, 0, 0, 0, g(Yes, No, false, false, "", "4月")},
-	{0x32c4, 0, 0, 0, g(Yes, No, false, false, "", "5月")},
-	{0x32c5, 0, 0, 0, g(Yes, No, false, false, "", "6月")},
-	{0x32c6, 0, 0, 0, g(Yes, No, false, false, "", "7月")},
-	{0x32c7, 0, 0, 0, g(Yes, No, false, false, "", "8月")},
-	{0x32c8, 0, 0, 0, g(Yes, No, false, false, "", "9月")},
-	{0x32c9, 0, 0, 0, g(Yes, No, false, false, "", "10月")},
-	{0x32ca, 0, 0, 0, g(Yes, No, false, false, "", "11月")},
-	{0x32cb, 0, 0, 0, g(Yes, No, false, false, "", "12月")},
-	{0x32cc, 0, 0, 0, g(Yes, No, false, false, "", "Hg")},
-	{0x32cd, 0, 0, 0, g(Yes, No, false, false, "", "erg")},
-	{0x32ce, 0, 0, 0, g(Yes, No, false, false, "", "eV")},
-	{0x32cf, 0, 0, 0, g(Yes, No, false, false, "", "LTD")},
-	{0x32d0, 0, 0, 0, g(Yes, No, false, false, "", "ア")},
-	{0x32d1, 0, 0, 0, g(Yes, No, false, false, "", "イ")},
-	{0x32d2, 0, 0, 0, g(Yes, No, false, false, "", "ウ")},
-	{0x32d3, 0, 0, 0, g(Yes, No, false, false, "", "エ")},
-	{0x32d4, 0, 0, 0, g(Yes, No, false, false, "", "オ")},
-	{0x32d5, 0, 0, 0, g(Yes, No, false, false, "", "カ")},
-	{0x32d6, 0, 0, 0, g(Yes, No, false, false, "", "キ")},
-	{0x32d7, 0, 0, 0, g(Yes, No, false, false, "", "ク")},
-	{0x32d8, 0, 0, 0, g(Yes, No, false, false, "", "ケ")},
-	{0x32d9, 0, 0, 0, g(Yes, No, false, false, "", "コ")},
-	{0x32da, 0, 0, 0, g(Yes, No, false, false, "", "サ")},
-	{0x32db, 0, 0, 0, g(Yes, No, false, false, "", "シ")},
-	{0x32dc, 0, 0, 0, g(Yes, No, false, false, "", "ス")},
-	{0x32dd, 0, 0, 0, g(Yes, No, false, false, "", "セ")},
-	{0x32de, 0, 0, 0, g(Yes, No, false, false, "", "ソ")},
-	{0x32df, 0, 0, 0, g(Yes, No, false, false, "", "タ")},
-	{0x32e0, 0, 0, 0, g(Yes, No, false, false, "", "チ")},
-	{0x32e1, 0, 0, 0, g(Yes, No, false, false, "", "ツ")},
-	{0x32e2, 0, 0, 0, g(Yes, No, false, false, "", "テ")},
-	{0x32e3, 0, 0, 0, g(Yes, No, false, false, "", "ト")},
-	{0x32e4, 0, 0, 0, g(Yes, No, false, false, "", "ナ")},
-	{0x32e5, 0, 0, 0, g(Yes, No, false, false, "", "ニ")},
-	{0x32e6, 0, 0, 0, g(Yes, No, false, false, "", "ヌ")},
-	{0x32e7, 0, 0, 0, g(Yes, No, false, false, "", "ネ")},
-	{0x32e8, 0, 0, 0, g(Yes, No, false, false, "", "ノ")},
-	{0x32e9, 0, 0, 0, g(Yes, No, false, false, "", "ハ")},
-	{0x32ea, 0, 0, 0, g(Yes, No, false, false, "", "ヒ")},
-	{0x32eb, 0, 0, 0, g(Yes, No, false, false, "", "フ")},
-	{0x32ec, 0, 0, 0, g(Yes, No, false, false, "", "ヘ")},
-	{0x32ed, 0, 0, 0, g(Yes, No, false, false, "", "ホ")},
-	{0x32ee, 0, 0, 0, g(Yes, No, false, false, "", "マ")},
-	{0x32ef, 0, 0, 0, g(Yes, No, false, false, "", "ミ")},
-	{0x32f0, 0, 0, 0, g(Yes, No, false, false, "", "ム")},
-	{0x32f1, 0, 0, 0, g(Yes, No, false, false, "", "メ")},
-	{0x32f2, 0, 0, 0, g(Yes, No, false, false, "", "モ")},
-	{0x32f3, 0, 0, 0, g(Yes, No, false, false, "", "ヤ")},
-	{0x32f4, 0, 0, 0, g(Yes, No, false, false, "", "ユ")},
-	{0x32f5, 0, 0, 0, g(Yes, No, false, false, "", "ヨ")},
-	{0x32f6, 0, 0, 0, g(Yes, No, false, false, "", "ラ")},
-	{0x32f7, 0, 0, 0, g(Yes, No, false, false, "", "リ")},
-	{0x32f8, 0, 0, 0, g(Yes, No, false, false, "", "ル")},
-	{0x32f9, 0, 0, 0, g(Yes, No, false, false, "", "レ")},
-	{0x32fa, 0, 0, 0, g(Yes, No, false, false, "", "ロ")},
-	{0x32fb, 0, 0, 0, g(Yes, No, false, false, "", "ワ")},
-	{0x32fc, 0, 0, 0, g(Yes, No, false, false, "", "ヰ")},
-	{0x32fd, 0, 0, 0, g(Yes, No, false, false, "", "ヱ")},
-	{0x32fe, 0, 0, 0, g(Yes, No, false, false, "", "ヲ")},
-	{0x32ff, 0, 0, 0, f(Yes, false, "")},
-	{0x3300, 0, 0, 0, g(Yes, No, false, false, "", "アパート")},
-	{0x3301, 0, 0, 0, g(Yes, No, false, false, "", "アルファ")},
-	{0x3302, 0, 0, 0, g(Yes, No, false, false, "", "アンペア")},
-	{0x3303, 0, 0, 0, g(Yes, No, false, false, "", "アール")},
-	{0x3304, 0, 0, 1, g(Yes, No, false, false, "", "イニング")},
-	{0x3305, 0, 0, 0, g(Yes, No, false, false, "", "インチ")},
-	{0x3306, 0, 0, 0, g(Yes, No, false, false, "", "ウォン")},
-	{0x3307, 0, 0, 1, g(Yes, No, false, false, "", "エスクード")},
-	{0x3308, 0, 0, 0, g(Yes, No, false, false, "", "エーカー")},
-	{0x3309, 0, 0, 0, g(Yes, No, false, false, "", "オンス")},
-	{0x330a, 0, 0, 0, g(Yes, No, false, false, "", "オーム")},
-	{0x330b, 0, 0, 0, g(Yes, No, false, false, "", "カイリ")},
-	{0x330c, 0, 0, 0, g(Yes, No, false, false, "", "カラット")},
-	{0x330d, 0, 0, 0, g(Yes, No, false, false, "", "カロリー")},
-	{0x330e, 0, 0, 0, g(Yes, No, false, false, "", "ガロン")},
-	{0x330f, 0, 0, 0, g(Yes, No, false, false, "", "ガンマ")},
-	{0x3310, 0, 0, 1, g(Yes, No, false, false, "", "ギガ")},
-	{0x3311, 0, 0, 0, g(Yes, No, false, false, "", "ギニー")},
-	{0x3312, 0, 0, 0, g(Yes, No, false, false, "", "キュリー")},
-	{0x3313, 0, 0, 0, g(Yes, No, false, false, "", "ギルダー")},
-	{0x3314, 0, 0, 0, g(Yes, No, false, false, "", "キロ")},
-	{0x3315, 0, 0, 0, g(Yes, No, false, false, "", "キログラム")},
-	{0x3316, 0, 0, 0, g(Yes, No, false, false, "", "キロメートル")},
-	{0x3317, 0, 0, 0, g(Yes, No, false, false, "", "キロワット")},
-	{0x3318, 0, 0, 0, g(Yes, No, false, false, "", "グラム")},
-	{0x3319, 0, 0, 0, g(Yes, No, false, false, "", "グラムトン")},
-	{0x331a, 0, 0, 0, g(Yes, No, false, false, "", "クルゼイロ")},
-	{0x331b, 0, 0, 0, g(Yes, No, false, false, "", "クローネ")},
-	{0x331c, 0, 0, 0, g(Yes, No, false, false, "", "ケース")},
-	{0x331d, 0, 0, 0, g(Yes, No, false, false, "", "コルナ")},
-	{0x331e, 0, 0, 1, g(Yes, No, false, false, "", "コーポ")},
-	{0x331f, 0, 0, 0, g(Yes, No, false, false, "", "サイクル")},
-	{0x3320, 0, 0, 0, g(Yes, No, false, false, "", "サンチーム")},
-	{0x3321, 0, 0, 1, g(Yes, No, false, false, "", "シリング")},
-	{0x3322, 0, 0, 0, g(Yes, No, false, false, "", "センチ")},
-	{0x3323, 0, 0, 0, g(Yes, No, false, false, "", "セント")},
-	{0x3324, 0, 0, 0, g(Yes, No, false, false, "", "ダース")},
-	{0x3325, 0, 0, 0, g(Yes, No, false, false, "", "デシ")},
-	{0x3326, 0, 0, 0, g(Yes, No, false, false, "", "ドル")},
-	{0x3327, 0, 0, 0, g(Yes, No, false, false, "", "トン")},
-	{0x3328, 0, 0, 0, g(Yes, No, false, false, "", "ナノ")},
-	{0x3329, 0, 0, 0, g(Yes, No, false, false, "", "ノット")},
-	{0x332a, 0, 0, 0, g(Yes, No, false, false, "", "ハイツ")},
-	{0x332b, 0, 0, 0, g(Yes, No, false, false, "", "パーセント")},
-	{0x332c, 0, 0, 0, g(Yes, No, false, false, "", "パーツ")},
-	{0x332d, 0, 0, 0, g(Yes, No, false, false, "", "バーレル")},
-	{0x332e, 0, 0, 0, g(Yes, No, false, false, "", "ピアストル")},
-	{0x332f, 0, 0, 0, g(Yes, No, false, false, "", "ピクル")},
-	{0x3330, 0, 0, 0, g(Yes, No, false, false, "", "ピコ")},
-	{0x3331, 0, 0, 0, g(Yes, No, false, false, "", "ビル")},
-	{0x3332, 0, 0, 1, g(Yes, No, false, false, "", "ファラッド")},
-	{0x3333, 0, 0, 0, g(Yes, No, false, false, "", "フィート")},
-	{0x3334, 0, 0, 0, g(Yes, No, false, false, "", "ブッシェル")},
-	{0x3335, 0, 0, 0, g(Yes, No, false, false, "", "フラン")},
-	{0x3336, 0, 0, 0, g(Yes, No, false, false, "", "ヘクタール")},
-	{0x3337, 0, 0, 0, g(Yes, No, false, false, "", "ペソ")},
-	{0x3338, 0, 0, 0, g(Yes, No, false, false, "", "ペニヒ")},
-	{0x3339, 0, 0, 0, g(Yes, No, false, false, "", "ヘルツ")},
-	{0x333a, 0, 0, 0, g(Yes, No, false, false, "", "ペンス")},
-	{0x333b, 0, 0, 1, g(Yes, No, false, false, "", "ページ")},
-	{0x333c, 0, 0, 0, g(Yes, No, false, false, "", "ベータ")},
-	{0x333d, 0, 0, 0, g(Yes, No, false, false, "", "ポイント")},
-	{0x333e, 0, 0, 0, g(Yes, No, false, false, "", "ボルト")},
-	{0x333f, 0, 0, 0, g(Yes, No, false, false, "", "ホン")},
-	{0x3340, 0, 0, 1, g(Yes, No, false, false, "", "ポンド")},
-	{0x3341, 0, 0, 0, g(Yes, No, false, false, "", "ホール")},
-	{0x3342, 0, 0, 0, g(Yes, No, false, false, "", "ホーン")},
-	{0x3343, 0, 0, 0, g(Yes, No, false, false, "", "マイクロ")},
-	{0x3344, 0, 0, 0, g(Yes, No, false, false, "", "マイル")},
-	{0x3345, 0, 0, 0, g(Yes, No, false, false, "", "マッハ")},
-	{0x3346, 0, 0, 0, g(Yes, No, false, false, "", "マルク")},
-	{0x3347, 0, 0, 0, g(Yes, No, false, false, "", "マンション")},
-	{0x3348, 0, 0, 0, g(Yes, No, false, false, "", "ミクロン")},
-	{0x3349, 0, 0, 0, g(Yes, No, false, false, "", "ミリ")},
-	{0x334a, 0, 0, 0, g(Yes, No, false, false, "", "ミリバール")},
-	{0x334b, 0, 0, 1, g(Yes, No, false, false, "", "メガ")},
-	{0x334c, 0, 0, 0, g(Yes, No, false, false, "", "メガトン")},
-	{0x334d, 0, 0, 0, g(Yes, No, false, false, "", "メートル")},
-	{0x334e, 0, 0, 1, g(Yes, No, false, false, "", "ヤード")},
-	{0x334f, 0, 0, 0, g(Yes, No, false, false, "", "ヤール")},
-	{0x3350, 0, 0, 0, g(Yes, No, false, false, "", "ユアン")},
-	{0x3351, 0, 0, 0, g(Yes, No, false, false, "", "リットル")},
-	{0x3352, 0, 0, 0, g(Yes, No, false, false, "", "リラ")},
-	{0x3353, 0, 0, 0, g(Yes, No, false, false, "", "ルピー")},
-	{0x3354, 0, 0, 0, g(Yes, No, false, false, "", "ルーブル")},
-	{0x3355, 0, 0, 0, g(Yes, No, false, false, "", "レム")},
-	{0x3356, 0, 0, 0, g(Yes, No, false, false, "", "レントゲン")},
-	{0x3357, 0, 0, 0, g(Yes, No, false, false, "", "ワット")},
-	{0x3358, 0, 0, 0, g(Yes, No, false, false, "", "0点")},
-	{0x3359, 0, 0, 0, g(Yes, No, false, false, "", "1点")},
-	{0x335a, 0, 0, 0, g(Yes, No, false, false, "", "2点")},
-	{0x335b, 0, 0, 0, g(Yes, No, false, false, "", "3点")},
-	{0x335c, 0, 0, 0, g(Yes, No, false, false, "", "4点")},
-	{0x335d, 0, 0, 0, g(Yes, No, false, false, "", "5点")},
-	{0x335e, 0, 0, 0, g(Yes, No, false, false, "", "6点")},
-	{0x335f, 0, 0, 0, g(Yes, No, false, false, "", "7点")},
-	{0x3360, 0, 0, 0, g(Yes, No, false, false, "", "8点")},
-	{0x3361, 0, 0, 0, g(Yes, No, false, false, "", "9点")},
-	{0x3362, 0, 0, 0, g(Yes, No, false, false, "", "10点")},
-	{0x3363, 0, 0, 0, g(Yes, No, false, false, "", "11点")},
-	{0x3364, 0, 0, 0, g(Yes, No, false, false, "", "12点")},
-	{0x3365, 0, 0, 0, g(Yes, No, false, false, "", "13点")},
-	{0x3366, 0, 0, 0, g(Yes, No, false, false, "", "14点")},
-	{0x3367, 0, 0, 0, g(Yes, No, false, false, "", "15点")},
-	{0x3368, 0, 0, 0, g(Yes, No, false, false, "", "16点")},
-	{0x3369, 0, 0, 0, g(Yes, No, false, false, "", "17点")},
-	{0x336a, 0, 0, 0, g(Yes, No, false, false, "", "18点")},
-	{0x336b, 0, 0, 0, g(Yes, No, false, false, "", "19点")},
-	{0x336c, 0, 0, 0, g(Yes, No, false, false, "", "20点")},
-	{0x336d, 0, 0, 0, g(Yes, No, false, false, "", "21点")},
-	{0x336e, 0, 0, 0, g(Yes, No, false, false, "", "22点")},
-	{0x336f, 0, 0, 0, g(Yes, No, false, false, "", "23点")},
-	{0x3370, 0, 0, 0, g(Yes, No, false, false, "", "24点")},
-	{0x3371, 0, 0, 0, g(Yes, No, false, false, "", "hPa")},
-	{0x3372, 0, 0, 0, g(Yes, No, false, false, "", "da")},
-	{0x3373, 0, 0, 0, g(Yes, No, false, false, "", "AU")},
-	{0x3374, 0, 0, 0, g(Yes, No, false, false, "", "bar")},
-	{0x3375, 0, 0, 0, g(Yes, No, false, false, "", "oV")},
-	{0x3376, 0, 0, 0, g(Yes, No, false, false, "", "pc")},
-	{0x3377, 0, 0, 0, g(Yes, No, false, false, "", "dm")},
-	{0x3378, 0, 0, 0, g(Yes, No, false, false, "", "dm2")},
-	{0x3379, 0, 0, 0, g(Yes, No, false, false, "", "dm3")},
-	{0x337a, 0, 0, 0, g(Yes, No, false, false, "", "IU")},
-	{0x337b, 0, 0, 0, g(Yes, No, false, false, "", "平成")},
-	{0x337c, 0, 0, 0, g(Yes, No, false, false, "", "昭和")},
-	{0x337d, 0, 0, 0, g(Yes, No, false, false, "", "大正")},
-	{0x337e, 0, 0, 0, g(Yes, No, false, false, "", "明治")},
-	{0x337f, 0, 0, 0, g(Yes, No, false, false, "", "株式会社")},
-	{0x3380, 0, 0, 0, g(Yes, No, false, false, "", "pA")},
-	{0x3381, 0, 0, 0, g(Yes, No, false, false, "", "nA")},
-	{0x3382, 0, 0, 0, g(Yes, No, false, false, "", "μA")},
-	{0x3383, 0, 0, 0, g(Yes, No, false, false, "", "mA")},
-	{0x3384, 0, 0, 0, g(Yes, No, false, false, "", "kA")},
-	{0x3385, 0, 0, 0, g(Yes, No, false, false, "", "KB")},
-	{0x3386, 0, 0, 0, g(Yes, No, false, false, "", "MB")},
-	{0x3387, 0, 0, 0, g(Yes, No, false, false, "", "GB")},
-	{0x3388, 0, 0, 0, g(Yes, No, false, false, "", "cal")},
-	{0x3389, 0, 0, 0, g(Yes, No, false, false, "", "kcal")},
-	{0x338a, 0, 0, 0, g(Yes, No, false, false, "", "pF")},
-	{0x338b, 0, 0, 0, g(Yes, No, false, false, "", "nF")},
-	{0x338c, 0, 0, 0, g(Yes, No, false, false, "", "μF")},
-	{0x338d, 0, 0, 0, g(Yes, No, false, false, "", "μg")},
-	{0x338e, 0, 0, 0, g(Yes, No, false, false, "", "mg")},
-	{0x338f, 0, 0, 0, g(Yes, No, false, false, "", "kg")},
-	{0x3390, 0, 0, 0, g(Yes, No, false, false, "", "Hz")},
-	{0x3391, 0, 0, 0, g(Yes, No, false, false, "", "kHz")},
-	{0x3392, 0, 0, 0, g(Yes, No, false, false, "", "MHz")},
-	{0x3393, 0, 0, 0, g(Yes, No, false, false, "", "GHz")},
-	{0x3394, 0, 0, 0, g(Yes, No, false, false, "", "THz")},
-	{0x3395, 0, 0, 0, g(Yes, No, false, false, "", "μl")},
-	{0x3396, 0, 0, 0, g(Yes, No, false, false, "", "ml")},
-	{0x3397, 0, 0, 0, g(Yes, No, false, false, "", "dl")},
-	{0x3398, 0, 0, 0, g(Yes, No, false, false, "", "kl")},
-	{0x3399, 0, 0, 0, g(Yes, No, false, false, "", "fm")},
-	{0x339a, 0, 0, 0, g(Yes, No, false, false, "", "nm")},
-	{0x339b, 0, 0, 0, g(Yes, No, false, false, "", "μm")},
-	{0x339c, 0, 0, 0, g(Yes, No, false, false, "", "mm")},
-	{0x339d, 0, 0, 0, g(Yes, No, false, false, "", "cm")},
-	{0x339e, 0, 0, 0, g(Yes, No, false, false, "", "km")},
-	{0x339f, 0, 0, 0, g(Yes, No, false, false, "", "mm2")},
-	{0x33a0, 0, 0, 0, g(Yes, No, false, false, "", "cm2")},
-	{0x33a1, 0, 0, 0, g(Yes, No, false, false, "", "m2")},
-	{0x33a2, 0, 0, 0, g(Yes, No, false, false, "", "km2")},
-	{0x33a3, 0, 0, 0, g(Yes, No, false, false, "", "mm3")},
-	{0x33a4, 0, 0, 0, g(Yes, No, false, false, "", "cm3")},
-	{0x33a5, 0, 0, 0, g(Yes, No, false, false, "", "m3")},
-	{0x33a6, 0, 0, 0, g(Yes, No, false, false, "", "km3")},
-	{0x33a7, 0, 0, 0, g(Yes, No, false, false, "", "m∕s")},
-	{0x33a8, 0, 0, 0, g(Yes, No, false, false, "", "m∕s2")},
-	{0x33a9, 0, 0, 0, g(Yes, No, false, false, "", "Pa")},
-	{0x33aa, 0, 0, 0, g(Yes, No, false, false, "", "kPa")},
-	{0x33ab, 0, 0, 0, g(Yes, No, false, false, "", "MPa")},
-	{0x33ac, 0, 0, 0, g(Yes, No, false, false, "", "GPa")},
-	{0x33ad, 0, 0, 0, g(Yes, No, false, false, "", "rad")},
-	{0x33ae, 0, 0, 0, g(Yes, No, false, false, "", "rad∕s")},
-	{0x33af, 0, 0, 0, g(Yes, No, false, false, "", "rad∕s2")},
-	{0x33b0, 0, 0, 0, g(Yes, No, false, false, "", "ps")},
-	{0x33b1, 0, 0, 0, g(Yes, No, false, false, "", "ns")},
-	{0x33b2, 0, 0, 0, g(Yes, No, false, false, "", "μs")},
-	{0x33b3, 0, 0, 0, g(Yes, No, false, false, "", "ms")},
-	{0x33b4, 0, 0, 0, g(Yes, No, false, false, "", "pV")},
-	{0x33b5, 0, 0, 0, g(Yes, No, false, false, "", "nV")},
-	{0x33b6, 0, 0, 0, g(Yes, No, false, false, "", "μV")},
-	{0x33b7, 0, 0, 0, g(Yes, No, false, false, "", "mV")},
-	{0x33b8, 0, 0, 0, g(Yes, No, false, false, "", "kV")},
-	{0x33b9, 0, 0, 0, g(Yes, No, false, false, "", "MV")},
-	{0x33ba, 0, 0, 0, g(Yes, No, false, false, "", "pW")},
-	{0x33bb, 0, 0, 0, g(Yes, No, false, false, "", "nW")},
-	{0x33bc, 0, 0, 0, g(Yes, No, false, false, "", "μW")},
-	{0x33bd, 0, 0, 0, g(Yes, No, false, false, "", "mW")},
-	{0x33be, 0, 0, 0, g(Yes, No, false, false, "", "kW")},
-	{0x33bf, 0, 0, 0, g(Yes, No, false, false, "", "MW")},
-	{0x33c0, 0, 0, 0, g(Yes, No, false, false, "", "kΩ")},
-	{0x33c1, 0, 0, 0, g(Yes, No, false, false, "", "MΩ")},
-	{0x33c2, 0, 0, 0, g(Yes, No, false, false, "", "a.m.")},
-	{0x33c3, 0, 0, 0, g(Yes, No, false, false, "", "Bq")},
-	{0x33c4, 0, 0, 0, g(Yes, No, false, false, "", "cc")},
-	{0x33c5, 0, 0, 0, g(Yes, No, false, false, "", "cd")},
-	{0x33c6, 0, 0, 0, g(Yes, No, false, false, "", "C∕kg")},
-	{0x33c7, 0, 0, 0, g(Yes, No, false, false, "", "Co.")},
-	{0x33c8, 0, 0, 0, g(Yes, No, false, false, "", "dB")},
-	{0x33c9, 0, 0, 0, g(Yes, No, false, false, "", "Gy")},
-	{0x33ca, 0, 0, 0, g(Yes, No, false, false, "", "ha")},
-	{0x33cb, 0, 0, 0, g(Yes, No, false, false, "", "HP")},
-	{0x33cc, 0, 0, 0, g(Yes, No, false, false, "", "in")},
-	{0x33cd, 0, 0, 0, g(Yes, No, false, false, "", "KK")},
-	{0x33ce, 0, 0, 0, g(Yes, No, false, false, "", "KM")},
-	{0x33cf, 0, 0, 0, g(Yes, No, false, false, "", "kt")},
-	{0x33d0, 0, 0, 0, g(Yes, No, false, false, "", "lm")},
-	{0x33d1, 0, 0, 0, g(Yes, No, false, false, "", "ln")},
-	{0x33d2, 0, 0, 0, g(Yes, No, false, false, "", "log")},
-	{0x33d3, 0, 0, 0, g(Yes, No, false, false, "", "lx")},
-	{0x33d4, 0, 0, 0, g(Yes, No, false, false, "", "mb")},
-	{0x33d5, 0, 0, 0, g(Yes, No, false, false, "", "mil")},
-	{0x33d6, 0, 0, 0, g(Yes, No, false, false, "", "mol")},
-	{0x33d7, 0, 0, 0, g(Yes, No, false, false, "", "PH")},
-	{0x33d8, 0, 0, 0, g(Yes, No, false, false, "", "p.m.")},
-	{0x33d9, 0, 0, 0, g(Yes, No, false, false, "", "PPM")},
-	{0x33da, 0, 0, 0, g(Yes, No, false, false, "", "PR")},
-	{0x33db, 0, 0, 0, g(Yes, No, false, false, "", "sr")},
-	{0x33dc, 0, 0, 0, g(Yes, No, false, false, "", "Sv")},
-	{0x33dd, 0, 0, 0, g(Yes, No, false, false, "", "Wb")},
-	{0x33de, 0, 0, 0, g(Yes, No, false, false, "", "V∕m")},
-	{0x33df, 0, 0, 0, g(Yes, No, false, false, "", "A∕m")},
-	{0x33e0, 0, 0, 0, g(Yes, No, false, false, "", "1日")},
-	{0x33e1, 0, 0, 0, g(Yes, No, false, false, "", "2日")},
-	{0x33e2, 0, 0, 0, g(Yes, No, false, false, "", "3日")},
-	{0x33e3, 0, 0, 0, g(Yes, No, false, false, "", "4日")},
-	{0x33e4, 0, 0, 0, g(Yes, No, false, false, "", "5日")},
-	{0x33e5, 0, 0, 0, g(Yes, No, false, false, "", "6日")},
-	{0x33e6, 0, 0, 0, g(Yes, No, false, false, "", "7日")},
-	{0x33e7, 0, 0, 0, g(Yes, No, false, false, "", "8日")},
-	{0x33e8, 0, 0, 0, g(Yes, No, false, false, "", "9日")},
-	{0x33e9, 0, 0, 0, g(Yes, No, false, false, "", "10日")},
-	{0x33ea, 0, 0, 0, g(Yes, No, false, false, "", "11日")},
-	{0x33eb, 0, 0, 0, g(Yes, No, false, false, "", "12日")},
-	{0x33ec, 0, 0, 0, g(Yes, No, false, false, "", "13日")},
-	{0x33ed, 0, 0, 0, g(Yes, No, false, false, "", "14日")},
-	{0x33ee, 0, 0, 0, g(Yes, No, false, false, "", "15日")},
-	{0x33ef, 0, 0, 0, g(Yes, No, false, false, "", "16日")},
-	{0x33f0, 0, 0, 0, g(Yes, No, false, false, "", "17日")},
-	{0x33f1, 0, 0, 0, g(Yes, No, false, false, "", "18日")},
-	{0x33f2, 0, 0, 0, g(Yes, No, false, false, "", "19日")},
-	{0x33f3, 0, 0, 0, g(Yes, No, false, false, "", "20日")},
-	{0x33f4, 0, 0, 0, g(Yes, No, false, false, "", "21日")},
-	{0x33f5, 0, 0, 0, g(Yes, No, false, false, "", "22日")},
-	{0x33f6, 0, 0, 0, g(Yes, No, false, false, "", "23日")},
-	{0x33f7, 0, 0, 0, g(Yes, No, false, false, "", "24日")},
-	{0x33f8, 0, 0, 0, g(Yes, No, false, false, "", "25日")},
-	{0x33f9, 0, 0, 0, g(Yes, No, false, false, "", "26日")},
-	{0x33fa, 0, 0, 0, g(Yes, No, false, false, "", "27日")},
-	{0x33fb, 0, 0, 0, g(Yes, No, false, false, "", "28日")},
-	{0x33fc, 0, 0, 0, g(Yes, No, false, false, "", "29日")},
-	{0x33fd, 0, 0, 0, g(Yes, No, false, false, "", "30日")},
-	{0x33fe, 0, 0, 0, g(Yes, No, false, false, "", "31日")},
-	{0x33ff, 0, 0, 0, g(Yes, No, false, false, "", "gal")},
-	{0x3400, 0, 0, 0, f(Yes, false, "")},
-	{0xa66f, 230, 1, 1, f(Yes, false, "")},
-	{0xa670, 0, 0, 0, f(Yes, false, "")},
-	{0xa674, 230, 1, 1, f(Yes, false, "")},
-	{0xa67e, 0, 0, 0, f(Yes, false, "")},
-	{0xa69c, 0, 0, 0, g(Yes, No, false, false, "", "ъ")},
-	{0xa69d, 0, 0, 0, g(Yes, No, false, false, "", "ь")},
-	{0xa69e, 230, 1, 1, f(Yes, false, "")},
-	{0xa6a0, 0, 0, 0, f(Yes, false, "")},
-	{0xa6f0, 230, 1, 1, f(Yes, false, "")},
-	{0xa6f2, 0, 0, 0, f(Yes, false, "")},
-	{0xa770, 0, 0, 0, g(Yes, No, false, false, "", "ꝯ")},
-	{0xa771, 0, 0, 0, f(Yes, false, "")},
-	{0xa7f8, 0, 0, 0, g(Yes, No, false, false, "", "Ħ")},
-	{0xa7f9, 0, 0, 0, g(Yes, No, false, false, "", "œ")},
-	{0xa7fa, 0, 0, 0, f(Yes, false, "")},
-	{0xa806, 9, 1, 1, f(Yes, false, "")},
-	{0xa807, 0, 0, 0, f(Yes, false, "")},
-	{0xa8c4, 9, 1, 1, f(Yes, false, "")},
-	{0xa8c5, 0, 0, 0, f(Yes, false, "")},
-	{0xa8e0, 230, 1, 1, f(Yes, false, "")},
-	{0xa8f2, 0, 0, 0, f(Yes, false, "")},
-	{0xa92b, 220, 1, 1, f(Yes, false, "")},
-	{0xa92e, 0, 0, 0, f(Yes, false, "")},
-	{0xa953, 9, 1, 1, f(Yes, false, "")},
-	{0xa954, 0, 0, 0, f(Yes, false, "")},
-	{0xa9b3, 7, 1, 1, f(Yes, false, "")},
-	{0xa9b4, 0, 0, 0, f(Yes, false, "")},
-	{0xa9c0, 9, 1, 1, f(Yes, false, "")},
-	{0xa9c1, 0, 0, 0, f(Yes, false, "")},
-	{0xaab0, 230, 1, 1, f(Yes, false, "")},
-	{0xaab1, 0, 0, 0, f(Yes, false, "")},
-	{0xaab2, 230, 1, 1, f(Yes, false, "")},
-	{0xaab4, 220, 1, 1, f(Yes, false, "")},
-	{0xaab5, 0, 0, 0, f(Yes, false, "")},
-	{0xaab7, 230, 1, 1, f(Yes, false, "")},
-	{0xaab9, 0, 0, 0, f(Yes, false, "")},
-	{0xaabe, 230, 1, 1, f(Yes, false, "")},
-	{0xaac0, 0, 0, 0, f(Yes, false, "")},
-	{0xaac1, 230, 1, 1, f(Yes, false, "")},
-	{0xaac2, 0, 0, 0, f(Yes, false, "")},
-	{0xaaf6, 9, 1, 1, f(Yes, false, "")},
-	{0xaaf7, 0, 0, 0, f(Yes, false, "")},
-	{0xab5c, 0, 0, 0, g(Yes, No, false, false, "", "ꜧ")},
-	{0xab5d, 0, 0, 0, g(Yes, No, false, false, "", "ꬷ")},
-	{0xab5e, 0, 0, 0, g(Yes, No, false, false, "", "ɫ")},
-	{0xab5f, 0, 0, 0, g(Yes, No, false, false, "", "ꭒ")},
-	{0xab60, 0, 0, 0, f(Yes, false, "")},
-	{0xabed, 9, 1, 1, f(Yes, false, "")},
-	{0xabee, 0, 0, 0, f(Yes, false, "")},
-	{0xac00, 0, 0, 1, f(Yes, true, "")},
-	{0xac01, 0, 0, 2, f(Yes, false, "")},
-	{0xac1c, 0, 0, 1, f(Yes, true, "")},
-	{0xac1d, 0, 0, 2, f(Yes, false, "")},
-	{0xac38, 0, 0, 1, f(Yes, true, "")},
-	{0xac39, 0, 0, 2, f(Yes, false, "")},
-	{0xac54, 0, 0, 1, f(Yes, true, "")},
-	{0xac55, 0, 0, 2, f(Yes, false, "")},
-	{0xac70, 0, 0, 1, f(Yes, true, "")},
-	{0xac71, 0, 0, 2, f(Yes, false, "")},
-	{0xac8c, 0, 0, 1, f(Yes, true, "")},
-	{0xac8d, 0, 0, 2, f(Yes, false, "")},
-	{0xaca8, 0, 0, 1, f(Yes, true, "")},
-	{0xaca9, 0, 0, 2, f(Yes, false, "")},
-	{0xacc4, 0, 0, 1, f(Yes, true, "")},
-	{0xacc5, 0, 0, 2, f(Yes, false, "")},
-	{0xace0, 0, 0, 1, f(Yes, true, "")},
-	{0xace1, 0, 0, 2, f(Yes, false, "")},
-	{0xacfc, 0, 0, 1, f(Yes, true, "")},
-	{0xacfd, 0, 0, 2, f(Yes, false, "")},
-	{0xad18, 0, 0, 1, f(Yes, true, "")},
-	{0xad19, 0, 0, 2, f(Yes, false, "")},
-	{0xad34, 0, 0, 1, f(Yes, true, "")},
-	{0xad35, 0, 0, 2, f(Yes, false, "")},
-	{0xad50, 0, 0, 1, f(Yes, true, "")},
-	{0xad51, 0, 0, 2, f(Yes, false, "")},
-	{0xad6c, 0, 0, 1, f(Yes, true, "")},
-	{0xad6d, 0, 0, 2, f(Yes, false, "")},
-	{0xad88, 0, 0, 1, f(Yes, true, "")},
-	{0xad89, 0, 0, 2, f(Yes, false, "")},
-	{0xada4, 0, 0, 1, f(Yes, true, "")},
-	{0xada5, 0, 0, 2, f(Yes, false, "")},
-	{0xadc0, 0, 0, 1, f(Yes, true, "")},
-	{0xadc1, 0, 0, 2, f(Yes, false, "")},
-	{0xaddc, 0, 0, 1, f(Yes, true, "")},
-	{0xaddd, 0, 0, 2, f(Yes, false, "")},
-	{0xadf8, 0, 0, 1, f(Yes, true, "")},
-	{0xadf9, 0, 0, 2, f(Yes, false, "")},
-	{0xae14, 0, 0, 1, f(Yes, true, "")},
-	{0xae15, 0, 0, 2, f(Yes, false, "")},
-	{0xae30, 0, 0, 1, f(Yes, true, "")},
-	{0xae31, 0, 0, 2, f(Yes, false, "")},
-	{0xae4c, 0, 0, 1, f(Yes, true, "")},
-	{0xae4d, 0, 0, 2, f(Yes, false, "")},
-	{0xae68, 0, 0, 1, f(Yes, true, "")},
-	{0xae69, 0, 0, 2, f(Yes, false, "")},
-	{0xae84, 0, 0, 1, f(Yes, true, "")},
-	{0xae85, 0, 0, 2, f(Yes, false, "")},
-	{0xaea0, 0, 0, 1, f(Yes, true, "")},
-	{0xaea1, 0, 0, 2, f(Yes, false, "")},
-	{0xaebc, 0, 0, 1, f(Yes, true, "")},
-	{0xaebd, 0, 0, 2, f(Yes, false, "")},
-	{0xaed8, 0, 0, 1, f(Yes, true, "")},
-	{0xaed9, 0, 0, 2, f(Yes, false, "")},
-	{0xaef4, 0, 0, 1, f(Yes, true, "")},
-	{0xaef5, 0, 0, 2, f(Yes, false, "")},
-	{0xaf10, 0, 0, 1, f(Yes, true, "")},
-	{0xaf11, 0, 0, 2, f(Yes, false, "")},
-	{0xaf2c, 0, 0, 1, f(Yes, true, "")},
-	{0xaf2d, 0, 0, 2, f(Yes, false, "")},
-	{0xaf48, 0, 0, 1, f(Yes, true, "")},
-	{0xaf49, 0, 0, 2, f(Yes, false, "")},
-	{0xaf64, 0, 0, 1, f(Yes, true, "")},
-	{0xaf65, 0, 0, 2, f(Yes, false, "")},
-	{0xaf80, 0, 0, 1, f(Yes, true, "")},
-	{0xaf81, 0, 0, 2, f(Yes, false, "")},
-	{0xaf9c, 0, 0, 1, f(Yes, true, "")},
-	{0xaf9d, 0, 0, 2, f(Yes, false, "")},
-	{0xafb8, 0, 0, 1, f(Yes, true, "")},
-	{0xafb9, 0, 0, 2, f(Yes, false, "")},
-	{0xafd4, 0, 0, 1, f(Yes, true, "")},
-	{0xafd5, 0, 0, 2, f(Yes, false, "")},
-	{0xaff0, 0, 0, 1, f(Yes, true, "")},
-	{0xaff1, 0, 0, 2, f(Yes, false, "")},
-	{0xb00c, 0, 0, 1, f(Yes, true, "")},
-	{0xb00d, 0, 0, 2, f(Yes, false, "")},
-	{0xb028, 0, 0, 1, f(Yes, true, "")},
-	{0xb029, 0, 0, 2, f(Yes, false, "")},
-	{0xb044, 0, 0, 1, f(Yes, true, "")},
-	{0xb045, 0, 0, 2, f(Yes, false, "")},
-	{0xb060, 0, 0, 1, f(Yes, true, "")},
-	{0xb061, 0, 0, 2, f(Yes, false, "")},
-	{0xb07c, 0, 0, 1, f(Yes, true, "")},
-	{0xb07d, 0, 0, 2, f(Yes, false, "")},
-	{0xb098, 0, 0, 1, f(Yes, true, "")},
-	{0xb099, 0, 0, 2, f(Yes, false, "")},
-	{0xb0b4, 0, 0, 1, f(Yes, true, "")},
-	{0xb0b5, 0, 0, 2, f(Yes, false, "")},
-	{0xb0d0, 0, 0, 1, f(Yes, true, "")},
-	{0xb0d1, 0, 0, 2, f(Yes, false, "")},
-	{0xb0ec, 0, 0, 1, f(Yes, true, "")},
-	{0xb0ed, 0, 0, 2, f(Yes, false, "")},
-	{0xb108, 0, 0, 1, f(Yes, true, "")},
-	{0xb109, 0, 0, 2, f(Yes, false, "")},
-	{0xb124, 0, 0, 1, f(Yes, true, "")},
-	{0xb125, 0, 0, 2, f(Yes, false, "")},
-	{0xb140, 0, 0, 1, f(Yes, true, "")},
-	{0xb141, 0, 0, 2, f(Yes, false, "")},
-	{0xb15c, 0, 0, 1, f(Yes, true, "")},
-	{0xb15d, 0, 0, 2, f(Yes, false, "")},
-	{0xb178, 0, 0, 1, f(Yes, true, "")},
-	{0xb179, 0, 0, 2, f(Yes, false, "")},
-	{0xb194, 0, 0, 1, f(Yes, true, "")},
-	{0xb195, 0, 0, 2, f(Yes, false, "")},
-	{0xb1b0, 0, 0, 1, f(Yes, true, "")},
-	{0xb1b1, 0, 0, 2, f(Yes, false, "")},
-	{0xb1cc, 0, 0, 1, f(Yes, true, "")},
-	{0xb1cd, 0, 0, 2, f(Yes, false, "")},
-	{0xb1e8, 0, 0, 1, f(Yes, true, "")},
-	{0xb1e9, 0, 0, 2, f(Yes, false, "")},
-	{0xb204, 0, 0, 1, f(Yes, true, "")},
-	{0xb205, 0, 0, 2, f(Yes, false, "")},
-	{0xb220, 0, 0, 1, f(Yes, true, "")},
-	{0xb221, 0, 0, 2, f(Yes, false, "")},
-	{0xb23c, 0, 0, 1, f(Yes, true, "")},
-	{0xb23d, 0, 0, 2, f(Yes, false, "")},
-	{0xb258, 0, 0, 1, f(Yes, true, "")},
-	{0xb259, 0, 0, 2, f(Yes, false, "")},
-	{0xb274, 0, 0, 1, f(Yes, true, "")},
-	{0xb275, 0, 0, 2, f(Yes, false, "")},
-	{0xb290, 0, 0, 1, f(Yes, true, "")},
-	{0xb291, 0, 0, 2, f(Yes, false, "")},
-	{0xb2ac, 0, 0, 1, f(Yes, true, "")},
-	{0xb2ad, 0, 0, 2, f(Yes, false, "")},
-	{0xb2c8, 0, 0, 1, f(Yes, true, "")},
-	{0xb2c9, 0, 0, 2, f(Yes, false, "")},
-	{0xb2e4, 0, 0, 1, f(Yes, true, "")},
-	{0xb2e5, 0, 0, 2, f(Yes, false, "")},
-	{0xb300, 0, 0, 1, f(Yes, true, "")},
-	{0xb301, 0, 0, 2, f(Yes, false, "")},
-	{0xb31c, 0, 0, 1, f(Yes, true, "")},
-	{0xb31d, 0, 0, 2, f(Yes, false, "")},
-	{0xb338, 0, 0, 1, f(Yes, true, "")},
-	{0xb339, 0, 0, 2, f(Yes, false, "")},
-	{0xb354, 0, 0, 1, f(Yes, true, "")},
-	{0xb355, 0, 0, 2, f(Yes, false, "")},
-	{0xb370, 0, 0, 1, f(Yes, true, "")},
-	{0xb371, 0, 0, 2, f(Yes, false, "")},
-	{0xb38c, 0, 0, 1, f(Yes, true, "")},
-	{0xb38d, 0, 0, 2, f(Yes, false, "")},
-	{0xb3a8, 0, 0, 1, f(Yes, true, "")},
-	{0xb3a9, 0, 0, 2, f(Yes, false, "")},
-	{0xb3c4, 0, 0, 1, f(Yes, true, "")},
-	{0xb3c5, 0, 0, 2, f(Yes, false, "")},
-	{0xb3e0, 0, 0, 1, f(Yes, true, "")},
-	{0xb3e1, 0, 0, 2, f(Yes, false, "")},
-	{0xb3fc, 0, 0, 1, f(Yes, true, "")},
-	{0xb3fd, 0, 0, 2, f(Yes, false, "")},
-	{0xb418, 0, 0, 1, f(Yes, true, "")},
-	{0xb419, 0, 0, 2, f(Yes, false, "")},
-	{0xb434, 0, 0, 1, f(Yes, true, "")},
-	{0xb435, 0, 0, 2, f(Yes, false, "")},
-	{0xb450, 0, 0, 1, f(Yes, true, "")},
-	{0xb451, 0, 0, 2, f(Yes, false, "")},
-	{0xb46c, 0, 0, 1, f(Yes, true, "")},
-	{0xb46d, 0, 0, 2, f(Yes, false, "")},
-	{0xb488, 0, 0, 1, f(Yes, true, "")},
-	{0xb489, 0, 0, 2, f(Yes, false, "")},
-	{0xb4a4, 0, 0, 1, f(Yes, true, "")},
-	{0xb4a5, 0, 0, 2, f(Yes, false, "")},
-	{0xb4c0, 0, 0, 1, f(Yes, true, "")},
-	{0xb4c1, 0, 0, 2, f(Yes, false, "")},
-	{0xb4dc, 0, 0, 1, f(Yes, true, "")},
-	{0xb4dd, 0, 0, 2, f(Yes, false, "")},
-	{0xb4f8, 0, 0, 1, f(Yes, true, "")},
-	{0xb4f9, 0, 0, 2, f(Yes, false, "")},
-	{0xb514, 0, 0, 1, f(Yes, true, "")},
-	{0xb515, 0, 0, 2, f(Yes, false, "")},
-	{0xb530, 0, 0, 1, f(Yes, true, "")},
-	{0xb531, 0, 0, 2, f(Yes, false, "")},
-	{0xb54c, 0, 0, 1, f(Yes, true, "")},
-	{0xb54d, 0, 0, 2, f(Yes, false, "")},
-	{0xb568, 0, 0, 1, f(Yes, true, "")},
-	{0xb569, 0, 0, 2, f(Yes, false, "")},
-	{0xb584, 0, 0, 1, f(Yes, true, "")},
-	{0xb585, 0, 0, 2, f(Yes, false, "")},
-	{0xb5a0, 0, 0, 1, f(Yes, true, "")},
-	{0xb5a1, 0, 0, 2, f(Yes, false, "")},
-	{0xb5bc, 0, 0, 1, f(Yes, true, "")},
-	{0xb5bd, 0, 0, 2, f(Yes, false, "")},
-	{0xb5d8, 0, 0, 1, f(Yes, true, "")},
-	{0xb5d9, 0, 0, 2, f(Yes, false, "")},
-	{0xb5f4, 0, 0, 1, f(Yes, true, "")},
-	{0xb5f5, 0, 0, 2, f(Yes, false, "")},
-	{0xb610, 0, 0, 1, f(Yes, true, "")},
-	{0xb611, 0, 0, 2, f(Yes, false, "")},
-	{0xb62c, 0, 0, 1, f(Yes, true, "")},
-	{0xb62d, 0, 0, 2, f(Yes, false, "")},
-	{0xb648, 0, 0, 1, f(Yes, true, "")},
-	{0xb649, 0, 0, 2, f(Yes, false, "")},
-	{0xb664, 0, 0, 1, f(Yes, true, "")},
-	{0xb665, 0, 0, 2, f(Yes, false, "")},
-	{0xb680, 0, 0, 1, f(Yes, true, "")},
-	{0xb681, 0, 0, 2, f(Yes, false, "")},
-	{0xb69c, 0, 0, 1, f(Yes, true, "")},
-	{0xb69d, 0, 0, 2, f(Yes, false, "")},
-	{0xb6b8, 0, 0, 1, f(Yes, true, "")},
-	{0xb6b9, 0, 0, 2, f(Yes, false, "")},
-	{0xb6d4, 0, 0, 1, f(Yes, true, "")},
-	{0xb6d5, 0, 0, 2, f(Yes, false, "")},
-	{0xb6f0, 0, 0, 1, f(Yes, true, "")},
-	{0xb6f1, 0, 0, 2, f(Yes, false, "")},
-	{0xb70c, 0, 0, 1, f(Yes, true, "")},
-	{0xb70d, 0, 0, 2, f(Yes, false, "")},
-	{0xb728, 0, 0, 1, f(Yes, true, "")},
-	{0xb729, 0, 0, 2, f(Yes, false, "")},
-	{0xb744, 0, 0, 1, f(Yes, true, "")},
-	{0xb745, 0, 0, 2, f(Yes, false, "")},
-	{0xb760, 0, 0, 1, f(Yes, true, "")},
-	{0xb761, 0, 0, 2, f(Yes, false, "")},
-	{0xb77c, 0, 0, 1, f(Yes, true, "")},
-	{0xb77d, 0, 0, 2, f(Yes, false, "")},
-	{0xb798, 0, 0, 1, f(Yes, true, "")},
-	{0xb799, 0, 0, 2, f(Yes, false, "")},
-	{0xb7b4, 0, 0, 1, f(Yes, true, "")},
-	{0xb7b5, 0, 0, 2, f(Yes, false, "")},
-	{0xb7d0, 0, 0, 1, f(Yes, true, "")},
-	{0xb7d1, 0, 0, 2, f(Yes, false, "")},
-	{0xb7ec, 0, 0, 1, f(Yes, true, "")},
-	{0xb7ed, 0, 0, 2, f(Yes, false, "")},
-	{0xb808, 0, 0, 1, f(Yes, true, "")},
-	{0xb809, 0, 0, 2, f(Yes, false, "")},
-	{0xb824, 0, 0, 1, f(Yes, true, "")},
-	{0xb825, 0, 0, 2, f(Yes, false, "")},
-	{0xb840, 0, 0, 1, f(Yes, true, "")},
-	{0xb841, 0, 0, 2, f(Yes, false, "")},
-	{0xb85c, 0, 0, 1, f(Yes, true, "")},
-	{0xb85d, 0, 0, 2, f(Yes, false, "")},
-	{0xb878, 0, 0, 1, f(Yes, true, "")},
-	{0xb879, 0, 0, 2, f(Yes, false, "")},
-	{0xb894, 0, 0, 1, f(Yes, true, "")},
-	{0xb895, 0, 0, 2, f(Yes, false, "")},
-	{0xb8b0, 0, 0, 1, f(Yes, true, "")},
-	{0xb8b1, 0, 0, 2, f(Yes, false, "")},
-	{0xb8cc, 0, 0, 1, f(Yes, true, "")},
-	{0xb8cd, 0, 0, 2, f(Yes, false, "")},
-	{0xb8e8, 0, 0, 1, f(Yes, true, "")},
-	{0xb8e9, 0, 0, 2, f(Yes, false, "")},
-	{0xb904, 0, 0, 1, f(Yes, true, "")},
-	{0xb905, 0, 0, 2, f(Yes, false, "")},
-	{0xb920, 0, 0, 1, f(Yes, true, "")},
-	{0xb921, 0, 0, 2, f(Yes, false, "")},
-	{0xb93c, 0, 0, 1, f(Yes, true, "")},
-	{0xb93d, 0, 0, 2, f(Yes, false, "")},
-	{0xb958, 0, 0, 1, f(Yes, true, "")},
-	{0xb959, 0, 0, 2, f(Yes, false, "")},
-	{0xb974, 0, 0, 1, f(Yes, true, "")},
-	{0xb975, 0, 0, 2, f(Yes, false, "")},
-	{0xb990, 0, 0, 1, f(Yes, true, "")},
-	{0xb991, 0, 0, 2, f(Yes, false, "")},
-	{0xb9ac, 0, 0, 1, f(Yes, true, "")},
-	{0xb9ad, 0, 0, 2, f(Yes, false, "")},
-	{0xb9c8, 0, 0, 1, f(Yes, true, "")},
-	{0xb9c9, 0, 0, 2, f(Yes, false, "")},
-	{0xb9e4, 0, 0, 1, f(Yes, true, "")},
-	{0xb9e5, 0, 0, 2, f(Yes, false, "")},
-	{0xba00, 0, 0, 1, f(Yes, true, "")},
-	{0xba01, 0, 0, 2, f(Yes, false, "")},
-	{0xba1c, 0, 0, 1, f(Yes, true, "")},
-	{0xba1d, 0, 0, 2, f(Yes, false, "")},
-	{0xba38, 0, 0, 1, f(Yes, true, "")},
-	{0xba39, 0, 0, 2, f(Yes, false, "")},
-	{0xba54, 0, 0, 1, f(Yes, true, "")},
-	{0xba55, 0, 0, 2, f(Yes, false, "")},
-	{0xba70, 0, 0, 1, f(Yes, true, "")},
-	{0xba71, 0, 0, 2, f(Yes, false, "")},
-	{0xba8c, 0, 0, 1, f(Yes, true, "")},
-	{0xba8d, 0, 0, 2, f(Yes, false, "")},
-	{0xbaa8, 0, 0, 1, f(Yes, true, "")},
-	{0xbaa9, 0, 0, 2, f(Yes, false, "")},
-	{0xbac4, 0, 0, 1, f(Yes, true, "")},
-	{0xbac5, 0, 0, 2, f(Yes, false, "")},
-	{0xbae0, 0, 0, 1, f(Yes, true, "")},
-	{0xbae1, 0, 0, 2, f(Yes, false, "")},
-	{0xbafc, 0, 0, 1, f(Yes, true, "")},
-	{0xbafd, 0, 0, 2, f(Yes, false, "")},
-	{0xbb18, 0, 0, 1, f(Yes, true, "")},
-	{0xbb19, 0, 0, 2, f(Yes, false, "")},
-	{0xbb34, 0, 0, 1, f(Yes, true, "")},
-	{0xbb35, 0, 0, 2, f(Yes, false, "")},
-	{0xbb50, 0, 0, 1, f(Yes, true, "")},
-	{0xbb51, 0, 0, 2, f(Yes, false, "")},
-	{0xbb6c, 0, 0, 1, f(Yes, true, "")},
-	{0xbb6d, 0, 0, 2, f(Yes, false, "")},
-	{0xbb88, 0, 0, 1, f(Yes, true, "")},
-	{0xbb89, 0, 0, 2, f(Yes, false, "")},
-	{0xbba4, 0, 0, 1, f(Yes, true, "")},
-	{0xbba5, 0, 0, 2, f(Yes, false, "")},
-	{0xbbc0, 0, 0, 1, f(Yes, true, "")},
-	{0xbbc1, 0, 0, 2, f(Yes, false, "")},
-	{0xbbdc, 0, 0, 1, f(Yes, true, "")},
-	{0xbbdd, 0, 0, 2, f(Yes, false, "")},
-	{0xbbf8, 0, 0, 1, f(Yes, true, "")},
-	{0xbbf9, 0, 0, 2, f(Yes, false, "")},
-	{0xbc14, 0, 0, 1, f(Yes, true, "")},
-	{0xbc15, 0, 0, 2, f(Yes, false, "")},
-	{0xbc30, 0, 0, 1, f(Yes, true, "")},
-	{0xbc31, 0, 0, 2, f(Yes, false, "")},
-	{0xbc4c, 0, 0, 1, f(Yes, true, "")},
-	{0xbc4d, 0, 0, 2, f(Yes, false, "")},
-	{0xbc68, 0, 0, 1, f(Yes, true, "")},
-	{0xbc69, 0, 0, 2, f(Yes, false, "")},
-	{0xbc84, 0, 0, 1, f(Yes, true, "")},
-	{0xbc85, 0, 0, 2, f(Yes, false, "")},
-	{0xbca0, 0, 0, 1, f(Yes, true, "")},
-	{0xbca1, 0, 0, 2, f(Yes, false, "")},
-	{0xbcbc, 0, 0, 1, f(Yes, true, "")},
-	{0xbcbd, 0, 0, 2, f(Yes, false, "")},
-	{0xbcd8, 0, 0, 1, f(Yes, true, "")},
-	{0xbcd9, 0, 0, 2, f(Yes, false, "")},
-	{0xbcf4, 0, 0, 1, f(Yes, true, "")},
-	{0xbcf5, 0, 0, 2, f(Yes, false, "")},
-	{0xbd10, 0, 0, 1, f(Yes, true, "")},
-	{0xbd11, 0, 0, 2, f(Yes, false, "")},
-	{0xbd2c, 0, 0, 1, f(Yes, true, "")},
-	{0xbd2d, 0, 0, 2, f(Yes, false, "")},
-	{0xbd48, 0, 0, 1, f(Yes, true, "")},
-	{0xbd49, 0, 0, 2, f(Yes, false, "")},
-	{0xbd64, 0, 0, 1, f(Yes, true, "")},
-	{0xbd65, 0, 0, 2, f(Yes, false, "")},
-	{0xbd80, 0, 0, 1, f(Yes, true, "")},
-	{0xbd81, 0, 0, 2, f(Yes, false, "")},
-	{0xbd9c, 0, 0, 1, f(Yes, true, "")},
-	{0xbd9d, 0, 0, 2, f(Yes, false, "")},
-	{0xbdb8, 0, 0, 1, f(Yes, true, "")},
-	{0xbdb9, 0, 0, 2, f(Yes, false, "")},
-	{0xbdd4, 0, 0, 1, f(Yes, true, "")},
-	{0xbdd5, 0, 0, 2, f(Yes, false, "")},
-	{0xbdf0, 0, 0, 1, f(Yes, true, "")},
-	{0xbdf1, 0, 0, 2, f(Yes, false, "")},
-	{0xbe0c, 0, 0, 1, f(Yes, true, "")},
-	{0xbe0d, 0, 0, 2, f(Yes, false, "")},
-	{0xbe28, 0, 0, 1, f(Yes, true, "")},
-	{0xbe29, 0, 0, 2, f(Yes, false, "")},
-	{0xbe44, 0, 0, 1, f(Yes, true, "")},
-	{0xbe45, 0, 0, 2, f(Yes, false, "")},
-	{0xbe60, 0, 0, 1, f(Yes, true, "")},
-	{0xbe61, 0, 0, 2, f(Yes, false, "")},
-	{0xbe7c, 0, 0, 1, f(Yes, true, "")},
-	{0xbe7d, 0, 0, 2, f(Yes, false, "")},
-	{0xbe98, 0, 0, 1, f(Yes, true, "")},
-	{0xbe99, 0, 0, 2, f(Yes, false, "")},
-	{0xbeb4, 0, 0, 1, f(Yes, true, "")},
-	{0xbeb5, 0, 0, 2, f(Yes, false, "")},
-	{0xbed0, 0, 0, 1, f(Yes, true, "")},
-	{0xbed1, 0, 0, 2, f(Yes, false, "")},
-	{0xbeec, 0, 0, 1, f(Yes, true, "")},
-	{0xbeed, 0, 0, 2, f(Yes, false, "")},
-	{0xbf08, 0, 0, 1, f(Yes, true, "")},
-	{0xbf09, 0, 0, 2, f(Yes, false, "")},
-	{0xbf24, 0, 0, 1, f(Yes, true, "")},
-	{0xbf25, 0, 0, 2, f(Yes, false, "")},
-	{0xbf40, 0, 0, 1, f(Yes, true, "")},
-	{0xbf41, 0, 0, 2, f(Yes, false, "")},
-	{0xbf5c, 0, 0, 1, f(Yes, true, "")},
-	{0xbf5d, 0, 0, 2, f(Yes, false, "")},
-	{0xbf78, 0, 0, 1, f(Yes, true, "")},
-	{0xbf79, 0, 0, 2, f(Yes, false, "")},
-	{0xbf94, 0, 0, 1, f(Yes, true, "")},
-	{0xbf95, 0, 0, 2, f(Yes, false, "")},
-	{0xbfb0, 0, 0, 1, f(Yes, true, "")},
-	{0xbfb1, 0, 0, 2, f(Yes, false, "")},
-	{0xbfcc, 0, 0, 1, f(Yes, true, "")},
-	{0xbfcd, 0, 0, 2, f(Yes, false, "")},
-	{0xbfe8, 0, 0, 1, f(Yes, true, "")},
-	{0xbfe9, 0, 0, 2, f(Yes, false, "")},
-	{0xc004, 0, 0, 1, f(Yes, true, "")},
-	{0xc005, 0, 0, 2, f(Yes, false, "")},
-	{0xc020, 0, 0, 1, f(Yes, true, "")},
-	{0xc021, 0, 0, 2, f(Yes, false, "")},
-	{0xc03c, 0, 0, 1, f(Yes, true, "")},
-	{0xc03d, 0, 0, 2, f(Yes, false, "")},
-	{0xc058, 0, 0, 1, f(Yes, true, "")},
-	{0xc059, 0, 0, 2, f(Yes, false, "")},
-	{0xc074, 0, 0, 1, f(Yes, true, "")},
-	{0xc075, 0, 0, 2, f(Yes, false, "")},
-	{0xc090, 0, 0, 1, f(Yes, true, "")},
-	{0xc091, 0, 0, 2, f(Yes, false, "")},
-	{0xc0ac, 0, 0, 1, f(Yes, true, "")},
-	{0xc0ad, 0, 0, 2, f(Yes, false, "")},
-	{0xc0c8, 0, 0, 1, f(Yes, true, "")},
-	{0xc0c9, 0, 0, 2, f(Yes, false, "")},
-	{0xc0e4, 0, 0, 1, f(Yes, true, "")},
-	{0xc0e5, 0, 0, 2, f(Yes, false, "")},
-	{0xc100, 0, 0, 1, f(Yes, true, "")},
-	{0xc101, 0, 0, 2, f(Yes, false, "")},
-	{0xc11c, 0, 0, 1, f(Yes, true, "")},
-	{0xc11d, 0, 0, 2, f(Yes, false, "")},
-	{0xc138, 0, 0, 1, f(Yes, true, "")},
-	{0xc139, 0, 0, 2, f(Yes, false, "")},
-	{0xc154, 0, 0, 1, f(Yes, true, "")},
-	{0xc155, 0, 0, 2, f(Yes, false, "")},
-	{0xc170, 0, 0, 1, f(Yes, true, "")},
-	{0xc171, 0, 0, 2, f(Yes, false, "")},
-	{0xc18c, 0, 0, 1, f(Yes, true, "")},
-	{0xc18d, 0, 0, 2, f(Yes, false, "")},
-	{0xc1a8, 0, 0, 1, f(Yes, true, "")},
-	{0xc1a9, 0, 0, 2, f(Yes, false, "")},
-	{0xc1c4, 0, 0, 1, f(Yes, true, "")},
-	{0xc1c5, 0, 0, 2, f(Yes, false, "")},
-	{0xc1e0, 0, 0, 1, f(Yes, true, "")},
-	{0xc1e1, 0, 0, 2, f(Yes, false, "")},
-	{0xc1fc, 0, 0, 1, f(Yes, true, "")},
-	{0xc1fd, 0, 0, 2, f(Yes, false, "")},
-	{0xc218, 0, 0, 1, f(Yes, true, "")},
-	{0xc219, 0, 0, 2, f(Yes, false, "")},
-	{0xc234, 0, 0, 1, f(Yes, true, "")},
-	{0xc235, 0, 0, 2, f(Yes, false, "")},
-	{0xc250, 0, 0, 1, f(Yes, true, "")},
-	{0xc251, 0, 0, 2, f(Yes, false, "")},
-	{0xc26c, 0, 0, 1, f(Yes, true, "")},
-	{0xc26d, 0, 0, 2, f(Yes, false, "")},
-	{0xc288, 0, 0, 1, f(Yes, true, "")},
-	{0xc289, 0, 0, 2, f(Yes, false, "")},
-	{0xc2a4, 0, 0, 1, f(Yes, true, "")},
-	{0xc2a5, 0, 0, 2, f(Yes, false, "")},
-	{0xc2c0, 0, 0, 1, f(Yes, true, "")},
-	{0xc2c1, 0, 0, 2, f(Yes, false, "")},
-	{0xc2dc, 0, 0, 1, f(Yes, true, "")},
-	{0xc2dd, 0, 0, 2, f(Yes, false, "")},
-	{0xc2f8, 0, 0, 1, f(Yes, true, "")},
-	{0xc2f9, 0, 0, 2, f(Yes, false, "")},
-	{0xc314, 0, 0, 1, f(Yes, true, "")},
-	{0xc315, 0, 0, 2, f(Yes, false, "")},
-	{0xc330, 0, 0, 1, f(Yes, true, "")},
-	{0xc331, 0, 0, 2, f(Yes, false, "")},
-	{0xc34c, 0, 0, 1, f(Yes, true, "")},
-	{0xc34d, 0, 0, 2, f(Yes, false, "")},
-	{0xc368, 0, 0, 1, f(Yes, true, "")},
-	{0xc369, 0, 0, 2, f(Yes, false, "")},
-	{0xc384, 0, 0, 1, f(Yes, true, "")},
-	{0xc385, 0, 0, 2, f(Yes, false, "")},
-	{0xc3a0, 0, 0, 1, f(Yes, true, "")},
-	{0xc3a1, 0, 0, 2, f(Yes, false, "")},
-	{0xc3bc, 0, 0, 1, f(Yes, true, "")},
-	{0xc3bd, 0, 0, 2, f(Yes, false, "")},
-	{0xc3d8, 0, 0, 1, f(Yes, true, "")},
-	{0xc3d9, 0, 0, 2, f(Yes, false, "")},
-	{0xc3f4, 0, 0, 1, f(Yes, true, "")},
-	{0xc3f5, 0, 0, 2, f(Yes, false, "")},
-	{0xc410, 0, 0, 1, f(Yes, true, "")},
-	{0xc411, 0, 0, 2, f(Yes, false, "")},
-	{0xc42c, 0, 0, 1, f(Yes, true, "")},
-	{0xc42d, 0, 0, 2, f(Yes, false, "")},
-	{0xc448, 0, 0, 1, f(Yes, true, "")},
-	{0xc449, 0, 0, 2, f(Yes, false, "")},
-	{0xc464, 0, 0, 1, f(Yes, true, "")},
-	{0xc465, 0, 0, 2, f(Yes, false, "")},
-	{0xc480, 0, 0, 1, f(Yes, true, "")},
-	{0xc481, 0, 0, 2, f(Yes, false, "")},
-	{0xc49c, 0, 0, 1, f(Yes, true, "")},
-	{0xc49d, 0, 0, 2, f(Yes, false, "")},
-	{0xc4b8, 0, 0, 1, f(Yes, true, "")},
-	{0xc4b9, 0, 0, 2, f(Yes, false, "")},
-	{0xc4d4, 0, 0, 1, f(Yes, true, "")},
-	{0xc4d5, 0, 0, 2, f(Yes, false, "")},
-	{0xc4f0, 0, 0, 1, f(Yes, true, "")},
-	{0xc4f1, 0, 0, 2, f(Yes, false, "")},
-	{0xc50c, 0, 0, 1, f(Yes, true, "")},
-	{0xc50d, 0, 0, 2, f(Yes, false, "")},
-	{0xc528, 0, 0, 1, f(Yes, true, "")},
-	{0xc529, 0, 0, 2, f(Yes, false, "")},
-	{0xc544, 0, 0, 1, f(Yes, true, "")},
-	{0xc545, 0, 0, 2, f(Yes, false, "")},
-	{0xc560, 0, 0, 1, f(Yes, true, "")},
-	{0xc561, 0, 0, 2, f(Yes, false, "")},
-	{0xc57c, 0, 0, 1, f(Yes, true, "")},
-	{0xc57d, 0, 0, 2, f(Yes, false, "")},
-	{0xc598, 0, 0, 1, f(Yes, true, "")},
-	{0xc599, 0, 0, 2, f(Yes, false, "")},
-	{0xc5b4, 0, 0, 1, f(Yes, true, "")},
-	{0xc5b5, 0, 0, 2, f(Yes, false, "")},
-	{0xc5d0, 0, 0, 1, f(Yes, true, "")},
-	{0xc5d1, 0, 0, 2, f(Yes, false, "")},
-	{0xc5ec, 0, 0, 1, f(Yes, true, "")},
-	{0xc5ed, 0, 0, 2, f(Yes, false, "")},
-	{0xc608, 0, 0, 1, f(Yes, true, "")},
-	{0xc609, 0, 0, 2, f(Yes, false, "")},
-	{0xc624, 0, 0, 1, f(Yes, true, "")},
-	{0xc625, 0, 0, 2, f(Yes, false, "")},
-	{0xc640, 0, 0, 1, f(Yes, true, "")},
-	{0xc641, 0, 0, 2, f(Yes, false, "")},
-	{0xc65c, 0, 0, 1, f(Yes, true, "")},
-	{0xc65d, 0, 0, 2, f(Yes, false, "")},
-	{0xc678, 0, 0, 1, f(Yes, true, "")},
-	{0xc679, 0, 0, 2, f(Yes, false, "")},
-	{0xc694, 0, 0, 1, f(Yes, true, "")},
-	{0xc695, 0, 0, 2, f(Yes, false, "")},
-	{0xc6b0, 0, 0, 1, f(Yes, true, "")},
-	{0xc6b1, 0, 0, 2, f(Yes, false, "")},
-	{0xc6cc, 0, 0, 1, f(Yes, true, "")},
-	{0xc6cd, 0, 0, 2, f(Yes, false, "")},
-	{0xc6e8, 0, 0, 1, f(Yes, true, "")},
-	{0xc6e9, 0, 0, 2, f(Yes, false, "")},
-	{0xc704, 0, 0, 1, f(Yes, true, "")},
-	{0xc705, 0, 0, 2, f(Yes, false, "")},
-	{0xc720, 0, 0, 1, f(Yes, true, "")},
-	{0xc721, 0, 0, 2, f(Yes, false, "")},
-	{0xc73c, 0, 0, 1, f(Yes, true, "")},
-	{0xc73d, 0, 0, 2, f(Yes, false, "")},
-	{0xc758, 0, 0, 1, f(Yes, true, "")},
-	{0xc759, 0, 0, 2, f(Yes, false, "")},
-	{0xc774, 0, 0, 1, f(Yes, true, "")},
-	{0xc775, 0, 0, 2, f(Yes, false, "")},
-	{0xc790, 0, 0, 1, f(Yes, true, "")},
-	{0xc791, 0, 0, 2, f(Yes, false, "")},
-	{0xc7ac, 0, 0, 1, f(Yes, true, "")},
-	{0xc7ad, 0, 0, 2, f(Yes, false, "")},
-	{0xc7c8, 0, 0, 1, f(Yes, true, "")},
-	{0xc7c9, 0, 0, 2, f(Yes, false, "")},
-	{0xc7e4, 0, 0, 1, f(Yes, true, "")},
-	{0xc7e5, 0, 0, 2, f(Yes, false, "")},
-	{0xc800, 0, 0, 1, f(Yes, true, "")},
-	{0xc801, 0, 0, 2, f(Yes, false, "")},
-	{0xc81c, 0, 0, 1, f(Yes, true, "")},
-	{0xc81d, 0, 0, 2, f(Yes, false, "")},
-	{0xc838, 0, 0, 1, f(Yes, true, "")},
-	{0xc839, 0, 0, 2, f(Yes, false, "")},
-	{0xc854, 0, 0, 1, f(Yes, true, "")},
-	{0xc855, 0, 0, 2, f(Yes, false, "")},
-	{0xc870, 0, 0, 1, f(Yes, true, "")},
-	{0xc871, 0, 0, 2, f(Yes, false, "")},
-	{0xc88c, 0, 0, 1, f(Yes, true, "")},
-	{0xc88d, 0, 0, 2, f(Yes, false, "")},
-	{0xc8a8, 0, 0, 1, f(Yes, true, "")},
-	{0xc8a9, 0, 0, 2, f(Yes, false, "")},
-	{0xc8c4, 0, 0, 1, f(Yes, true, "")},
-	{0xc8c5, 0, 0, 2, f(Yes, false, "")},
-	{0xc8e0, 0, 0, 1, f(Yes, true, "")},
-	{0xc8e1, 0, 0, 2, f(Yes, false, "")},
-	{0xc8fc, 0, 0, 1, f(Yes, true, "")},
-	{0xc8fd, 0, 0, 2, f(Yes, false, "")},
-	{0xc918, 0, 0, 1, f(Yes, true, "")},
-	{0xc919, 0, 0, 2, f(Yes, false, "")},
-	{0xc934, 0, 0, 1, f(Yes, true, "")},
-	{0xc935, 0, 0, 2, f(Yes, false, "")},
-	{0xc950, 0, 0, 1, f(Yes, true, "")},
-	{0xc951, 0, 0, 2, f(Yes, false, "")},
-	{0xc96c, 0, 0, 1, f(Yes, true, "")},
-	{0xc96d, 0, 0, 2, f(Yes, false, "")},
-	{0xc988, 0, 0, 1, f(Yes, true, "")},
-	{0xc989, 0, 0, 2, f(Yes, false, "")},
-	{0xc9a4, 0, 0, 1, f(Yes, true, "")},
-	{0xc9a5, 0, 0, 2, f(Yes, false, "")},
-	{0xc9c0, 0, 0, 1, f(Yes, true, "")},
-	{0xc9c1, 0, 0, 2, f(Yes, false, "")},
-	{0xc9dc, 0, 0, 1, f(Yes, true, "")},
-	{0xc9dd, 0, 0, 2, f(Yes, false, "")},
-	{0xc9f8, 0, 0, 1, f(Yes, true, "")},
-	{0xc9f9, 0, 0, 2, f(Yes, false, "")},
-	{0xca14, 0, 0, 1, f(Yes, true, "")},
-	{0xca15, 0, 0, 2, f(Yes, false, "")},
-	{0xca30, 0, 0, 1, f(Yes, true, "")},
-	{0xca31, 0, 0, 2, f(Yes, false, "")},
-	{0xca4c, 0, 0, 1, f(Yes, true, "")},
-	{0xca4d, 0, 0, 2, f(Yes, false, "")},
-	{0xca68, 0, 0, 1, f(Yes, true, "")},
-	{0xca69, 0, 0, 2, f(Yes, false, "")},
-	{0xca84, 0, 0, 1, f(Yes, true, "")},
-	{0xca85, 0, 0, 2, f(Yes, false, "")},
-	{0xcaa0, 0, 0, 1, f(Yes, true, "")},
-	{0xcaa1, 0, 0, 2, f(Yes, false, "")},
-	{0xcabc, 0, 0, 1, f(Yes, true, "")},
-	{0xcabd, 0, 0, 2, f(Yes, false, "")},
-	{0xcad8, 0, 0, 1, f(Yes, true, "")},
-	{0xcad9, 0, 0, 2, f(Yes, false, "")},
-	{0xcaf4, 0, 0, 1, f(Yes, true, "")},
-	{0xcaf5, 0, 0, 2, f(Yes, false, "")},
-	{0xcb10, 0, 0, 1, f(Yes, true, "")},
-	{0xcb11, 0, 0, 2, f(Yes, false, "")},
-	{0xcb2c, 0, 0, 1, f(Yes, true, "")},
-	{0xcb2d, 0, 0, 2, f(Yes, false, "")},
-	{0xcb48, 0, 0, 1, f(Yes, true, "")},
-	{0xcb49, 0, 0, 2, f(Yes, false, "")},
-	{0xcb64, 0, 0, 1, f(Yes, true, "")},
-	{0xcb65, 0, 0, 2, f(Yes, false, "")},
-	{0xcb80, 0, 0, 1, f(Yes, true, "")},
-	{0xcb81, 0, 0, 2, f(Yes, false, "")},
-	{0xcb9c, 0, 0, 1, f(Yes, true, "")},
-	{0xcb9d, 0, 0, 2, f(Yes, false, "")},
-	{0xcbb8, 0, 0, 1, f(Yes, true, "")},
-	{0xcbb9, 0, 0, 2, f(Yes, false, "")},
-	{0xcbd4, 0, 0, 1, f(Yes, true, "")},
-	{0xcbd5, 0, 0, 2, f(Yes, false, "")},
-	{0xcbf0, 0, 0, 1, f(Yes, true, "")},
-	{0xcbf1, 0, 0, 2, f(Yes, false, "")},
-	{0xcc0c, 0, 0, 1, f(Yes, true, "")},
-	{0xcc0d, 0, 0, 2, f(Yes, false, "")},
-	{0xcc28, 0, 0, 1, f(Yes, true, "")},
-	{0xcc29, 0, 0, 2, f(Yes, false, "")},
-	{0xcc44, 0, 0, 1, f(Yes, true, "")},
-	{0xcc45, 0, 0, 2, f(Yes, false, "")},
-	{0xcc60, 0, 0, 1, f(Yes, true, "")},
-	{0xcc61, 0, 0, 2, f(Yes, false, "")},
-	{0xcc7c, 0, 0, 1, f(Yes, true, "")},
-	{0xcc7d, 0, 0, 2, f(Yes, false, "")},
-	{0xcc98, 0, 0, 1, f(Yes, true, "")},
-	{0xcc99, 0, 0, 2, f(Yes, false, "")},
-	{0xccb4, 0, 0, 1, f(Yes, true, "")},
-	{0xccb5, 0, 0, 2, f(Yes, false, "")},
-	{0xccd0, 0, 0, 1, f(Yes, true, "")},
-	{0xccd1, 0, 0, 2, f(Yes, false, "")},
-	{0xccec, 0, 0, 1, f(Yes, true, "")},
-	{0xcced, 0, 0, 2, f(Yes, false, "")},
-	{0xcd08, 0, 0, 1, f(Yes, true, "")},
-	{0xcd09, 0, 0, 2, f(Yes, false, "")},
-	{0xcd24, 0, 0, 1, f(Yes, true, "")},
-	{0xcd25, 0, 0, 2, f(Yes, false, "")},
-	{0xcd40, 0, 0, 1, f(Yes, true, "")},
-	{0xcd41, 0, 0, 2, f(Yes, false, "")},
-	{0xcd5c, 0, 0, 1, f(Yes, true, "")},
-	{0xcd5d, 0, 0, 2, f(Yes, false, "")},
-	{0xcd78, 0, 0, 1, f(Yes, true, "")},
-	{0xcd79, 0, 0, 2, f(Yes, false, "")},
-	{0xcd94, 0, 0, 1, f(Yes, true, "")},
-	{0xcd95, 0, 0, 2, f(Yes, false, "")},
-	{0xcdb0, 0, 0, 1, f(Yes, true, "")},
-	{0xcdb1, 0, 0, 2, f(Yes, false, "")},
-	{0xcdcc, 0, 0, 1, f(Yes, true, "")},
-	{0xcdcd, 0, 0, 2, f(Yes, false, "")},
-	{0xcde8, 0, 0, 1, f(Yes, true, "")},
-	{0xcde9, 0, 0, 2, f(Yes, false, "")},
-	{0xce04, 0, 0, 1, f(Yes, true, "")},
-	{0xce05, 0, 0, 2, f(Yes, false, "")},
-	{0xce20, 0, 0, 1, f(Yes, true, "")},
-	{0xce21, 0, 0, 2, f(Yes, false, "")},
-	{0xce3c, 0, 0, 1, f(Yes, true, "")},
-	{0xce3d, 0, 0, 2, f(Yes, false, "")},
-	{0xce58, 0, 0, 1, f(Yes, true, "")},
-	{0xce59, 0, 0, 2, f(Yes, false, "")},
-	{0xce74, 0, 0, 1, f(Yes, true, "")},
-	{0xce75, 0, 0, 2, f(Yes, false, "")},
-	{0xce90, 0, 0, 1, f(Yes, true, "")},
-	{0xce91, 0, 0, 2, f(Yes, false, "")},
-	{0xceac, 0, 0, 1, f(Yes, true, "")},
-	{0xcead, 0, 0, 2, f(Yes, false, "")},
-	{0xcec8, 0, 0, 1, f(Yes, true, "")},
-	{0xcec9, 0, 0, 2, f(Yes, false, "")},
-	{0xcee4, 0, 0, 1, f(Yes, true, "")},
-	{0xcee5, 0, 0, 2, f(Yes, false, "")},
-	{0xcf00, 0, 0, 1, f(Yes, true, "")},
-	{0xcf01, 0, 0, 2, f(Yes, false, "")},
-	{0xcf1c, 0, 0, 1, f(Yes, true, "")},
-	{0xcf1d, 0, 0, 2, f(Yes, false, "")},
-	{0xcf38, 0, 0, 1, f(Yes, true, "")},
-	{0xcf39, 0, 0, 2, f(Yes, false, "")},
-	{0xcf54, 0, 0, 1, f(Yes, true, "")},
-	{0xcf55, 0, 0, 2, f(Yes, false, "")},
-	{0xcf70, 0, 0, 1, f(Yes, true, "")},
-	{0xcf71, 0, 0, 2, f(Yes, false, "")},
-	{0xcf8c, 0, 0, 1, f(Yes, true, "")},
-	{0xcf8d, 0, 0, 2, f(Yes, false, "")},
-	{0xcfa8, 0, 0, 1, f(Yes, true, "")},
-	{0xcfa9, 0, 0, 2, f(Yes, false, "")},
-	{0xcfc4, 0, 0, 1, f(Yes, true, "")},
-	{0xcfc5, 0, 0, 2, f(Yes, false, "")},
-	{0xcfe0, 0, 0, 1, f(Yes, true, "")},
-	{0xcfe1, 0, 0, 2, f(Yes, false, "")},
-	{0xcffc, 0, 0, 1, f(Yes, true, "")},
-	{0xcffd, 0, 0, 2, f(Yes, false, "")},
-	{0xd018, 0, 0, 1, f(Yes, true, "")},
-	{0xd019, 0, 0, 2, f(Yes, false, "")},
-	{0xd034, 0, 0, 1, f(Yes, true, "")},
-	{0xd035, 0, 0, 2, f(Yes, false, "")},
-	{0xd050, 0, 0, 1, f(Yes, true, "")},
-	{0xd051, 0, 0, 2, f(Yes, false, "")},
-	{0xd06c, 0, 0, 1, f(Yes, true, "")},
-	{0xd06d, 0, 0, 2, f(Yes, false, "")},
-	{0xd088, 0, 0, 1, f(Yes, true, "")},
-	{0xd089, 0, 0, 2, f(Yes, false, "")},
-	{0xd0a4, 0, 0, 1, f(Yes, true, "")},
-	{0xd0a5, 0, 0, 2, f(Yes, false, "")},
-	{0xd0c0, 0, 0, 1, f(Yes, true, "")},
-	{0xd0c1, 0, 0, 2, f(Yes, false, "")},
-	{0xd0dc, 0, 0, 1, f(Yes, true, "")},
-	{0xd0dd, 0, 0, 2, f(Yes, false, "")},
-	{0xd0f8, 0, 0, 1, f(Yes, true, "")},
-	{0xd0f9, 0, 0, 2, f(Yes, false, "")},
-	{0xd114, 0, 0, 1, f(Yes, true, "")},
-	{0xd115, 0, 0, 2, f(Yes, false, "")},
-	{0xd130, 0, 0, 1, f(Yes, true, "")},
-	{0xd131, 0, 0, 2, f(Yes, false, "")},
-	{0xd14c, 0, 0, 1, f(Yes, true, "")},
-	{0xd14d, 0, 0, 2, f(Yes, false, "")},
-	{0xd168, 0, 0, 1, f(Yes, true, "")},
-	{0xd169, 0, 0, 2, f(Yes, false, "")},
-	{0xd184, 0, 0, 1, f(Yes, true, "")},
-	{0xd185, 0, 0, 2, f(Yes, false, "")},
-	{0xd1a0, 0, 0, 1, f(Yes, true, "")},
-	{0xd1a1, 0, 0, 2, f(Yes, false, "")},
-	{0xd1bc, 0, 0, 1, f(Yes, true, "")},
-	{0xd1bd, 0, 0, 2, f(Yes, false, "")},
-	{0xd1d8, 0, 0, 1, f(Yes, true, "")},
-	{0xd1d9, 0, 0, 2, f(Yes, false, "")},
-	{0xd1f4, 0, 0, 1, f(Yes, true, "")},
-	{0xd1f5, 0, 0, 2, f(Yes, false, "")},
-	{0xd210, 0, 0, 1, f(Yes, true, "")},
-	{0xd211, 0, 0, 2, f(Yes, false, "")},
-	{0xd22c, 0, 0, 1, f(Yes, true, "")},
-	{0xd22d, 0, 0, 2, f(Yes, false, "")},
-	{0xd248, 0, 0, 1, f(Yes, true, "")},
-	{0xd249, 0, 0, 2, f(Yes, false, "")},
-	{0xd264, 0, 0, 1, f(Yes, true, "")},
-	{0xd265, 0, 0, 2, f(Yes, false, "")},
-	{0xd280, 0, 0, 1, f(Yes, true, "")},
-	{0xd281, 0, 0, 2, f(Yes, false, "")},
-	{0xd29c, 0, 0, 1, f(Yes, true, "")},
-	{0xd29d, 0, 0, 2, f(Yes, false, "")},
-	{0xd2b8, 0, 0, 1, f(Yes, true, "")},
-	{0xd2b9, 0, 0, 2, f(Yes, false, "")},
-	{0xd2d4, 0, 0, 1, f(Yes, true, "")},
-	{0xd2d5, 0, 0, 2, f(Yes, false, "")},
-	{0xd2f0, 0, 0, 1, f(Yes, true, "")},
-	{0xd2f1, 0, 0, 2, f(Yes, false, "")},
-	{0xd30c, 0, 0, 1, f(Yes, true, "")},
-	{0xd30d, 0, 0, 2, f(Yes, false, "")},
-	{0xd328, 0, 0, 1, f(Yes, true, "")},
-	{0xd329, 0, 0, 2, f(Yes, false, "")},
-	{0xd344, 0, 0, 1, f(Yes, true, "")},
-	{0xd345, 0, 0, 2, f(Yes, false, "")},
-	{0xd360, 0, 0, 1, f(Yes, true, "")},
-	{0xd361, 0, 0, 2, f(Yes, false, "")},
-	{0xd37c, 0, 0, 1, f(Yes, true, "")},
-	{0xd37d, 0, 0, 2, f(Yes, false, "")},
-	{0xd398, 0, 0, 1, f(Yes, true, "")},
-	{0xd399, 0, 0, 2, f(Yes, false, "")},
-	{0xd3b4, 0, 0, 1, f(Yes, true, "")},
-	{0xd3b5, 0, 0, 2, f(Yes, false, "")},
-	{0xd3d0, 0, 0, 1, f(Yes, true, "")},
-	{0xd3d1, 0, 0, 2, f(Yes, false, "")},
-	{0xd3ec, 0, 0, 1, f(Yes, true, "")},
-	{0xd3ed, 0, 0, 2, f(Yes, false, "")},
-	{0xd408, 0, 0, 1, f(Yes, true, "")},
-	{0xd409, 0, 0, 2, f(Yes, false, "")},
-	{0xd424, 0, 0, 1, f(Yes, true, "")},
-	{0xd425, 0, 0, 2, f(Yes, false, "")},
-	{0xd440, 0, 0, 1, f(Yes, true, "")},
-	{0xd441, 0, 0, 2, f(Yes, false, "")},
-	{0xd45c, 0, 0, 1, f(Yes, true, "")},
-	{0xd45d, 0, 0, 2, f(Yes, false, "")},
-	{0xd478, 0, 0, 1, f(Yes, true, "")},
-	{0xd479, 0, 0, 2, f(Yes, false, "")},
-	{0xd494, 0, 0, 1, f(Yes, true, "")},
-	{0xd495, 0, 0, 2, f(Yes, false, "")},
-	{0xd4b0, 0, 0, 1, f(Yes, true, "")},
-	{0xd4b1, 0, 0, 2, f(Yes, false, "")},
-	{0xd4cc, 0, 0, 1, f(Yes, true, "")},
-	{0xd4cd, 0, 0, 2, f(Yes, false, "")},
-	{0xd4e8, 0, 0, 1, f(Yes, true, "")},
-	{0xd4e9, 0, 0, 2, f(Yes, false, "")},
-	{0xd504, 0, 0, 1, f(Yes, true, "")},
-	{0xd505, 0, 0, 2, f(Yes, false, "")},
-	{0xd520, 0, 0, 1, f(Yes, true, "")},
-	{0xd521, 0, 0, 2, f(Yes, false, "")},
-	{0xd53c, 0, 0, 1, f(Yes, true, "")},
-	{0xd53d, 0, 0, 2, f(Yes, false, "")},
-	{0xd558, 0, 0, 1, f(Yes, true, "")},
-	{0xd559, 0, 0, 2, f(Yes, false, "")},
-	{0xd574, 0, 0, 1, f(Yes, true, "")},
-	{0xd575, 0, 0, 2, f(Yes, false, "")},
-	{0xd590, 0, 0, 1, f(Yes, true, "")},
-	{0xd591, 0, 0, 2, f(Yes, false, "")},
-	{0xd5ac, 0, 0, 1, f(Yes, true, "")},
-	{0xd5ad, 0, 0, 2, f(Yes, false, "")},
-	{0xd5c8, 0, 0, 1, f(Yes, true, "")},
-	{0xd5c9, 0, 0, 2, f(Yes, false, "")},
-	{0xd5e4, 0, 0, 1, f(Yes, true, "")},
-	{0xd5e5, 0, 0, 2, f(Yes, false, "")},
-	{0xd600, 0, 0, 1, f(Yes, true, "")},
-	{0xd601, 0, 0, 2, f(Yes, false, "")},
-	{0xd61c, 0, 0, 1, f(Yes, true, "")},
-	{0xd61d, 0, 0, 2, f(Yes, false, "")},
-	{0xd638, 0, 0, 1, f(Yes, true, "")},
-	{0xd639, 0, 0, 2, f(Yes, false, "")},
-	{0xd654, 0, 0, 1, f(Yes, true, "")},
-	{0xd655, 0, 0, 2, f(Yes, false, "")},
-	{0xd670, 0, 0, 1, f(Yes, true, "")},
-	{0xd671, 0, 0, 2, f(Yes, false, "")},
-	{0xd68c, 0, 0, 1, f(Yes, true, "")},
-	{0xd68d, 0, 0, 2, f(Yes, false, "")},
-	{0xd6a8, 0, 0, 1, f(Yes, true, "")},
-	{0xd6a9, 0, 0, 2, f(Yes, false, "")},
-	{0xd6c4, 0, 0, 1, f(Yes, true, "")},
-	{0xd6c5, 0, 0, 2, f(Yes, false, "")},
-	{0xd6e0, 0, 0, 1, f(Yes, true, "")},
-	{0xd6e1, 0, 0, 2, f(Yes, false, "")},
-	{0xd6fc, 0, 0, 1, f(Yes, true, "")},
-	{0xd6fd, 0, 0, 2, f(Yes, false, "")},
-	{0xd718, 0, 0, 1, f(Yes, true, "")},
-	{0xd719, 0, 0, 2, f(Yes, false, "")},
-	{0xd734, 0, 0, 1, f(Yes, true, "")},
-	{0xd735, 0, 0, 2, f(Yes, false, "")},
-	{0xd750, 0, 0, 1, f(Yes, true, "")},
-	{0xd751, 0, 0, 2, f(Yes, false, "")},
-	{0xd76c, 0, 0, 1, f(Yes, true, "")},
-	{0xd76d, 0, 0, 2, f(Yes, false, "")},
-	{0xd788, 0, 0, 1, f(Yes, true, "")},
-	{0xd789, 0, 0, 2, f(Yes, false, "")},
-	{0xd7a4, 0, 0, 0, f(Yes, false, "")},
-	{0xf900, 0, 0, 0, f(No, false, "豈")},
-	{0xf901, 0, 0, 0, f(No, false, "更")},
-	{0xf902, 0, 0, 0, f(No, false, "車")},
-	{0xf903, 0, 0, 0, f(No, false, "賈")},
-	{0xf904, 0, 0, 0, f(No, false, "滑")},
-	{0xf905, 0, 0, 0, f(No, false, "串")},
-	{0xf906, 0, 0, 0, f(No, false, "句")},
-	{0xf907, 0, 0, 0, f(No, false, "龜")},
-	{0xf909, 0, 0, 0, f(No, false, "契")},
-	{0xf90a, 0, 0, 0, f(No, false, "金")},
-	{0xf90b, 0, 0, 0, f(No, false, "喇")},
-	{0xf90c, 0, 0, 0, f(No, false, "奈")},
-	{0xf90d, 0, 0, 0, f(No, false, "懶")},
-	{0xf90e, 0, 0, 0, f(No, false, "癩")},
-	{0xf90f, 0, 0, 0, f(No, false, "羅")},
-	{0xf910, 0, 0, 0, f(No, false, "蘿")},
-	{0xf911, 0, 0, 0, f(No, false, "螺")},
-	{0xf912, 0, 0, 0, f(No, false, "裸")},
-	{0xf913, 0, 0, 0, f(No, false, "邏")},
-	{0xf914, 0, 0, 0, f(No, false, "樂")},
-	{0xf915, 0, 0, 0, f(No, false, "洛")},
-	{0xf916, 0, 0, 0, f(No, false, "烙")},
-	{0xf917, 0, 0, 0, f(No, false, "珞")},
-	{0xf918, 0, 0, 0, f(No, false, "落")},
-	{0xf919, 0, 0, 0, f(No, false, "酪")},
-	{0xf91a, 0, 0, 0, f(No, false, "駱")},
-	{0xf91b, 0, 0, 0, f(No, false, "亂")},
-	{0xf91c, 0, 0, 0, f(No, false, "卵")},
-	{0xf91d, 0, 0, 0, f(No, false, "欄")},
-	{0xf91e, 0, 0, 0, f(No, false, "爛")},
-	{0xf91f, 0, 0, 0, f(No, false, "蘭")},
-	{0xf920, 0, 0, 0, f(No, false, "鸞")},
-	{0xf921, 0, 0, 0, f(No, false, "嵐")},
-	{0xf922, 0, 0, 0, f(No, false, "濫")},
-	{0xf923, 0, 0, 0, f(No, false, "藍")},
-	{0xf924, 0, 0, 0, f(No, false, "襤")},
-	{0xf925, 0, 0, 0, f(No, false, "拉")},
-	{0xf926, 0, 0, 0, f(No, false, "臘")},
-	{0xf927, 0, 0, 0, f(No, false, "蠟")},
-	{0xf928, 0, 0, 0, f(No, false, "廊")},
-	{0xf929, 0, 0, 0, f(No, false, "朗")},
-	{0xf92a, 0, 0, 0, f(No, false, "浪")},
-	{0xf92b, 0, 0, 0, f(No, false, "狼")},
-	{0xf92c, 0, 0, 0, f(No, false, "郎")},
-	{0xf92d, 0, 0, 0, f(No, false, "來")},
-	{0xf92e, 0, 0, 0, f(No, false, "冷")},
-	{0xf92f, 0, 0, 0, f(No, false, "勞")},
-	{0xf930, 0, 0, 0, f(No, false, "擄")},
-	{0xf931, 0, 0, 0, f(No, false, "櫓")},
-	{0xf932, 0, 0, 0, f(No, false, "爐")},
-	{0xf933, 0, 0, 0, f(No, false, "盧")},
-	{0xf934, 0, 0, 0, f(No, false, "老")},
-	{0xf935, 0, 0, 0, f(No, false, "蘆")},
-	{0xf936, 0, 0, 0, f(No, false, "虜")},
-	{0xf937, 0, 0, 0, f(No, false, "路")},
-	{0xf938, 0, 0, 0, f(No, false, "露")},
-	{0xf939, 0, 0, 0, f(No, false, "魯")},
-	{0xf93a, 0, 0, 0, f(No, false, "鷺")},
-	{0xf93b, 0, 0, 0, f(No, false, "碌")},
-	{0xf93c, 0, 0, 0, f(No, false, "祿")},
-	{0xf93d, 0, 0, 0, f(No, false, "綠")},
-	{0xf93e, 0, 0, 0, f(No, false, "菉")},
-	{0xf93f, 0, 0, 0, f(No, false, "錄")},
-	{0xf940, 0, 0, 0, f(No, false, "鹿")},
-	{0xf941, 0, 0, 0, f(No, false, "論")},
-	{0xf942, 0, 0, 0, f(No, false, "壟")},
-	{0xf943, 0, 0, 0, f(No, false, "弄")},
-	{0xf944, 0, 0, 0, f(No, false, "籠")},
-	{0xf945, 0, 0, 0, f(No, false, "聾")},
-	{0xf946, 0, 0, 0, f(No, false, "牢")},
-	{0xf947, 0, 0, 0, f(No, false, "磊")},
-	{0xf948, 0, 0, 0, f(No, false, "賂")},
-	{0xf949, 0, 0, 0, f(No, false, "雷")},
-	{0xf94a, 0, 0, 0, f(No, false, "壘")},
-	{0xf94b, 0, 0, 0, f(No, false, "屢")},
-	{0xf94c, 0, 0, 0, f(No, false, "樓")},
-	{0xf94d, 0, 0, 0, f(No, false, "淚")},
-	{0xf94e, 0, 0, 0, f(No, false, "漏")},
-	{0xf94f, 0, 0, 0, f(No, false, "累")},
-	{0xf950, 0, 0, 0, f(No, false, "縷")},
-	{0xf951, 0, 0, 0, f(No, false, "陋")},
-	{0xf952, 0, 0, 0, f(No, false, "勒")},
-	{0xf953, 0, 0, 0, f(No, false, "肋")},
-	{0xf954, 0, 0, 0, f(No, false, "凜")},
-	{0xf955, 0, 0, 0, f(No, false, "凌")},
-	{0xf956, 0, 0, 0, f(No, false, "稜")},
-	{0xf957, 0, 0, 0, f(No, false, "綾")},
-	{0xf958, 0, 0, 0, f(No, false, "菱")},
-	{0xf959, 0, 0, 0, f(No, false, "陵")},
-	{0xf95a, 0, 0, 0, f(No, false, "讀")},
-	{0xf95b, 0, 0, 0, f(No, false, "拏")},
-	{0xf95c, 0, 0, 0, f(No, false, "樂")},
-	{0xf95d, 0, 0, 0, f(No, false, "諾")},
-	{0xf95e, 0, 0, 0, f(No, false, "丹")},
-	{0xf95f, 0, 0, 0, f(No, false, "寧")},
-	{0xf960, 0, 0, 0, f(No, false, "怒")},
-	{0xf961, 0, 0, 0, f(No, false, "率")},
-	{0xf962, 0, 0, 0, f(No, false, "異")},
-	{0xf963, 0, 0, 0, f(No, false, "北")},
-	{0xf964, 0, 0, 0, f(No, false, "磻")},
-	{0xf965, 0, 0, 0, f(No, false, "便")},
-	{0xf966, 0, 0, 0, f(No, false, "復")},
-	{0xf967, 0, 0, 0, f(No, false, "不")},
-	{0xf968, 0, 0, 0, f(No, false, "泌")},
-	{0xf969, 0, 0, 0, f(No, false, "數")},
-	{0xf96a, 0, 0, 0, f(No, false, "索")},
-	{0xf96b, 0, 0, 0, f(No, false, "參")},
-	{0xf96c, 0, 0, 0, f(No, false, "塞")},
-	{0xf96d, 0, 0, 0, f(No, false, "省")},
-	{0xf96e, 0, 0, 0, f(No, false, "葉")},
-	{0xf96f, 0, 0, 0, f(No, false, "說")},
-	{0xf970, 0, 0, 0, f(No, false, "殺")},
-	{0xf971, 0, 0, 0, f(No, false, "辰")},
-	{0xf972, 0, 0, 0, f(No, false, "沈")},
-	{0xf973, 0, 0, 0, f(No, false, "拾")},
-	{0xf974, 0, 0, 0, f(No, false, "若")},
-	{0xf975, 0, 0, 0, f(No, false, "掠")},
-	{0xf976, 0, 0, 0, f(No, false, "略")},
-	{0xf977, 0, 0, 0, f(No, false, "亮")},
-	{0xf978, 0, 0, 0, f(No, false, "兩")},
-	{0xf979, 0, 0, 0, f(No, false, "凉")},
-	{0xf97a, 0, 0, 0, f(No, false, "梁")},
-	{0xf97b, 0, 0, 0, f(No, false, "糧")},
-	{0xf97c, 0, 0, 0, f(No, false, "良")},
-	{0xf97d, 0, 0, 0, f(No, false, "諒")},
-	{0xf97e, 0, 0, 0, f(No, false, "量")},
-	{0xf97f, 0, 0, 0, f(No, false, "勵")},
-	{0xf980, 0, 0, 0, f(No, false, "呂")},
-	{0xf981, 0, 0, 0, f(No, false, "女")},
-	{0xf982, 0, 0, 0, f(No, false, "廬")},
-	{0xf983, 0, 0, 0, f(No, false, "旅")},
-	{0xf984, 0, 0, 0, f(No, false, "濾")},
-	{0xf985, 0, 0, 0, f(No, false, "礪")},
-	{0xf986, 0, 0, 0, f(No, false, "閭")},
-	{0xf987, 0, 0, 0, f(No, false, "驪")},
-	{0xf988, 0, 0, 0, f(No, false, "麗")},
-	{0xf989, 0, 0, 0, f(No, false, "黎")},
-	{0xf98a, 0, 0, 0, f(No, false, "力")},
-	{0xf98b, 0, 0, 0, f(No, false, "曆")},
-	{0xf98c, 0, 0, 0, f(No, false, "歷")},
-	{0xf98d, 0, 0, 0, f(No, false, "轢")},
-	{0xf98e, 0, 0, 0, f(No, false, "年")},
-	{0xf98f, 0, 0, 0, f(No, false, "憐")},
-	{0xf990, 0, 0, 0, f(No, false, "戀")},
-	{0xf991, 0, 0, 0, f(No, false, "撚")},
-	{0xf992, 0, 0, 0, f(No, false, "漣")},
-	{0xf993, 0, 0, 0, f(No, false, "煉")},
-	{0xf994, 0, 0, 0, f(No, false, "璉")},
-	{0xf995, 0, 0, 0, f(No, false, "秊")},
-	{0xf996, 0, 0, 0, f(No, false, "練")},
-	{0xf997, 0, 0, 0, f(No, false, "聯")},
-	{0xf998, 0, 0, 0, f(No, false, "輦")},
-	{0xf999, 0, 0, 0, f(No, false, "蓮")},
-	{0xf99a, 0, 0, 0, f(No, false, "連")},
-	{0xf99b, 0, 0, 0, f(No, false, "鍊")},
-	{0xf99c, 0, 0, 0, f(No, false, "列")},
-	{0xf99d, 0, 0, 0, f(No, false, "劣")},
-	{0xf99e, 0, 0, 0, f(No, false, "咽")},
-	{0xf99f, 0, 0, 0, f(No, false, "烈")},
-	{0xf9a0, 0, 0, 0, f(No, false, "裂")},
-	{0xf9a1, 0, 0, 0, f(No, false, "說")},
-	{0xf9a2, 0, 0, 0, f(No, false, "廉")},
-	{0xf9a3, 0, 0, 0, f(No, false, "念")},
-	{0xf9a4, 0, 0, 0, f(No, false, "捻")},
-	{0xf9a5, 0, 0, 0, f(No, false, "殮")},
-	{0xf9a6, 0, 0, 0, f(No, false, "簾")},
-	{0xf9a7, 0, 0, 0, f(No, false, "獵")},
-	{0xf9a8, 0, 0, 0, f(No, false, "令")},
-	{0xf9a9, 0, 0, 0, f(No, false, "囹")},
-	{0xf9aa, 0, 0, 0, f(No, false, "寧")},
-	{0xf9ab, 0, 0, 0, f(No, false, "嶺")},
-	{0xf9ac, 0, 0, 0, f(No, false, "怜")},
-	{0xf9ad, 0, 0, 0, f(No, false, "玲")},
-	{0xf9ae, 0, 0, 0, f(No, false, "瑩")},
-	{0xf9af, 0, 0, 0, f(No, false, "羚")},
-	{0xf9b0, 0, 0, 0, f(No, false, "聆")},
-	{0xf9b1, 0, 0, 0, f(No, false, "鈴")},
-	{0xf9b2, 0, 0, 0, f(No, false, "零")},
-	{0xf9b3, 0, 0, 0, f(No, false, "靈")},
-	{0xf9b4, 0, 0, 0, f(No, false, "領")},
-	{0xf9b5, 0, 0, 0, f(No, false, "例")},
-	{0xf9b6, 0, 0, 0, f(No, false, "禮")},
-	{0xf9b7, 0, 0, 0, f(No, false, "醴")},
-	{0xf9b8, 0, 0, 0, f(No, false, "隸")},
-	{0xf9b9, 0, 0, 0, f(No, false, "惡")},
-	{0xf9ba, 0, 0, 0, f(No, false, "了")},
-	{0xf9bb, 0, 0, 0, f(No, false, "僚")},
-	{0xf9bc, 0, 0, 0, f(No, false, "寮")},
-	{0xf9bd, 0, 0, 0, f(No, false, "尿")},
-	{0xf9be, 0, 0, 0, f(No, false, "料")},
-	{0xf9bf, 0, 0, 0, f(No, false, "樂")},
-	{0xf9c0, 0, 0, 0, f(No, false, "燎")},
-	{0xf9c1, 0, 0, 0, f(No, false, "療")},
-	{0xf9c2, 0, 0, 0, f(No, false, "蓼")},
-	{0xf9c3, 0, 0, 0, f(No, false, "遼")},
-	{0xf9c4, 0, 0, 0, f(No, false, "龍")},
-	{0xf9c5, 0, 0, 0, f(No, false, "暈")},
-	{0xf9c6, 0, 0, 0, f(No, false, "阮")},
-	{0xf9c7, 0, 0, 0, f(No, false, "劉")},
-	{0xf9c8, 0, 0, 0, f(No, false, "杻")},
-	{0xf9c9, 0, 0, 0, f(No, false, "柳")},
-	{0xf9ca, 0, 0, 0, f(No, false, "流")},
-	{0xf9cb, 0, 0, 0, f(No, false, "溜")},
-	{0xf9cc, 0, 0, 0, f(No, false, "琉")},
-	{0xf9cd, 0, 0, 0, f(No, false, "留")},
-	{0xf9ce, 0, 0, 0, f(No, false, "硫")},
-	{0xf9cf, 0, 0, 0, f(No, false, "紐")},
-	{0xf9d0, 0, 0, 0, f(No, false, "類")},
-	{0xf9d1, 0, 0, 0, f(No, false, "六")},
-	{0xf9d2, 0, 0, 0, f(No, false, "戮")},
-	{0xf9d3, 0, 0, 0, f(No, false, "陸")},
-	{0xf9d4, 0, 0, 0, f(No, false, "倫")},
-	{0xf9d5, 0, 0, 0, f(No, false, "崙")},
-	{0xf9d6, 0, 0, 0, f(No, false, "淪")},
-	{0xf9d7, 0, 0, 0, f(No, false, "輪")},
-	{0xf9d8, 0, 0, 0, f(No, false, "律")},
-	{0xf9d9, 0, 0, 0, f(No, false, "慄")},
-	{0xf9da, 0, 0, 0, f(No, false, "栗")},
-	{0xf9db, 0, 0, 0, f(No, false, "率")},
-	{0xf9dc, 0, 0, 0, f(No, false, "隆")},
-	{0xf9dd, 0, 0, 0, f(No, false, "利")},
-	{0xf9de, 0, 0, 0, f(No, false, "吏")},
-	{0xf9df, 0, 0, 0, f(No, false, "履")},
-	{0xf9e0, 0, 0, 0, f(No, false, "易")},
-	{0xf9e1, 0, 0, 0, f(No, false, "李")},
-	{0xf9e2, 0, 0, 0, f(No, false, "梨")},
-	{0xf9e3, 0, 0, 0, f(No, false, "泥")},
-	{0xf9e4, 0, 0, 0, f(No, false, "理")},
-	{0xf9e5, 0, 0, 0, f(No, false, "痢")},
-	{0xf9e6, 0, 0, 0, f(No, false, "罹")},
-	{0xf9e7, 0, 0, 0, f(No, false, "裏")},
-	{0xf9e8, 0, 0, 0, f(No, false, "裡")},
-	{0xf9e9, 0, 0, 0, f(No, false, "里")},
-	{0xf9ea, 0, 0, 0, f(No, false, "離")},
-	{0xf9eb, 0, 0, 0, f(No, false, "匿")},
-	{0xf9ec, 0, 0, 0, f(No, false, "溺")},
-	{0xf9ed, 0, 0, 0, f(No, false, "吝")},
-	{0xf9ee, 0, 0, 0, f(No, false, "燐")},
-	{0xf9ef, 0, 0, 0, f(No, false, "璘")},
-	{0xf9f0, 0, 0, 0, f(No, false, "藺")},
-	{0xf9f1, 0, 0, 0, f(No, false, "隣")},
-	{0xf9f2, 0, 0, 0, f(No, false, "鱗")},
-	{0xf9f3, 0, 0, 0, f(No, false, "麟")},
-	{0xf9f4, 0, 0, 0, f(No, false, "林")},
-	{0xf9f5, 0, 0, 0, f(No, false, "淋")},
-	{0xf9f6, 0, 0, 0, f(No, false, "臨")},
-	{0xf9f7, 0, 0, 0, f(No, false, "立")},
-	{0xf9f8, 0, 0, 0, f(No, false, "笠")},
-	{0xf9f9, 0, 0, 0, f(No, false, "粒")},
-	{0xf9fa, 0, 0, 0, f(No, false, "狀")},
-	{0xf9fb, 0, 0, 0, f(No, false, "炙")},
-	{0xf9fc, 0, 0, 0, f(No, false, "識")},
-	{0xf9fd, 0, 0, 0, f(No, false, "什")},
-	{0xf9fe, 0, 0, 0, f(No, false, "茶")},
-	{0xf9ff, 0, 0, 0, f(No, false, "刺")},
-	{0xfa00, 0, 0, 0, f(No, false, "切")},
-	{0xfa01, 0, 0, 0, f(No, false, "度")},
-	{0xfa02, 0, 0, 0, f(No, false, "拓")},
-	{0xfa03, 0, 0, 0, f(No, false, "糖")},
-	{0xfa04, 0, 0, 0, f(No, false, "宅")},
-	{0xfa05, 0, 0, 0, f(No, false, "洞")},
-	{0xfa06, 0, 0, 0, f(No, false, "暴")},
-	{0xfa07, 0, 0, 0, f(No, false, "輻")},
-	{0xfa08, 0, 0, 0, f(No, false, "行")},
-	{0xfa09, 0, 0, 0, f(No, false, "降")},
-	{0xfa0a, 0, 0, 0, f(No, false, "見")},
-	{0xfa0b, 0, 0, 0, f(No, false, "廓")},
-	{0xfa0c, 0, 0, 0, f(No, false, "兀")},
-	{0xfa0d, 0, 0, 0, f(No, false, "嗀")},
-	{0xfa0e, 0, 0, 0, f(Yes, false, "")},
-	{0xfa10, 0, 0, 0, f(No, false, "塚")},
-	{0xfa11, 0, 0, 0, f(Yes, false, "")},
-	{0xfa12, 0, 0, 0, f(No, false, "晴")},
-	{0xfa13, 0, 0, 0, f(Yes, false, "")},
-	{0xfa15, 0, 0, 0, f(No, false, "凞")},
-	{0xfa16, 0, 0, 0, f(No, false, "猪")},
-	{0xfa17, 0, 0, 0, f(No, false, "益")},
-	{0xfa18, 0, 0, 0, f(No, false, "礼")},
-	{0xfa19, 0, 0, 0, f(No, false, "神")},
-	{0xfa1a, 0, 0, 0, f(No, false, "祥")},
-	{0xfa1b, 0, 0, 0, f(No, false, "福")},
-	{0xfa1c, 0, 0, 0, f(No, false, "靖")},
-	{0xfa1d, 0, 0, 0, f(No, false, "精")},
-	{0xfa1e, 0, 0, 0, f(No, false, "羽")},
-	{0xfa1f, 0, 0, 0, f(Yes, false, "")},
-	{0xfa20, 0, 0, 0, f(No, false, "蘒")},
-	{0xfa21, 0, 0, 0, f(Yes, false, "")},
-	{0xfa22, 0, 0, 0, f(No, false, "諸")},
-	{0xfa23, 0, 0, 0, f(Yes, false, "")},
-	{0xfa25, 0, 0, 0, f(No, false, "逸")},
-	{0xfa26, 0, 0, 0, f(No, false, "都")},
-	{0xfa27, 0, 0, 0, f(Yes, false, "")},
-	{0xfa2a, 0, 0, 0, f(No, false, "飯")},
-	{0xfa2b, 0, 0, 0, f(No, false, "飼")},
-	{0xfa2c, 0, 0, 0, f(No, false, "館")},
-	{0xfa2d, 0, 0, 0, f(No, false, "鶴")},
-	{0xfa2e, 0, 0, 0, f(No, false, "郞")},
-	{0xfa2f, 0, 0, 0, f(No, false, "隷")},
-	{0xfa30, 0, 0, 0, f(No, false, "侮")},
-	{0xfa31, 0, 0, 0, f(No, false, "僧")},
-	{0xfa32, 0, 0, 0, f(No, false, "免")},
-	{0xfa33, 0, 0, 0, f(No, false, "勉")},
-	{0xfa34, 0, 0, 0, f(No, false, "勤")},
-	{0xfa35, 0, 0, 0, f(No, false, "卑")},
-	{0xfa36, 0, 0, 0, f(No, false, "喝")},
-	{0xfa37, 0, 0, 0, f(No, false, "嘆")},
-	{0xfa38, 0, 0, 0, f(No, false, "器")},
-	{0xfa39, 0, 0, 0, f(No, false, "塀")},
-	{0xfa3a, 0, 0, 0, f(No, false, "墨")},
-	{0xfa3b, 0, 0, 0, f(No, false, "層")},
-	{0xfa3c, 0, 0, 0, f(No, false, "屮")},
-	{0xfa3d, 0, 0, 0, f(No, false, "悔")},
-	{0xfa3e, 0, 0, 0, f(No, false, "慨")},
-	{0xfa3f, 0, 0, 0, f(No, false, "憎")},
-	{0xfa40, 0, 0, 0, f(No, false, "懲")},
-	{0xfa41, 0, 0, 0, f(No, false, "敏")},
-	{0xfa42, 0, 0, 0, f(No, false, "既")},
-	{0xfa43, 0, 0, 0, f(No, false, "暑")},
-	{0xfa44, 0, 0, 0, f(No, false, "梅")},
-	{0xfa45, 0, 0, 0, f(No, false, "海")},
-	{0xfa46, 0, 0, 0, f(No, false, "渚")},
-	{0xfa47, 0, 0, 0, f(No, false, "漢")},
-	{0xfa48, 0, 0, 0, f(No, false, "煮")},
-	{0xfa49, 0, 0, 0, f(No, false, "爫")},
-	{0xfa4a, 0, 0, 0, f(No, false, "琢")},
-	{0xfa4b, 0, 0, 0, f(No, false, "碑")},
-	{0xfa4c, 0, 0, 0, f(No, false, "社")},
-	{0xfa4d, 0, 0, 0, f(No, false, "祉")},
-	{0xfa4e, 0, 0, 0, f(No, false, "祈")},
-	{0xfa4f, 0, 0, 0, f(No, false, "祐")},
-	{0xfa50, 0, 0, 0, f(No, false, "祖")},
-	{0xfa51, 0, 0, 0, f(No, false, "祝")},
-	{0xfa52, 0, 0, 0, f(No, false, "禍")},
-	{0xfa53, 0, 0, 0, f(No, false, "禎")},
-	{0xfa54, 0, 0, 0, f(No, false, "穀")},
-	{0xfa55, 0, 0, 0, f(No, false, "突")},
-	{0xfa56, 0, 0, 0, f(No, false, "節")},
-	{0xfa57, 0, 0, 0, f(No, false, "練")},
-	{0xfa58, 0, 0, 0, f(No, false, "縉")},
-	{0xfa59, 0, 0, 0, f(No, false, "繁")},
-	{0xfa5a, 0, 0, 0, f(No, false, "署")},
-	{0xfa5b, 0, 0, 0, f(No, false, "者")},
-	{0xfa5c, 0, 0, 0, f(No, false, "臭")},
-	{0xfa5d, 0, 0, 0, f(No, false, "艹")},
-	{0xfa5f, 0, 0, 0, f(No, false, "著")},
-	{0xfa60, 0, 0, 0, f(No, false, "褐")},
-	{0xfa61, 0, 0, 0, f(No, false, "視")},
-	{0xfa62, 0, 0, 0, f(No, false, "謁")},
-	{0xfa63, 0, 0, 0, f(No, false, "謹")},
-	{0xfa64, 0, 0, 0, f(No, false, "賓")},
-	{0xfa65, 0, 0, 0, f(No, false, "贈")},
-	{0xfa66, 0, 0, 0, f(No, false, "辶")},
-	{0xfa67, 0, 0, 0, f(No, false, "逸")},
-	{0xfa68, 0, 0, 0, f(No, false, "難")},
-	{0xfa69, 0, 0, 0, f(No, false, "響")},
-	{0xfa6a, 0, 0, 0, f(No, false, "頻")},
-	{0xfa6b, 0, 0, 0, f(No, false, "恵")},
-	{0xfa6c, 0, 0, 0, f(No, false, "𤋮")},
-	{0xfa6d, 0, 0, 0, f(No, false, "舘")},
-	{0xfa6e, 0, 0, 0, f(Yes, false, "")},
-	{0xfa70, 0, 0, 0, f(No, false, "並")},
-	{0xfa71, 0, 0, 0, f(No, false, "况")},
-	{0xfa72, 0, 0, 0, f(No, false, "全")},
-	{0xfa73, 0, 0, 0, f(No, false, "侀")},
-	{0xfa74, 0, 0, 0, f(No, false, "充")},
-	{0xfa75, 0, 0, 0, f(No, false, "冀")},
-	{0xfa76, 0, 0, 0, f(No, false, "勇")},
-	{0xfa77, 0, 0, 0, f(No, false, "勺")},
-	{0xfa78, 0, 0, 0, f(No, false, "喝")},
-	{0xfa79, 0, 0, 0, f(No, false, "啕")},
-	{0xfa7a, 0, 0, 0, f(No, false, "喙")},
-	{0xfa7b, 0, 0, 0, f(No, false, "嗢")},
-	{0xfa7c, 0, 0, 0, f(No, false, "塚")},
-	{0xfa7d, 0, 0, 0, f(No, false, "墳")},
-	{0xfa7e, 0, 0, 0, f(No, false, "奄")},
-	{0xfa7f, 0, 0, 0, f(No, false, "奔")},
-	{0xfa80, 0, 0, 0, f(No, false, "婢")},
-	{0xfa81, 0, 0, 0, f(No, false, "嬨")},
-	{0xfa82, 0, 0, 0, f(No, false, "廒")},
-	{0xfa83, 0, 0, 0, f(No, false, "廙")},
-	{0xfa84, 0, 0, 0, f(No, false, "彩")},
-	{0xfa85, 0, 0, 0, f(No, false, "徭")},
-	{0xfa86, 0, 0, 0, f(No, false, "惘")},
-	{0xfa87, 0, 0, 0, f(No, false, "慎")},
-	{0xfa88, 0, 0, 0, f(No, false, "愈")},
-	{0xfa89, 0, 0, 0, f(No, false, "憎")},
-	{0xfa8a, 0, 0, 0, f(No, false, "慠")},
-	{0xfa8b, 0, 0, 0, f(No, false, "懲")},
-	{0xfa8c, 0, 0, 0, f(No, false, "戴")},
-	{0xfa8d, 0, 0, 0, f(No, false, "揄")},
-	{0xfa8e, 0, 0, 0, f(No, false, "搜")},
-	{0xfa8f, 0, 0, 0, f(No, false, "摒")},
-	{0xfa90, 0, 0, 0, f(No, false, "敖")},
-	{0xfa91, 0, 0, 0, f(No, false, "晴")},
-	{0xfa92, 0, 0, 0, f(No, false, "朗")},
-	{0xfa93, 0, 0, 0, f(No, false, "望")},
-	{0xfa94, 0, 0, 0, f(No, false, "杖")},
-	{0xfa95, 0, 0, 0, f(No, false, "歹")},
-	{0xfa96, 0, 0, 0, f(No, false, "殺")},
-	{0xfa97, 0, 0, 0, f(No, false, "流")},
-	{0xfa98, 0, 0, 0, f(No, false, "滛")},
-	{0xfa99, 0, 0, 0, f(No, false, "滋")},
-	{0xfa9a, 0, 0, 0, f(No, false, "漢")},
-	{0xfa9b, 0, 0, 0, f(No, false, "瀞")},
-	{0xfa9c, 0, 0, 0, f(No, false, "煮")},
-	{0xfa9d, 0, 0, 0, f(No, false, "瞧")},
-	{0xfa9e, 0, 0, 0, f(No, false, "爵")},
-	{0xfa9f, 0, 0, 0, f(No, false, "犯")},
-	{0xfaa0, 0, 0, 0, f(No, false, "猪")},
-	{0xfaa1, 0, 0, 0, f(No, false, "瑱")},
-	{0xfaa2, 0, 0, 0, f(No, false, "甆")},
-	{0xfaa3, 0, 0, 0, f(No, false, "画")},
-	{0xfaa4, 0, 0, 0, f(No, false, "瘝")},
-	{0xfaa5, 0, 0, 0, f(No, false, "瘟")},
-	{0xfaa6, 0, 0, 0, f(No, false, "益")},
-	{0xfaa7, 0, 0, 0, f(No, false, "盛")},
-	{0xfaa8, 0, 0, 0, f(No, false, "直")},
-	{0xfaa9, 0, 0, 0, f(No, false, "睊")},
-	{0xfaaa, 0, 0, 0, f(No, false, "着")},
-	{0xfaab, 0, 0, 0, f(No, false, "磌")},
-	{0xfaac, 0, 0, 0, f(No, false, "窱")},
-	{0xfaad, 0, 0, 0, f(No, false, "節")},
-	{0xfaae, 0, 0, 0, f(No, false, "类")},
-	{0xfaaf, 0, 0, 0, f(No, false, "絛")},
-	{0xfab0, 0, 0, 0, f(No, false, "練")},
-	{0xfab1, 0, 0, 0, f(No, false, "缾")},
-	{0xfab2, 0, 0, 0, f(No, false, "者")},
-	{0xfab3, 0, 0, 0, f(No, false, "荒")},
-	{0xfab4, 0, 0, 0, f(No, false, "華")},
-	{0xfab5, 0, 0, 0, f(No, false, "蝹")},
-	{0xfab6, 0, 0, 0, f(No, false, "襁")},
-	{0xfab7, 0, 0, 0, f(No, false, "覆")},
-	{0xfab8, 0, 0, 0, f(No, false, "視")},
-	{0xfab9, 0, 0, 0, f(No, false, "調")},
-	{0xfaba, 0, 0, 0, f(No, false, "諸")},
-	{0xfabb, 0, 0, 0, f(No, false, "請")},
-	{0xfabc, 0, 0, 0, f(No, false, "謁")},
-	{0xfabd, 0, 0, 0, f(No, false, "諾")},
-	{0xfabe, 0, 0, 0, f(No, false, "諭")},
-	{0xfabf, 0, 0, 0, f(No, false, "謹")},
-	{0xfac0, 0, 0, 0, f(No, false, "變")},
-	{0xfac1, 0, 0, 0, f(No, false, "贈")},
-	{0xfac2, 0, 0, 0, f(No, false, "輸")},
-	{0xfac3, 0, 0, 0, f(No, false, "遲")},
-	{0xfac4, 0, 0, 0, f(No, false, "醙")},
-	{0xfac5, 0, 0, 0, f(No, false, "鉶")},
-	{0xfac6, 0, 0, 0, f(No, false, "陼")},
-	{0xfac7, 0, 0, 0, f(No, false, "難")},
-	{0xfac8, 0, 0, 0, f(No, false, "靖")},
-	{0xfac9, 0, 0, 0, f(No, false, "韛")},
-	{0xfaca, 0, 0, 0, f(No, false, "響")},
-	{0xfacb, 0, 0, 0, f(No, false, "頋")},
-	{0xfacc, 0, 0, 0, f(No, false, "頻")},
-	{0xfacd, 0, 0, 0, f(No, false, "鬒")},
-	{0xface, 0, 0, 0, f(No, false, "龜")},
-	{0xfacf, 0, 0, 0, f(No, false, "𢡊")},
-	{0xfad0, 0, 0, 0, f(No, false, "𢡄")},
-	{0xfad1, 0, 0, 0, f(No, false, "𣏕")},
-	{0xfad2, 0, 0, 0, f(No, false, "㮝")},
-	{0xfad3, 0, 0, 0, f(No, false, "䀘")},
-	{0xfad4, 0, 0, 0, f(No, false, "䀹")},
-	{0xfad5, 0, 0, 0, f(No, false, "𥉉")},
-	{0xfad6, 0, 0, 0, f(No, false, "𥳐")},
-	{0xfad7, 0, 0, 0, f(No, false, "𧻓")},
-	{0xfad8, 0, 0, 0, f(No, false, "齃")},
-	{0xfad9, 0, 0, 0, f(No, false, "龎")},
-	{0xfada, 0, 0, 0, f(Yes, false, "")},
-	{0xfb00, 0, 0, 0, g(Yes, No, false, false, "", "ff")},
-	{0xfb01, 0, 0, 0, g(Yes, No, false, false, "", "fi")},
-	{0xfb02, 0, 0, 0, g(Yes, No, false, false, "", "fl")},
-	{0xfb03, 0, 0, 0, g(Yes, No, false, false, "", "ffi")},
-	{0xfb04, 0, 0, 0, g(Yes, No, false, false, "", "ffl")},
-	{0xfb05, 0, 0, 0, g(Yes, No, false, false, "", "st")},
-	{0xfb07, 0, 0, 0, f(Yes, false, "")},
-	{0xfb13, 0, 0, 0, g(Yes, No, false, false, "", "մն")},
-	{0xfb14, 0, 0, 0, g(Yes, No, false, false, "", "մե")},
-	{0xfb15, 0, 0, 0, g(Yes, No, false, false, "", "մի")},
-	{0xfb16, 0, 0, 0, g(Yes, No, false, false, "", "վն")},
-	{0xfb17, 0, 0, 0, g(Yes, No, false, false, "", "մխ")},
-	{0xfb18, 0, 0, 0, f(Yes, false, "")},
-	{0xfb1d, 0, 0, 1, f(No, false, "יִ")},
-	{0xfb1e, 26, 1, 1, f(Yes, false, "")},
-	{0xfb1f, 0, 0, 1, f(No, false, "ײַ")},
-	{0xfb20, 0, 0, 0, g(Yes, No, false, false, "", "ע")},
-	{0xfb21, 0, 0, 0, g(Yes, No, false, false, "", "א")},
-	{0xfb22, 0, 0, 0, g(Yes, No, false, false, "", "ד")},
-	{0xfb23, 0, 0, 0, g(Yes, No, false, false, "", "ה")},
-	{0xfb24, 0, 0, 0, g(Yes, No, false, false, "", "כ")},
-	{0xfb25, 0, 0, 0, g(Yes, No, false, false, "", "ל")},
-	{0xfb26, 0, 0, 0, g(Yes, No, false, false, "", "ם")},
-	{0xfb27, 0, 0, 0, g(Yes, No, false, false, "", "ר")},
-	{0xfb28, 0, 0, 0, g(Yes, No, false, false, "", "ת")},
-	{0xfb29, 0, 0, 0, g(Yes, No, false, false, "", "+")},
-	{0xfb2a, 0, 0, 1, f(No, false, "שׁ")},
-	{0xfb2b, 0, 0, 1, f(No, false, "שׂ")},
-	{0xfb2c, 0, 0, 2, f(No, false, "שּׁ")},
-	{0xfb2d, 0, 0, 2, f(No, false, "שּׂ")},
-	{0xfb2e, 0, 0, 1, f(No, false, "אַ")},
-	{0xfb2f, 0, 0, 1, f(No, false, "אָ")},
-	{0xfb30, 0, 0, 1, f(No, false, "אּ")},
-	{0xfb31, 0, 0, 1, f(No, false, "בּ")},
-	{0xfb32, 0, 0, 1, f(No, false, "גּ")},
-	{0xfb33, 0, 0, 1, f(No, false, "דּ")},
-	{0xfb34, 0, 0, 1, f(No, false, "הּ")},
-	{0xfb35, 0, 0, 1, f(No, false, "וּ")},
-	{0xfb36, 0, 0, 1, f(No, false, "זּ")},
-	{0xfb37, 0, 0, 0, f(Yes, false, "")},
-	{0xfb38, 0, 0, 1, f(No, false, "טּ")},
-	{0xfb39, 0, 0, 1, f(No, false, "יּ")},
-	{0xfb3a, 0, 0, 1, f(No, false, "ךּ")},
-	{0xfb3b, 0, 0, 1, f(No, false, "כּ")},
-	{0xfb3c, 0, 0, 1, f(No, false, "לּ")},
-	{0xfb3d, 0, 0, 0, f(Yes, false, "")},
-	{0xfb3e, 0, 0, 1, f(No, false, "מּ")},
-	{0xfb3f, 0, 0, 0, f(Yes, false, "")},
-	{0xfb40, 0, 0, 1, f(No, false, "נּ")},
-	{0xfb41, 0, 0, 1, f(No, false, "סּ")},
-	{0xfb42, 0, 0, 0, f(Yes, false, "")},
-	{0xfb43, 0, 0, 1, f(No, false, "ףּ")},
-	{0xfb44, 0, 0, 1, f(No, false, "פּ")},
-	{0xfb45, 0, 0, 0, f(Yes, false, "")},
-	{0xfb46, 0, 0, 1, f(No, false, "צּ")},
-	{0xfb47, 0, 0, 1, f(No, false, "קּ")},
-	{0xfb48, 0, 0, 1, f(No, false, "רּ")},
-	{0xfb49, 0, 0, 1, f(No, false, "שּ")},
-	{0xfb4a, 0, 0, 1, f(No, false, "תּ")},
-	{0xfb4b, 0, 0, 1, f(No, false, "וֹ")},
-	{0xfb4c, 0, 0, 1, f(No, false, "בֿ")},
-	{0xfb4d, 0, 0, 1, f(No, false, "כֿ")},
-	{0xfb4e, 0, 0, 1, f(No, false, "פֿ")},
-	{0xfb4f, 0, 0, 0, g(Yes, No, false, false, "", "אל")},
-	{0xfb50, 0, 0, 0, g(Yes, No, false, false, "", "ٱ")},
-	{0xfb52, 0, 0, 0, g(Yes, No, false, false, "", "ٻ")},
-	{0xfb56, 0, 0, 0, g(Yes, No, false, false, "", "پ")},
-	{0xfb5a, 0, 0, 0, g(Yes, No, false, false, "", "ڀ")},
-	{0xfb5e, 0, 0, 0, g(Yes, No, false, false, "", "ٺ")},
-	{0xfb62, 0, 0, 0, g(Yes, No, false, false, "", "ٿ")},
-	{0xfb66, 0, 0, 0, g(Yes, No, false, false, "", "ٹ")},
-	{0xfb6a, 0, 0, 0, g(Yes, No, false, false, "", "ڤ")},
-	{0xfb6e, 0, 0, 0, g(Yes, No, false, false, "", "ڦ")},
-	{0xfb72, 0, 0, 0, g(Yes, No, false, false, "", "ڄ")},
-	{0xfb76, 0, 0, 0, g(Yes, No, false, false, "", "ڃ")},
-	{0xfb7a, 0, 0, 0, g(Yes, No, false, false, "", "چ")},
-	{0xfb7e, 0, 0, 0, g(Yes, No, false, false, "", "ڇ")},
-	{0xfb82, 0, 0, 0, g(Yes, No, false, false, "", "ڍ")},
-	{0xfb84, 0, 0, 0, g(Yes, No, false, false, "", "ڌ")},
-	{0xfb86, 0, 0, 0, g(Yes, No, false, false, "", "ڎ")},
-	{0xfb88, 0, 0, 0, g(Yes, No, false, false, "", "ڈ")},
-	{0xfb8a, 0, 0, 0, g(Yes, No, false, false, "", "ژ")},
-	{0xfb8c, 0, 0, 0, g(Yes, No, false, false, "", "ڑ")},
-	{0xfb8e, 0, 0, 0, g(Yes, No, false, false, "", "ک")},
-	{0xfb92, 0, 0, 0, g(Yes, No, false, false, "", "گ")},
-	{0xfb96, 0, 0, 0, g(Yes, No, false, false, "", "ڳ")},
-	{0xfb9a, 0, 0, 0, g(Yes, No, false, false, "", "ڱ")},
-	{0xfb9e, 0, 0, 0, g(Yes, No, false, false, "", "ں")},
-	{0xfba0, 0, 0, 0, g(Yes, No, false, false, "", "ڻ")},
-	{0xfba4, 0, 0, 1, g(Yes, No, false, false, "", "ۀ")},
-	{0xfba6, 0, 0, 0, g(Yes, No, false, false, "", "ہ")},
-	{0xfbaa, 0, 0, 0, g(Yes, No, false, false, "", "ھ")},
-	{0xfbae, 0, 0, 0, g(Yes, No, false, false, "", "ے")},
-	{0xfbb0, 0, 0, 1, g(Yes, No, false, false, "", "ۓ")},
-	{0xfbb2, 0, 0, 0, f(Yes, false, "")},
-	{0xfbd3, 0, 0, 0, g(Yes, No, false, false, "", "ڭ")},
-	{0xfbd7, 0, 0, 0, g(Yes, No, false, false, "", "ۇ")},
-	{0xfbd9, 0, 0, 0, g(Yes, No, false, false, "", "ۆ")},
-	{0xfbdb, 0, 0, 0, g(Yes, No, false, false, "", "ۈ")},
-	{0xfbdd, 0, 0, 0, g(Yes, No, false, false, "", "ۇٴ")},
-	{0xfbde, 0, 0, 0, g(Yes, No, false, false, "", "ۋ")},
-	{0xfbe0, 0, 0, 0, g(Yes, No, false, false, "", "ۅ")},
-	{0xfbe2, 0, 0, 0, g(Yes, No, false, false, "", "ۉ")},
-	{0xfbe4, 0, 0, 0, g(Yes, No, false, false, "", "ې")},
-	{0xfbe8, 0, 0, 0, g(Yes, No, false, false, "", "ى")},
-	{0xfbea, 0, 0, 0, g(Yes, No, false, false, "", "ئا")},
-	{0xfbec, 0, 0, 0, g(Yes, No, false, false, "", "ئە")},
-	{0xfbee, 0, 0, 0, g(Yes, No, false, false, "", "ئو")},
-	{0xfbf0, 0, 0, 0, g(Yes, No, false, false, "", "ئۇ")},
-	{0xfbf2, 0, 0, 0, g(Yes, No, false, false, "", "ئۆ")},
-	{0xfbf4, 0, 0, 0, g(Yes, No, false, false, "", "ئۈ")},
-	{0xfbf6, 0, 0, 0, g(Yes, No, false, false, "", "ئې")},
-	{0xfbf9, 0, 0, 0, g(Yes, No, false, false, "", "ئى")},
-	{0xfbfc, 0, 0, 0, g(Yes, No, false, false, "", "ی")},
-	{0xfc00, 0, 0, 0, g(Yes, No, false, false, "", "ئج")},
-	{0xfc01, 0, 0, 0, g(Yes, No, false, false, "", "ئح")},
-	{0xfc02, 0, 0, 0, g(Yes, No, false, false, "", "ئم")},
-	{0xfc03, 0, 0, 0, g(Yes, No, false, false, "", "ئى")},
-	{0xfc04, 0, 0, 0, g(Yes, No, false, false, "", "ئي")},
-	{0xfc05, 0, 0, 0, g(Yes, No, false, false, "", "بج")},
-	{0xfc06, 0, 0, 0, g(Yes, No, false, false, "", "بح")},
-	{0xfc07, 0, 0, 0, g(Yes, No, false, false, "", "بخ")},
-	{0xfc08, 0, 0, 0, g(Yes, No, false, false, "", "بم")},
-	{0xfc09, 0, 0, 0, g(Yes, No, false, false, "", "بى")},
-	{0xfc0a, 0, 0, 0, g(Yes, No, false, false, "", "بي")},
-	{0xfc0b, 0, 0, 0, g(Yes, No, false, false, "", "تج")},
-	{0xfc0c, 0, 0, 0, g(Yes, No, false, false, "", "تح")},
-	{0xfc0d, 0, 0, 0, g(Yes, No, false, false, "", "تخ")},
-	{0xfc0e, 0, 0, 0, g(Yes, No, false, false, "", "تم")},
-	{0xfc0f, 0, 0, 0, g(Yes, No, false, false, "", "تى")},
-	{0xfc10, 0, 0, 0, g(Yes, No, false, false, "", "تي")},
-	{0xfc11, 0, 0, 0, g(Yes, No, false, false, "", "ثج")},
-	{0xfc12, 0, 0, 0, g(Yes, No, false, false, "", "ثم")},
-	{0xfc13, 0, 0, 0, g(Yes, No, false, false, "", "ثى")},
-	{0xfc14, 0, 0, 0, g(Yes, No, false, false, "", "ثي")},
-	{0xfc15, 0, 0, 0, g(Yes, No, false, false, "", "جح")},
-	{0xfc16, 0, 0, 0, g(Yes, No, false, false, "", "جم")},
-	{0xfc17, 0, 0, 0, g(Yes, No, false, false, "", "حج")},
-	{0xfc18, 0, 0, 0, g(Yes, No, false, false, "", "حم")},
-	{0xfc19, 0, 0, 0, g(Yes, No, false, false, "", "خج")},
-	{0xfc1a, 0, 0, 0, g(Yes, No, false, false, "", "خح")},
-	{0xfc1b, 0, 0, 0, g(Yes, No, false, false, "", "خم")},
-	{0xfc1c, 0, 0, 0, g(Yes, No, false, false, "", "سج")},
-	{0xfc1d, 0, 0, 0, g(Yes, No, false, false, "", "سح")},
-	{0xfc1e, 0, 0, 0, g(Yes, No, false, false, "", "سخ")},
-	{0xfc1f, 0, 0, 0, g(Yes, No, false, false, "", "سم")},
-	{0xfc20, 0, 0, 0, g(Yes, No, false, false, "", "صح")},
-	{0xfc21, 0, 0, 0, g(Yes, No, false, false, "", "صم")},
-	{0xfc22, 0, 0, 0, g(Yes, No, false, false, "", "ضج")},
-	{0xfc23, 0, 0, 0, g(Yes, No, false, false, "", "ضح")},
-	{0xfc24, 0, 0, 0, g(Yes, No, false, false, "", "ضخ")},
-	{0xfc25, 0, 0, 0, g(Yes, No, false, false, "", "ضم")},
-	{0xfc26, 0, 0, 0, g(Yes, No, false, false, "", "طح")},
-	{0xfc27, 0, 0, 0, g(Yes, No, false, false, "", "طم")},
-	{0xfc28, 0, 0, 0, g(Yes, No, false, false, "", "ظم")},
-	{0xfc29, 0, 0, 0, g(Yes, No, false, false, "", "عج")},
-	{0xfc2a, 0, 0, 0, g(Yes, No, false, false, "", "عم")},
-	{0xfc2b, 0, 0, 0, g(Yes, No, false, false, "", "غج")},
-	{0xfc2c, 0, 0, 0, g(Yes, No, false, false, "", "غم")},
-	{0xfc2d, 0, 0, 0, g(Yes, No, false, false, "", "فج")},
-	{0xfc2e, 0, 0, 0, g(Yes, No, false, false, "", "فح")},
-	{0xfc2f, 0, 0, 0, g(Yes, No, false, false, "", "فخ")},
-	{0xfc30, 0, 0, 0, g(Yes, No, false, false, "", "فم")},
-	{0xfc31, 0, 0, 0, g(Yes, No, false, false, "", "فى")},
-	{0xfc32, 0, 0, 0, g(Yes, No, false, false, "", "في")},
-	{0xfc33, 0, 0, 0, g(Yes, No, false, false, "", "قح")},
-	{0xfc34, 0, 0, 0, g(Yes, No, false, false, "", "قم")},
-	{0xfc35, 0, 0, 0, g(Yes, No, false, false, "", "قى")},
-	{0xfc36, 0, 0, 0, g(Yes, No, false, false, "", "قي")},
-	{0xfc37, 0, 0, 0, g(Yes, No, false, false, "", "كا")},
-	{0xfc38, 0, 0, 0, g(Yes, No, false, false, "", "كج")},
-	{0xfc39, 0, 0, 0, g(Yes, No, false, false, "", "كح")},
-	{0xfc3a, 0, 0, 0, g(Yes, No, false, false, "", "كخ")},
-	{0xfc3b, 0, 0, 0, g(Yes, No, false, false, "", "كل")},
-	{0xfc3c, 0, 0, 0, g(Yes, No, false, false, "", "كم")},
-	{0xfc3d, 0, 0, 0, g(Yes, No, false, false, "", "كى")},
-	{0xfc3e, 0, 0, 0, g(Yes, No, false, false, "", "كي")},
-	{0xfc3f, 0, 0, 0, g(Yes, No, false, false, "", "لج")},
-	{0xfc40, 0, 0, 0, g(Yes, No, false, false, "", "لح")},
-	{0xfc41, 0, 0, 0, g(Yes, No, false, false, "", "لخ")},
-	{0xfc42, 0, 0, 0, g(Yes, No, false, false, "", "لم")},
-	{0xfc43, 0, 0, 0, g(Yes, No, false, false, "", "لى")},
-	{0xfc44, 0, 0, 0, g(Yes, No, false, false, "", "لي")},
-	{0xfc45, 0, 0, 0, g(Yes, No, false, false, "", "مج")},
-	{0xfc46, 0, 0, 0, g(Yes, No, false, false, "", "مح")},
-	{0xfc47, 0, 0, 0, g(Yes, No, false, false, "", "مخ")},
-	{0xfc48, 0, 0, 0, g(Yes, No, false, false, "", "مم")},
-	{0xfc49, 0, 0, 0, g(Yes, No, false, false, "", "مى")},
-	{0xfc4a, 0, 0, 0, g(Yes, No, false, false, "", "مي")},
-	{0xfc4b, 0, 0, 0, g(Yes, No, false, false, "", "نج")},
-	{0xfc4c, 0, 0, 0, g(Yes, No, false, false, "", "نح")},
-	{0xfc4d, 0, 0, 0, g(Yes, No, false, false, "", "نخ")},
-	{0xfc4e, 0, 0, 0, g(Yes, No, false, false, "", "نم")},
-	{0xfc4f, 0, 0, 0, g(Yes, No, false, false, "", "نى")},
-	{0xfc50, 0, 0, 0, g(Yes, No, false, false, "", "ني")},
-	{0xfc51, 0, 0, 0, g(Yes, No, false, false, "", "هج")},
-	{0xfc52, 0, 0, 0, g(Yes, No, false, false, "", "هم")},
-	{0xfc53, 0, 0, 0, g(Yes, No, false, false, "", "هى")},
-	{0xfc54, 0, 0, 0, g(Yes, No, false, false, "", "هي")},
-	{0xfc55, 0, 0, 0, g(Yes, No, false, false, "", "يج")},
-	{0xfc56, 0, 0, 0, g(Yes, No, false, false, "", "يح")},
-	{0xfc57, 0, 0, 0, g(Yes, No, false, false, "", "يخ")},
-	{0xfc58, 0, 0, 0, g(Yes, No, false, false, "", "يم")},
-	{0xfc59, 0, 0, 0, g(Yes, No, false, false, "", "يى")},
-	{0xfc5a, 0, 0, 0, g(Yes, No, false, false, "", "يي")},
-	{0xfc5b, 0, 0, 1, g(Yes, No, false, false, "", "ذٰ")},
-	{0xfc5c, 0, 0, 1, g(Yes, No, false, false, "", "رٰ")},
-	{0xfc5d, 0, 0, 1, g(Yes, No, false, false, "", "ىٰ")},
-	{0xfc5e, 0, 0, 2, g(Yes, No, false, false, "", " ٌّ")},
-	{0xfc5f, 0, 0, 2, g(Yes, No, false, false, "", " ٍّ")},
-	{0xfc60, 0, 0, 2, g(Yes, No, false, false, "", " َّ")},
-	{0xfc61, 0, 0, 2, g(Yes, No, false, false, "", " ُّ")},
-	{0xfc62, 0, 0, 2, g(Yes, No, false, false, "", " ِّ")},
-	{0xfc63, 0, 0, 2, g(Yes, No, false, false, "", " ّٰ")},
-	{0xfc64, 0, 0, 0, g(Yes, No, false, false, "", "ئر")},
-	{0xfc65, 0, 0, 0, g(Yes, No, false, false, "", "ئز")},
-	{0xfc66, 0, 0, 0, g(Yes, No, false, false, "", "ئم")},
-	{0xfc67, 0, 0, 0, g(Yes, No, false, false, "", "ئن")},
-	{0xfc68, 0, 0, 0, g(Yes, No, false, false, "", "ئى")},
-	{0xfc69, 0, 0, 0, g(Yes, No, false, false, "", "ئي")},
-	{0xfc6a, 0, 0, 0, g(Yes, No, false, false, "", "بر")},
-	{0xfc6b, 0, 0, 0, g(Yes, No, false, false, "", "بز")},
-	{0xfc6c, 0, 0, 0, g(Yes, No, false, false, "", "بم")},
-	{0xfc6d, 0, 0, 0, g(Yes, No, false, false, "", "بن")},
-	{0xfc6e, 0, 0, 0, g(Yes, No, false, false, "", "بى")},
-	{0xfc6f, 0, 0, 0, g(Yes, No, false, false, "", "بي")},
-	{0xfc70, 0, 0, 0, g(Yes, No, false, false, "", "تر")},
-	{0xfc71, 0, 0, 0, g(Yes, No, false, false, "", "تز")},
-	{0xfc72, 0, 0, 0, g(Yes, No, false, false, "", "تم")},
-	{0xfc73, 0, 0, 0, g(Yes, No, false, false, "", "تن")},
-	{0xfc74, 0, 0, 0, g(Yes, No, false, false, "", "تى")},
-	{0xfc75, 0, 0, 0, g(Yes, No, false, false, "", "تي")},
-	{0xfc76, 0, 0, 0, g(Yes, No, false, false, "", "ثر")},
-	{0xfc77, 0, 0, 0, g(Yes, No, false, false, "", "ثز")},
-	{0xfc78, 0, 0, 0, g(Yes, No, false, false, "", "ثم")},
-	{0xfc79, 0, 0, 0, g(Yes, No, false, false, "", "ثن")},
-	{0xfc7a, 0, 0, 0, g(Yes, No, false, false, "", "ثى")},
-	{0xfc7b, 0, 0, 0, g(Yes, No, false, false, "", "ثي")},
-	{0xfc7c, 0, 0, 0, g(Yes, No, false, false, "", "فى")},
-	{0xfc7d, 0, 0, 0, g(Yes, No, false, false, "", "في")},
-	{0xfc7e, 0, 0, 0, g(Yes, No, false, false, "", "قى")},
-	{0xfc7f, 0, 0, 0, g(Yes, No, false, false, "", "قي")},
-	{0xfc80, 0, 0, 0, g(Yes, No, false, false, "", "كا")},
-	{0xfc81, 0, 0, 0, g(Yes, No, false, false, "", "كل")},
-	{0xfc82, 0, 0, 0, g(Yes, No, false, false, "", "كم")},
-	{0xfc83, 0, 0, 0, g(Yes, No, false, false, "", "كى")},
-	{0xfc84, 0, 0, 0, g(Yes, No, false, false, "", "كي")},
-	{0xfc85, 0, 0, 0, g(Yes, No, false, false, "", "لم")},
-	{0xfc86, 0, 0, 0, g(Yes, No, false, false, "", "لى")},
-	{0xfc87, 0, 0, 0, g(Yes, No, false, false, "", "لي")},
-	{0xfc88, 0, 0, 0, g(Yes, No, false, false, "", "ما")},
-	{0xfc89, 0, 0, 0, g(Yes, No, false, false, "", "مم")},
-	{0xfc8a, 0, 0, 0, g(Yes, No, false, false, "", "نر")},
-	{0xfc8b, 0, 0, 0, g(Yes, No, false, false, "", "نز")},
-	{0xfc8c, 0, 0, 0, g(Yes, No, false, false, "", "نم")},
-	{0xfc8d, 0, 0, 0, g(Yes, No, false, false, "", "نن")},
-	{0xfc8e, 0, 0, 0, g(Yes, No, false, false, "", "نى")},
-	{0xfc8f, 0, 0, 0, g(Yes, No, false, false, "", "ني")},
-	{0xfc90, 0, 0, 1, g(Yes, No, false, false, "", "ىٰ")},
-	{0xfc91, 0, 0, 0, g(Yes, No, false, false, "", "ير")},
-	{0xfc92, 0, 0, 0, g(Yes, No, false, false, "", "يز")},
-	{0xfc93, 0, 0, 0, g(Yes, No, false, false, "", "يم")},
-	{0xfc94, 0, 0, 0, g(Yes, No, false, false, "", "ين")},
-	{0xfc95, 0, 0, 0, g(Yes, No, false, false, "", "يى")},
-	{0xfc96, 0, 0, 0, g(Yes, No, false, false, "", "يي")},
-	{0xfc97, 0, 0, 0, g(Yes, No, false, false, "", "ئج")},
-	{0xfc98, 0, 0, 0, g(Yes, No, false, false, "", "ئح")},
-	{0xfc99, 0, 0, 0, g(Yes, No, false, false, "", "ئخ")},
-	{0xfc9a, 0, 0, 0, g(Yes, No, false, false, "", "ئم")},
-	{0xfc9b, 0, 0, 0, g(Yes, No, false, false, "", "ئه")},
-	{0xfc9c, 0, 0, 0, g(Yes, No, false, false, "", "بج")},
-	{0xfc9d, 0, 0, 0, g(Yes, No, false, false, "", "بح")},
-	{0xfc9e, 0, 0, 0, g(Yes, No, false, false, "", "بخ")},
-	{0xfc9f, 0, 0, 0, g(Yes, No, false, false, "", "بم")},
-	{0xfca0, 0, 0, 0, g(Yes, No, false, false, "", "به")},
-	{0xfca1, 0, 0, 0, g(Yes, No, false, false, "", "تج")},
-	{0xfca2, 0, 0, 0, g(Yes, No, false, false, "", "تح")},
-	{0xfca3, 0, 0, 0, g(Yes, No, false, false, "", "تخ")},
-	{0xfca4, 0, 0, 0, g(Yes, No, false, false, "", "تم")},
-	{0xfca5, 0, 0, 0, g(Yes, No, false, false, "", "ته")},
-	{0xfca6, 0, 0, 0, g(Yes, No, false, false, "", "ثم")},
-	{0xfca7, 0, 0, 0, g(Yes, No, false, false, "", "جح")},
-	{0xfca8, 0, 0, 0, g(Yes, No, false, false, "", "جم")},
-	{0xfca9, 0, 0, 0, g(Yes, No, false, false, "", "حج")},
-	{0xfcaa, 0, 0, 0, g(Yes, No, false, false, "", "حم")},
-	{0xfcab, 0, 0, 0, g(Yes, No, false, false, "", "خج")},
-	{0xfcac, 0, 0, 0, g(Yes, No, false, false, "", "خم")},
-	{0xfcad, 0, 0, 0, g(Yes, No, false, false, "", "سج")},
-	{0xfcae, 0, 0, 0, g(Yes, No, false, false, "", "سح")},
-	{0xfcaf, 0, 0, 0, g(Yes, No, false, false, "", "سخ")},
-	{0xfcb0, 0, 0, 0, g(Yes, No, false, false, "", "سم")},
-	{0xfcb1, 0, 0, 0, g(Yes, No, false, false, "", "صح")},
-	{0xfcb2, 0, 0, 0, g(Yes, No, false, false, "", "صخ")},
-	{0xfcb3, 0, 0, 0, g(Yes, No, false, false, "", "صم")},
-	{0xfcb4, 0, 0, 0, g(Yes, No, false, false, "", "ضج")},
-	{0xfcb5, 0, 0, 0, g(Yes, No, false, false, "", "ضح")},
-	{0xfcb6, 0, 0, 0, g(Yes, No, false, false, "", "ضخ")},
-	{0xfcb7, 0, 0, 0, g(Yes, No, false, false, "", "ضم")},
-	{0xfcb8, 0, 0, 0, g(Yes, No, false, false, "", "طح")},
-	{0xfcb9, 0, 0, 0, g(Yes, No, false, false, "", "ظم")},
-	{0xfcba, 0, 0, 0, g(Yes, No, false, false, "", "عج")},
-	{0xfcbb, 0, 0, 0, g(Yes, No, false, false, "", "عم")},
-	{0xfcbc, 0, 0, 0, g(Yes, No, false, false, "", "غج")},
-	{0xfcbd, 0, 0, 0, g(Yes, No, false, false, "", "غم")},
-	{0xfcbe, 0, 0, 0, g(Yes, No, false, false, "", "فج")},
-	{0xfcbf, 0, 0, 0, g(Yes, No, false, false, "", "فح")},
-	{0xfcc0, 0, 0, 0, g(Yes, No, false, false, "", "فخ")},
-	{0xfcc1, 0, 0, 0, g(Yes, No, false, false, "", "فم")},
-	{0xfcc2, 0, 0, 0, g(Yes, No, false, false, "", "قح")},
-	{0xfcc3, 0, 0, 0, g(Yes, No, false, false, "", "قم")},
-	{0xfcc4, 0, 0, 0, g(Yes, No, false, false, "", "كج")},
-	{0xfcc5, 0, 0, 0, g(Yes, No, false, false, "", "كح")},
-	{0xfcc6, 0, 0, 0, g(Yes, No, false, false, "", "كخ")},
-	{0xfcc7, 0, 0, 0, g(Yes, No, false, false, "", "كل")},
-	{0xfcc8, 0, 0, 0, g(Yes, No, false, false, "", "كم")},
-	{0xfcc9, 0, 0, 0, g(Yes, No, false, false, "", "لج")},
-	{0xfcca, 0, 0, 0, g(Yes, No, false, false, "", "لح")},
-	{0xfccb, 0, 0, 0, g(Yes, No, false, false, "", "لخ")},
-	{0xfccc, 0, 0, 0, g(Yes, No, false, false, "", "لم")},
-	{0xfccd, 0, 0, 0, g(Yes, No, false, false, "", "له")},
-	{0xfcce, 0, 0, 0, g(Yes, No, false, false, "", "مج")},
-	{0xfccf, 0, 0, 0, g(Yes, No, false, false, "", "مح")},
-	{0xfcd0, 0, 0, 0, g(Yes, No, false, false, "", "مخ")},
-	{0xfcd1, 0, 0, 0, g(Yes, No, false, false, "", "مم")},
-	{0xfcd2, 0, 0, 0, g(Yes, No, false, false, "", "نج")},
-	{0xfcd3, 0, 0, 0, g(Yes, No, false, false, "", "نح")},
-	{0xfcd4, 0, 0, 0, g(Yes, No, false, false, "", "نخ")},
-	{0xfcd5, 0, 0, 0, g(Yes, No, false, false, "", "نم")},
-	{0xfcd6, 0, 0, 0, g(Yes, No, false, false, "", "نه")},
-	{0xfcd7, 0, 0, 0, g(Yes, No, false, false, "", "هج")},
-	{0xfcd8, 0, 0, 0, g(Yes, No, false, false, "", "هم")},
-	{0xfcd9, 0, 0, 1, g(Yes, No, false, false, "", "هٰ")},
-	{0xfcda, 0, 0, 0, g(Yes, No, false, false, "", "يج")},
-	{0xfcdb, 0, 0, 0, g(Yes, No, false, false, "", "يح")},
-	{0xfcdc, 0, 0, 0, g(Yes, No, false, false, "", "يخ")},
-	{0xfcdd, 0, 0, 0, g(Yes, No, false, false, "", "يم")},
-	{0xfcde, 0, 0, 0, g(Yes, No, false, false, "", "يه")},
-	{0xfcdf, 0, 0, 0, g(Yes, No, false, false, "", "ئم")},
-	{0xfce0, 0, 0, 0, g(Yes, No, false, false, "", "ئه")},
-	{0xfce1, 0, 0, 0, g(Yes, No, false, false, "", "بم")},
-	{0xfce2, 0, 0, 0, g(Yes, No, false, false, "", "به")},
-	{0xfce3, 0, 0, 0, g(Yes, No, false, false, "", "تم")},
-	{0xfce4, 0, 0, 0, g(Yes, No, false, false, "", "ته")},
-	{0xfce5, 0, 0, 0, g(Yes, No, false, false, "", "ثم")},
-	{0xfce6, 0, 0, 0, g(Yes, No, false, false, "", "ثه")},
-	{0xfce7, 0, 0, 0, g(Yes, No, false, false, "", "سم")},
-	{0xfce8, 0, 0, 0, g(Yes, No, false, false, "", "سه")},
-	{0xfce9, 0, 0, 0, g(Yes, No, false, false, "", "شم")},
-	{0xfcea, 0, 0, 0, g(Yes, No, false, false, "", "شه")},
-	{0xfceb, 0, 0, 0, g(Yes, No, false, false, "", "كل")},
-	{0xfcec, 0, 0, 0, g(Yes, No, false, false, "", "كم")},
-	{0xfced, 0, 0, 0, g(Yes, No, false, false, "", "لم")},
-	{0xfcee, 0, 0, 0, g(Yes, No, false, false, "", "نم")},
-	{0xfcef, 0, 0, 0, g(Yes, No, false, false, "", "نه")},
-	{0xfcf0, 0, 0, 0, g(Yes, No, false, false, "", "يم")},
-	{0xfcf1, 0, 0, 0, g(Yes, No, false, false, "", "يه")},
-	{0xfcf2, 0, 0, 2, g(Yes, No, false, false, "", "ـَّ")},
-	{0xfcf3, 0, 0, 2, g(Yes, No, false, false, "", "ـُّ")},
-	{0xfcf4, 0, 0, 2, g(Yes, No, false, false, "", "ـِّ")},
-	{0xfcf5, 0, 0, 0, g(Yes, No, false, false, "", "طى")},
-	{0xfcf6, 0, 0, 0, g(Yes, No, false, false, "", "طي")},
-	{0xfcf7, 0, 0, 0, g(Yes, No, false, false, "", "عى")},
-	{0xfcf8, 0, 0, 0, g(Yes, No, false, false, "", "عي")},
-	{0xfcf9, 0, 0, 0, g(Yes, No, false, false, "", "غى")},
-	{0xfcfa, 0, 0, 0, g(Yes, No, false, false, "", "غي")},
-	{0xfcfb, 0, 0, 0, g(Yes, No, false, false, "", "سى")},
-	{0xfcfc, 0, 0, 0, g(Yes, No, false, false, "", "سي")},
-	{0xfcfd, 0, 0, 0, g(Yes, No, false, false, "", "شى")},
-	{0xfcfe, 0, 0, 0, g(Yes, No, false, false, "", "شي")},
-	{0xfcff, 0, 0, 0, g(Yes, No, false, false, "", "حى")},
-	{0xfd00, 0, 0, 0, g(Yes, No, false, false, "", "حي")},
-	{0xfd01, 0, 0, 0, g(Yes, No, false, false, "", "جى")},
-	{0xfd02, 0, 0, 0, g(Yes, No, false, false, "", "جي")},
-	{0xfd03, 0, 0, 0, g(Yes, No, false, false, "", "خى")},
-	{0xfd04, 0, 0, 0, g(Yes, No, false, false, "", "خي")},
-	{0xfd05, 0, 0, 0, g(Yes, No, false, false, "", "صى")},
-	{0xfd06, 0, 0, 0, g(Yes, No, false, false, "", "صي")},
-	{0xfd07, 0, 0, 0, g(Yes, No, false, false, "", "ضى")},
-	{0xfd08, 0, 0, 0, g(Yes, No, false, false, "", "ضي")},
-	{0xfd09, 0, 0, 0, g(Yes, No, false, false, "", "شج")},
-	{0xfd0a, 0, 0, 0, g(Yes, No, false, false, "", "شح")},
-	{0xfd0b, 0, 0, 0, g(Yes, No, false, false, "", "شخ")},
-	{0xfd0c, 0, 0, 0, g(Yes, No, false, false, "", "شم")},
-	{0xfd0d, 0, 0, 0, g(Yes, No, false, false, "", "شر")},
-	{0xfd0e, 0, 0, 0, g(Yes, No, false, false, "", "سر")},
-	{0xfd0f, 0, 0, 0, g(Yes, No, false, false, "", "صر")},
-	{0xfd10, 0, 0, 0, g(Yes, No, false, false, "", "ضر")},
-	{0xfd11, 0, 0, 0, g(Yes, No, false, false, "", "طى")},
-	{0xfd12, 0, 0, 0, g(Yes, No, false, false, "", "طي")},
-	{0xfd13, 0, 0, 0, g(Yes, No, false, false, "", "عى")},
-	{0xfd14, 0, 0, 0, g(Yes, No, false, false, "", "عي")},
-	{0xfd15, 0, 0, 0, g(Yes, No, false, false, "", "غى")},
-	{0xfd16, 0, 0, 0, g(Yes, No, false, false, "", "غي")},
-	{0xfd17, 0, 0, 0, g(Yes, No, false, false, "", "سى")},
-	{0xfd18, 0, 0, 0, g(Yes, No, false, false, "", "سي")},
-	{0xfd19, 0, 0, 0, g(Yes, No, false, false, "", "شى")},
-	{0xfd1a, 0, 0, 0, g(Yes, No, false, false, "", "شي")},
-	{0xfd1b, 0, 0, 0, g(Yes, No, false, false, "", "حى")},
-	{0xfd1c, 0, 0, 0, g(Yes, No, false, false, "", "حي")},
-	{0xfd1d, 0, 0, 0, g(Yes, No, false, false, "", "جى")},
-	{0xfd1e, 0, 0, 0, g(Yes, No, false, false, "", "جي")},
-	{0xfd1f, 0, 0, 0, g(Yes, No, false, false, "", "خى")},
-	{0xfd20, 0, 0, 0, g(Yes, No, false, false, "", "خي")},
-	{0xfd21, 0, 0, 0, g(Yes, No, false, false, "", "صى")},
-	{0xfd22, 0, 0, 0, g(Yes, No, false, false, "", "صي")},
-	{0xfd23, 0, 0, 0, g(Yes, No, false, false, "", "ضى")},
-	{0xfd24, 0, 0, 0, g(Yes, No, false, false, "", "ضي")},
-	{0xfd25, 0, 0, 0, g(Yes, No, false, false, "", "شج")},
-	{0xfd26, 0, 0, 0, g(Yes, No, false, false, "", "شح")},
-	{0xfd27, 0, 0, 0, g(Yes, No, false, false, "", "شخ")},
-	{0xfd28, 0, 0, 0, g(Yes, No, false, false, "", "شم")},
-	{0xfd29, 0, 0, 0, g(Yes, No, false, false, "", "شر")},
-	{0xfd2a, 0, 0, 0, g(Yes, No, false, false, "", "سر")},
-	{0xfd2b, 0, 0, 0, g(Yes, No, false, false, "", "صر")},
-	{0xfd2c, 0, 0, 0, g(Yes, No, false, false, "", "ضر")},
-	{0xfd2d, 0, 0, 0, g(Yes, No, false, false, "", "شج")},
-	{0xfd2e, 0, 0, 0, g(Yes, No, false, false, "", "شح")},
-	{0xfd2f, 0, 0, 0, g(Yes, No, false, false, "", "شخ")},
-	{0xfd30, 0, 0, 0, g(Yes, No, false, false, "", "شم")},
-	{0xfd31, 0, 0, 0, g(Yes, No, false, false, "", "سه")},
-	{0xfd32, 0, 0, 0, g(Yes, No, false, false, "", "شه")},
-	{0xfd33, 0, 0, 0, g(Yes, No, false, false, "", "طم")},
-	{0xfd34, 0, 0, 0, g(Yes, No, false, false, "", "سج")},
-	{0xfd35, 0, 0, 0, g(Yes, No, false, false, "", "سح")},
-	{0xfd36, 0, 0, 0, g(Yes, No, false, false, "", "سخ")},
-	{0xfd37, 0, 0, 0, g(Yes, No, false, false, "", "شج")},
-	{0xfd38, 0, 0, 0, g(Yes, No, false, false, "", "شح")},
-	{0xfd39, 0, 0, 0, g(Yes, No, false, false, "", "شخ")},
-	{0xfd3a, 0, 0, 0, g(Yes, No, false, false, "", "طم")},
-	{0xfd3b, 0, 0, 0, g(Yes, No, false, false, "", "ظم")},
-	{0xfd3c, 0, 0, 1, g(Yes, No, false, false, "", "اً")},
-	{0xfd3e, 0, 0, 0, f(Yes, false, "")},
-	{0xfd50, 0, 0, 0, g(Yes, No, false, false, "", "تجم")},
-	{0xfd51, 0, 0, 0, g(Yes, No, false, false, "", "تحج")},
-	{0xfd53, 0, 0, 0, g(Yes, No, false, false, "", "تحم")},
-	{0xfd54, 0, 0, 0, g(Yes, No, false, false, "", "تخم")},
-	{0xfd55, 0, 0, 0, g(Yes, No, false, false, "", "تمج")},
-	{0xfd56, 0, 0, 0, g(Yes, No, false, false, "", "تمح")},
-	{0xfd57, 0, 0, 0, g(Yes, No, false, false, "", "تمخ")},
-	{0xfd58, 0, 0, 0, g(Yes, No, false, false, "", "جمح")},
-	{0xfd5a, 0, 0, 0, g(Yes, No, false, false, "", "حمي")},
-	{0xfd5b, 0, 0, 0, g(Yes, No, false, false, "", "حمى")},
-	{0xfd5c, 0, 0, 0, g(Yes, No, false, false, "", "سحج")},
-	{0xfd5d, 0, 0, 0, g(Yes, No, false, false, "", "سجح")},
-	{0xfd5e, 0, 0, 0, g(Yes, No, false, false, "", "سجى")},
-	{0xfd5f, 0, 0, 0, g(Yes, No, false, false, "", "سمح")},
-	{0xfd61, 0, 0, 0, g(Yes, No, false, false, "", "سمج")},
-	{0xfd62, 0, 0, 0, g(Yes, No, false, false, "", "سمم")},
-	{0xfd64, 0, 0, 0, g(Yes, No, false, false, "", "صحح")},
-	{0xfd66, 0, 0, 0, g(Yes, No, false, false, "", "صمم")},
-	{0xfd67, 0, 0, 0, g(Yes, No, false, false, "", "شحم")},
-	{0xfd69, 0, 0, 0, g(Yes, No, false, false, "", "شجي")},
-	{0xfd6a, 0, 0, 0, g(Yes, No, false, false, "", "شمخ")},
-	{0xfd6c, 0, 0, 0, g(Yes, No, false, false, "", "شمم")},
-	{0xfd6e, 0, 0, 0, g(Yes, No, false, false, "", "ضحى")},
-	{0xfd6f, 0, 0, 0, g(Yes, No, false, false, "", "ضخم")},
-	{0xfd71, 0, 0, 0, g(Yes, No, false, false, "", "طمح")},
-	{0xfd73, 0, 0, 0, g(Yes, No, false, false, "", "طمم")},
-	{0xfd74, 0, 0, 0, g(Yes, No, false, false, "", "طمي")},
-	{0xfd75, 0, 0, 0, g(Yes, No, false, false, "", "عجم")},
-	{0xfd76, 0, 0, 0, g(Yes, No, false, false, "", "عمم")},
-	{0xfd78, 0, 0, 0, g(Yes, No, false, false, "", "عمى")},
-	{0xfd79, 0, 0, 0, g(Yes, No, false, false, "", "غمم")},
-	{0xfd7a, 0, 0, 0, g(Yes, No, false, false, "", "غمي")},
-	{0xfd7b, 0, 0, 0, g(Yes, No, false, false, "", "غمى")},
-	{0xfd7c, 0, 0, 0, g(Yes, No, false, false, "", "فخم")},
-	{0xfd7e, 0, 0, 0, g(Yes, No, false, false, "", "قمح")},
-	{0xfd7f, 0, 0, 0, g(Yes, No, false, false, "", "قمم")},
-	{0xfd80, 0, 0, 0, g(Yes, No, false, false, "", "لحم")},
-	{0xfd81, 0, 0, 0, g(Yes, No, false, false, "", "لحي")},
-	{0xfd82, 0, 0, 0, g(Yes, No, false, false, "", "لحى")},
-	{0xfd83, 0, 0, 0, g(Yes, No, false, false, "", "لجج")},
-	{0xfd85, 0, 0, 0, g(Yes, No, false, false, "", "لخم")},
-	{0xfd87, 0, 0, 0, g(Yes, No, false, false, "", "لمح")},
-	{0xfd89, 0, 0, 0, g(Yes, No, false, false, "", "محج")},
-	{0xfd8a, 0, 0, 0, g(Yes, No, false, false, "", "محم")},
-	{0xfd8b, 0, 0, 0, g(Yes, No, false, false, "", "محي")},
-	{0xfd8c, 0, 0, 0, g(Yes, No, false, false, "", "مجح")},
-	{0xfd8d, 0, 0, 0, g(Yes, No, false, false, "", "مجم")},
-	{0xfd8e, 0, 0, 0, g(Yes, No, false, false, "", "مخج")},
-	{0xfd8f, 0, 0, 0, g(Yes, No, false, false, "", "مخم")},
-	{0xfd90, 0, 0, 0, f(Yes, false, "")},
-	{0xfd92, 0, 0, 0, g(Yes, No, false, false, "", "مجخ")},
-	{0xfd93, 0, 0, 0, g(Yes, No, false, false, "", "همج")},
-	{0xfd94, 0, 0, 0, g(Yes, No, false, false, "", "همم")},
-	{0xfd95, 0, 0, 0, g(Yes, No, false, false, "", "نحم")},
-	{0xfd96, 0, 0, 0, g(Yes, No, false, false, "", "نحى")},
-	{0xfd97, 0, 0, 0, g(Yes, No, false, false, "", "نجم")},
-	{0xfd99, 0, 0, 0, g(Yes, No, false, false, "", "نجى")},
-	{0xfd9a, 0, 0, 0, g(Yes, No, false, false, "", "نمي")},
-	{0xfd9b, 0, 0, 0, g(Yes, No, false, false, "", "نمى")},
-	{0xfd9c, 0, 0, 0, g(Yes, No, false, false, "", "يمم")},
-	{0xfd9e, 0, 0, 0, g(Yes, No, false, false, "", "بخي")},
-	{0xfd9f, 0, 0, 0, g(Yes, No, false, false, "", "تجي")},
-	{0xfda0, 0, 0, 0, g(Yes, No, false, false, "", "تجى")},
-	{0xfda1, 0, 0, 0, g(Yes, No, false, false, "", "تخي")},
-	{0xfda2, 0, 0, 0, g(Yes, No, false, false, "", "تخى")},
-	{0xfda3, 0, 0, 0, g(Yes, No, false, false, "", "تمي")},
-	{0xfda4, 0, 0, 0, g(Yes, No, false, false, "", "تمى")},
-	{0xfda5, 0, 0, 0, g(Yes, No, false, false, "", "جمي")},
-	{0xfda6, 0, 0, 0, g(Yes, No, false, false, "", "جحى")},
-	{0xfda7, 0, 0, 0, g(Yes, No, false, false, "", "جمى")},
-	{0xfda8, 0, 0, 0, g(Yes, No, false, false, "", "سخى")},
-	{0xfda9, 0, 0, 0, g(Yes, No, false, false, "", "صحي")},
-	{0xfdaa, 0, 0, 0, g(Yes, No, false, false, "", "شحي")},
-	{0xfdab, 0, 0, 0, g(Yes, No, false, false, "", "ضحي")},
-	{0xfdac, 0, 0, 0, g(Yes, No, false, false, "", "لجي")},
-	{0xfdad, 0, 0, 0, g(Yes, No, false, false, "", "لمي")},
-	{0xfdae, 0, 0, 0, g(Yes, No, false, false, "", "يحي")},
-	{0xfdaf, 0, 0, 0, g(Yes, No, false, false, "", "يجي")},
-	{0xfdb0, 0, 0, 0, g(Yes, No, false, false, "", "يمي")},
-	{0xfdb1, 0, 0, 0, g(Yes, No, false, false, "", "ممي")},
-	{0xfdb2, 0, 0, 0, g(Yes, No, false, false, "", "قمي")},
-	{0xfdb3, 0, 0, 0, g(Yes, No, false, false, "", "نحي")},
-	{0xfdb4, 0, 0, 0, g(Yes, No, false, false, "", "قمح")},
-	{0xfdb5, 0, 0, 0, g(Yes, No, false, false, "", "لحم")},
-	{0xfdb6, 0, 0, 0, g(Yes, No, false, false, "", "عمي")},
-	{0xfdb7, 0, 0, 0, g(Yes, No, false, false, "", "كمي")},
-	{0xfdb8, 0, 0, 0, g(Yes, No, false, false, "", "نجح")},
-	{0xfdb9, 0, 0, 0, g(Yes, No, false, false, "", "مخي")},
-	{0xfdba, 0, 0, 0, g(Yes, No, false, false, "", "لجم")},
-	{0xfdbb, 0, 0, 0, g(Yes, No, false, false, "", "كمم")},
-	{0xfdbc, 0, 0, 0, g(Yes, No, false, false, "", "لجم")},
-	{0xfdbd, 0, 0, 0, g(Yes, No, false, false, "", "نجح")},
-	{0xfdbe, 0, 0, 0, g(Yes, No, false, false, "", "جحي")},
-	{0xfdbf, 0, 0, 0, g(Yes, No, false, false, "", "حجي")},
-	{0xfdc0, 0, 0, 0, g(Yes, No, false, false, "", "مجي")},
-	{0xfdc1, 0, 0, 0, g(Yes, No, false, false, "", "فمي")},
-	{0xfdc2, 0, 0, 0, g(Yes, No, false, false, "", "بحي")},
-	{0xfdc3, 0, 0, 0, g(Yes, No, false, false, "", "كمم")},
-	{0xfdc4, 0, 0, 0, g(Yes, No, false, false, "", "عجم")},
-	{0xfdc5, 0, 0, 0, g(Yes, No, false, false, "", "صمم")},
-	{0xfdc6, 0, 0, 0, g(Yes, No, false, false, "", "سخي")},
-	{0xfdc7, 0, 0, 0, g(Yes, No, false, false, "", "نجي")},
-	{0xfdc8, 0, 0, 0, f(Yes, false, "")},
-	{0xfdf0, 0, 0, 0, g(Yes, No, false, false, "", "صلے")},
-	{0xfdf1, 0, 0, 0, g(Yes, No, false, false, "", "قلے")},
-	{0xfdf2, 0, 0, 0, g(Yes, No, false, false, "", "الله")},
-	{0xfdf3, 0, 0, 0, g(Yes, No, false, false, "", "اكبر")},
-	{0xfdf4, 0, 0, 0, g(Yes, No, false, false, "", "محمد")},
-	{0xfdf5, 0, 0, 0, g(Yes, No, false, false, "", "صلعم")},
-	{0xfdf6, 0, 0, 0, g(Yes, No, false, false, "", "رسول")},
-	{0xfdf7, 0, 0, 0, g(Yes, No, false, false, "", "عليه")},
-	{0xfdf8, 0, 0, 0, g(Yes, No, false, false, "", "وسلم")},
-	{0xfdf9, 0, 0, 0, g(Yes, No, false, false, "", "صلى")},
-	{0xfdfa, 0, 0, 0, g(Yes, No, false, false, "", "صلى الله عليه وسلم")},
-	{0xfdfb, 0, 0, 0, g(Yes, No, false, false, "", "جل جلاله")},
-	{0xfdfc, 0, 0, 0, g(Yes, No, false, false, "", "ریال")},
-	{0xfdfd, 0, 0, 0, f(Yes, false, "")},
-	{0xfe10, 0, 0, 0, g(Yes, No, false, false, "", ",")},
-	{0xfe11, 0, 0, 0, g(Yes, No, false, false, "", "、")},
-	{0xfe12, 0, 0, 0, g(Yes, No, false, false, "", "。")},
-	{0xfe13, 0, 0, 0, g(Yes, No, false, false, "", ":")},
-	{0xfe14, 0, 0, 0, g(Yes, No, false, false, "", ";")},
-	{0xfe15, 0, 0, 0, g(Yes, No, false, false, "", "!")},
-	{0xfe16, 0, 0, 0, g(Yes, No, false, false, "", "?")},
-	{0xfe17, 0, 0, 0, g(Yes, No, false, false, "", "〖")},
-	{0xfe18, 0, 0, 0, g(Yes, No, false, false, "", "〗")},
-	{0xfe19, 0, 0, 0, g(Yes, No, false, false, "", "...")},
-	{0xfe1a, 0, 0, 0, f(Yes, false, "")},
-	{0xfe20, 230, 1, 1, f(Yes, false, "")},
-	{0xfe27, 220, 1, 1, f(Yes, false, "")},
-	{0xfe2e, 230, 1, 1, f(Yes, false, "")},
-	{0xfe30, 0, 0, 0, g(Yes, No, false, false, "", "..")},
-	{0xfe31, 0, 0, 0, g(Yes, No, false, false, "", "—")},
-	{0xfe32, 0, 0, 0, g(Yes, No, false, false, "", "–")},
-	{0xfe33, 0, 0, 0, g(Yes, No, false, false, "", "_")},
-	{0xfe35, 0, 0, 0, g(Yes, No, false, false, "", "(")},
-	{0xfe36, 0, 0, 0, g(Yes, No, false, false, "", ")")},
-	{0xfe37, 0, 0, 0, g(Yes, No, false, false, "", "{")},
-	{0xfe38, 0, 0, 0, g(Yes, No, false, false, "", "}")},
-	{0xfe39, 0, 0, 0, g(Yes, No, false, false, "", "〔")},
-	{0xfe3a, 0, 0, 0, g(Yes, No, false, false, "", "〕")},
-	{0xfe3b, 0, 0, 0, g(Yes, No, false, false, "", "【")},
-	{0xfe3c, 0, 0, 0, g(Yes, No, false, false, "", "】")},
-	{0xfe3d, 0, 0, 0, g(Yes, No, false, false, "", "《")},
-	{0xfe3e, 0, 0, 0, g(Yes, No, false, false, "", "》")},
-	{0xfe3f, 0, 0, 0, g(Yes, No, false, false, "", "〈")},
-	{0xfe40, 0, 0, 0, g(Yes, No, false, false, "", "〉")},
-	{0xfe41, 0, 0, 0, g(Yes, No, false, false, "", "「")},
-	{0xfe42, 0, 0, 0, g(Yes, No, false, false, "", "」")},
-	{0xfe43, 0, 0, 0, g(Yes, No, false, false, "", "『")},
-	{0xfe44, 0, 0, 0, g(Yes, No, false, false, "", "』")},
-	{0xfe45, 0, 0, 0, f(Yes, false, "")},
-	{0xfe47, 0, 0, 0, g(Yes, No, false, false, "", "[")},
-	{0xfe48, 0, 0, 0, g(Yes, No, false, false, "", "]")},
-	{0xfe49, 0, 0, 1, g(Yes, No, false, false, "", " ̅")},
-	{0xfe4d, 0, 0, 0, g(Yes, No, false, false, "", "_")},
-	{0xfe50, 0, 0, 0, g(Yes, No, false, false, "", ",")},
-	{0xfe51, 0, 0, 0, g(Yes, No, false, false, "", "、")},
-	{0xfe52, 0, 0, 0, g(Yes, No, false, false, "", ".")},
-	{0xfe53, 0, 0, 0, f(Yes, false, "")},
-	{0xfe54, 0, 0, 0, g(Yes, No, false, false, "", ";")},
-	{0xfe55, 0, 0, 0, g(Yes, No, false, false, "", ":")},
-	{0xfe56, 0, 0, 0, g(Yes, No, false, false, "", "?")},
-	{0xfe57, 0, 0, 0, g(Yes, No, false, false, "", "!")},
-	{0xfe58, 0, 0, 0, g(Yes, No, false, false, "", "—")},
-	{0xfe59, 0, 0, 0, g(Yes, No, false, false, "", "(")},
-	{0xfe5a, 0, 0, 0, g(Yes, No, false, false, "", ")")},
-	{0xfe5b, 0, 0, 0, g(Yes, No, false, false, "", "{")},
-	{0xfe5c, 0, 0, 0, g(Yes, No, false, false, "", "}")},
-	{0xfe5d, 0, 0, 0, g(Yes, No, false, false, "", "〔")},
-	{0xfe5e, 0, 0, 0, g(Yes, No, false, false, "", "〕")},
-	{0xfe5f, 0, 0, 0, g(Yes, No, false, false, "", "#")},
-	{0xfe60, 0, 0, 0, g(Yes, No, false, false, "", "&")},
-	{0xfe61, 0, 0, 0, g(Yes, No, false, false, "", "*")},
-	{0xfe62, 0, 0, 0, g(Yes, No, false, false, "", "+")},
-	{0xfe63, 0, 0, 0, g(Yes, No, false, false, "", "-")},
-	{0xfe64, 0, 0, 0, g(Yes, No, false, false, "", "<")},
-	{0xfe65, 0, 0, 0, g(Yes, No, false, false, "", ">")},
-	{0xfe66, 0, 0, 0, g(Yes, No, false, false, "", "=")},
-	{0xfe67, 0, 0, 0, f(Yes, false, "")},
-	{0xfe68, 0, 0, 0, g(Yes, No, false, false, "", "\\")},
-	{0xfe69, 0, 0, 0, g(Yes, No, false, false, "", "$")},
-	{0xfe6a, 0, 0, 0, g(Yes, No, false, false, "", "%")},
-	{0xfe6b, 0, 0, 0, g(Yes, No, false, false, "", "@")},
-	{0xfe6c, 0, 0, 0, f(Yes, false, "")},
-	{0xfe70, 0, 0, 1, g(Yes, No, false, false, "", " ً")},
-	{0xfe71, 0, 0, 1, g(Yes, No, false, false, "", "ـً")},
-	{0xfe72, 0, 0, 1, g(Yes, No, false, false, "", " ٌ")},
-	{0xfe73, 0, 0, 0, f(Yes, false, "")},
-	{0xfe74, 0, 0, 1, g(Yes, No, false, false, "", " ٍ")},
-	{0xfe75, 0, 0, 0, f(Yes, false, "")},
-	{0xfe76, 0, 0, 1, g(Yes, No, false, false, "", " َ")},
-	{0xfe77, 0, 0, 1, g(Yes, No, false, false, "", "ـَ")},
-	{0xfe78, 0, 0, 1, g(Yes, No, false, false, "", " ُ")},
-	{0xfe79, 0, 0, 1, g(Yes, No, false, false, "", "ـُ")},
-	{0xfe7a, 0, 0, 1, g(Yes, No, false, false, "", " ِ")},
-	{0xfe7b, 0, 0, 1, g(Yes, No, false, false, "", "ـِ")},
-	{0xfe7c, 0, 0, 1, g(Yes, No, false, false, "", " ّ")},
-	{0xfe7d, 0, 0, 1, g(Yes, No, false, false, "", "ـّ")},
-	{0xfe7e, 0, 0, 1, g(Yes, No, false, false, "", " ْ")},
-	{0xfe7f, 0, 0, 1, g(Yes, No, false, false, "", "ـْ")},
-	{0xfe80, 0, 0, 0, g(Yes, No, false, false, "", "ء")},
-	{0xfe81, 0, 0, 1, g(Yes, No, false, false, "", "آ")},
-	{0xfe83, 0, 0, 1, g(Yes, No, false, false, "", "أ")},
-	{0xfe85, 0, 0, 1, g(Yes, No, false, false, "", "ؤ")},
-	{0xfe87, 0, 0, 1, g(Yes, No, false, false, "", "إ")},
-	{0xfe89, 0, 0, 1, g(Yes, No, false, false, "", "ئ")},
-	{0xfe8d, 0, 0, 0, g(Yes, No, false, false, "", "ا")},
-	{0xfe8f, 0, 0, 0, g(Yes, No, false, false, "", "ب")},
-	{0xfe93, 0, 0, 0, g(Yes, No, false, false, "", "ة")},
-	{0xfe95, 0, 0, 0, g(Yes, No, false, false, "", "ت")},
-	{0xfe99, 0, 0, 0, g(Yes, No, false, false, "", "ث")},
-	{0xfe9d, 0, 0, 0, g(Yes, No, false, false, "", "ج")},
-	{0xfea1, 0, 0, 0, g(Yes, No, false, false, "", "ح")},
-	{0xfea5, 0, 0, 0, g(Yes, No, false, false, "", "خ")},
-	{0xfea9, 0, 0, 0, g(Yes, No, false, false, "", "د")},
-	{0xfeab, 0, 0, 0, g(Yes, No, false, false, "", "ذ")},
-	{0xfead, 0, 0, 0, g(Yes, No, false, false, "", "ر")},
-	{0xfeaf, 0, 0, 0, g(Yes, No, false, false, "", "ز")},
-	{0xfeb1, 0, 0, 0, g(Yes, No, false, false, "", "س")},
-	{0xfeb5, 0, 0, 0, g(Yes, No, false, false, "", "ش")},
-	{0xfeb9, 0, 0, 0, g(Yes, No, false, false, "", "ص")},
-	{0xfebd, 0, 0, 0, g(Yes, No, false, false, "", "ض")},
-	{0xfec1, 0, 0, 0, g(Yes, No, false, false, "", "ط")},
-	{0xfec5, 0, 0, 0, g(Yes, No, false, false, "", "ظ")},
-	{0xfec9, 0, 0, 0, g(Yes, No, false, false, "", "ع")},
-	{0xfecd, 0, 0, 0, g(Yes, No, false, false, "", "غ")},
-	{0xfed1, 0, 0, 0, g(Yes, No, false, false, "", "ف")},
-	{0xfed5, 0, 0, 0, g(Yes, No, false, false, "", "ق")},
-	{0xfed9, 0, 0, 0, g(Yes, No, false, false, "", "ك")},
-	{0xfedd, 0, 0, 0, g(Yes, No, false, false, "", "ل")},
-	{0xfee1, 0, 0, 0, g(Yes, No, false, false, "", "م")},
-	{0xfee5, 0, 0, 0, g(Yes, No, false, false, "", "ن")},
-	{0xfee9, 0, 0, 0, g(Yes, No, false, false, "", "ه")},
-	{0xfeed, 0, 0, 0, g(Yes, No, false, false, "", "و")},
-	{0xfeef, 0, 0, 0, g(Yes, No, false, false, "", "ى")},
-	{0xfef1, 0, 0, 0, g(Yes, No, false, false, "", "ي")},
-	{0xfef5, 0, 0, 1, g(Yes, No, false, false, "", "لآ")},
-	{0xfef7, 0, 0, 1, g(Yes, No, false, false, "", "لأ")},
-	{0xfef9, 0, 0, 1, g(Yes, No, false, false, "", "لإ")},
-	{0xfefb, 0, 0, 0, g(Yes, No, false, false, "", "لا")},
-	{0xfefd, 0, 0, 0, f(Yes, false, "")},
-	{0xff01, 0, 0, 0, g(Yes, No, false, false, "", "!")},
-	{0xff02, 0, 0, 0, g(Yes, No, false, false, "", "\"")},
-	{0xff03, 0, 0, 0, g(Yes, No, false, false, "", "#")},
-	{0xff04, 0, 0, 0, g(Yes, No, false, false, "", "$")},
-	{0xff05, 0, 0, 0, g(Yes, No, false, false, "", "%")},
-	{0xff06, 0, 0, 0, g(Yes, No, false, false, "", "&")},
-	{0xff07, 0, 0, 0, g(Yes, No, false, false, "", "'")},
-	{0xff08, 0, 0, 0, g(Yes, No, false, false, "", "(")},
-	{0xff09, 0, 0, 0, g(Yes, No, false, false, "", ")")},
-	{0xff0a, 0, 0, 0, g(Yes, No, false, false, "", "*")},
-	{0xff0b, 0, 0, 0, g(Yes, No, false, false, "", "+")},
-	{0xff0c, 0, 0, 0, g(Yes, No, false, false, "", ",")},
-	{0xff0d, 0, 0, 0, g(Yes, No, false, false, "", "-")},
-	{0xff0e, 0, 0, 0, g(Yes, No, false, false, "", ".")},
-	{0xff0f, 0, 0, 0, g(Yes, No, false, false, "", "/")},
-	{0xff10, 0, 0, 0, g(Yes, No, false, false, "", "0")},
-	{0xff11, 0, 0, 0, g(Yes, No, false, false, "", "1")},
-	{0xff12, 0, 0, 0, g(Yes, No, false, false, "", "2")},
-	{0xff13, 0, 0, 0, g(Yes, No, false, false, "", "3")},
-	{0xff14, 0, 0, 0, g(Yes, No, false, false, "", "4")},
-	{0xff15, 0, 0, 0, g(Yes, No, false, false, "", "5")},
-	{0xff16, 0, 0, 0, g(Yes, No, false, false, "", "6")},
-	{0xff17, 0, 0, 0, g(Yes, No, false, false, "", "7")},
-	{0xff18, 0, 0, 0, g(Yes, No, false, false, "", "8")},
-	{0xff19, 0, 0, 0, g(Yes, No, false, false, "", "9")},
-	{0xff1a, 0, 0, 0, g(Yes, No, false, false, "", ":")},
-	{0xff1b, 0, 0, 0, g(Yes, No, false, false, "", ";")},
-	{0xff1c, 0, 0, 0, g(Yes, No, false, false, "", "<")},
-	{0xff1d, 0, 0, 0, g(Yes, No, false, false, "", "=")},
-	{0xff1e, 0, 0, 0, g(Yes, No, false, false, "", ">")},
-	{0xff1f, 0, 0, 0, g(Yes, No, false, false, "", "?")},
-	{0xff20, 0, 0, 0, g(Yes, No, false, false, "", "@")},
-	{0xff21, 0, 0, 0, g(Yes, No, false, false, "", "A")},
-	{0xff22, 0, 0, 0, g(Yes, No, false, false, "", "B")},
-	{0xff23, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0xff24, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0xff25, 0, 0, 0, g(Yes, No, false, false, "", "E")},
-	{0xff26, 0, 0, 0, g(Yes, No, false, false, "", "F")},
-	{0xff27, 0, 0, 0, g(Yes, No, false, false, "", "G")},
-	{0xff28, 0, 0, 0, g(Yes, No, false, false, "", "H")},
-	{0xff29, 0, 0, 0, g(Yes, No, false, false, "", "I")},
-	{0xff2a, 0, 0, 0, g(Yes, No, false, false, "", "J")},
-	{0xff2b, 0, 0, 0, g(Yes, No, false, false, "", "K")},
-	{0xff2c, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0xff2d, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0xff2e, 0, 0, 0, g(Yes, No, false, false, "", "N")},
-	{0xff2f, 0, 0, 0, g(Yes, No, false, false, "", "O")},
-	{0xff30, 0, 0, 0, g(Yes, No, false, false, "", "P")},
-	{0xff31, 0, 0, 0, g(Yes, No, false, false, "", "Q")},
-	{0xff32, 0, 0, 0, g(Yes, No, false, false, "", "R")},
-	{0xff33, 0, 0, 0, g(Yes, No, false, false, "", "S")},
-	{0xff34, 0, 0, 0, g(Yes, No, false, false, "", "T")},
-	{0xff35, 0, 0, 0, g(Yes, No, false, false, "", "U")},
-	{0xff36, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0xff37, 0, 0, 0, g(Yes, No, false, false, "", "W")},
-	{0xff38, 0, 0, 0, g(Yes, No, false, false, "", "X")},
-	{0xff39, 0, 0, 0, g(Yes, No, false, false, "", "Y")},
-	{0xff3a, 0, 0, 0, g(Yes, No, false, false, "", "Z")},
-	{0xff3b, 0, 0, 0, g(Yes, No, false, false, "", "[")},
-	{0xff3c, 0, 0, 0, g(Yes, No, false, false, "", "\\")},
-	{0xff3d, 0, 0, 0, g(Yes, No, false, false, "", "]")},
-	{0xff3e, 0, 0, 0, g(Yes, No, false, false, "", "^")},
-	{0xff3f, 0, 0, 0, g(Yes, No, false, false, "", "_")},
-	{0xff40, 0, 0, 0, g(Yes, No, false, false, "", "`")},
-	{0xff41, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0xff42, 0, 0, 0, g(Yes, No, false, false, "", "b")},
-	{0xff43, 0, 0, 0, g(Yes, No, false, false, "", "c")},
-	{0xff44, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0xff45, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0xff46, 0, 0, 0, g(Yes, No, false, false, "", "f")},
-	{0xff47, 0, 0, 0, g(Yes, No, false, false, "", "g")},
-	{0xff48, 0, 0, 0, g(Yes, No, false, false, "", "h")},
-	{0xff49, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0xff4a, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0xff4b, 0, 0, 0, g(Yes, No, false, false, "", "k")},
-	{0xff4c, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0xff4d, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0xff4e, 0, 0, 0, g(Yes, No, false, false, "", "n")},
-	{0xff4f, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0xff50, 0, 0, 0, g(Yes, No, false, false, "", "p")},
-	{0xff51, 0, 0, 0, g(Yes, No, false, false, "", "q")},
-	{0xff52, 0, 0, 0, g(Yes, No, false, false, "", "r")},
-	{0xff53, 0, 0, 0, g(Yes, No, false, false, "", "s")},
-	{0xff54, 0, 0, 0, g(Yes, No, false, false, "", "t")},
-	{0xff55, 0, 0, 0, g(Yes, No, false, false, "", "u")},
-	{0xff56, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0xff57, 0, 0, 0, g(Yes, No, false, false, "", "w")},
-	{0xff58, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0xff59, 0, 0, 0, g(Yes, No, false, false, "", "y")},
-	{0xff5a, 0, 0, 0, g(Yes, No, false, false, "", "z")},
-	{0xff5b, 0, 0, 0, g(Yes, No, false, false, "", "{")},
-	{0xff5c, 0, 0, 0, g(Yes, No, false, false, "", "|")},
-	{0xff5d, 0, 0, 0, g(Yes, No, false, false, "", "}")},
-	{0xff5e, 0, 0, 0, g(Yes, No, false, false, "", "~")},
-	{0xff5f, 0, 0, 0, g(Yes, No, false, false, "", "⦅")},
-	{0xff60, 0, 0, 0, g(Yes, No, false, false, "", "⦆")},
-	{0xff61, 0, 0, 0, g(Yes, No, false, false, "", "。")},
-	{0xff62, 0, 0, 0, g(Yes, No, false, false, "", "「")},
-	{0xff63, 0, 0, 0, g(Yes, No, false, false, "", "」")},
-	{0xff64, 0, 0, 0, g(Yes, No, false, false, "", "、")},
-	{0xff65, 0, 0, 0, g(Yes, No, false, false, "", "・")},
-	{0xff66, 0, 0, 0, g(Yes, No, false, false, "", "ヲ")},
-	{0xff67, 0, 0, 0, g(Yes, No, false, false, "", "ァ")},
-	{0xff68, 0, 0, 0, g(Yes, No, false, false, "", "ィ")},
-	{0xff69, 0, 0, 0, g(Yes, No, false, false, "", "ゥ")},
-	{0xff6a, 0, 0, 0, g(Yes, No, false, false, "", "ェ")},
-	{0xff6b, 0, 0, 0, g(Yes, No, false, false, "", "ォ")},
-	{0xff6c, 0, 0, 0, g(Yes, No, false, false, "", "ャ")},
-	{0xff6d, 0, 0, 0, g(Yes, No, false, false, "", "ュ")},
-	{0xff6e, 0, 0, 0, g(Yes, No, false, false, "", "ョ")},
-	{0xff6f, 0, 0, 0, g(Yes, No, false, false, "", "ッ")},
-	{0xff70, 0, 0, 0, g(Yes, No, false, false, "", "ー")},
-	{0xff71, 0, 0, 0, g(Yes, No, false, false, "", "ア")},
-	{0xff72, 0, 0, 0, g(Yes, No, false, false, "", "イ")},
-	{0xff73, 0, 0, 0, g(Yes, No, false, false, "", "ウ")},
-	{0xff74, 0, 0, 0, g(Yes, No, false, false, "", "エ")},
-	{0xff75, 0, 0, 0, g(Yes, No, false, false, "", "オ")},
-	{0xff76, 0, 0, 0, g(Yes, No, false, false, "", "カ")},
-	{0xff77, 0, 0, 0, g(Yes, No, false, false, "", "キ")},
-	{0xff78, 0, 0, 0, g(Yes, No, false, false, "", "ク")},
-	{0xff79, 0, 0, 0, g(Yes, No, false, false, "", "ケ")},
-	{0xff7a, 0, 0, 0, g(Yes, No, false, false, "", "コ")},
-	{0xff7b, 0, 0, 0, g(Yes, No, false, false, "", "サ")},
-	{0xff7c, 0, 0, 0, g(Yes, No, false, false, "", "シ")},
-	{0xff7d, 0, 0, 0, g(Yes, No, false, false, "", "ス")},
-	{0xff7e, 0, 0, 0, g(Yes, No, false, false, "", "セ")},
-	{0xff7f, 0, 0, 0, g(Yes, No, false, false, "", "ソ")},
-	{0xff80, 0, 0, 0, g(Yes, No, false, false, "", "タ")},
-	{0xff81, 0, 0, 0, g(Yes, No, false, false, "", "チ")},
-	{0xff82, 0, 0, 0, g(Yes, No, false, false, "", "ツ")},
-	{0xff83, 0, 0, 0, g(Yes, No, false, false, "", "テ")},
-	{0xff84, 0, 0, 0, g(Yes, No, false, false, "", "ト")},
-	{0xff85, 0, 0, 0, g(Yes, No, false, false, "", "ナ")},
-	{0xff86, 0, 0, 0, g(Yes, No, false, false, "", "ニ")},
-	{0xff87, 0, 0, 0, g(Yes, No, false, false, "", "ヌ")},
-	{0xff88, 0, 0, 0, g(Yes, No, false, false, "", "ネ")},
-	{0xff89, 0, 0, 0, g(Yes, No, false, false, "", "ノ")},
-	{0xff8a, 0, 0, 0, g(Yes, No, false, false, "", "ハ")},
-	{0xff8b, 0, 0, 0, g(Yes, No, false, false, "", "ヒ")},
-	{0xff8c, 0, 0, 0, g(Yes, No, false, false, "", "フ")},
-	{0xff8d, 0, 0, 0, g(Yes, No, false, false, "", "ヘ")},
-	{0xff8e, 0, 0, 0, g(Yes, No, false, false, "", "ホ")},
-	{0xff8f, 0, 0, 0, g(Yes, No, false, false, "", "マ")},
-	{0xff90, 0, 0, 0, g(Yes, No, false, false, "", "ミ")},
-	{0xff91, 0, 0, 0, g(Yes, No, false, false, "", "ム")},
-	{0xff92, 0, 0, 0, g(Yes, No, false, false, "", "メ")},
-	{0xff93, 0, 0, 0, g(Yes, No, false, false, "", "モ")},
-	{0xff94, 0, 0, 0, g(Yes, No, false, false, "", "ヤ")},
-	{0xff95, 0, 0, 0, g(Yes, No, false, false, "", "ユ")},
-	{0xff96, 0, 0, 0, g(Yes, No, false, false, "", "ヨ")},
-	{0xff97, 0, 0, 0, g(Yes, No, false, false, "", "ラ")},
-	{0xff98, 0, 0, 0, g(Yes, No, false, false, "", "リ")},
-	{0xff99, 0, 0, 0, g(Yes, No, false, false, "", "ル")},
-	{0xff9a, 0, 0, 0, g(Yes, No, false, false, "", "レ")},
-	{0xff9b, 0, 0, 0, g(Yes, No, false, false, "", "ロ")},
-	{0xff9c, 0, 0, 0, g(Yes, No, false, false, "", "ワ")},
-	{0xff9d, 0, 0, 0, g(Yes, No, false, false, "", "ン")},
-	{0xff9e, 0, 1, 1, g(Yes, No, false, false, "", "゙")},
-	{0xff9f, 0, 1, 1, g(Yes, No, false, false, "", "゚")},
-	{0xffa0, 0, 0, 0, g(Yes, No, false, false, "", "ᅠ")},
-	{0xffa1, 0, 0, 0, g(Yes, No, false, false, "", "ᄀ")},
-	{0xffa2, 0, 0, 0, g(Yes, No, false, false, "", "ᄁ")},
-	{0xffa3, 0, 1, 1, g(Yes, No, false, false, "", "ᆪ")},
-	{0xffa4, 0, 0, 0, g(Yes, No, false, false, "", "ᄂ")},
-	{0xffa5, 0, 1, 1, g(Yes, No, false, false, "", "ᆬ")},
-	{0xffa6, 0, 1, 1, g(Yes, No, false, false, "", "ᆭ")},
-	{0xffa7, 0, 0, 0, g(Yes, No, false, false, "", "ᄃ")},
-	{0xffa8, 0, 0, 0, g(Yes, No, false, false, "", "ᄄ")},
-	{0xffa9, 0, 0, 0, g(Yes, No, false, false, "", "ᄅ")},
-	{0xffaa, 0, 1, 1, g(Yes, No, false, false, "", "ᆰ")},
-	{0xffab, 0, 1, 1, g(Yes, No, false, false, "", "ᆱ")},
-	{0xffac, 0, 1, 1, g(Yes, No, false, false, "", "ᆲ")},
-	{0xffad, 0, 1, 1, g(Yes, No, false, false, "", "ᆳ")},
-	{0xffae, 0, 1, 1, g(Yes, No, false, false, "", "ᆴ")},
-	{0xffaf, 0, 1, 1, g(Yes, No, false, false, "", "ᆵ")},
-	{0xffb0, 0, 0, 0, g(Yes, No, false, false, "", "ᄚ")},
-	{0xffb1, 0, 0, 0, g(Yes, No, false, false, "", "ᄆ")},
-	{0xffb2, 0, 0, 0, g(Yes, No, false, false, "", "ᄇ")},
-	{0xffb3, 0, 0, 0, g(Yes, No, false, false, "", "ᄈ")},
-	{0xffb4, 0, 0, 0, g(Yes, No, false, false, "", "ᄡ")},
-	{0xffb5, 0, 0, 0, g(Yes, No, false, false, "", "ᄉ")},
-	{0xffb6, 0, 0, 0, g(Yes, No, false, false, "", "ᄊ")},
-	{0xffb7, 0, 0, 0, g(Yes, No, false, false, "", "ᄋ")},
-	{0xffb8, 0, 0, 0, g(Yes, No, false, false, "", "ᄌ")},
-	{0xffb9, 0, 0, 0, g(Yes, No, false, false, "", "ᄍ")},
-	{0xffba, 0, 0, 0, g(Yes, No, false, false, "", "ᄎ")},
-	{0xffbb, 0, 0, 0, g(Yes, No, false, false, "", "ᄏ")},
-	{0xffbc, 0, 0, 0, g(Yes, No, false, false, "", "ᄐ")},
-	{0xffbd, 0, 0, 0, g(Yes, No, false, false, "", "ᄑ")},
-	{0xffbe, 0, 0, 0, g(Yes, No, false, false, "", "ᄒ")},
-	{0xffbf, 0, 0, 0, f(Yes, false, "")},
-	{0xffc2, 0, 1, 1, g(Yes, No, false, false, "", "ᅡ")},
-	{0xffc3, 0, 1, 1, g(Yes, No, false, false, "", "ᅢ")},
-	{0xffc4, 0, 1, 1, g(Yes, No, false, false, "", "ᅣ")},
-	{0xffc5, 0, 1, 1, g(Yes, No, false, false, "", "ᅤ")},
-	{0xffc6, 0, 1, 1, g(Yes, No, false, false, "", "ᅥ")},
-	{0xffc7, 0, 1, 1, g(Yes, No, false, false, "", "ᅦ")},
-	{0xffc8, 0, 0, 0, f(Yes, false, "")},
-	{0xffca, 0, 1, 1, g(Yes, No, false, false, "", "ᅧ")},
-	{0xffcb, 0, 1, 1, g(Yes, No, false, false, "", "ᅨ")},
-	{0xffcc, 0, 1, 1, g(Yes, No, false, false, "", "ᅩ")},
-	{0xffcd, 0, 1, 1, g(Yes, No, false, false, "", "ᅪ")},
-	{0xffce, 0, 1, 1, g(Yes, No, false, false, "", "ᅫ")},
-	{0xffcf, 0, 1, 1, g(Yes, No, false, false, "", "ᅬ")},
-	{0xffd0, 0, 0, 0, f(Yes, false, "")},
-	{0xffd2, 0, 1, 1, g(Yes, No, false, false, "", "ᅭ")},
-	{0xffd3, 0, 1, 1, g(Yes, No, false, false, "", "ᅮ")},
-	{0xffd4, 0, 1, 1, g(Yes, No, false, false, "", "ᅯ")},
-	{0xffd5, 0, 1, 1, g(Yes, No, false, false, "", "ᅰ")},
-	{0xffd6, 0, 1, 1, g(Yes, No, false, false, "", "ᅱ")},
-	{0xffd7, 0, 1, 1, g(Yes, No, false, false, "", "ᅲ")},
-	{0xffd8, 0, 0, 0, f(Yes, false, "")},
-	{0xffda, 0, 1, 1, g(Yes, No, false, false, "", "ᅳ")},
-	{0xffdb, 0, 1, 1, g(Yes, No, false, false, "", "ᅴ")},
-	{0xffdc, 0, 1, 1, g(Yes, No, false, false, "", "ᅵ")},
-	{0xffdd, 0, 0, 0, f(Yes, false, "")},
-	{0xffe0, 0, 0, 0, g(Yes, No, false, false, "", "¢")},
-	{0xffe1, 0, 0, 0, g(Yes, No, false, false, "", "£")},
-	{0xffe2, 0, 0, 0, g(Yes, No, false, false, "", "¬")},
-	{0xffe3, 0, 0, 1, g(Yes, No, false, false, "", " ̄")},
-	{0xffe4, 0, 0, 0, g(Yes, No, false, false, "", "¦")},
-	{0xffe5, 0, 0, 0, g(Yes, No, false, false, "", "¥")},
-	{0xffe6, 0, 0, 0, g(Yes, No, false, false, "", "₩")},
-	{0xffe7, 0, 0, 0, f(Yes, false, "")},
-	{0xffe8, 0, 0, 0, g(Yes, No, false, false, "", "│")},
-	{0xffe9, 0, 0, 0, g(Yes, No, false, false, "", "←")},
-	{0xffea, 0, 0, 0, g(Yes, No, false, false, "", "↑")},
-	{0xffeb, 0, 0, 0, g(Yes, No, false, false, "", "→")},
-	{0xffec, 0, 0, 0, g(Yes, No, false, false, "", "↓")},
-	{0xffed, 0, 0, 0, g(Yes, No, false, false, "", "■")},
-	{0xffee, 0, 0, 0, g(Yes, No, false, false, "", "○")},
-	{0xffef, 0, 0, 0, f(Yes, false, "")},
-	{0x101fd, 220, 1, 1, f(Yes, false, "")},
-	{0x101fe, 0, 0, 0, f(Yes, false, "")},
-	{0x102e0, 220, 1, 1, f(Yes, false, "")},
-	{0x102e1, 0, 0, 0, f(Yes, false, "")},
-	{0x10376, 230, 1, 1, f(Yes, false, "")},
-	{0x1037b, 0, 0, 0, f(Yes, false, "")},
-	{0x10a0d, 220, 1, 1, f(Yes, false, "")},
-	{0x10a0e, 0, 0, 0, f(Yes, false, "")},
-	{0x10a0f, 230, 1, 1, f(Yes, false, "")},
-	{0x10a10, 0, 0, 0, f(Yes, false, "")},
-	{0x10a38, 230, 1, 1, f(Yes, false, "")},
-	{0x10a39, 1, 1, 1, f(Yes, false, "")},
-	{0x10a3a, 220, 1, 1, f(Yes, false, "")},
-	{0x10a3b, 0, 0, 0, f(Yes, false, "")},
-	{0x10a3f, 9, 1, 1, f(Yes, false, "")},
-	{0x10a40, 0, 0, 0, f(Yes, false, "")},
-	{0x10ae5, 230, 1, 1, f(Yes, false, "")},
-	{0x10ae6, 220, 1, 1, f(Yes, false, "")},
-	{0x10ae7, 0, 0, 0, f(Yes, false, "")},
-	{0x11046, 9, 1, 1, f(Yes, false, "")},
-	{0x11047, 0, 0, 0, f(Yes, false, "")},
-	{0x1107f, 9, 1, 1, f(Yes, false, "")},
-	{0x11080, 0, 0, 0, f(Yes, false, "")},
-	{0x11099, 0, 0, 0, f(Yes, true, "")},
-	{0x1109a, 0, 0, 1, f(Yes, false, "𑂚")},
-	{0x1109b, 0, 0, 0, f(Yes, true, "")},
-	{0x1109c, 0, 0, 1, f(Yes, false, "𑂜")},
-	{0x1109d, 0, 0, 0, f(Yes, false, "")},
-	{0x110a5, 0, 0, 0, f(Yes, true, "")},
-	{0x110a6, 0, 0, 0, f(Yes, false, "")},
-	{0x110ab, 0, 0, 1, f(Yes, false, "𑂫")},
-	{0x110ac, 0, 0, 0, f(Yes, false, "")},
-	{0x110b9, 9, 1, 1, f(Yes, false, "")},
-	{0x110ba, 7, 1, 1, f(Maybe, false, "")},
-	{0x110bb, 0, 0, 0, f(Yes, false, "")},
-	{0x11100, 230, 1, 1, f(Yes, false, "")},
-	{0x11103, 0, 0, 0, f(Yes, false, "")},
-	{0x11127, 0, 1, 1, f(Maybe, false, "")},
-	{0x11128, 0, 0, 0, f(Yes, false, "")},
-	{0x1112e, 0, 0, 1, f(Yes, false, "𑄮")},
-	{0x1112f, 0, 0, 1, f(Yes, false, "𑄯")},
-	{0x11130, 0, 0, 0, f(Yes, false, "")},
-	{0x11131, 0, 0, 0, f(Yes, true, "")},
-	{0x11133, 9, 1, 1, f(Yes, false, "")},
-	{0x11135, 0, 0, 0, f(Yes, false, "")},
-	{0x11173, 7, 1, 1, f(Yes, false, "")},
-	{0x11174, 0, 0, 0, f(Yes, false, "")},
-	{0x111c0, 9, 1, 1, f(Yes, false, "")},
-	{0x111c1, 0, 0, 0, f(Yes, false, "")},
-	{0x111ca, 7, 1, 1, f(Yes, false, "")},
-	{0x111cb, 0, 0, 0, f(Yes, false, "")},
-	{0x11235, 9, 1, 1, f(Yes, false, "")},
-	{0x11236, 7, 1, 1, f(Yes, false, "")},
-	{0x11237, 0, 0, 0, f(Yes, false, "")},
-	{0x112e9, 7, 1, 1, f(Yes, false, "")},
-	{0x112ea, 9, 1, 1, f(Yes, false, "")},
-	{0x112eb, 0, 0, 0, f(Yes, false, "")},
-	{0x1133c, 7, 1, 1, f(Yes, false, "")},
-	{0x1133d, 0, 0, 0, f(Yes, false, "")},
-	{0x1133e, 0, 1, 1, f(Maybe, false, "")},
-	{0x1133f, 0, 0, 0, f(Yes, false, "")},
-	{0x11347, 0, 0, 0, f(Yes, true, "")},
-	{0x11348, 0, 0, 0, f(Yes, false, "")},
-	{0x1134b, 0, 0, 1, f(Yes, false, "𑍋")},
-	{0x1134c, 0, 0, 1, f(Yes, false, "𑍌")},
-	{0x1134d, 9, 1, 1, f(Yes, false, "")},
-	{0x1134e, 0, 0, 0, f(Yes, false, "")},
-	{0x11357, 0, 1, 1, f(Maybe, false, "")},
-	{0x11358, 0, 0, 0, f(Yes, false, "")},
-	{0x11366, 230, 1, 1, f(Yes, false, "")},
-	{0x1136d, 0, 0, 0, f(Yes, false, "")},
-	{0x11370, 230, 1, 1, f(Yes, false, "")},
-	{0x11375, 0, 0, 0, f(Yes, false, "")},
-	{0x11442, 9, 1, 1, f(Yes, false, "")},
-	{0x11443, 0, 0, 0, f(Yes, false, "")},
-	{0x11446, 7, 1, 1, f(Yes, false, "")},
-	{0x11447, 0, 0, 0, f(Yes, false, "")},
-	{0x114b0, 0, 1, 1, f(Maybe, false, "")},
-	{0x114b1, 0, 0, 0, f(Yes, false, "")},
-	{0x114b9, 0, 0, 0, f(Yes, true, "")},
-	{0x114ba, 0, 1, 1, f(Maybe, false, "")},
-	{0x114bb, 0, 0, 1, f(Yes, false, "𑒻")},
-	{0x114bc, 0, 0, 1, f(Yes, false, "𑒼")},
-	{0x114bd, 0, 1, 1, f(Maybe, false, "")},
-	{0x114be, 0, 0, 1, f(Yes, false, "𑒾")},
-	{0x114bf, 0, 0, 0, f(Yes, false, "")},
-	{0x114c2, 9, 1, 1, f(Yes, false, "")},
-	{0x114c3, 7, 1, 1, f(Yes, false, "")},
-	{0x114c4, 0, 0, 0, f(Yes, false, "")},
-	{0x115af, 0, 1, 1, f(Maybe, false, "")},
-	{0x115b0, 0, 0, 0, f(Yes, false, "")},
-	{0x115b8, 0, 0, 0, f(Yes, true, "")},
-	{0x115ba, 0, 0, 1, f(Yes, false, "𑖺")},
-	{0x115bb, 0, 0, 1, f(Yes, false, "𑖻")},
-	{0x115bc, 0, 0, 0, f(Yes, false, "")},
-	{0x115bf, 9, 1, 1, f(Yes, false, "")},
-	{0x115c0, 7, 1, 1, f(Yes, false, "")},
-	{0x115c1, 0, 0, 0, f(Yes, false, "")},
-	{0x1163f, 9, 1, 1, f(Yes, false, "")},
-	{0x11640, 0, 0, 0, f(Yes, false, "")},
-	{0x116b6, 9, 1, 1, f(Yes, false, "")},
-	{0x116b7, 7, 1, 1, f(Yes, false, "")},
-	{0x116b8, 0, 0, 0, f(Yes, false, "")},
-	{0x1172b, 9, 1, 1, f(Yes, false, "")},
-	{0x1172c, 0, 0, 0, f(Yes, false, "")},
-	{0x11c3f, 9, 1, 1, f(Yes, false, "")},
-	{0x11c40, 0, 0, 0, f(Yes, false, "")},
-	{0x16af0, 1, 1, 1, f(Yes, false, "")},
-	{0x16af5, 0, 0, 0, f(Yes, false, "")},
-	{0x16b30, 230, 1, 1, f(Yes, false, "")},
-	{0x16b37, 0, 0, 0, f(Yes, false, "")},
-	{0x1bc9e, 1, 1, 1, f(Yes, false, "")},
-	{0x1bc9f, 0, 0, 0, f(Yes, false, "")},
-	{0x1d15e, 0, 0, 1, f(No, false, "𝅗𝅥")},
-	{0x1d15f, 0, 0, 1, f(No, false, "𝅘𝅥")},
-	{0x1d160, 0, 0, 2, f(No, false, "𝅘𝅥𝅮")},
-	{0x1d161, 0, 0, 2, f(No, false, "𝅘𝅥𝅯")},
-	{0x1d162, 0, 0, 2, f(No, false, "𝅘𝅥𝅰")},
-	{0x1d163, 0, 0, 2, f(No, false, "𝅘𝅥𝅱")},
-	{0x1d164, 0, 0, 2, f(No, false, "𝅘𝅥𝅲")},
-	{0x1d165, 216, 1, 1, f(Yes, false, "")},
-	{0x1d167, 1, 1, 1, f(Yes, false, "")},
-	{0x1d16a, 0, 0, 0, f(Yes, false, "")},
-	{0x1d16d, 226, 1, 1, f(Yes, false, "")},
-	{0x1d16e, 216, 1, 1, f(Yes, false, "")},
-	{0x1d173, 0, 0, 0, f(Yes, false, "")},
-	{0x1d17b, 220, 1, 1, f(Yes, false, "")},
-	{0x1d183, 0, 0, 0, f(Yes, false, "")},
-	{0x1d185, 230, 1, 1, f(Yes, false, "")},
-	{0x1d18a, 220, 1, 1, f(Yes, false, "")},
-	{0x1d18c, 0, 0, 0, f(Yes, false, "")},
-	{0x1d1aa, 230, 1, 1, f(Yes, false, "")},
-	{0x1d1ae, 0, 0, 0, f(Yes, false, "")},
-	{0x1d1bb, 0, 0, 1, f(No, false, "𝆹𝅥")},
-	{0x1d1bc, 0, 0, 1, f(No, false, "𝆺𝅥")},
-	{0x1d1bd, 0, 0, 2, f(No, false, "𝆹𝅥𝅮")},
-	{0x1d1be, 0, 0, 2, f(No, false, "𝆺𝅥𝅮")},
-	{0x1d1bf, 0, 0, 2, f(No, false, "𝆹𝅥𝅯")},
-	{0x1d1c0, 0, 0, 2, f(No, false, "𝆺𝅥𝅯")},
-	{0x1d1c1, 0, 0, 0, f(Yes, false, "")},
-	{0x1d242, 230, 1, 1, f(Yes, false, "")},
-	{0x1d245, 0, 0, 0, f(Yes, false, "")},
-	{0x1d400, 0, 0, 0, g(Yes, No, false, false, "", "A")},
-	{0x1d401, 0, 0, 0, g(Yes, No, false, false, "", "B")},
-	{0x1d402, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0x1d403, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x1d404, 0, 0, 0, g(Yes, No, false, false, "", "E")},
-	{0x1d405, 0, 0, 0, g(Yes, No, false, false, "", "F")},
-	{0x1d406, 0, 0, 0, g(Yes, No, false, false, "", "G")},
-	{0x1d407, 0, 0, 0, g(Yes, No, false, false, "", "H")},
-	{0x1d408, 0, 0, 0, g(Yes, No, false, false, "", "I")},
-	{0x1d409, 0, 0, 0, g(Yes, No, false, false, "", "J")},
-	{0x1d40a, 0, 0, 0, g(Yes, No, false, false, "", "K")},
-	{0x1d40b, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0x1d40c, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0x1d40d, 0, 0, 0, g(Yes, No, false, false, "", "N")},
-	{0x1d40e, 0, 0, 0, g(Yes, No, false, false, "", "O")},
-	{0x1d40f, 0, 0, 0, g(Yes, No, false, false, "", "P")},
-	{0x1d410, 0, 0, 0, g(Yes, No, false, false, "", "Q")},
-	{0x1d411, 0, 0, 0, g(Yes, No, false, false, "", "R")},
-	{0x1d412, 0, 0, 0, g(Yes, No, false, false, "", "S")},
-	{0x1d413, 0, 0, 0, g(Yes, No, false, false, "", "T")},
-	{0x1d414, 0, 0, 0, g(Yes, No, false, false, "", "U")},
-	{0x1d415, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0x1d416, 0, 0, 0, g(Yes, No, false, false, "", "W")},
-	{0x1d417, 0, 0, 0, g(Yes, No, false, false, "", "X")},
-	{0x1d418, 0, 0, 0, g(Yes, No, false, false, "", "Y")},
-	{0x1d419, 0, 0, 0, g(Yes, No, false, false, "", "Z")},
-	{0x1d41a, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0x1d41b, 0, 0, 0, g(Yes, No, false, false, "", "b")},
-	{0x1d41c, 0, 0, 0, g(Yes, No, false, false, "", "c")},
-	{0x1d41d, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0x1d41e, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0x1d41f, 0, 0, 0, g(Yes, No, false, false, "", "f")},
-	{0x1d420, 0, 0, 0, g(Yes, No, false, false, "", "g")},
-	{0x1d421, 0, 0, 0, g(Yes, No, false, false, "", "h")},
-	{0x1d422, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x1d423, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0x1d424, 0, 0, 0, g(Yes, No, false, false, "", "k")},
-	{0x1d425, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x1d426, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0x1d427, 0, 0, 0, g(Yes, No, false, false, "", "n")},
-	{0x1d428, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0x1d429, 0, 0, 0, g(Yes, No, false, false, "", "p")},
-	{0x1d42a, 0, 0, 0, g(Yes, No, false, false, "", "q")},
-	{0x1d42b, 0, 0, 0, g(Yes, No, false, false, "", "r")},
-	{0x1d42c, 0, 0, 0, g(Yes, No, false, false, "", "s")},
-	{0x1d42d, 0, 0, 0, g(Yes, No, false, false, "", "t")},
-	{0x1d42e, 0, 0, 0, g(Yes, No, false, false, "", "u")},
-	{0x1d42f, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0x1d430, 0, 0, 0, g(Yes, No, false, false, "", "w")},
-	{0x1d431, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0x1d432, 0, 0, 0, g(Yes, No, false, false, "", "y")},
-	{0x1d433, 0, 0, 0, g(Yes, No, false, false, "", "z")},
-	{0x1d434, 0, 0, 0, g(Yes, No, false, false, "", "A")},
-	{0x1d435, 0, 0, 0, g(Yes, No, false, false, "", "B")},
-	{0x1d436, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0x1d437, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x1d438, 0, 0, 0, g(Yes, No, false, false, "", "E")},
-	{0x1d439, 0, 0, 0, g(Yes, No, false, false, "", "F")},
-	{0x1d43a, 0, 0, 0, g(Yes, No, false, false, "", "G")},
-	{0x1d43b, 0, 0, 0, g(Yes, No, false, false, "", "H")},
-	{0x1d43c, 0, 0, 0, g(Yes, No, false, false, "", "I")},
-	{0x1d43d, 0, 0, 0, g(Yes, No, false, false, "", "J")},
-	{0x1d43e, 0, 0, 0, g(Yes, No, false, false, "", "K")},
-	{0x1d43f, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0x1d440, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0x1d441, 0, 0, 0, g(Yes, No, false, false, "", "N")},
-	{0x1d442, 0, 0, 0, g(Yes, No, false, false, "", "O")},
-	{0x1d443, 0, 0, 0, g(Yes, No, false, false, "", "P")},
-	{0x1d444, 0, 0, 0, g(Yes, No, false, false, "", "Q")},
-	{0x1d445, 0, 0, 0, g(Yes, No, false, false, "", "R")},
-	{0x1d446, 0, 0, 0, g(Yes, No, false, false, "", "S")},
-	{0x1d447, 0, 0, 0, g(Yes, No, false, false, "", "T")},
-	{0x1d448, 0, 0, 0, g(Yes, No, false, false, "", "U")},
-	{0x1d449, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0x1d44a, 0, 0, 0, g(Yes, No, false, false, "", "W")},
-	{0x1d44b, 0, 0, 0, g(Yes, No, false, false, "", "X")},
-	{0x1d44c, 0, 0, 0, g(Yes, No, false, false, "", "Y")},
-	{0x1d44d, 0, 0, 0, g(Yes, No, false, false, "", "Z")},
-	{0x1d44e, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0x1d44f, 0, 0, 0, g(Yes, No, false, false, "", "b")},
-	{0x1d450, 0, 0, 0, g(Yes, No, false, false, "", "c")},
-	{0x1d451, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0x1d452, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0x1d453, 0, 0, 0, g(Yes, No, false, false, "", "f")},
-	{0x1d454, 0, 0, 0, g(Yes, No, false, false, "", "g")},
-	{0x1d455, 0, 0, 0, f(Yes, false, "")},
-	{0x1d456, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x1d457, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0x1d458, 0, 0, 0, g(Yes, No, false, false, "", "k")},
-	{0x1d459, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x1d45a, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0x1d45b, 0, 0, 0, g(Yes, No, false, false, "", "n")},
-	{0x1d45c, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0x1d45d, 0, 0, 0, g(Yes, No, false, false, "", "p")},
-	{0x1d45e, 0, 0, 0, g(Yes, No, false, false, "", "q")},
-	{0x1d45f, 0, 0, 0, g(Yes, No, false, false, "", "r")},
-	{0x1d460, 0, 0, 0, g(Yes, No, false, false, "", "s")},
-	{0x1d461, 0, 0, 0, g(Yes, No, false, false, "", "t")},
-	{0x1d462, 0, 0, 0, g(Yes, No, false, false, "", "u")},
-	{0x1d463, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0x1d464, 0, 0, 0, g(Yes, No, false, false, "", "w")},
-	{0x1d465, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0x1d466, 0, 0, 0, g(Yes, No, false, false, "", "y")},
-	{0x1d467, 0, 0, 0, g(Yes, No, false, false, "", "z")},
-	{0x1d468, 0, 0, 0, g(Yes, No, false, false, "", "A")},
-	{0x1d469, 0, 0, 0, g(Yes, No, false, false, "", "B")},
-	{0x1d46a, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0x1d46b, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x1d46c, 0, 0, 0, g(Yes, No, false, false, "", "E")},
-	{0x1d46d, 0, 0, 0, g(Yes, No, false, false, "", "F")},
-	{0x1d46e, 0, 0, 0, g(Yes, No, false, false, "", "G")},
-	{0x1d46f, 0, 0, 0, g(Yes, No, false, false, "", "H")},
-	{0x1d470, 0, 0, 0, g(Yes, No, false, false, "", "I")},
-	{0x1d471, 0, 0, 0, g(Yes, No, false, false, "", "J")},
-	{0x1d472, 0, 0, 0, g(Yes, No, false, false, "", "K")},
-	{0x1d473, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0x1d474, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0x1d475, 0, 0, 0, g(Yes, No, false, false, "", "N")},
-	{0x1d476, 0, 0, 0, g(Yes, No, false, false, "", "O")},
-	{0x1d477, 0, 0, 0, g(Yes, No, false, false, "", "P")},
-	{0x1d478, 0, 0, 0, g(Yes, No, false, false, "", "Q")},
-	{0x1d479, 0, 0, 0, g(Yes, No, false, false, "", "R")},
-	{0x1d47a, 0, 0, 0, g(Yes, No, false, false, "", "S")},
-	{0x1d47b, 0, 0, 0, g(Yes, No, false, false, "", "T")},
-	{0x1d47c, 0, 0, 0, g(Yes, No, false, false, "", "U")},
-	{0x1d47d, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0x1d47e, 0, 0, 0, g(Yes, No, false, false, "", "W")},
-	{0x1d47f, 0, 0, 0, g(Yes, No, false, false, "", "X")},
-	{0x1d480, 0, 0, 0, g(Yes, No, false, false, "", "Y")},
-	{0x1d481, 0, 0, 0, g(Yes, No, false, false, "", "Z")},
-	{0x1d482, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0x1d483, 0, 0, 0, g(Yes, No, false, false, "", "b")},
-	{0x1d484, 0, 0, 0, g(Yes, No, false, false, "", "c")},
-	{0x1d485, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0x1d486, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0x1d487, 0, 0, 0, g(Yes, No, false, false, "", "f")},
-	{0x1d488, 0, 0, 0, g(Yes, No, false, false, "", "g")},
-	{0x1d489, 0, 0, 0, g(Yes, No, false, false, "", "h")},
-	{0x1d48a, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x1d48b, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0x1d48c, 0, 0, 0, g(Yes, No, false, false, "", "k")},
-	{0x1d48d, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x1d48e, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0x1d48f, 0, 0, 0, g(Yes, No, false, false, "", "n")},
-	{0x1d490, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0x1d491, 0, 0, 0, g(Yes, No, false, false, "", "p")},
-	{0x1d492, 0, 0, 0, g(Yes, No, false, false, "", "q")},
-	{0x1d493, 0, 0, 0, g(Yes, No, false, false, "", "r")},
-	{0x1d494, 0, 0, 0, g(Yes, No, false, false, "", "s")},
-	{0x1d495, 0, 0, 0, g(Yes, No, false, false, "", "t")},
-	{0x1d496, 0, 0, 0, g(Yes, No, false, false, "", "u")},
-	{0x1d497, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0x1d498, 0, 0, 0, g(Yes, No, false, false, "", "w")},
-	{0x1d499, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0x1d49a, 0, 0, 0, g(Yes, No, false, false, "", "y")},
-	{0x1d49b, 0, 0, 0, g(Yes, No, false, false, "", "z")},
-	{0x1d49c, 0, 0, 0, g(Yes, No, false, false, "", "A")},
-	{0x1d49d, 0, 0, 0, f(Yes, false, "")},
-	{0x1d49e, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0x1d49f, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x1d4a0, 0, 0, 0, f(Yes, false, "")},
-	{0x1d4a2, 0, 0, 0, g(Yes, No, false, false, "", "G")},
-	{0x1d4a3, 0, 0, 0, f(Yes, false, "")},
-	{0x1d4a5, 0, 0, 0, g(Yes, No, false, false, "", "J")},
-	{0x1d4a6, 0, 0, 0, g(Yes, No, false, false, "", "K")},
-	{0x1d4a7, 0, 0, 0, f(Yes, false, "")},
-	{0x1d4a9, 0, 0, 0, g(Yes, No, false, false, "", "N")},
-	{0x1d4aa, 0, 0, 0, g(Yes, No, false, false, "", "O")},
-	{0x1d4ab, 0, 0, 0, g(Yes, No, false, false, "", "P")},
-	{0x1d4ac, 0, 0, 0, g(Yes, No, false, false, "", "Q")},
-	{0x1d4ad, 0, 0, 0, f(Yes, false, "")},
-	{0x1d4ae, 0, 0, 0, g(Yes, No, false, false, "", "S")},
-	{0x1d4af, 0, 0, 0, g(Yes, No, false, false, "", "T")},
-	{0x1d4b0, 0, 0, 0, g(Yes, No, false, false, "", "U")},
-	{0x1d4b1, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0x1d4b2, 0, 0, 0, g(Yes, No, false, false, "", "W")},
-	{0x1d4b3, 0, 0, 0, g(Yes, No, false, false, "", "X")},
-	{0x1d4b4, 0, 0, 0, g(Yes, No, false, false, "", "Y")},
-	{0x1d4b5, 0, 0, 0, g(Yes, No, false, false, "", "Z")},
-	{0x1d4b6, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0x1d4b7, 0, 0, 0, g(Yes, No, false, false, "", "b")},
-	{0x1d4b8, 0, 0, 0, g(Yes, No, false, false, "", "c")},
-	{0x1d4b9, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0x1d4ba, 0, 0, 0, f(Yes, false, "")},
-	{0x1d4bb, 0, 0, 0, g(Yes, No, false, false, "", "f")},
-	{0x1d4bc, 0, 0, 0, f(Yes, false, "")},
-	{0x1d4bd, 0, 0, 0, g(Yes, No, false, false, "", "h")},
-	{0x1d4be, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x1d4bf, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0x1d4c0, 0, 0, 0, g(Yes, No, false, false, "", "k")},
-	{0x1d4c1, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x1d4c2, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0x1d4c3, 0, 0, 0, g(Yes, No, false, false, "", "n")},
-	{0x1d4c4, 0, 0, 0, f(Yes, false, "")},
-	{0x1d4c5, 0, 0, 0, g(Yes, No, false, false, "", "p")},
-	{0x1d4c6, 0, 0, 0, g(Yes, No, false, false, "", "q")},
-	{0x1d4c7, 0, 0, 0, g(Yes, No, false, false, "", "r")},
-	{0x1d4c8, 0, 0, 0, g(Yes, No, false, false, "", "s")},
-	{0x1d4c9, 0, 0, 0, g(Yes, No, false, false, "", "t")},
-	{0x1d4ca, 0, 0, 0, g(Yes, No, false, false, "", "u")},
-	{0x1d4cb, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0x1d4cc, 0, 0, 0, g(Yes, No, false, false, "", "w")},
-	{0x1d4cd, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0x1d4ce, 0, 0, 0, g(Yes, No, false, false, "", "y")},
-	{0x1d4cf, 0, 0, 0, g(Yes, No, false, false, "", "z")},
-	{0x1d4d0, 0, 0, 0, g(Yes, No, false, false, "", "A")},
-	{0x1d4d1, 0, 0, 0, g(Yes, No, false, false, "", "B")},
-	{0x1d4d2, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0x1d4d3, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x1d4d4, 0, 0, 0, g(Yes, No, false, false, "", "E")},
-	{0x1d4d5, 0, 0, 0, g(Yes, No, false, false, "", "F")},
-	{0x1d4d6, 0, 0, 0, g(Yes, No, false, false, "", "G")},
-	{0x1d4d7, 0, 0, 0, g(Yes, No, false, false, "", "H")},
-	{0x1d4d8, 0, 0, 0, g(Yes, No, false, false, "", "I")},
-	{0x1d4d9, 0, 0, 0, g(Yes, No, false, false, "", "J")},
-	{0x1d4da, 0, 0, 0, g(Yes, No, false, false, "", "K")},
-	{0x1d4db, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0x1d4dc, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0x1d4dd, 0, 0, 0, g(Yes, No, false, false, "", "N")},
-	{0x1d4de, 0, 0, 0, g(Yes, No, false, false, "", "O")},
-	{0x1d4df, 0, 0, 0, g(Yes, No, false, false, "", "P")},
-	{0x1d4e0, 0, 0, 0, g(Yes, No, false, false, "", "Q")},
-	{0x1d4e1, 0, 0, 0, g(Yes, No, false, false, "", "R")},
-	{0x1d4e2, 0, 0, 0, g(Yes, No, false, false, "", "S")},
-	{0x1d4e3, 0, 0, 0, g(Yes, No, false, false, "", "T")},
-	{0x1d4e4, 0, 0, 0, g(Yes, No, false, false, "", "U")},
-	{0x1d4e5, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0x1d4e6, 0, 0, 0, g(Yes, No, false, false, "", "W")},
-	{0x1d4e7, 0, 0, 0, g(Yes, No, false, false, "", "X")},
-	{0x1d4e8, 0, 0, 0, g(Yes, No, false, false, "", "Y")},
-	{0x1d4e9, 0, 0, 0, g(Yes, No, false, false, "", "Z")},
-	{0x1d4ea, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0x1d4eb, 0, 0, 0, g(Yes, No, false, false, "", "b")},
-	{0x1d4ec, 0, 0, 0, g(Yes, No, false, false, "", "c")},
-	{0x1d4ed, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0x1d4ee, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0x1d4ef, 0, 0, 0, g(Yes, No, false, false, "", "f")},
-	{0x1d4f0, 0, 0, 0, g(Yes, No, false, false, "", "g")},
-	{0x1d4f1, 0, 0, 0, g(Yes, No, false, false, "", "h")},
-	{0x1d4f2, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x1d4f3, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0x1d4f4, 0, 0, 0, g(Yes, No, false, false, "", "k")},
-	{0x1d4f5, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x1d4f6, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0x1d4f7, 0, 0, 0, g(Yes, No, false, false, "", "n")},
-	{0x1d4f8, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0x1d4f9, 0, 0, 0, g(Yes, No, false, false, "", "p")},
-	{0x1d4fa, 0, 0, 0, g(Yes, No, false, false, "", "q")},
-	{0x1d4fb, 0, 0, 0, g(Yes, No, false, false, "", "r")},
-	{0x1d4fc, 0, 0, 0, g(Yes, No, false, false, "", "s")},
-	{0x1d4fd, 0, 0, 0, g(Yes, No, false, false, "", "t")},
-	{0x1d4fe, 0, 0, 0, g(Yes, No, false, false, "", "u")},
-	{0x1d4ff, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0x1d500, 0, 0, 0, g(Yes, No, false, false, "", "w")},
-	{0x1d501, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0x1d502, 0, 0, 0, g(Yes, No, false, false, "", "y")},
-	{0x1d503, 0, 0, 0, g(Yes, No, false, false, "", "z")},
-	{0x1d504, 0, 0, 0, g(Yes, No, false, false, "", "A")},
-	{0x1d505, 0, 0, 0, g(Yes, No, false, false, "", "B")},
-	{0x1d506, 0, 0, 0, f(Yes, false, "")},
-	{0x1d507, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x1d508, 0, 0, 0, g(Yes, No, false, false, "", "E")},
-	{0x1d509, 0, 0, 0, g(Yes, No, false, false, "", "F")},
-	{0x1d50a, 0, 0, 0, g(Yes, No, false, false, "", "G")},
-	{0x1d50b, 0, 0, 0, f(Yes, false, "")},
-	{0x1d50d, 0, 0, 0, g(Yes, No, false, false, "", "J")},
-	{0x1d50e, 0, 0, 0, g(Yes, No, false, false, "", "K")},
-	{0x1d50f, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0x1d510, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0x1d511, 0, 0, 0, g(Yes, No, false, false, "", "N")},
-	{0x1d512, 0, 0, 0, g(Yes, No, false, false, "", "O")},
-	{0x1d513, 0, 0, 0, g(Yes, No, false, false, "", "P")},
-	{0x1d514, 0, 0, 0, g(Yes, No, false, false, "", "Q")},
-	{0x1d515, 0, 0, 0, f(Yes, false, "")},
-	{0x1d516, 0, 0, 0, g(Yes, No, false, false, "", "S")},
-	{0x1d517, 0, 0, 0, g(Yes, No, false, false, "", "T")},
-	{0x1d518, 0, 0, 0, g(Yes, No, false, false, "", "U")},
-	{0x1d519, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0x1d51a, 0, 0, 0, g(Yes, No, false, false, "", "W")},
-	{0x1d51b, 0, 0, 0, g(Yes, No, false, false, "", "X")},
-	{0x1d51c, 0, 0, 0, g(Yes, No, false, false, "", "Y")},
-	{0x1d51d, 0, 0, 0, f(Yes, false, "")},
-	{0x1d51e, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0x1d51f, 0, 0, 0, g(Yes, No, false, false, "", "b")},
-	{0x1d520, 0, 0, 0, g(Yes, No, false, false, "", "c")},
-	{0x1d521, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0x1d522, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0x1d523, 0, 0, 0, g(Yes, No, false, false, "", "f")},
-	{0x1d524, 0, 0, 0, g(Yes, No, false, false, "", "g")},
-	{0x1d525, 0, 0, 0, g(Yes, No, false, false, "", "h")},
-	{0x1d526, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x1d527, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0x1d528, 0, 0, 0, g(Yes, No, false, false, "", "k")},
-	{0x1d529, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x1d52a, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0x1d52b, 0, 0, 0, g(Yes, No, false, false, "", "n")},
-	{0x1d52c, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0x1d52d, 0, 0, 0, g(Yes, No, false, false, "", "p")},
-	{0x1d52e, 0, 0, 0, g(Yes, No, false, false, "", "q")},
-	{0x1d52f, 0, 0, 0, g(Yes, No, false, false, "", "r")},
-	{0x1d530, 0, 0, 0, g(Yes, No, false, false, "", "s")},
-	{0x1d531, 0, 0, 0, g(Yes, No, false, false, "", "t")},
-	{0x1d532, 0, 0, 0, g(Yes, No, false, false, "", "u")},
-	{0x1d533, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0x1d534, 0, 0, 0, g(Yes, No, false, false, "", "w")},
-	{0x1d535, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0x1d536, 0, 0, 0, g(Yes, No, false, false, "", "y")},
-	{0x1d537, 0, 0, 0, g(Yes, No, false, false, "", "z")},
-	{0x1d538, 0, 0, 0, g(Yes, No, false, false, "", "A")},
-	{0x1d539, 0, 0, 0, g(Yes, No, false, false, "", "B")},
-	{0x1d53a, 0, 0, 0, f(Yes, false, "")},
-	{0x1d53b, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x1d53c, 0, 0, 0, g(Yes, No, false, false, "", "E")},
-	{0x1d53d, 0, 0, 0, g(Yes, No, false, false, "", "F")},
-	{0x1d53e, 0, 0, 0, g(Yes, No, false, false, "", "G")},
-	{0x1d53f, 0, 0, 0, f(Yes, false, "")},
-	{0x1d540, 0, 0, 0, g(Yes, No, false, false, "", "I")},
-	{0x1d541, 0, 0, 0, g(Yes, No, false, false, "", "J")},
-	{0x1d542, 0, 0, 0, g(Yes, No, false, false, "", "K")},
-	{0x1d543, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0x1d544, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0x1d545, 0, 0, 0, f(Yes, false, "")},
-	{0x1d546, 0, 0, 0, g(Yes, No, false, false, "", "O")},
-	{0x1d547, 0, 0, 0, f(Yes, false, "")},
-	{0x1d54a, 0, 0, 0, g(Yes, No, false, false, "", "S")},
-	{0x1d54b, 0, 0, 0, g(Yes, No, false, false, "", "T")},
-	{0x1d54c, 0, 0, 0, g(Yes, No, false, false, "", "U")},
-	{0x1d54d, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0x1d54e, 0, 0, 0, g(Yes, No, false, false, "", "W")},
-	{0x1d54f, 0, 0, 0, g(Yes, No, false, false, "", "X")},
-	{0x1d550, 0, 0, 0, g(Yes, No, false, false, "", "Y")},
-	{0x1d551, 0, 0, 0, f(Yes, false, "")},
-	{0x1d552, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0x1d553, 0, 0, 0, g(Yes, No, false, false, "", "b")},
-	{0x1d554, 0, 0, 0, g(Yes, No, false, false, "", "c")},
-	{0x1d555, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0x1d556, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0x1d557, 0, 0, 0, g(Yes, No, false, false, "", "f")},
-	{0x1d558, 0, 0, 0, g(Yes, No, false, false, "", "g")},
-	{0x1d559, 0, 0, 0, g(Yes, No, false, false, "", "h")},
-	{0x1d55a, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x1d55b, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0x1d55c, 0, 0, 0, g(Yes, No, false, false, "", "k")},
-	{0x1d55d, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x1d55e, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0x1d55f, 0, 0, 0, g(Yes, No, false, false, "", "n")},
-	{0x1d560, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0x1d561, 0, 0, 0, g(Yes, No, false, false, "", "p")},
-	{0x1d562, 0, 0, 0, g(Yes, No, false, false, "", "q")},
-	{0x1d563, 0, 0, 0, g(Yes, No, false, false, "", "r")},
-	{0x1d564, 0, 0, 0, g(Yes, No, false, false, "", "s")},
-	{0x1d565, 0, 0, 0, g(Yes, No, false, false, "", "t")},
-	{0x1d566, 0, 0, 0, g(Yes, No, false, false, "", "u")},
-	{0x1d567, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0x1d568, 0, 0, 0, g(Yes, No, false, false, "", "w")},
-	{0x1d569, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0x1d56a, 0, 0, 0, g(Yes, No, false, false, "", "y")},
-	{0x1d56b, 0, 0, 0, g(Yes, No, false, false, "", "z")},
-	{0x1d56c, 0, 0, 0, g(Yes, No, false, false, "", "A")},
-	{0x1d56d, 0, 0, 0, g(Yes, No, false, false, "", "B")},
-	{0x1d56e, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0x1d56f, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x1d570, 0, 0, 0, g(Yes, No, false, false, "", "E")},
-	{0x1d571, 0, 0, 0, g(Yes, No, false, false, "", "F")},
-	{0x1d572, 0, 0, 0, g(Yes, No, false, false, "", "G")},
-	{0x1d573, 0, 0, 0, g(Yes, No, false, false, "", "H")},
-	{0x1d574, 0, 0, 0, g(Yes, No, false, false, "", "I")},
-	{0x1d575, 0, 0, 0, g(Yes, No, false, false, "", "J")},
-	{0x1d576, 0, 0, 0, g(Yes, No, false, false, "", "K")},
-	{0x1d577, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0x1d578, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0x1d579, 0, 0, 0, g(Yes, No, false, false, "", "N")},
-	{0x1d57a, 0, 0, 0, g(Yes, No, false, false, "", "O")},
-	{0x1d57b, 0, 0, 0, g(Yes, No, false, false, "", "P")},
-	{0x1d57c, 0, 0, 0, g(Yes, No, false, false, "", "Q")},
-	{0x1d57d, 0, 0, 0, g(Yes, No, false, false, "", "R")},
-	{0x1d57e, 0, 0, 0, g(Yes, No, false, false, "", "S")},
-	{0x1d57f, 0, 0, 0, g(Yes, No, false, false, "", "T")},
-	{0x1d580, 0, 0, 0, g(Yes, No, false, false, "", "U")},
-	{0x1d581, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0x1d582, 0, 0, 0, g(Yes, No, false, false, "", "W")},
-	{0x1d583, 0, 0, 0, g(Yes, No, false, false, "", "X")},
-	{0x1d584, 0, 0, 0, g(Yes, No, false, false, "", "Y")},
-	{0x1d585, 0, 0, 0, g(Yes, No, false, false, "", "Z")},
-	{0x1d586, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0x1d587, 0, 0, 0, g(Yes, No, false, false, "", "b")},
-	{0x1d588, 0, 0, 0, g(Yes, No, false, false, "", "c")},
-	{0x1d589, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0x1d58a, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0x1d58b, 0, 0, 0, g(Yes, No, false, false, "", "f")},
-	{0x1d58c, 0, 0, 0, g(Yes, No, false, false, "", "g")},
-	{0x1d58d, 0, 0, 0, g(Yes, No, false, false, "", "h")},
-	{0x1d58e, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x1d58f, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0x1d590, 0, 0, 0, g(Yes, No, false, false, "", "k")},
-	{0x1d591, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x1d592, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0x1d593, 0, 0, 0, g(Yes, No, false, false, "", "n")},
-	{0x1d594, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0x1d595, 0, 0, 0, g(Yes, No, false, false, "", "p")},
-	{0x1d596, 0, 0, 0, g(Yes, No, false, false, "", "q")},
-	{0x1d597, 0, 0, 0, g(Yes, No, false, false, "", "r")},
-	{0x1d598, 0, 0, 0, g(Yes, No, false, false, "", "s")},
-	{0x1d599, 0, 0, 0, g(Yes, No, false, false, "", "t")},
-	{0x1d59a, 0, 0, 0, g(Yes, No, false, false, "", "u")},
-	{0x1d59b, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0x1d59c, 0, 0, 0, g(Yes, No, false, false, "", "w")},
-	{0x1d59d, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0x1d59e, 0, 0, 0, g(Yes, No, false, false, "", "y")},
-	{0x1d59f, 0, 0, 0, g(Yes, No, false, false, "", "z")},
-	{0x1d5a0, 0, 0, 0, g(Yes, No, false, false, "", "A")},
-	{0x1d5a1, 0, 0, 0, g(Yes, No, false, false, "", "B")},
-	{0x1d5a2, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0x1d5a3, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x1d5a4, 0, 0, 0, g(Yes, No, false, false, "", "E")},
-	{0x1d5a5, 0, 0, 0, g(Yes, No, false, false, "", "F")},
-	{0x1d5a6, 0, 0, 0, g(Yes, No, false, false, "", "G")},
-	{0x1d5a7, 0, 0, 0, g(Yes, No, false, false, "", "H")},
-	{0x1d5a8, 0, 0, 0, g(Yes, No, false, false, "", "I")},
-	{0x1d5a9, 0, 0, 0, g(Yes, No, false, false, "", "J")},
-	{0x1d5aa, 0, 0, 0, g(Yes, No, false, false, "", "K")},
-	{0x1d5ab, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0x1d5ac, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0x1d5ad, 0, 0, 0, g(Yes, No, false, false, "", "N")},
-	{0x1d5ae, 0, 0, 0, g(Yes, No, false, false, "", "O")},
-	{0x1d5af, 0, 0, 0, g(Yes, No, false, false, "", "P")},
-	{0x1d5b0, 0, 0, 0, g(Yes, No, false, false, "", "Q")},
-	{0x1d5b1, 0, 0, 0, g(Yes, No, false, false, "", "R")},
-	{0x1d5b2, 0, 0, 0, g(Yes, No, false, false, "", "S")},
-	{0x1d5b3, 0, 0, 0, g(Yes, No, false, false, "", "T")},
-	{0x1d5b4, 0, 0, 0, g(Yes, No, false, false, "", "U")},
-	{0x1d5b5, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0x1d5b6, 0, 0, 0, g(Yes, No, false, false, "", "W")},
-	{0x1d5b7, 0, 0, 0, g(Yes, No, false, false, "", "X")},
-	{0x1d5b8, 0, 0, 0, g(Yes, No, false, false, "", "Y")},
-	{0x1d5b9, 0, 0, 0, g(Yes, No, false, false, "", "Z")},
-	{0x1d5ba, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0x1d5bb, 0, 0, 0, g(Yes, No, false, false, "", "b")},
-	{0x1d5bc, 0, 0, 0, g(Yes, No, false, false, "", "c")},
-	{0x1d5bd, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0x1d5be, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0x1d5bf, 0, 0, 0, g(Yes, No, false, false, "", "f")},
-	{0x1d5c0, 0, 0, 0, g(Yes, No, false, false, "", "g")},
-	{0x1d5c1, 0, 0, 0, g(Yes, No, false, false, "", "h")},
-	{0x1d5c2, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x1d5c3, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0x1d5c4, 0, 0, 0, g(Yes, No, false, false, "", "k")},
-	{0x1d5c5, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x1d5c6, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0x1d5c7, 0, 0, 0, g(Yes, No, false, false, "", "n")},
-	{0x1d5c8, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0x1d5c9, 0, 0, 0, g(Yes, No, false, false, "", "p")},
-	{0x1d5ca, 0, 0, 0, g(Yes, No, false, false, "", "q")},
-	{0x1d5cb, 0, 0, 0, g(Yes, No, false, false, "", "r")},
-	{0x1d5cc, 0, 0, 0, g(Yes, No, false, false, "", "s")},
-	{0x1d5cd, 0, 0, 0, g(Yes, No, false, false, "", "t")},
-	{0x1d5ce, 0, 0, 0, g(Yes, No, false, false, "", "u")},
-	{0x1d5cf, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0x1d5d0, 0, 0, 0, g(Yes, No, false, false, "", "w")},
-	{0x1d5d1, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0x1d5d2, 0, 0, 0, g(Yes, No, false, false, "", "y")},
-	{0x1d5d3, 0, 0, 0, g(Yes, No, false, false, "", "z")},
-	{0x1d5d4, 0, 0, 0, g(Yes, No, false, false, "", "A")},
-	{0x1d5d5, 0, 0, 0, g(Yes, No, false, false, "", "B")},
-	{0x1d5d6, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0x1d5d7, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x1d5d8, 0, 0, 0, g(Yes, No, false, false, "", "E")},
-	{0x1d5d9, 0, 0, 0, g(Yes, No, false, false, "", "F")},
-	{0x1d5da, 0, 0, 0, g(Yes, No, false, false, "", "G")},
-	{0x1d5db, 0, 0, 0, g(Yes, No, false, false, "", "H")},
-	{0x1d5dc, 0, 0, 0, g(Yes, No, false, false, "", "I")},
-	{0x1d5dd, 0, 0, 0, g(Yes, No, false, false, "", "J")},
-	{0x1d5de, 0, 0, 0, g(Yes, No, false, false, "", "K")},
-	{0x1d5df, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0x1d5e0, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0x1d5e1, 0, 0, 0, g(Yes, No, false, false, "", "N")},
-	{0x1d5e2, 0, 0, 0, g(Yes, No, false, false, "", "O")},
-	{0x1d5e3, 0, 0, 0, g(Yes, No, false, false, "", "P")},
-	{0x1d5e4, 0, 0, 0, g(Yes, No, false, false, "", "Q")},
-	{0x1d5e5, 0, 0, 0, g(Yes, No, false, false, "", "R")},
-	{0x1d5e6, 0, 0, 0, g(Yes, No, false, false, "", "S")},
-	{0x1d5e7, 0, 0, 0, g(Yes, No, false, false, "", "T")},
-	{0x1d5e8, 0, 0, 0, g(Yes, No, false, false, "", "U")},
-	{0x1d5e9, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0x1d5ea, 0, 0, 0, g(Yes, No, false, false, "", "W")},
-	{0x1d5eb, 0, 0, 0, g(Yes, No, false, false, "", "X")},
-	{0x1d5ec, 0, 0, 0, g(Yes, No, false, false, "", "Y")},
-	{0x1d5ed, 0, 0, 0, g(Yes, No, false, false, "", "Z")},
-	{0x1d5ee, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0x1d5ef, 0, 0, 0, g(Yes, No, false, false, "", "b")},
-	{0x1d5f0, 0, 0, 0, g(Yes, No, false, false, "", "c")},
-	{0x1d5f1, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0x1d5f2, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0x1d5f3, 0, 0, 0, g(Yes, No, false, false, "", "f")},
-	{0x1d5f4, 0, 0, 0, g(Yes, No, false, false, "", "g")},
-	{0x1d5f5, 0, 0, 0, g(Yes, No, false, false, "", "h")},
-	{0x1d5f6, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x1d5f7, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0x1d5f8, 0, 0, 0, g(Yes, No, false, false, "", "k")},
-	{0x1d5f9, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x1d5fa, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0x1d5fb, 0, 0, 0, g(Yes, No, false, false, "", "n")},
-	{0x1d5fc, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0x1d5fd, 0, 0, 0, g(Yes, No, false, false, "", "p")},
-	{0x1d5fe, 0, 0, 0, g(Yes, No, false, false, "", "q")},
-	{0x1d5ff, 0, 0, 0, g(Yes, No, false, false, "", "r")},
-	{0x1d600, 0, 0, 0, g(Yes, No, false, false, "", "s")},
-	{0x1d601, 0, 0, 0, g(Yes, No, false, false, "", "t")},
-	{0x1d602, 0, 0, 0, g(Yes, No, false, false, "", "u")},
-	{0x1d603, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0x1d604, 0, 0, 0, g(Yes, No, false, false, "", "w")},
-	{0x1d605, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0x1d606, 0, 0, 0, g(Yes, No, false, false, "", "y")},
-	{0x1d607, 0, 0, 0, g(Yes, No, false, false, "", "z")},
-	{0x1d608, 0, 0, 0, g(Yes, No, false, false, "", "A")},
-	{0x1d609, 0, 0, 0, g(Yes, No, false, false, "", "B")},
-	{0x1d60a, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0x1d60b, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x1d60c, 0, 0, 0, g(Yes, No, false, false, "", "E")},
-	{0x1d60d, 0, 0, 0, g(Yes, No, false, false, "", "F")},
-	{0x1d60e, 0, 0, 0, g(Yes, No, false, false, "", "G")},
-	{0x1d60f, 0, 0, 0, g(Yes, No, false, false, "", "H")},
-	{0x1d610, 0, 0, 0, g(Yes, No, false, false, "", "I")},
-	{0x1d611, 0, 0, 0, g(Yes, No, false, false, "", "J")},
-	{0x1d612, 0, 0, 0, g(Yes, No, false, false, "", "K")},
-	{0x1d613, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0x1d614, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0x1d615, 0, 0, 0, g(Yes, No, false, false, "", "N")},
-	{0x1d616, 0, 0, 0, g(Yes, No, false, false, "", "O")},
-	{0x1d617, 0, 0, 0, g(Yes, No, false, false, "", "P")},
-	{0x1d618, 0, 0, 0, g(Yes, No, false, false, "", "Q")},
-	{0x1d619, 0, 0, 0, g(Yes, No, false, false, "", "R")},
-	{0x1d61a, 0, 0, 0, g(Yes, No, false, false, "", "S")},
-	{0x1d61b, 0, 0, 0, g(Yes, No, false, false, "", "T")},
-	{0x1d61c, 0, 0, 0, g(Yes, No, false, false, "", "U")},
-	{0x1d61d, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0x1d61e, 0, 0, 0, g(Yes, No, false, false, "", "W")},
-	{0x1d61f, 0, 0, 0, g(Yes, No, false, false, "", "X")},
-	{0x1d620, 0, 0, 0, g(Yes, No, false, false, "", "Y")},
-	{0x1d621, 0, 0, 0, g(Yes, No, false, false, "", "Z")},
-	{0x1d622, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0x1d623, 0, 0, 0, g(Yes, No, false, false, "", "b")},
-	{0x1d624, 0, 0, 0, g(Yes, No, false, false, "", "c")},
-	{0x1d625, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0x1d626, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0x1d627, 0, 0, 0, g(Yes, No, false, false, "", "f")},
-	{0x1d628, 0, 0, 0, g(Yes, No, false, false, "", "g")},
-	{0x1d629, 0, 0, 0, g(Yes, No, false, false, "", "h")},
-	{0x1d62a, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x1d62b, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0x1d62c, 0, 0, 0, g(Yes, No, false, false, "", "k")},
-	{0x1d62d, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x1d62e, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0x1d62f, 0, 0, 0, g(Yes, No, false, false, "", "n")},
-	{0x1d630, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0x1d631, 0, 0, 0, g(Yes, No, false, false, "", "p")},
-	{0x1d632, 0, 0, 0, g(Yes, No, false, false, "", "q")},
-	{0x1d633, 0, 0, 0, g(Yes, No, false, false, "", "r")},
-	{0x1d634, 0, 0, 0, g(Yes, No, false, false, "", "s")},
-	{0x1d635, 0, 0, 0, g(Yes, No, false, false, "", "t")},
-	{0x1d636, 0, 0, 0, g(Yes, No, false, false, "", "u")},
-	{0x1d637, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0x1d638, 0, 0, 0, g(Yes, No, false, false, "", "w")},
-	{0x1d639, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0x1d63a, 0, 0, 0, g(Yes, No, false, false, "", "y")},
-	{0x1d63b, 0, 0, 0, g(Yes, No, false, false, "", "z")},
-	{0x1d63c, 0, 0, 0, g(Yes, No, false, false, "", "A")},
-	{0x1d63d, 0, 0, 0, g(Yes, No, false, false, "", "B")},
-	{0x1d63e, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0x1d63f, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x1d640, 0, 0, 0, g(Yes, No, false, false, "", "E")},
-	{0x1d641, 0, 0, 0, g(Yes, No, false, false, "", "F")},
-	{0x1d642, 0, 0, 0, g(Yes, No, false, false, "", "G")},
-	{0x1d643, 0, 0, 0, g(Yes, No, false, false, "", "H")},
-	{0x1d644, 0, 0, 0, g(Yes, No, false, false, "", "I")},
-	{0x1d645, 0, 0, 0, g(Yes, No, false, false, "", "J")},
-	{0x1d646, 0, 0, 0, g(Yes, No, false, false, "", "K")},
-	{0x1d647, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0x1d648, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0x1d649, 0, 0, 0, g(Yes, No, false, false, "", "N")},
-	{0x1d64a, 0, 0, 0, g(Yes, No, false, false, "", "O")},
-	{0x1d64b, 0, 0, 0, g(Yes, No, false, false, "", "P")},
-	{0x1d64c, 0, 0, 0, g(Yes, No, false, false, "", "Q")},
-	{0x1d64d, 0, 0, 0, g(Yes, No, false, false, "", "R")},
-	{0x1d64e, 0, 0, 0, g(Yes, No, false, false, "", "S")},
-	{0x1d64f, 0, 0, 0, g(Yes, No, false, false, "", "T")},
-	{0x1d650, 0, 0, 0, g(Yes, No, false, false, "", "U")},
-	{0x1d651, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0x1d652, 0, 0, 0, g(Yes, No, false, false, "", "W")},
-	{0x1d653, 0, 0, 0, g(Yes, No, false, false, "", "X")},
-	{0x1d654, 0, 0, 0, g(Yes, No, false, false, "", "Y")},
-	{0x1d655, 0, 0, 0, g(Yes, No, false, false, "", "Z")},
-	{0x1d656, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0x1d657, 0, 0, 0, g(Yes, No, false, false, "", "b")},
-	{0x1d658, 0, 0, 0, g(Yes, No, false, false, "", "c")},
-	{0x1d659, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0x1d65a, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0x1d65b, 0, 0, 0, g(Yes, No, false, false, "", "f")},
-	{0x1d65c, 0, 0, 0, g(Yes, No, false, false, "", "g")},
-	{0x1d65d, 0, 0, 0, g(Yes, No, false, false, "", "h")},
-	{0x1d65e, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x1d65f, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0x1d660, 0, 0, 0, g(Yes, No, false, false, "", "k")},
-	{0x1d661, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x1d662, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0x1d663, 0, 0, 0, g(Yes, No, false, false, "", "n")},
-	{0x1d664, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0x1d665, 0, 0, 0, g(Yes, No, false, false, "", "p")},
-	{0x1d666, 0, 0, 0, g(Yes, No, false, false, "", "q")},
-	{0x1d667, 0, 0, 0, g(Yes, No, false, false, "", "r")},
-	{0x1d668, 0, 0, 0, g(Yes, No, false, false, "", "s")},
-	{0x1d669, 0, 0, 0, g(Yes, No, false, false, "", "t")},
-	{0x1d66a, 0, 0, 0, g(Yes, No, false, false, "", "u")},
-	{0x1d66b, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0x1d66c, 0, 0, 0, g(Yes, No, false, false, "", "w")},
-	{0x1d66d, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0x1d66e, 0, 0, 0, g(Yes, No, false, false, "", "y")},
-	{0x1d66f, 0, 0, 0, g(Yes, No, false, false, "", "z")},
-	{0x1d670, 0, 0, 0, g(Yes, No, false, false, "", "A")},
-	{0x1d671, 0, 0, 0, g(Yes, No, false, false, "", "B")},
-	{0x1d672, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0x1d673, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x1d674, 0, 0, 0, g(Yes, No, false, false, "", "E")},
-	{0x1d675, 0, 0, 0, g(Yes, No, false, false, "", "F")},
-	{0x1d676, 0, 0, 0, g(Yes, No, false, false, "", "G")},
-	{0x1d677, 0, 0, 0, g(Yes, No, false, false, "", "H")},
-	{0x1d678, 0, 0, 0, g(Yes, No, false, false, "", "I")},
-	{0x1d679, 0, 0, 0, g(Yes, No, false, false, "", "J")},
-	{0x1d67a, 0, 0, 0, g(Yes, No, false, false, "", "K")},
-	{0x1d67b, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0x1d67c, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0x1d67d, 0, 0, 0, g(Yes, No, false, false, "", "N")},
-	{0x1d67e, 0, 0, 0, g(Yes, No, false, false, "", "O")},
-	{0x1d67f, 0, 0, 0, g(Yes, No, false, false, "", "P")},
-	{0x1d680, 0, 0, 0, g(Yes, No, false, false, "", "Q")},
-	{0x1d681, 0, 0, 0, g(Yes, No, false, false, "", "R")},
-	{0x1d682, 0, 0, 0, g(Yes, No, false, false, "", "S")},
-	{0x1d683, 0, 0, 0, g(Yes, No, false, false, "", "T")},
-	{0x1d684, 0, 0, 0, g(Yes, No, false, false, "", "U")},
-	{0x1d685, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0x1d686, 0, 0, 0, g(Yes, No, false, false, "", "W")},
-	{0x1d687, 0, 0, 0, g(Yes, No, false, false, "", "X")},
-	{0x1d688, 0, 0, 0, g(Yes, No, false, false, "", "Y")},
-	{0x1d689, 0, 0, 0, g(Yes, No, false, false, "", "Z")},
-	{0x1d68a, 0, 0, 0, g(Yes, No, false, false, "", "a")},
-	{0x1d68b, 0, 0, 0, g(Yes, No, false, false, "", "b")},
-	{0x1d68c, 0, 0, 0, g(Yes, No, false, false, "", "c")},
-	{0x1d68d, 0, 0, 0, g(Yes, No, false, false, "", "d")},
-	{0x1d68e, 0, 0, 0, g(Yes, No, false, false, "", "e")},
-	{0x1d68f, 0, 0, 0, g(Yes, No, false, false, "", "f")},
-	{0x1d690, 0, 0, 0, g(Yes, No, false, false, "", "g")},
-	{0x1d691, 0, 0, 0, g(Yes, No, false, false, "", "h")},
-	{0x1d692, 0, 0, 0, g(Yes, No, false, false, "", "i")},
-	{0x1d693, 0, 0, 0, g(Yes, No, false, false, "", "j")},
-	{0x1d694, 0, 0, 0, g(Yes, No, false, false, "", "k")},
-	{0x1d695, 0, 0, 0, g(Yes, No, false, false, "", "l")},
-	{0x1d696, 0, 0, 0, g(Yes, No, false, false, "", "m")},
-	{0x1d697, 0, 0, 0, g(Yes, No, false, false, "", "n")},
-	{0x1d698, 0, 0, 0, g(Yes, No, false, false, "", "o")},
-	{0x1d699, 0, 0, 0, g(Yes, No, false, false, "", "p")},
-	{0x1d69a, 0, 0, 0, g(Yes, No, false, false, "", "q")},
-	{0x1d69b, 0, 0, 0, g(Yes, No, false, false, "", "r")},
-	{0x1d69c, 0, 0, 0, g(Yes, No, false, false, "", "s")},
-	{0x1d69d, 0, 0, 0, g(Yes, No, false, false, "", "t")},
-	{0x1d69e, 0, 0, 0, g(Yes, No, false, false, "", "u")},
-	{0x1d69f, 0, 0, 0, g(Yes, No, false, false, "", "v")},
-	{0x1d6a0, 0, 0, 0, g(Yes, No, false, false, "", "w")},
-	{0x1d6a1, 0, 0, 0, g(Yes, No, false, false, "", "x")},
-	{0x1d6a2, 0, 0, 0, g(Yes, No, false, false, "", "y")},
-	{0x1d6a3, 0, 0, 0, g(Yes, No, false, false, "", "z")},
-	{0x1d6a4, 0, 0, 0, g(Yes, No, false, false, "", "ı")},
-	{0x1d6a5, 0, 0, 0, g(Yes, No, false, false, "", "ȷ")},
-	{0x1d6a6, 0, 0, 0, f(Yes, false, "")},
-	{0x1d6a8, 0, 0, 0, g(Yes, No, false, false, "", "Α")},
-	{0x1d6a9, 0, 0, 0, g(Yes, No, false, false, "", "Β")},
-	{0x1d6aa, 0, 0, 0, g(Yes, No, false, false, "", "Γ")},
-	{0x1d6ab, 0, 0, 0, g(Yes, No, false, false, "", "Δ")},
-	{0x1d6ac, 0, 0, 0, g(Yes, No, false, false, "", "Ε")},
-	{0x1d6ad, 0, 0, 0, g(Yes, No, false, false, "", "Ζ")},
-	{0x1d6ae, 0, 0, 0, g(Yes, No, false, false, "", "Η")},
-	{0x1d6af, 0, 0, 0, g(Yes, No, false, false, "", "Θ")},
-	{0x1d6b0, 0, 0, 0, g(Yes, No, false, false, "", "Ι")},
-	{0x1d6b1, 0, 0, 0, g(Yes, No, false, false, "", "Κ")},
-	{0x1d6b2, 0, 0, 0, g(Yes, No, false, false, "", "Λ")},
-	{0x1d6b3, 0, 0, 0, g(Yes, No, false, false, "", "Μ")},
-	{0x1d6b4, 0, 0, 0, g(Yes, No, false, false, "", "Ν")},
-	{0x1d6b5, 0, 0, 0, g(Yes, No, false, false, "", "Ξ")},
-	{0x1d6b6, 0, 0, 0, g(Yes, No, false, false, "", "Ο")},
-	{0x1d6b7, 0, 0, 0, g(Yes, No, false, false, "", "Π")},
-	{0x1d6b8, 0, 0, 0, g(Yes, No, false, false, "", "Ρ")},
-	{0x1d6b9, 0, 0, 0, g(Yes, No, false, false, "", "Θ")},
-	{0x1d6ba, 0, 0, 0, g(Yes, No, false, false, "", "Σ")},
-	{0x1d6bb, 0, 0, 0, g(Yes, No, false, false, "", "Τ")},
-	{0x1d6bc, 0, 0, 0, g(Yes, No, false, false, "", "Υ")},
-	{0x1d6bd, 0, 0, 0, g(Yes, No, false, false, "", "Φ")},
-	{0x1d6be, 0, 0, 0, g(Yes, No, false, false, "", "Χ")},
-	{0x1d6bf, 0, 0, 0, g(Yes, No, false, false, "", "Ψ")},
-	{0x1d6c0, 0, 0, 0, g(Yes, No, false, false, "", "Ω")},
-	{0x1d6c1, 0, 0, 0, g(Yes, No, false, false, "", "∇")},
-	{0x1d6c2, 0, 0, 0, g(Yes, No, false, false, "", "α")},
-	{0x1d6c3, 0, 0, 0, g(Yes, No, false, false, "", "β")},
-	{0x1d6c4, 0, 0, 0, g(Yes, No, false, false, "", "γ")},
-	{0x1d6c5, 0, 0, 0, g(Yes, No, false, false, "", "δ")},
-	{0x1d6c6, 0, 0, 0, g(Yes, No, false, false, "", "ε")},
-	{0x1d6c7, 0, 0, 0, g(Yes, No, false, false, "", "ζ")},
-	{0x1d6c8, 0, 0, 0, g(Yes, No, false, false, "", "η")},
-	{0x1d6c9, 0, 0, 0, g(Yes, No, false, false, "", "θ")},
-	{0x1d6ca, 0, 0, 0, g(Yes, No, false, false, "", "ι")},
-	{0x1d6cb, 0, 0, 0, g(Yes, No, false, false, "", "κ")},
-	{0x1d6cc, 0, 0, 0, g(Yes, No, false, false, "", "λ")},
-	{0x1d6cd, 0, 0, 0, g(Yes, No, false, false, "", "μ")},
-	{0x1d6ce, 0, 0, 0, g(Yes, No, false, false, "", "ν")},
-	{0x1d6cf, 0, 0, 0, g(Yes, No, false, false, "", "ξ")},
-	{0x1d6d0, 0, 0, 0, g(Yes, No, false, false, "", "ο")},
-	{0x1d6d1, 0, 0, 0, g(Yes, No, false, false, "", "π")},
-	{0x1d6d2, 0, 0, 0, g(Yes, No, false, false, "", "ρ")},
-	{0x1d6d3, 0, 0, 0, g(Yes, No, false, false, "", "ς")},
-	{0x1d6d4, 0, 0, 0, g(Yes, No, false, false, "", "σ")},
-	{0x1d6d5, 0, 0, 0, g(Yes, No, false, false, "", "τ")},
-	{0x1d6d6, 0, 0, 0, g(Yes, No, false, false, "", "υ")},
-	{0x1d6d7, 0, 0, 0, g(Yes, No, false, false, "", "φ")},
-	{0x1d6d8, 0, 0, 0, g(Yes, No, false, false, "", "χ")},
-	{0x1d6d9, 0, 0, 0, g(Yes, No, false, false, "", "ψ")},
-	{0x1d6da, 0, 0, 0, g(Yes, No, false, false, "", "ω")},
-	{0x1d6db, 0, 0, 0, g(Yes, No, false, false, "", "∂")},
-	{0x1d6dc, 0, 0, 0, g(Yes, No, false, false, "", "ε")},
-	{0x1d6dd, 0, 0, 0, g(Yes, No, false, false, "", "θ")},
-	{0x1d6de, 0, 0, 0, g(Yes, No, false, false, "", "κ")},
-	{0x1d6df, 0, 0, 0, g(Yes, No, false, false, "", "φ")},
-	{0x1d6e0, 0, 0, 0, g(Yes, No, false, false, "", "ρ")},
-	{0x1d6e1, 0, 0, 0, g(Yes, No, false, false, "", "π")},
-	{0x1d6e2, 0, 0, 0, g(Yes, No, false, false, "", "Α")},
-	{0x1d6e3, 0, 0, 0, g(Yes, No, false, false, "", "Β")},
-	{0x1d6e4, 0, 0, 0, g(Yes, No, false, false, "", "Γ")},
-	{0x1d6e5, 0, 0, 0, g(Yes, No, false, false, "", "Δ")},
-	{0x1d6e6, 0, 0, 0, g(Yes, No, false, false, "", "Ε")},
-	{0x1d6e7, 0, 0, 0, g(Yes, No, false, false, "", "Ζ")},
-	{0x1d6e8, 0, 0, 0, g(Yes, No, false, false, "", "Η")},
-	{0x1d6e9, 0, 0, 0, g(Yes, No, false, false, "", "Θ")},
-	{0x1d6ea, 0, 0, 0, g(Yes, No, false, false, "", "Ι")},
-	{0x1d6eb, 0, 0, 0, g(Yes, No, false, false, "", "Κ")},
-	{0x1d6ec, 0, 0, 0, g(Yes, No, false, false, "", "Λ")},
-	{0x1d6ed, 0, 0, 0, g(Yes, No, false, false, "", "Μ")},
-	{0x1d6ee, 0, 0, 0, g(Yes, No, false, false, "", "Ν")},
-	{0x1d6ef, 0, 0, 0, g(Yes, No, false, false, "", "Ξ")},
-	{0x1d6f0, 0, 0, 0, g(Yes, No, false, false, "", "Ο")},
-	{0x1d6f1, 0, 0, 0, g(Yes, No, false, false, "", "Π")},
-	{0x1d6f2, 0, 0, 0, g(Yes, No, false, false, "", "Ρ")},
-	{0x1d6f3, 0, 0, 0, g(Yes, No, false, false, "", "Θ")},
-	{0x1d6f4, 0, 0, 0, g(Yes, No, false, false, "", "Σ")},
-	{0x1d6f5, 0, 0, 0, g(Yes, No, false, false, "", "Τ")},
-	{0x1d6f6, 0, 0, 0, g(Yes, No, false, false, "", "Υ")},
-	{0x1d6f7, 0, 0, 0, g(Yes, No, false, false, "", "Φ")},
-	{0x1d6f8, 0, 0, 0, g(Yes, No, false, false, "", "Χ")},
-	{0x1d6f9, 0, 0, 0, g(Yes, No, false, false, "", "Ψ")},
-	{0x1d6fa, 0, 0, 0, g(Yes, No, false, false, "", "Ω")},
-	{0x1d6fb, 0, 0, 0, g(Yes, No, false, false, "", "∇")},
-	{0x1d6fc, 0, 0, 0, g(Yes, No, false, false, "", "α")},
-	{0x1d6fd, 0, 0, 0, g(Yes, No, false, false, "", "β")},
-	{0x1d6fe, 0, 0, 0, g(Yes, No, false, false, "", "γ")},
-	{0x1d6ff, 0, 0, 0, g(Yes, No, false, false, "", "δ")},
-	{0x1d700, 0, 0, 0, g(Yes, No, false, false, "", "ε")},
-	{0x1d701, 0, 0, 0, g(Yes, No, false, false, "", "ζ")},
-	{0x1d702, 0, 0, 0, g(Yes, No, false, false, "", "η")},
-	{0x1d703, 0, 0, 0, g(Yes, No, false, false, "", "θ")},
-	{0x1d704, 0, 0, 0, g(Yes, No, false, false, "", "ι")},
-	{0x1d705, 0, 0, 0, g(Yes, No, false, false, "", "κ")},
-	{0x1d706, 0, 0, 0, g(Yes, No, false, false, "", "λ")},
-	{0x1d707, 0, 0, 0, g(Yes, No, false, false, "", "μ")},
-	{0x1d708, 0, 0, 0, g(Yes, No, false, false, "", "ν")},
-	{0x1d709, 0, 0, 0, g(Yes, No, false, false, "", "ξ")},
-	{0x1d70a, 0, 0, 0, g(Yes, No, false, false, "", "ο")},
-	{0x1d70b, 0, 0, 0, g(Yes, No, false, false, "", "π")},
-	{0x1d70c, 0, 0, 0, g(Yes, No, false, false, "", "ρ")},
-	{0x1d70d, 0, 0, 0, g(Yes, No, false, false, "", "ς")},
-	{0x1d70e, 0, 0, 0, g(Yes, No, false, false, "", "σ")},
-	{0x1d70f, 0, 0, 0, g(Yes, No, false, false, "", "τ")},
-	{0x1d710, 0, 0, 0, g(Yes, No, false, false, "", "υ")},
-	{0x1d711, 0, 0, 0, g(Yes, No, false, false, "", "φ")},
-	{0x1d712, 0, 0, 0, g(Yes, No, false, false, "", "χ")},
-	{0x1d713, 0, 0, 0, g(Yes, No, false, false, "", "ψ")},
-	{0x1d714, 0, 0, 0, g(Yes, No, false, false, "", "ω")},
-	{0x1d715, 0, 0, 0, g(Yes, No, false, false, "", "∂")},
-	{0x1d716, 0, 0, 0, g(Yes, No, false, false, "", "ε")},
-	{0x1d717, 0, 0, 0, g(Yes, No, false, false, "", "θ")},
-	{0x1d718, 0, 0, 0, g(Yes, No, false, false, "", "κ")},
-	{0x1d719, 0, 0, 0, g(Yes, No, false, false, "", "φ")},
-	{0x1d71a, 0, 0, 0, g(Yes, No, false, false, "", "ρ")},
-	{0x1d71b, 0, 0, 0, g(Yes, No, false, false, "", "π")},
-	{0x1d71c, 0, 0, 0, g(Yes, No, false, false, "", "Α")},
-	{0x1d71d, 0, 0, 0, g(Yes, No, false, false, "", "Β")},
-	{0x1d71e, 0, 0, 0, g(Yes, No, false, false, "", "Γ")},
-	{0x1d71f, 0, 0, 0, g(Yes, No, false, false, "", "Δ")},
-	{0x1d720, 0, 0, 0, g(Yes, No, false, false, "", "Ε")},
-	{0x1d721, 0, 0, 0, g(Yes, No, false, false, "", "Ζ")},
-	{0x1d722, 0, 0, 0, g(Yes, No, false, false, "", "Η")},
-	{0x1d723, 0, 0, 0, g(Yes, No, false, false, "", "Θ")},
-	{0x1d724, 0, 0, 0, g(Yes, No, false, false, "", "Ι")},
-	{0x1d725, 0, 0, 0, g(Yes, No, false, false, "", "Κ")},
-	{0x1d726, 0, 0, 0, g(Yes, No, false, false, "", "Λ")},
-	{0x1d727, 0, 0, 0, g(Yes, No, false, false, "", "Μ")},
-	{0x1d728, 0, 0, 0, g(Yes, No, false, false, "", "Ν")},
-	{0x1d729, 0, 0, 0, g(Yes, No, false, false, "", "Ξ")},
-	{0x1d72a, 0, 0, 0, g(Yes, No, false, false, "", "Ο")},
-	{0x1d72b, 0, 0, 0, g(Yes, No, false, false, "", "Π")},
-	{0x1d72c, 0, 0, 0, g(Yes, No, false, false, "", "Ρ")},
-	{0x1d72d, 0, 0, 0, g(Yes, No, false, false, "", "Θ")},
-	{0x1d72e, 0, 0, 0, g(Yes, No, false, false, "", "Σ")},
-	{0x1d72f, 0, 0, 0, g(Yes, No, false, false, "", "Τ")},
-	{0x1d730, 0, 0, 0, g(Yes, No, false, false, "", "Υ")},
-	{0x1d731, 0, 0, 0, g(Yes, No, false, false, "", "Φ")},
-	{0x1d732, 0, 0, 0, g(Yes, No, false, false, "", "Χ")},
-	{0x1d733, 0, 0, 0, g(Yes, No, false, false, "", "Ψ")},
-	{0x1d734, 0, 0, 0, g(Yes, No, false, false, "", "Ω")},
-	{0x1d735, 0, 0, 0, g(Yes, No, false, false, "", "∇")},
-	{0x1d736, 0, 0, 0, g(Yes, No, false, false, "", "α")},
-	{0x1d737, 0, 0, 0, g(Yes, No, false, false, "", "β")},
-	{0x1d738, 0, 0, 0, g(Yes, No, false, false, "", "γ")},
-	{0x1d739, 0, 0, 0, g(Yes, No, false, false, "", "δ")},
-	{0x1d73a, 0, 0, 0, g(Yes, No, false, false, "", "ε")},
-	{0x1d73b, 0, 0, 0, g(Yes, No, false, false, "", "ζ")},
-	{0x1d73c, 0, 0, 0, g(Yes, No, false, false, "", "η")},
-	{0x1d73d, 0, 0, 0, g(Yes, No, false, false, "", "θ")},
-	{0x1d73e, 0, 0, 0, g(Yes, No, false, false, "", "ι")},
-	{0x1d73f, 0, 0, 0, g(Yes, No, false, false, "", "κ")},
-	{0x1d740, 0, 0, 0, g(Yes, No, false, false, "", "λ")},
-	{0x1d741, 0, 0, 0, g(Yes, No, false, false, "", "μ")},
-	{0x1d742, 0, 0, 0, g(Yes, No, false, false, "", "ν")},
-	{0x1d743, 0, 0, 0, g(Yes, No, false, false, "", "ξ")},
-	{0x1d744, 0, 0, 0, g(Yes, No, false, false, "", "ο")},
-	{0x1d745, 0, 0, 0, g(Yes, No, false, false, "", "π")},
-	{0x1d746, 0, 0, 0, g(Yes, No, false, false, "", "ρ")},
-	{0x1d747, 0, 0, 0, g(Yes, No, false, false, "", "ς")},
-	{0x1d748, 0, 0, 0, g(Yes, No, false, false, "", "σ")},
-	{0x1d749, 0, 0, 0, g(Yes, No, false, false, "", "τ")},
-	{0x1d74a, 0, 0, 0, g(Yes, No, false, false, "", "υ")},
-	{0x1d74b, 0, 0, 0, g(Yes, No, false, false, "", "φ")},
-	{0x1d74c, 0, 0, 0, g(Yes, No, false, false, "", "χ")},
-	{0x1d74d, 0, 0, 0, g(Yes, No, false, false, "", "ψ")},
-	{0x1d74e, 0, 0, 0, g(Yes, No, false, false, "", "ω")},
-	{0x1d74f, 0, 0, 0, g(Yes, No, false, false, "", "∂")},
-	{0x1d750, 0, 0, 0, g(Yes, No, false, false, "", "ε")},
-	{0x1d751, 0, 0, 0, g(Yes, No, false, false, "", "θ")},
-	{0x1d752, 0, 0, 0, g(Yes, No, false, false, "", "κ")},
-	{0x1d753, 0, 0, 0, g(Yes, No, false, false, "", "φ")},
-	{0x1d754, 0, 0, 0, g(Yes, No, false, false, "", "ρ")},
-	{0x1d755, 0, 0, 0, g(Yes, No, false, false, "", "π")},
-	{0x1d756, 0, 0, 0, g(Yes, No, false, false, "", "Α")},
-	{0x1d757, 0, 0, 0, g(Yes, No, false, false, "", "Β")},
-	{0x1d758, 0, 0, 0, g(Yes, No, false, false, "", "Γ")},
-	{0x1d759, 0, 0, 0, g(Yes, No, false, false, "", "Δ")},
-	{0x1d75a, 0, 0, 0, g(Yes, No, false, false, "", "Ε")},
-	{0x1d75b, 0, 0, 0, g(Yes, No, false, false, "", "Ζ")},
-	{0x1d75c, 0, 0, 0, g(Yes, No, false, false, "", "Η")},
-	{0x1d75d, 0, 0, 0, g(Yes, No, false, false, "", "Θ")},
-	{0x1d75e, 0, 0, 0, g(Yes, No, false, false, "", "Ι")},
-	{0x1d75f, 0, 0, 0, g(Yes, No, false, false, "", "Κ")},
-	{0x1d760, 0, 0, 0, g(Yes, No, false, false, "", "Λ")},
-	{0x1d761, 0, 0, 0, g(Yes, No, false, false, "", "Μ")},
-	{0x1d762, 0, 0, 0, g(Yes, No, false, false, "", "Ν")},
-	{0x1d763, 0, 0, 0, g(Yes, No, false, false, "", "Ξ")},
-	{0x1d764, 0, 0, 0, g(Yes, No, false, false, "", "Ο")},
-	{0x1d765, 0, 0, 0, g(Yes, No, false, false, "", "Π")},
-	{0x1d766, 0, 0, 0, g(Yes, No, false, false, "", "Ρ")},
-	{0x1d767, 0, 0, 0, g(Yes, No, false, false, "", "Θ")},
-	{0x1d768, 0, 0, 0, g(Yes, No, false, false, "", "Σ")},
-	{0x1d769, 0, 0, 0, g(Yes, No, false, false, "", "Τ")},
-	{0x1d76a, 0, 0, 0, g(Yes, No, false, false, "", "Υ")},
-	{0x1d76b, 0, 0, 0, g(Yes, No, false, false, "", "Φ")},
-	{0x1d76c, 0, 0, 0, g(Yes, No, false, false, "", "Χ")},
-	{0x1d76d, 0, 0, 0, g(Yes, No, false, false, "", "Ψ")},
-	{0x1d76e, 0, 0, 0, g(Yes, No, false, false, "", "Ω")},
-	{0x1d76f, 0, 0, 0, g(Yes, No, false, false, "", "∇")},
-	{0x1d770, 0, 0, 0, g(Yes, No, false, false, "", "α")},
-	{0x1d771, 0, 0, 0, g(Yes, No, false, false, "", "β")},
-	{0x1d772, 0, 0, 0, g(Yes, No, false, false, "", "γ")},
-	{0x1d773, 0, 0, 0, g(Yes, No, false, false, "", "δ")},
-	{0x1d774, 0, 0, 0, g(Yes, No, false, false, "", "ε")},
-	{0x1d775, 0, 0, 0, g(Yes, No, false, false, "", "ζ")},
-	{0x1d776, 0, 0, 0, g(Yes, No, false, false, "", "η")},
-	{0x1d777, 0, 0, 0, g(Yes, No, false, false, "", "θ")},
-	{0x1d778, 0, 0, 0, g(Yes, No, false, false, "", "ι")},
-	{0x1d779, 0, 0, 0, g(Yes, No, false, false, "", "κ")},
-	{0x1d77a, 0, 0, 0, g(Yes, No, false, false, "", "λ")},
-	{0x1d77b, 0, 0, 0, g(Yes, No, false, false, "", "μ")},
-	{0x1d77c, 0, 0, 0, g(Yes, No, false, false, "", "ν")},
-	{0x1d77d, 0, 0, 0, g(Yes, No, false, false, "", "ξ")},
-	{0x1d77e, 0, 0, 0, g(Yes, No, false, false, "", "ο")},
-	{0x1d77f, 0, 0, 0, g(Yes, No, false, false, "", "π")},
-	{0x1d780, 0, 0, 0, g(Yes, No, false, false, "", "ρ")},
-	{0x1d781, 0, 0, 0, g(Yes, No, false, false, "", "ς")},
-	{0x1d782, 0, 0, 0, g(Yes, No, false, false, "", "σ")},
-	{0x1d783, 0, 0, 0, g(Yes, No, false, false, "", "τ")},
-	{0x1d784, 0, 0, 0, g(Yes, No, false, false, "", "υ")},
-	{0x1d785, 0, 0, 0, g(Yes, No, false, false, "", "φ")},
-	{0x1d786, 0, 0, 0, g(Yes, No, false, false, "", "χ")},
-	{0x1d787, 0, 0, 0, g(Yes, No, false, false, "", "ψ")},
-	{0x1d788, 0, 0, 0, g(Yes, No, false, false, "", "ω")},
-	{0x1d789, 0, 0, 0, g(Yes, No, false, false, "", "∂")},
-	{0x1d78a, 0, 0, 0, g(Yes, No, false, false, "", "ε")},
-	{0x1d78b, 0, 0, 0, g(Yes, No, false, false, "", "θ")},
-	{0x1d78c, 0, 0, 0, g(Yes, No, false, false, "", "κ")},
-	{0x1d78d, 0, 0, 0, g(Yes, No, false, false, "", "φ")},
-	{0x1d78e, 0, 0, 0, g(Yes, No, false, false, "", "ρ")},
-	{0x1d78f, 0, 0, 0, g(Yes, No, false, false, "", "π")},
-	{0x1d790, 0, 0, 0, g(Yes, No, false, false, "", "Α")},
-	{0x1d791, 0, 0, 0, g(Yes, No, false, false, "", "Β")},
-	{0x1d792, 0, 0, 0, g(Yes, No, false, false, "", "Γ")},
-	{0x1d793, 0, 0, 0, g(Yes, No, false, false, "", "Δ")},
-	{0x1d794, 0, 0, 0, g(Yes, No, false, false, "", "Ε")},
-	{0x1d795, 0, 0, 0, g(Yes, No, false, false, "", "Ζ")},
-	{0x1d796, 0, 0, 0, g(Yes, No, false, false, "", "Η")},
-	{0x1d797, 0, 0, 0, g(Yes, No, false, false, "", "Θ")},
-	{0x1d798, 0, 0, 0, g(Yes, No, false, false, "", "Ι")},
-	{0x1d799, 0, 0, 0, g(Yes, No, false, false, "", "Κ")},
-	{0x1d79a, 0, 0, 0, g(Yes, No, false, false, "", "Λ")},
-	{0x1d79b, 0, 0, 0, g(Yes, No, false, false, "", "Μ")},
-	{0x1d79c, 0, 0, 0, g(Yes, No, false, false, "", "Ν")},
-	{0x1d79d, 0, 0, 0, g(Yes, No, false, false, "", "Ξ")},
-	{0x1d79e, 0, 0, 0, g(Yes, No, false, false, "", "Ο")},
-	{0x1d79f, 0, 0, 0, g(Yes, No, false, false, "", "Π")},
-	{0x1d7a0, 0, 0, 0, g(Yes, No, false, false, "", "Ρ")},
-	{0x1d7a1, 0, 0, 0, g(Yes, No, false, false, "", "Θ")},
-	{0x1d7a2, 0, 0, 0, g(Yes, No, false, false, "", "Σ")},
-	{0x1d7a3, 0, 0, 0, g(Yes, No, false, false, "", "Τ")},
-	{0x1d7a4, 0, 0, 0, g(Yes, No, false, false, "", "Υ")},
-	{0x1d7a5, 0, 0, 0, g(Yes, No, false, false, "", "Φ")},
-	{0x1d7a6, 0, 0, 0, g(Yes, No, false, false, "", "Χ")},
-	{0x1d7a7, 0, 0, 0, g(Yes, No, false, false, "", "Ψ")},
-	{0x1d7a8, 0, 0, 0, g(Yes, No, false, false, "", "Ω")},
-	{0x1d7a9, 0, 0, 0, g(Yes, No, false, false, "", "∇")},
-	{0x1d7aa, 0, 0, 0, g(Yes, No, false, false, "", "α")},
-	{0x1d7ab, 0, 0, 0, g(Yes, No, false, false, "", "β")},
-	{0x1d7ac, 0, 0, 0, g(Yes, No, false, false, "", "γ")},
-	{0x1d7ad, 0, 0, 0, g(Yes, No, false, false, "", "δ")},
-	{0x1d7ae, 0, 0, 0, g(Yes, No, false, false, "", "ε")},
-	{0x1d7af, 0, 0, 0, g(Yes, No, false, false, "", "ζ")},
-	{0x1d7b0, 0, 0, 0, g(Yes, No, false, false, "", "η")},
-	{0x1d7b1, 0, 0, 0, g(Yes, No, false, false, "", "θ")},
-	{0x1d7b2, 0, 0, 0, g(Yes, No, false, false, "", "ι")},
-	{0x1d7b3, 0, 0, 0, g(Yes, No, false, false, "", "κ")},
-	{0x1d7b4, 0, 0, 0, g(Yes, No, false, false, "", "λ")},
-	{0x1d7b5, 0, 0, 0, g(Yes, No, false, false, "", "μ")},
-	{0x1d7b6, 0, 0, 0, g(Yes, No, false, false, "", "ν")},
-	{0x1d7b7, 0, 0, 0, g(Yes, No, false, false, "", "ξ")},
-	{0x1d7b8, 0, 0, 0, g(Yes, No, false, false, "", "ο")},
-	{0x1d7b9, 0, 0, 0, g(Yes, No, false, false, "", "π")},
-	{0x1d7ba, 0, 0, 0, g(Yes, No, false, false, "", "ρ")},
-	{0x1d7bb, 0, 0, 0, g(Yes, No, false, false, "", "ς")},
-	{0x1d7bc, 0, 0, 0, g(Yes, No, false, false, "", "σ")},
-	{0x1d7bd, 0, 0, 0, g(Yes, No, false, false, "", "τ")},
-	{0x1d7be, 0, 0, 0, g(Yes, No, false, false, "", "υ")},
-	{0x1d7bf, 0, 0, 0, g(Yes, No, false, false, "", "φ")},
-	{0x1d7c0, 0, 0, 0, g(Yes, No, false, false, "", "χ")},
-	{0x1d7c1, 0, 0, 0, g(Yes, No, false, false, "", "ψ")},
-	{0x1d7c2, 0, 0, 0, g(Yes, No, false, false, "", "ω")},
-	{0x1d7c3, 0, 0, 0, g(Yes, No, false, false, "", "∂")},
-	{0x1d7c4, 0, 0, 0, g(Yes, No, false, false, "", "ε")},
-	{0x1d7c5, 0, 0, 0, g(Yes, No, false, false, "", "θ")},
-	{0x1d7c6, 0, 0, 0, g(Yes, No, false, false, "", "κ")},
-	{0x1d7c7, 0, 0, 0, g(Yes, No, false, false, "", "φ")},
-	{0x1d7c8, 0, 0, 0, g(Yes, No, false, false, "", "ρ")},
-	{0x1d7c9, 0, 0, 0, g(Yes, No, false, false, "", "π")},
-	{0x1d7ca, 0, 0, 0, g(Yes, No, false, false, "", "Ϝ")},
-	{0x1d7cb, 0, 0, 0, g(Yes, No, false, false, "", "ϝ")},
-	{0x1d7cc, 0, 0, 0, f(Yes, false, "")},
-	{0x1d7ce, 0, 0, 0, g(Yes, No, false, false, "", "0")},
-	{0x1d7cf, 0, 0, 0, g(Yes, No, false, false, "", "1")},
-	{0x1d7d0, 0, 0, 0, g(Yes, No, false, false, "", "2")},
-	{0x1d7d1, 0, 0, 0, g(Yes, No, false, false, "", "3")},
-	{0x1d7d2, 0, 0, 0, g(Yes, No, false, false, "", "4")},
-	{0x1d7d3, 0, 0, 0, g(Yes, No, false, false, "", "5")},
-	{0x1d7d4, 0, 0, 0, g(Yes, No, false, false, "", "6")},
-	{0x1d7d5, 0, 0, 0, g(Yes, No, false, false, "", "7")},
-	{0x1d7d6, 0, 0, 0, g(Yes, No, false, false, "", "8")},
-	{0x1d7d7, 0, 0, 0, g(Yes, No, false, false, "", "9")},
-	{0x1d7d8, 0, 0, 0, g(Yes, No, false, false, "", "0")},
-	{0x1d7d9, 0, 0, 0, g(Yes, No, false, false, "", "1")},
-	{0x1d7da, 0, 0, 0, g(Yes, No, false, false, "", "2")},
-	{0x1d7db, 0, 0, 0, g(Yes, No, false, false, "", "3")},
-	{0x1d7dc, 0, 0, 0, g(Yes, No, false, false, "", "4")},
-	{0x1d7dd, 0, 0, 0, g(Yes, No, false, false, "", "5")},
-	{0x1d7de, 0, 0, 0, g(Yes, No, false, false, "", "6")},
-	{0x1d7df, 0, 0, 0, g(Yes, No, false, false, "", "7")},
-	{0x1d7e0, 0, 0, 0, g(Yes, No, false, false, "", "8")},
-	{0x1d7e1, 0, 0, 0, g(Yes, No, false, false, "", "9")},
-	{0x1d7e2, 0, 0, 0, g(Yes, No, false, false, "", "0")},
-	{0x1d7e3, 0, 0, 0, g(Yes, No, false, false, "", "1")},
-	{0x1d7e4, 0, 0, 0, g(Yes, No, false, false, "", "2")},
-	{0x1d7e5, 0, 0, 0, g(Yes, No, false, false, "", "3")},
-	{0x1d7e6, 0, 0, 0, g(Yes, No, false, false, "", "4")},
-	{0x1d7e7, 0, 0, 0, g(Yes, No, false, false, "", "5")},
-	{0x1d7e8, 0, 0, 0, g(Yes, No, false, false, "", "6")},
-	{0x1d7e9, 0, 0, 0, g(Yes, No, false, false, "", "7")},
-	{0x1d7ea, 0, 0, 0, g(Yes, No, false, false, "", "8")},
-	{0x1d7eb, 0, 0, 0, g(Yes, No, false, false, "", "9")},
-	{0x1d7ec, 0, 0, 0, g(Yes, No, false, false, "", "0")},
-	{0x1d7ed, 0, 0, 0, g(Yes, No, false, false, "", "1")},
-	{0x1d7ee, 0, 0, 0, g(Yes, No, false, false, "", "2")},
-	{0x1d7ef, 0, 0, 0, g(Yes, No, false, false, "", "3")},
-	{0x1d7f0, 0, 0, 0, g(Yes, No, false, false, "", "4")},
-	{0x1d7f1, 0, 0, 0, g(Yes, No, false, false, "", "5")},
-	{0x1d7f2, 0, 0, 0, g(Yes, No, false, false, "", "6")},
-	{0x1d7f3, 0, 0, 0, g(Yes, No, false, false, "", "7")},
-	{0x1d7f4, 0, 0, 0, g(Yes, No, false, false, "", "8")},
-	{0x1d7f5, 0, 0, 0, g(Yes, No, false, false, "", "9")},
-	{0x1d7f6, 0, 0, 0, g(Yes, No, false, false, "", "0")},
-	{0x1d7f7, 0, 0, 0, g(Yes, No, false, false, "", "1")},
-	{0x1d7f8, 0, 0, 0, g(Yes, No, false, false, "", "2")},
-	{0x1d7f9, 0, 0, 0, g(Yes, No, false, false, "", "3")},
-	{0x1d7fa, 0, 0, 0, g(Yes, No, false, false, "", "4")},
-	{0x1d7fb, 0, 0, 0, g(Yes, No, false, false, "", "5")},
-	{0x1d7fc, 0, 0, 0, g(Yes, No, false, false, "", "6")},
-	{0x1d7fd, 0, 0, 0, g(Yes, No, false, false, "", "7")},
-	{0x1d7fe, 0, 0, 0, g(Yes, No, false, false, "", "8")},
-	{0x1d7ff, 0, 0, 0, g(Yes, No, false, false, "", "9")},
-	{0x1d800, 0, 0, 0, f(Yes, false, "")},
-	{0x1e000, 230, 1, 1, f(Yes, false, "")},
-	{0x1e007, 0, 0, 0, f(Yes, false, "")},
-	{0x1e008, 230, 1, 1, f(Yes, false, "")},
-	{0x1e019, 0, 0, 0, f(Yes, false, "")},
-	{0x1e01b, 230, 1, 1, f(Yes, false, "")},
-	{0x1e022, 0, 0, 0, f(Yes, false, "")},
-	{0x1e023, 230, 1, 1, f(Yes, false, "")},
-	{0x1e025, 0, 0, 0, f(Yes, false, "")},
-	{0x1e026, 230, 1, 1, f(Yes, false, "")},
-	{0x1e02b, 0, 0, 0, f(Yes, false, "")},
-	{0x1e8d0, 220, 1, 1, f(Yes, false, "")},
-	{0x1e8d7, 0, 0, 0, f(Yes, false, "")},
-	{0x1e944, 230, 1, 1, f(Yes, false, "")},
-	{0x1e94a, 7, 1, 1, f(Yes, false, "")},
-	{0x1e94b, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee00, 0, 0, 0, g(Yes, No, false, false, "", "ا")},
-	{0x1ee01, 0, 0, 0, g(Yes, No, false, false, "", "ب")},
-	{0x1ee02, 0, 0, 0, g(Yes, No, false, false, "", "ج")},
-	{0x1ee03, 0, 0, 0, g(Yes, No, false, false, "", "د")},
-	{0x1ee04, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee05, 0, 0, 0, g(Yes, No, false, false, "", "و")},
-	{0x1ee06, 0, 0, 0, g(Yes, No, false, false, "", "ز")},
-	{0x1ee07, 0, 0, 0, g(Yes, No, false, false, "", "ح")},
-	{0x1ee08, 0, 0, 0, g(Yes, No, false, false, "", "ط")},
-	{0x1ee09, 0, 0, 0, g(Yes, No, false, false, "", "ي")},
-	{0x1ee0a, 0, 0, 0, g(Yes, No, false, false, "", "ك")},
-	{0x1ee0b, 0, 0, 0, g(Yes, No, false, false, "", "ل")},
-	{0x1ee0c, 0, 0, 0, g(Yes, No, false, false, "", "م")},
-	{0x1ee0d, 0, 0, 0, g(Yes, No, false, false, "", "ن")},
-	{0x1ee0e, 0, 0, 0, g(Yes, No, false, false, "", "س")},
-	{0x1ee0f, 0, 0, 0, g(Yes, No, false, false, "", "ع")},
-	{0x1ee10, 0, 0, 0, g(Yes, No, false, false, "", "ف")},
-	{0x1ee11, 0, 0, 0, g(Yes, No, false, false, "", "ص")},
-	{0x1ee12, 0, 0, 0, g(Yes, No, false, false, "", "ق")},
-	{0x1ee13, 0, 0, 0, g(Yes, No, false, false, "", "ر")},
-	{0x1ee14, 0, 0, 0, g(Yes, No, false, false, "", "ش")},
-	{0x1ee15, 0, 0, 0, g(Yes, No, false, false, "", "ت")},
-	{0x1ee16, 0, 0, 0, g(Yes, No, false, false, "", "ث")},
-	{0x1ee17, 0, 0, 0, g(Yes, No, false, false, "", "خ")},
-	{0x1ee18, 0, 0, 0, g(Yes, No, false, false, "", "ذ")},
-	{0x1ee19, 0, 0, 0, g(Yes, No, false, false, "", "ض")},
-	{0x1ee1a, 0, 0, 0, g(Yes, No, false, false, "", "ظ")},
-	{0x1ee1b, 0, 0, 0, g(Yes, No, false, false, "", "غ")},
-	{0x1ee1c, 0, 0, 0, g(Yes, No, false, false, "", "ٮ")},
-	{0x1ee1d, 0, 0, 0, g(Yes, No, false, false, "", "ں")},
-	{0x1ee1e, 0, 0, 0, g(Yes, No, false, false, "", "ڡ")},
-	{0x1ee1f, 0, 0, 0, g(Yes, No, false, false, "", "ٯ")},
-	{0x1ee20, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee21, 0, 0, 0, g(Yes, No, false, false, "", "ب")},
-	{0x1ee22, 0, 0, 0, g(Yes, No, false, false, "", "ج")},
-	{0x1ee23, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee24, 0, 0, 0, g(Yes, No, false, false, "", "ه")},
-	{0x1ee25, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee27, 0, 0, 0, g(Yes, No, false, false, "", "ح")},
-	{0x1ee28, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee29, 0, 0, 0, g(Yes, No, false, false, "", "ي")},
-	{0x1ee2a, 0, 0, 0, g(Yes, No, false, false, "", "ك")},
-	{0x1ee2b, 0, 0, 0, g(Yes, No, false, false, "", "ل")},
-	{0x1ee2c, 0, 0, 0, g(Yes, No, false, false, "", "م")},
-	{0x1ee2d, 0, 0, 0, g(Yes, No, false, false, "", "ن")},
-	{0x1ee2e, 0, 0, 0, g(Yes, No, false, false, "", "س")},
-	{0x1ee2f, 0, 0, 0, g(Yes, No, false, false, "", "ع")},
-	{0x1ee30, 0, 0, 0, g(Yes, No, false, false, "", "ف")},
-	{0x1ee31, 0, 0, 0, g(Yes, No, false, false, "", "ص")},
-	{0x1ee32, 0, 0, 0, g(Yes, No, false, false, "", "ق")},
-	{0x1ee33, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee34, 0, 0, 0, g(Yes, No, false, false, "", "ش")},
-	{0x1ee35, 0, 0, 0, g(Yes, No, false, false, "", "ت")},
-	{0x1ee36, 0, 0, 0, g(Yes, No, false, false, "", "ث")},
-	{0x1ee37, 0, 0, 0, g(Yes, No, false, false, "", "خ")},
-	{0x1ee38, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee39, 0, 0, 0, g(Yes, No, false, false, "", "ض")},
-	{0x1ee3a, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee3b, 0, 0, 0, g(Yes, No, false, false, "", "غ")},
-	{0x1ee3c, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee42, 0, 0, 0, g(Yes, No, false, false, "", "ج")},
-	{0x1ee43, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee47, 0, 0, 0, g(Yes, No, false, false, "", "ح")},
-	{0x1ee48, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee49, 0, 0, 0, g(Yes, No, false, false, "", "ي")},
-	{0x1ee4a, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee4b, 0, 0, 0, g(Yes, No, false, false, "", "ل")},
-	{0x1ee4c, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee4d, 0, 0, 0, g(Yes, No, false, false, "", "ن")},
-	{0x1ee4e, 0, 0, 0, g(Yes, No, false, false, "", "س")},
-	{0x1ee4f, 0, 0, 0, g(Yes, No, false, false, "", "ع")},
-	{0x1ee50, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee51, 0, 0, 0, g(Yes, No, false, false, "", "ص")},
-	{0x1ee52, 0, 0, 0, g(Yes, No, false, false, "", "ق")},
-	{0x1ee53, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee54, 0, 0, 0, g(Yes, No, false, false, "", "ش")},
-	{0x1ee55, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee57, 0, 0, 0, g(Yes, No, false, false, "", "خ")},
-	{0x1ee58, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee59, 0, 0, 0, g(Yes, No, false, false, "", "ض")},
-	{0x1ee5a, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee5b, 0, 0, 0, g(Yes, No, false, false, "", "غ")},
-	{0x1ee5c, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee5d, 0, 0, 0, g(Yes, No, false, false, "", "ں")},
-	{0x1ee5e, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee5f, 0, 0, 0, g(Yes, No, false, false, "", "ٯ")},
-	{0x1ee60, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee61, 0, 0, 0, g(Yes, No, false, false, "", "ب")},
-	{0x1ee62, 0, 0, 0, g(Yes, No, false, false, "", "ج")},
-	{0x1ee63, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee64, 0, 0, 0, g(Yes, No, false, false, "", "ه")},
-	{0x1ee65, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee67, 0, 0, 0, g(Yes, No, false, false, "", "ح")},
-	{0x1ee68, 0, 0, 0, g(Yes, No, false, false, "", "ط")},
-	{0x1ee69, 0, 0, 0, g(Yes, No, false, false, "", "ي")},
-	{0x1ee6a, 0, 0, 0, g(Yes, No, false, false, "", "ك")},
-	{0x1ee6b, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee6c, 0, 0, 0, g(Yes, No, false, false, "", "م")},
-	{0x1ee6d, 0, 0, 0, g(Yes, No, false, false, "", "ن")},
-	{0x1ee6e, 0, 0, 0, g(Yes, No, false, false, "", "س")},
-	{0x1ee6f, 0, 0, 0, g(Yes, No, false, false, "", "ع")},
-	{0x1ee70, 0, 0, 0, g(Yes, No, false, false, "", "ف")},
-	{0x1ee71, 0, 0, 0, g(Yes, No, false, false, "", "ص")},
-	{0x1ee72, 0, 0, 0, g(Yes, No, false, false, "", "ق")},
-	{0x1ee73, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee74, 0, 0, 0, g(Yes, No, false, false, "", "ش")},
-	{0x1ee75, 0, 0, 0, g(Yes, No, false, false, "", "ت")},
-	{0x1ee76, 0, 0, 0, g(Yes, No, false, false, "", "ث")},
-	{0x1ee77, 0, 0, 0, g(Yes, No, false, false, "", "خ")},
-	{0x1ee78, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee79, 0, 0, 0, g(Yes, No, false, false, "", "ض")},
-	{0x1ee7a, 0, 0, 0, g(Yes, No, false, false, "", "ظ")},
-	{0x1ee7b, 0, 0, 0, g(Yes, No, false, false, "", "غ")},
-	{0x1ee7c, 0, 0, 0, g(Yes, No, false, false, "", "ٮ")},
-	{0x1ee7d, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee7e, 0, 0, 0, g(Yes, No, false, false, "", "ڡ")},
-	{0x1ee7f, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee80, 0, 0, 0, g(Yes, No, false, false, "", "ا")},
-	{0x1ee81, 0, 0, 0, g(Yes, No, false, false, "", "ب")},
-	{0x1ee82, 0, 0, 0, g(Yes, No, false, false, "", "ج")},
-	{0x1ee83, 0, 0, 0, g(Yes, No, false, false, "", "د")},
-	{0x1ee84, 0, 0, 0, g(Yes, No, false, false, "", "ه")},
-	{0x1ee85, 0, 0, 0, g(Yes, No, false, false, "", "و")},
-	{0x1ee86, 0, 0, 0, g(Yes, No, false, false, "", "ز")},
-	{0x1ee87, 0, 0, 0, g(Yes, No, false, false, "", "ح")},
-	{0x1ee88, 0, 0, 0, g(Yes, No, false, false, "", "ط")},
-	{0x1ee89, 0, 0, 0, g(Yes, No, false, false, "", "ي")},
-	{0x1ee8a, 0, 0, 0, f(Yes, false, "")},
-	{0x1ee8b, 0, 0, 0, g(Yes, No, false, false, "", "ل")},
-	{0x1ee8c, 0, 0, 0, g(Yes, No, false, false, "", "م")},
-	{0x1ee8d, 0, 0, 0, g(Yes, No, false, false, "", "ن")},
-	{0x1ee8e, 0, 0, 0, g(Yes, No, false, false, "", "س")},
-	{0x1ee8f, 0, 0, 0, g(Yes, No, false, false, "", "ع")},
-	{0x1ee90, 0, 0, 0, g(Yes, No, false, false, "", "ف")},
-	{0x1ee91, 0, 0, 0, g(Yes, No, false, false, "", "ص")},
-	{0x1ee92, 0, 0, 0, g(Yes, No, false, false, "", "ق")},
-	{0x1ee93, 0, 0, 0, g(Yes, No, false, false, "", "ر")},
-	{0x1ee94, 0, 0, 0, g(Yes, No, false, false, "", "ش")},
-	{0x1ee95, 0, 0, 0, g(Yes, No, false, false, "", "ت")},
-	{0x1ee96, 0, 0, 0, g(Yes, No, false, false, "", "ث")},
-	{0x1ee97, 0, 0, 0, g(Yes, No, false, false, "", "خ")},
-	{0x1ee98, 0, 0, 0, g(Yes, No, false, false, "", "ذ")},
-	{0x1ee99, 0, 0, 0, g(Yes, No, false, false, "", "ض")},
-	{0x1ee9a, 0, 0, 0, g(Yes, No, false, false, "", "ظ")},
-	{0x1ee9b, 0, 0, 0, g(Yes, No, false, false, "", "غ")},
-	{0x1ee9c, 0, 0, 0, f(Yes, false, "")},
-	{0x1eea1, 0, 0, 0, g(Yes, No, false, false, "", "ب")},
-	{0x1eea2, 0, 0, 0, g(Yes, No, false, false, "", "ج")},
-	{0x1eea3, 0, 0, 0, g(Yes, No, false, false, "", "د")},
-	{0x1eea4, 0, 0, 0, f(Yes, false, "")},
-	{0x1eea5, 0, 0, 0, g(Yes, No, false, false, "", "و")},
-	{0x1eea6, 0, 0, 0, g(Yes, No, false, false, "", "ز")},
-	{0x1eea7, 0, 0, 0, g(Yes, No, false, false, "", "ح")},
-	{0x1eea8, 0, 0, 0, g(Yes, No, false, false, "", "ط")},
-	{0x1eea9, 0, 0, 0, g(Yes, No, false, false, "", "ي")},
-	{0x1eeaa, 0, 0, 0, f(Yes, false, "")},
-	{0x1eeab, 0, 0, 0, g(Yes, No, false, false, "", "ل")},
-	{0x1eeac, 0, 0, 0, g(Yes, No, false, false, "", "م")},
-	{0x1eead, 0, 0, 0, g(Yes, No, false, false, "", "ن")},
-	{0x1eeae, 0, 0, 0, g(Yes, No, false, false, "", "س")},
-	{0x1eeaf, 0, 0, 0, g(Yes, No, false, false, "", "ع")},
-	{0x1eeb0, 0, 0, 0, g(Yes, No, false, false, "", "ف")},
-	{0x1eeb1, 0, 0, 0, g(Yes, No, false, false, "", "ص")},
-	{0x1eeb2, 0, 0, 0, g(Yes, No, false, false, "", "ق")},
-	{0x1eeb3, 0, 0, 0, g(Yes, No, false, false, "", "ر")},
-	{0x1eeb4, 0, 0, 0, g(Yes, No, false, false, "", "ش")},
-	{0x1eeb5, 0, 0, 0, g(Yes, No, false, false, "", "ت")},
-	{0x1eeb6, 0, 0, 0, g(Yes, No, false, false, "", "ث")},
-	{0x1eeb7, 0, 0, 0, g(Yes, No, false, false, "", "خ")},
-	{0x1eeb8, 0, 0, 0, g(Yes, No, false, false, "", "ذ")},
-	{0x1eeb9, 0, 0, 0, g(Yes, No, false, false, "", "ض")},
-	{0x1eeba, 0, 0, 0, g(Yes, No, false, false, "", "ظ")},
-	{0x1eebb, 0, 0, 0, g(Yes, No, false, false, "", "غ")},
-	{0x1eebc, 0, 0, 0, f(Yes, false, "")},
-	{0x1f100, 0, 0, 0, g(Yes, No, false, false, "", "0.")},
-	{0x1f101, 0, 0, 0, g(Yes, No, false, false, "", "0,")},
-	{0x1f102, 0, 0, 0, g(Yes, No, false, false, "", "1,")},
-	{0x1f103, 0, 0, 0, g(Yes, No, false, false, "", "2,")},
-	{0x1f104, 0, 0, 0, g(Yes, No, false, false, "", "3,")},
-	{0x1f105, 0, 0, 0, g(Yes, No, false, false, "", "4,")},
-	{0x1f106, 0, 0, 0, g(Yes, No, false, false, "", "5,")},
-	{0x1f107, 0, 0, 0, g(Yes, No, false, false, "", "6,")},
-	{0x1f108, 0, 0, 0, g(Yes, No, false, false, "", "7,")},
-	{0x1f109, 0, 0, 0, g(Yes, No, false, false, "", "8,")},
-	{0x1f10a, 0, 0, 0, g(Yes, No, false, false, "", "9,")},
-	{0x1f10b, 0, 0, 0, f(Yes, false, "")},
-	{0x1f110, 0, 0, 0, g(Yes, No, false, false, "", "(A)")},
-	{0x1f111, 0, 0, 0, g(Yes, No, false, false, "", "(B)")},
-	{0x1f112, 0, 0, 0, g(Yes, No, false, false, "", "(C)")},
-	{0x1f113, 0, 0, 0, g(Yes, No, false, false, "", "(D)")},
-	{0x1f114, 0, 0, 0, g(Yes, No, false, false, "", "(E)")},
-	{0x1f115, 0, 0, 0, g(Yes, No, false, false, "", "(F)")},
-	{0x1f116, 0, 0, 0, g(Yes, No, false, false, "", "(G)")},
-	{0x1f117, 0, 0, 0, g(Yes, No, false, false, "", "(H)")},
-	{0x1f118, 0, 0, 0, g(Yes, No, false, false, "", "(I)")},
-	{0x1f119, 0, 0, 0, g(Yes, No, false, false, "", "(J)")},
-	{0x1f11a, 0, 0, 0, g(Yes, No, false, false, "", "(K)")},
-	{0x1f11b, 0, 0, 0, g(Yes, No, false, false, "", "(L)")},
-	{0x1f11c, 0, 0, 0, g(Yes, No, false, false, "", "(M)")},
-	{0x1f11d, 0, 0, 0, g(Yes, No, false, false, "", "(N)")},
-	{0x1f11e, 0, 0, 0, g(Yes, No, false, false, "", "(O)")},
-	{0x1f11f, 0, 0, 0, g(Yes, No, false, false, "", "(P)")},
-	{0x1f120, 0, 0, 0, g(Yes, No, false, false, "", "(Q)")},
-	{0x1f121, 0, 0, 0, g(Yes, No, false, false, "", "(R)")},
-	{0x1f122, 0, 0, 0, g(Yes, No, false, false, "", "(S)")},
-	{0x1f123, 0, 0, 0, g(Yes, No, false, false, "", "(T)")},
-	{0x1f124, 0, 0, 0, g(Yes, No, false, false, "", "(U)")},
-	{0x1f125, 0, 0, 0, g(Yes, No, false, false, "", "(V)")},
-	{0x1f126, 0, 0, 0, g(Yes, No, false, false, "", "(W)")},
-	{0x1f127, 0, 0, 0, g(Yes, No, false, false, "", "(X)")},
-	{0x1f128, 0, 0, 0, g(Yes, No, false, false, "", "(Y)")},
-	{0x1f129, 0, 0, 0, g(Yes, No, false, false, "", "(Z)")},
-	{0x1f12a, 0, 0, 0, g(Yes, No, false, false, "", "〔S〕")},
-	{0x1f12b, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0x1f12c, 0, 0, 0, g(Yes, No, false, false, "", "R")},
-	{0x1f12d, 0, 0, 0, g(Yes, No, false, false, "", "CD")},
-	{0x1f12e, 0, 0, 0, g(Yes, No, false, false, "", "WZ")},
-	{0x1f12f, 0, 0, 0, f(Yes, false, "")},
-	{0x1f130, 0, 0, 0, g(Yes, No, false, false, "", "A")},
-	{0x1f131, 0, 0, 0, g(Yes, No, false, false, "", "B")},
-	{0x1f132, 0, 0, 0, g(Yes, No, false, false, "", "C")},
-	{0x1f133, 0, 0, 0, g(Yes, No, false, false, "", "D")},
-	{0x1f134, 0, 0, 0, g(Yes, No, false, false, "", "E")},
-	{0x1f135, 0, 0, 0, g(Yes, No, false, false, "", "F")},
-	{0x1f136, 0, 0, 0, g(Yes, No, false, false, "", "G")},
-	{0x1f137, 0, 0, 0, g(Yes, No, false, false, "", "H")},
-	{0x1f138, 0, 0, 0, g(Yes, No, false, false, "", "I")},
-	{0x1f139, 0, 0, 0, g(Yes, No, false, false, "", "J")},
-	{0x1f13a, 0, 0, 0, g(Yes, No, false, false, "", "K")},
-	{0x1f13b, 0, 0, 0, g(Yes, No, false, false, "", "L")},
-	{0x1f13c, 0, 0, 0, g(Yes, No, false, false, "", "M")},
-	{0x1f13d, 0, 0, 0, g(Yes, No, false, false, "", "N")},
-	{0x1f13e, 0, 0, 0, g(Yes, No, false, false, "", "O")},
-	{0x1f13f, 0, 0, 0, g(Yes, No, false, false, "", "P")},
-	{0x1f140, 0, 0, 0, g(Yes, No, false, false, "", "Q")},
-	{0x1f141, 0, 0, 0, g(Yes, No, false, false, "", "R")},
-	{0x1f142, 0, 0, 0, g(Yes, No, false, false, "", "S")},
-	{0x1f143, 0, 0, 0, g(Yes, No, false, false, "", "T")},
-	{0x1f144, 0, 0, 0, g(Yes, No, false, false, "", "U")},
-	{0x1f145, 0, 0, 0, g(Yes, No, false, false, "", "V")},
-	{0x1f146, 0, 0, 0, g(Yes, No, false, false, "", "W")},
-	{0x1f147, 0, 0, 0, g(Yes, No, false, false, "", "X")},
-	{0x1f148, 0, 0, 0, g(Yes, No, false, false, "", "Y")},
-	{0x1f149, 0, 0, 0, g(Yes, No, false, false, "", "Z")},
-	{0x1f14a, 0, 0, 0, g(Yes, No, false, false, "", "HV")},
-	{0x1f14b, 0, 0, 0, g(Yes, No, false, false, "", "MV")},
-	{0x1f14c, 0, 0, 0, g(Yes, No, false, false, "", "SD")},
-	{0x1f14d, 0, 0, 0, g(Yes, No, false, false, "", "SS")},
-	{0x1f14e, 0, 0, 0, g(Yes, No, false, false, "", "PPV")},
-	{0x1f14f, 0, 0, 0, g(Yes, No, false, false, "", "WC")},
-	{0x1f150, 0, 0, 0, f(Yes, false, "")},
-	{0x1f16a, 0, 0, 0, g(Yes, No, false, false, "", "MC")},
-	{0x1f16b, 0, 0, 0, g(Yes, No, false, false, "", "MD")},
-	{0x1f16c, 0, 0, 0, f(Yes, false, "")},
-	{0x1f190, 0, 0, 0, g(Yes, No, false, false, "", "DJ")},
-	{0x1f191, 0, 0, 0, f(Yes, false, "")},
-	{0x1f200, 0, 0, 0, g(Yes, No, false, false, "", "ほか")},
-	{0x1f201, 0, 0, 0, g(Yes, No, false, false, "", "ココ")},
-	{0x1f202, 0, 0, 0, g(Yes, No, false, false, "", "サ")},
-	{0x1f203, 0, 0, 0, f(Yes, false, "")},
-	{0x1f210, 0, 0, 0, g(Yes, No, false, false, "", "手")},
-	{0x1f211, 0, 0, 0, g(Yes, No, false, false, "", "字")},
-	{0x1f212, 0, 0, 0, g(Yes, No, false, false, "", "双")},
-	{0x1f213, 0, 0, 1, g(Yes, No, false, false, "", "デ")},
-	{0x1f214, 0, 0, 0, g(Yes, No, false, false, "", "二")},
-	{0x1f215, 0, 0, 0, g(Yes, No, false, false, "", "多")},
-	{0x1f216, 0, 0, 0, g(Yes, No, false, false, "", "解")},
-	{0x1f217, 0, 0, 0, g(Yes, No, false, false, "", "天")},
-	{0x1f218, 0, 0, 0, g(Yes, No, false, false, "", "交")},
-	{0x1f219, 0, 0, 0, g(Yes, No, false, false, "", "映")},
-	{0x1f21a, 0, 0, 0, g(Yes, No, false, false, "", "無")},
-	{0x1f21b, 0, 0, 0, g(Yes, No, false, false, "", "料")},
-	{0x1f21c, 0, 0, 0, g(Yes, No, false, false, "", "前")},
-	{0x1f21d, 0, 0, 0, g(Yes, No, false, false, "", "後")},
-	{0x1f21e, 0, 0, 0, g(Yes, No, false, false, "", "再")},
-	{0x1f21f, 0, 0, 0, g(Yes, No, false, false, "", "新")},
-	{0x1f220, 0, 0, 0, g(Yes, No, false, false, "", "初")},
-	{0x1f221, 0, 0, 0, g(Yes, No, false, false, "", "終")},
-	{0x1f222, 0, 0, 0, g(Yes, No, false, false, "", "生")},
-	{0x1f223, 0, 0, 0, g(Yes, No, false, false, "", "販")},
-	{0x1f224, 0, 0, 0, g(Yes, No, false, false, "", "声")},
-	{0x1f225, 0, 0, 0, g(Yes, No, false, false, "", "吹")},
-	{0x1f226, 0, 0, 0, g(Yes, No, false, false, "", "演")},
-	{0x1f227, 0, 0, 0, g(Yes, No, false, false, "", "投")},
-	{0x1f228, 0, 0, 0, g(Yes, No, false, false, "", "捕")},
-	{0x1f229, 0, 0, 0, g(Yes, No, false, false, "", "一")},
-	{0x1f22a, 0, 0, 0, g(Yes, No, false, false, "", "三")},
-	{0x1f22b, 0, 0, 0, g(Yes, No, false, false, "", "遊")},
-	{0x1f22c, 0, 0, 0, g(Yes, No, false, false, "", "左")},
-	{0x1f22d, 0, 0, 0, g(Yes, No, false, false, "", "中")},
-	{0x1f22e, 0, 0, 0, g(Yes, No, false, false, "", "右")},
-	{0x1f22f, 0, 0, 0, g(Yes, No, false, false, "", "指")},
-	{0x1f230, 0, 0, 0, g(Yes, No, false, false, "", "走")},
-	{0x1f231, 0, 0, 0, g(Yes, No, false, false, "", "打")},
-	{0x1f232, 0, 0, 0, g(Yes, No, false, false, "", "禁")},
-	{0x1f233, 0, 0, 0, g(Yes, No, false, false, "", "空")},
-	{0x1f234, 0, 0, 0, g(Yes, No, false, false, "", "合")},
-	{0x1f235, 0, 0, 0, g(Yes, No, false, false, "", "満")},
-	{0x1f236, 0, 0, 0, g(Yes, No, false, false, "", "有")},
-	{0x1f237, 0, 0, 0, g(Yes, No, false, false, "", "月")},
-	{0x1f238, 0, 0, 0, g(Yes, No, false, false, "", "申")},
-	{0x1f239, 0, 0, 0, g(Yes, No, false, false, "", "割")},
-	{0x1f23a, 0, 0, 0, g(Yes, No, false, false, "", "営")},
-	{0x1f23b, 0, 0, 0, g(Yes, No, false, false, "", "配")},
-	{0x1f23c, 0, 0, 0, f(Yes, false, "")},
-	{0x1f240, 0, 0, 0, g(Yes, No, false, false, "", "〔本〕")},
-	{0x1f241, 0, 0, 0, g(Yes, No, false, false, "", "〔三〕")},
-	{0x1f242, 0, 0, 0, g(Yes, No, false, false, "", "〔二〕")},
-	{0x1f243, 0, 0, 0, g(Yes, No, false, false, "", "〔安〕")},
-	{0x1f244, 0, 0, 0, g(Yes, No, false, false, "", "〔点〕")},
-	{0x1f245, 0, 0, 0, g(Yes, No, false, false, "", "〔打〕")},
-	{0x1f246, 0, 0, 0, g(Yes, No, false, false, "", "〔盗〕")},
-	{0x1f247, 0, 0, 0, g(Yes, No, false, false, "", "〔勝〕")},
-	{0x1f248, 0, 0, 0, g(Yes, No, false, false, "", "〔敗〕")},
-	{0x1f249, 0, 0, 0, f(Yes, false, "")},
-	{0x1f250, 0, 0, 0, g(Yes, No, false, false, "", "得")},
-	{0x1f251, 0, 0, 0, g(Yes, No, false, false, "", "可")},
-	{0x1f252, 0, 0, 0, f(Yes, false, "")},
-	{0x2f800, 0, 0, 0, f(No, false, "丽")},
-	{0x2f801, 0, 0, 0, f(No, false, "丸")},
-	{0x2f802, 0, 0, 0, f(No, false, "乁")},
-	{0x2f803, 0, 0, 0, f(No, false, "𠄢")},
-	{0x2f804, 0, 0, 0, f(No, false, "你")},
-	{0x2f805, 0, 0, 0, f(No, false, "侮")},
-	{0x2f806, 0, 0, 0, f(No, false, "侻")},
-	{0x2f807, 0, 0, 0, f(No, false, "倂")},
-	{0x2f808, 0, 0, 0, f(No, false, "偺")},
-	{0x2f809, 0, 0, 0, f(No, false, "備")},
-	{0x2f80a, 0, 0, 0, f(No, false, "僧")},
-	{0x2f80b, 0, 0, 0, f(No, false, "像")},
-	{0x2f80c, 0, 0, 0, f(No, false, "㒞")},
-	{0x2f80d, 0, 0, 0, f(No, false, "𠘺")},
-	{0x2f80e, 0, 0, 0, f(No, false, "免")},
-	{0x2f80f, 0, 0, 0, f(No, false, "兔")},
-	{0x2f810, 0, 0, 0, f(No, false, "兤")},
-	{0x2f811, 0, 0, 0, f(No, false, "具")},
-	{0x2f812, 0, 0, 0, f(No, false, "𠔜")},
-	{0x2f813, 0, 0, 0, f(No, false, "㒹")},
-	{0x2f814, 0, 0, 0, f(No, false, "內")},
-	{0x2f815, 0, 0, 0, f(No, false, "再")},
-	{0x2f816, 0, 0, 0, f(No, false, "𠕋")},
-	{0x2f817, 0, 0, 0, f(No, false, "冗")},
-	{0x2f818, 0, 0, 0, f(No, false, "冤")},
-	{0x2f819, 0, 0, 0, f(No, false, "仌")},
-	{0x2f81a, 0, 0, 0, f(No, false, "冬")},
-	{0x2f81b, 0, 0, 0, f(No, false, "况")},
-	{0x2f81c, 0, 0, 0, f(No, false, "𩇟")},
-	{0x2f81d, 0, 0, 0, f(No, false, "凵")},
-	{0x2f81e, 0, 0, 0, f(No, false, "刃")},
-	{0x2f81f, 0, 0, 0, f(No, false, "㓟")},
-	{0x2f820, 0, 0, 0, f(No, false, "刻")},
-	{0x2f821, 0, 0, 0, f(No, false, "剆")},
-	{0x2f822, 0, 0, 0, f(No, false, "割")},
-	{0x2f823, 0, 0, 0, f(No, false, "剷")},
-	{0x2f824, 0, 0, 0, f(No, false, "㔕")},
-	{0x2f825, 0, 0, 0, f(No, false, "勇")},
-	{0x2f826, 0, 0, 0, f(No, false, "勉")},
-	{0x2f827, 0, 0, 0, f(No, false, "勤")},
-	{0x2f828, 0, 0, 0, f(No, false, "勺")},
-	{0x2f829, 0, 0, 0, f(No, false, "包")},
-	{0x2f82a, 0, 0, 0, f(No, false, "匆")},
-	{0x2f82b, 0, 0, 0, f(No, false, "北")},
-	{0x2f82c, 0, 0, 0, f(No, false, "卉")},
-	{0x2f82d, 0, 0, 0, f(No, false, "卑")},
-	{0x2f82e, 0, 0, 0, f(No, false, "博")},
-	{0x2f82f, 0, 0, 0, f(No, false, "即")},
-	{0x2f830, 0, 0, 0, f(No, false, "卽")},
-	{0x2f831, 0, 0, 0, f(No, false, "卿")},
-	{0x2f834, 0, 0, 0, f(No, false, "𠨬")},
-	{0x2f835, 0, 0, 0, f(No, false, "灰")},
-	{0x2f836, 0, 0, 0, f(No, false, "及")},
-	{0x2f837, 0, 0, 0, f(No, false, "叟")},
-	{0x2f838, 0, 0, 0, f(No, false, "𠭣")},
-	{0x2f839, 0, 0, 0, f(No, false, "叫")},
-	{0x2f83a, 0, 0, 0, f(No, false, "叱")},
-	{0x2f83b, 0, 0, 0, f(No, false, "吆")},
-	{0x2f83c, 0, 0, 0, f(No, false, "咞")},
-	{0x2f83d, 0, 0, 0, f(No, false, "吸")},
-	{0x2f83e, 0, 0, 0, f(No, false, "呈")},
-	{0x2f83f, 0, 0, 0, f(No, false, "周")},
-	{0x2f840, 0, 0, 0, f(No, false, "咢")},
-	{0x2f841, 0, 0, 0, f(No, false, "哶")},
-	{0x2f842, 0, 0, 0, f(No, false, "唐")},
-	{0x2f843, 0, 0, 0, f(No, false, "啓")},
-	{0x2f844, 0, 0, 0, f(No, false, "啣")},
-	{0x2f845, 0, 0, 0, f(No, false, "善")},
-	{0x2f847, 0, 0, 0, f(No, false, "喙")},
-	{0x2f848, 0, 0, 0, f(No, false, "喫")},
-	{0x2f849, 0, 0, 0, f(No, false, "喳")},
-	{0x2f84a, 0, 0, 0, f(No, false, "嗂")},
-	{0x2f84b, 0, 0, 0, f(No, false, "圖")},
-	{0x2f84c, 0, 0, 0, f(No, false, "嘆")},
-	{0x2f84d, 0, 0, 0, f(No, false, "圗")},
-	{0x2f84e, 0, 0, 0, f(No, false, "噑")},
-	{0x2f84f, 0, 0, 0, f(No, false, "噴")},
-	{0x2f850, 0, 0, 0, f(No, false, "切")},
-	{0x2f851, 0, 0, 0, f(No, false, "壮")},
-	{0x2f852, 0, 0, 0, f(No, false, "城")},
-	{0x2f853, 0, 0, 0, f(No, false, "埴")},
-	{0x2f854, 0, 0, 0, f(No, false, "堍")},
-	{0x2f855, 0, 0, 0, f(No, false, "型")},
-	{0x2f856, 0, 0, 0, f(No, false, "堲")},
-	{0x2f857, 0, 0, 0, f(No, false, "報")},
-	{0x2f858, 0, 0, 0, f(No, false, "墬")},
-	{0x2f859, 0, 0, 0, f(No, false, "𡓤")},
-	{0x2f85a, 0, 0, 0, f(No, false, "売")},
-	{0x2f85b, 0, 0, 0, f(No, false, "壷")},
-	{0x2f85c, 0, 0, 0, f(No, false, "夆")},
-	{0x2f85d, 0, 0, 0, f(No, false, "多")},
-	{0x2f85e, 0, 0, 0, f(No, false, "夢")},
-	{0x2f85f, 0, 0, 0, f(No, false, "奢")},
-	{0x2f860, 0, 0, 0, f(No, false, "𡚨")},
-	{0x2f861, 0, 0, 0, f(No, false, "𡛪")},
-	{0x2f862, 0, 0, 0, f(No, false, "姬")},
-	{0x2f863, 0, 0, 0, f(No, false, "娛")},
-	{0x2f864, 0, 0, 0, f(No, false, "娧")},
-	{0x2f865, 0, 0, 0, f(No, false, "姘")},
-	{0x2f866, 0, 0, 0, f(No, false, "婦")},
-	{0x2f867, 0, 0, 0, f(No, false, "㛮")},
-	{0x2f868, 0, 0, 0, f(No, false, "㛼")},
-	{0x2f869, 0, 0, 0, f(No, false, "嬈")},
-	{0x2f86a, 0, 0, 0, f(No, false, "嬾")},
-	{0x2f86c, 0, 0, 0, f(No, false, "𡧈")},
-	{0x2f86d, 0, 0, 0, f(No, false, "寃")},
-	{0x2f86e, 0, 0, 0, f(No, false, "寘")},
-	{0x2f86f, 0, 0, 0, f(No, false, "寧")},
-	{0x2f870, 0, 0, 0, f(No, false, "寳")},
-	{0x2f871, 0, 0, 0, f(No, false, "𡬘")},
-	{0x2f872, 0, 0, 0, f(No, false, "寿")},
-	{0x2f873, 0, 0, 0, f(No, false, "将")},
-	{0x2f874, 0, 0, 0, f(No, false, "当")},
-	{0x2f875, 0, 0, 0, f(No, false, "尢")},
-	{0x2f876, 0, 0, 0, f(No, false, "㞁")},
-	{0x2f877, 0, 0, 0, f(No, false, "屠")},
-	{0x2f878, 0, 0, 0, f(No, false, "屮")},
-	{0x2f879, 0, 0, 0, f(No, false, "峀")},
-	{0x2f87a, 0, 0, 0, f(No, false, "岍")},
-	{0x2f87b, 0, 0, 0, f(No, false, "𡷤")},
-	{0x2f87c, 0, 0, 0, f(No, false, "嵃")},
-	{0x2f87d, 0, 0, 0, f(No, false, "𡷦")},
-	{0x2f87e, 0, 0, 0, f(No, false, "嵮")},
-	{0x2f87f, 0, 0, 0, f(No, false, "嵫")},
-	{0x2f880, 0, 0, 0, f(No, false, "嵼")},
-	{0x2f881, 0, 0, 0, f(No, false, "巡")},
-	{0x2f882, 0, 0, 0, f(No, false, "巢")},
-	{0x2f883, 0, 0, 0, f(No, false, "㠯")},
-	{0x2f884, 0, 0, 0, f(No, false, "巽")},
-	{0x2f885, 0, 0, 0, f(No, false, "帨")},
-	{0x2f886, 0, 0, 0, f(No, false, "帽")},
-	{0x2f887, 0, 0, 0, f(No, false, "幩")},
-	{0x2f888, 0, 0, 0, f(No, false, "㡢")},
-	{0x2f889, 0, 0, 0, f(No, false, "𢆃")},
-	{0x2f88a, 0, 0, 0, f(No, false, "㡼")},
-	{0x2f88b, 0, 0, 0, f(No, false, "庰")},
-	{0x2f88c, 0, 0, 0, f(No, false, "庳")},
-	{0x2f88d, 0, 0, 0, f(No, false, "庶")},
-	{0x2f88e, 0, 0, 0, f(No, false, "廊")},
-	{0x2f88f, 0, 0, 0, f(No, false, "𪎒")},
-	{0x2f890, 0, 0, 0, f(No, false, "廾")},
-	{0x2f891, 0, 0, 0, f(No, false, "𢌱")},
-	{0x2f893, 0, 0, 0, f(No, false, "舁")},
-	{0x2f894, 0, 0, 0, f(No, false, "弢")},
-	{0x2f896, 0, 0, 0, f(No, false, "㣇")},
-	{0x2f897, 0, 0, 0, f(No, false, "𣊸")},
-	{0x2f898, 0, 0, 0, f(No, false, "𦇚")},
-	{0x2f899, 0, 0, 0, f(No, false, "形")},
-	{0x2f89a, 0, 0, 0, f(No, false, "彫")},
-	{0x2f89b, 0, 0, 0, f(No, false, "㣣")},
-	{0x2f89c, 0, 0, 0, f(No, false, "徚")},
-	{0x2f89d, 0, 0, 0, f(No, false, "忍")},
-	{0x2f89e, 0, 0, 0, f(No, false, "志")},
-	{0x2f89f, 0, 0, 0, f(No, false, "忹")},
-	{0x2f8a0, 0, 0, 0, f(No, false, "悁")},
-	{0x2f8a1, 0, 0, 0, f(No, false, "㤺")},
-	{0x2f8a2, 0, 0, 0, f(No, false, "㤜")},
-	{0x2f8a3, 0, 0, 0, f(No, false, "悔")},
-	{0x2f8a4, 0, 0, 0, f(No, false, "𢛔")},
-	{0x2f8a5, 0, 0, 0, f(No, false, "惇")},
-	{0x2f8a6, 0, 0, 0, f(No, false, "慈")},
-	{0x2f8a7, 0, 0, 0, f(No, false, "慌")},
-	{0x2f8a8, 0, 0, 0, f(No, false, "慎")},
-	{0x2f8a9, 0, 0, 0, f(No, false, "慌")},
-	{0x2f8aa, 0, 0, 0, f(No, false, "慺")},
-	{0x2f8ab, 0, 0, 0, f(No, false, "憎")},
-	{0x2f8ac, 0, 0, 0, f(No, false, "憲")},
-	{0x2f8ad, 0, 0, 0, f(No, false, "憤")},
-	{0x2f8ae, 0, 0, 0, f(No, false, "憯")},
-	{0x2f8af, 0, 0, 0, f(No, false, "懞")},
-	{0x2f8b0, 0, 0, 0, f(No, false, "懲")},
-	{0x2f8b1, 0, 0, 0, f(No, false, "懶")},
-	{0x2f8b2, 0, 0, 0, f(No, false, "成")},
-	{0x2f8b3, 0, 0, 0, f(No, false, "戛")},
-	{0x2f8b4, 0, 0, 0, f(No, false, "扝")},
-	{0x2f8b5, 0, 0, 0, f(No, false, "抱")},
-	{0x2f8b6, 0, 0, 0, f(No, false, "拔")},
-	{0x2f8b7, 0, 0, 0, f(No, false, "捐")},
-	{0x2f8b8, 0, 0, 0, f(No, false, "𢬌")},
-	{0x2f8b9, 0, 0, 0, f(No, false, "挽")},
-	{0x2f8ba, 0, 0, 0, f(No, false, "拼")},
-	{0x2f8bb, 0, 0, 0, f(No, false, "捨")},
-	{0x2f8bc, 0, 0, 0, f(No, false, "掃")},
-	{0x2f8bd, 0, 0, 0, f(No, false, "揤")},
-	{0x2f8be, 0, 0, 0, f(No, false, "𢯱")},
-	{0x2f8bf, 0, 0, 0, f(No, false, "搢")},
-	{0x2f8c0, 0, 0, 0, f(No, false, "揅")},
-	{0x2f8c1, 0, 0, 0, f(No, false, "掩")},
-	{0x2f8c2, 0, 0, 0, f(No, false, "㨮")},
-	{0x2f8c3, 0, 0, 0, f(No, false, "摩")},
-	{0x2f8c4, 0, 0, 0, f(No, false, "摾")},
-	{0x2f8c5, 0, 0, 0, f(No, false, "撝")},
-	{0x2f8c6, 0, 0, 0, f(No, false, "摷")},
-	{0x2f8c7, 0, 0, 0, f(No, false, "㩬")},
-	{0x2f8c8, 0, 0, 0, f(No, false, "敏")},
-	{0x2f8c9, 0, 0, 0, f(No, false, "敬")},
-	{0x2f8ca, 0, 0, 0, f(No, false, "𣀊")},
-	{0x2f8cb, 0, 0, 0, f(No, false, "旣")},
-	{0x2f8cc, 0, 0, 0, f(No, false, "書")},
-	{0x2f8cd, 0, 0, 0, f(No, false, "晉")},
-	{0x2f8ce, 0, 0, 0, f(No, false, "㬙")},
-	{0x2f8cf, 0, 0, 0, f(No, false, "暑")},
-	{0x2f8d0, 0, 0, 0, f(No, false, "㬈")},
-	{0x2f8d1, 0, 0, 0, f(No, false, "㫤")},
-	{0x2f8d2, 0, 0, 0, f(No, false, "冒")},
-	{0x2f8d3, 0, 0, 0, f(No, false, "冕")},
-	{0x2f8d4, 0, 0, 0, f(No, false, "最")},
-	{0x2f8d5, 0, 0, 0, f(No, false, "暜")},
-	{0x2f8d6, 0, 0, 0, f(No, false, "肭")},
-	{0x2f8d7, 0, 0, 0, f(No, false, "䏙")},
-	{0x2f8d8, 0, 0, 0, f(No, false, "朗")},
-	{0x2f8d9, 0, 0, 0, f(No, false, "望")},
-	{0x2f8da, 0, 0, 0, f(No, false, "朡")},
-	{0x2f8db, 0, 0, 0, f(No, false, "杞")},
-	{0x2f8dc, 0, 0, 0, f(No, false, "杓")},
-	{0x2f8dd, 0, 0, 0, f(No, false, "𣏃")},
-	{0x2f8de, 0, 0, 0, f(No, false, "㭉")},
-	{0x2f8df, 0, 0, 0, f(No, false, "柺")},
-	{0x2f8e0, 0, 0, 0, f(No, false, "枅")},
-	{0x2f8e1, 0, 0, 0, f(No, false, "桒")},
-	{0x2f8e2, 0, 0, 0, f(No, false, "梅")},
-	{0x2f8e3, 0, 0, 0, f(No, false, "𣑭")},
-	{0x2f8e4, 0, 0, 0, f(No, false, "梎")},
-	{0x2f8e5, 0, 0, 0, f(No, false, "栟")},
-	{0x2f8e6, 0, 0, 0, f(No, false, "椔")},
-	{0x2f8e7, 0, 0, 0, f(No, false, "㮝")},
-	{0x2f8e8, 0, 0, 0, f(No, false, "楂")},
-	{0x2f8e9, 0, 0, 0, f(No, false, "榣")},
-	{0x2f8ea, 0, 0, 0, f(No, false, "槪")},
-	{0x2f8eb, 0, 0, 0, f(No, false, "檨")},
-	{0x2f8ec, 0, 0, 0, f(No, false, "𣚣")},
-	{0x2f8ed, 0, 0, 0, f(No, false, "櫛")},
-	{0x2f8ee, 0, 0, 0, f(No, false, "㰘")},
-	{0x2f8ef, 0, 0, 0, f(No, false, "次")},
-	{0x2f8f0, 0, 0, 0, f(No, false, "𣢧")},
-	{0x2f8f1, 0, 0, 0, f(No, false, "歔")},
-	{0x2f8f2, 0, 0, 0, f(No, false, "㱎")},
-	{0x2f8f3, 0, 0, 0, f(No, false, "歲")},
-	{0x2f8f4, 0, 0, 0, f(No, false, "殟")},
-	{0x2f8f5, 0, 0, 0, f(No, false, "殺")},
-	{0x2f8f6, 0, 0, 0, f(No, false, "殻")},
-	{0x2f8f7, 0, 0, 0, f(No, false, "𣪍")},
-	{0x2f8f8, 0, 0, 0, f(No, false, "𡴋")},
-	{0x2f8f9, 0, 0, 0, f(No, false, "𣫺")},
-	{0x2f8fa, 0, 0, 0, f(No, false, "汎")},
-	{0x2f8fb, 0, 0, 0, f(No, false, "𣲼")},
-	{0x2f8fc, 0, 0, 0, f(No, false, "沿")},
-	{0x2f8fd, 0, 0, 0, f(No, false, "泍")},
-	{0x2f8fe, 0, 0, 0, f(No, false, "汧")},
-	{0x2f8ff, 0, 0, 0, f(No, false, "洖")},
-	{0x2f900, 0, 0, 0, f(No, false, "派")},
-	{0x2f901, 0, 0, 0, f(No, false, "海")},
-	{0x2f902, 0, 0, 0, f(No, false, "流")},
-	{0x2f903, 0, 0, 0, f(No, false, "浩")},
-	{0x2f904, 0, 0, 0, f(No, false, "浸")},
-	{0x2f905, 0, 0, 0, f(No, false, "涅")},
-	{0x2f906, 0, 0, 0, f(No, false, "𣴞")},
-	{0x2f907, 0, 0, 0, f(No, false, "洴")},
-	{0x2f908, 0, 0, 0, f(No, false, "港")},
-	{0x2f909, 0, 0, 0, f(No, false, "湮")},
-	{0x2f90a, 0, 0, 0, f(No, false, "㴳")},
-	{0x2f90b, 0, 0, 0, f(No, false, "滋")},
-	{0x2f90c, 0, 0, 0, f(No, false, "滇")},
-	{0x2f90d, 0, 0, 0, f(No, false, "𣻑")},
-	{0x2f90e, 0, 0, 0, f(No, false, "淹")},
-	{0x2f90f, 0, 0, 0, f(No, false, "潮")},
-	{0x2f910, 0, 0, 0, f(No, false, "𣽞")},
-	{0x2f911, 0, 0, 0, f(No, false, "𣾎")},
-	{0x2f912, 0, 0, 0, f(No, false, "濆")},
-	{0x2f913, 0, 0, 0, f(No, false, "瀹")},
-	{0x2f914, 0, 0, 0, f(No, false, "瀞")},
-	{0x2f915, 0, 0, 0, f(No, false, "瀛")},
-	{0x2f916, 0, 0, 0, f(No, false, "㶖")},
-	{0x2f917, 0, 0, 0, f(No, false, "灊")},
-	{0x2f918, 0, 0, 0, f(No, false, "災")},
-	{0x2f919, 0, 0, 0, f(No, false, "灷")},
-	{0x2f91a, 0, 0, 0, f(No, false, "炭")},
-	{0x2f91b, 0, 0, 0, f(No, false, "𠔥")},
-	{0x2f91c, 0, 0, 0, f(No, false, "煅")},
-	{0x2f91d, 0, 0, 0, f(No, false, "𤉣")},
-	{0x2f91e, 0, 0, 0, f(No, false, "熜")},
-	{0x2f91f, 0, 0, 0, f(No, false, "𤎫")},
-	{0x2f920, 0, 0, 0, f(No, false, "爨")},
-	{0x2f921, 0, 0, 0, f(No, false, "爵")},
-	{0x2f922, 0, 0, 0, f(No, false, "牐")},
-	{0x2f923, 0, 0, 0, f(No, false, "𤘈")},
-	{0x2f924, 0, 0, 0, f(No, false, "犀")},
-	{0x2f925, 0, 0, 0, f(No, false, "犕")},
-	{0x2f926, 0, 0, 0, f(No, false, "𤜵")},
-	{0x2f927, 0, 0, 0, f(No, false, "𤠔")},
-	{0x2f928, 0, 0, 0, f(No, false, "獺")},
-	{0x2f929, 0, 0, 0, f(No, false, "王")},
-	{0x2f92a, 0, 0, 0, f(No, false, "㺬")},
-	{0x2f92b, 0, 0, 0, f(No, false, "玥")},
-	{0x2f92c, 0, 0, 0, f(No, false, "㺸")},
-	{0x2f92e, 0, 0, 0, f(No, false, "瑇")},
-	{0x2f92f, 0, 0, 0, f(No, false, "瑜")},
-	{0x2f930, 0, 0, 0, f(No, false, "瑱")},
-	{0x2f931, 0, 0, 0, f(No, false, "璅")},
-	{0x2f932, 0, 0, 0, f(No, false, "瓊")},
-	{0x2f933, 0, 0, 0, f(No, false, "㼛")},
-	{0x2f934, 0, 0, 0, f(No, false, "甤")},
-	{0x2f935, 0, 0, 0, f(No, false, "𤰶")},
-	{0x2f936, 0, 0, 0, f(No, false, "甾")},
-	{0x2f937, 0, 0, 0, f(No, false, "𤲒")},
-	{0x2f938, 0, 0, 0, f(No, false, "異")},
-	{0x2f939, 0, 0, 0, f(No, false, "𢆟")},
-	{0x2f93a, 0, 0, 0, f(No, false, "瘐")},
-	{0x2f93b, 0, 0, 0, f(No, false, "𤾡")},
-	{0x2f93c, 0, 0, 0, f(No, false, "𤾸")},
-	{0x2f93d, 0, 0, 0, f(No, false, "𥁄")},
-	{0x2f93e, 0, 0, 0, f(No, false, "㿼")},
-	{0x2f93f, 0, 0, 0, f(No, false, "䀈")},
-	{0x2f940, 0, 0, 0, f(No, false, "直")},
-	{0x2f941, 0, 0, 0, f(No, false, "𥃳")},
-	{0x2f942, 0, 0, 0, f(No, false, "𥃲")},
-	{0x2f943, 0, 0, 0, f(No, false, "𥄙")},
-	{0x2f944, 0, 0, 0, f(No, false, "𥄳")},
-	{0x2f945, 0, 0, 0, f(No, false, "眞")},
-	{0x2f946, 0, 0, 0, f(No, false, "真")},
-	{0x2f948, 0, 0, 0, f(No, false, "睊")},
-	{0x2f949, 0, 0, 0, f(No, false, "䀹")},
-	{0x2f94a, 0, 0, 0, f(No, false, "瞋")},
-	{0x2f94b, 0, 0, 0, f(No, false, "䁆")},
-	{0x2f94c, 0, 0, 0, f(No, false, "䂖")},
-	{0x2f94d, 0, 0, 0, f(No, false, "𥐝")},
-	{0x2f94e, 0, 0, 0, f(No, false, "硎")},
-	{0x2f94f, 0, 0, 0, f(No, false, "碌")},
-	{0x2f950, 0, 0, 0, f(No, false, "磌")},
-	{0x2f951, 0, 0, 0, f(No, false, "䃣")},
-	{0x2f952, 0, 0, 0, f(No, false, "𥘦")},
-	{0x2f953, 0, 0, 0, f(No, false, "祖")},
-	{0x2f954, 0, 0, 0, f(No, false, "𥚚")},
-	{0x2f955, 0, 0, 0, f(No, false, "𥛅")},
-	{0x2f956, 0, 0, 0, f(No, false, "福")},
-	{0x2f957, 0, 0, 0, f(No, false, "秫")},
-	{0x2f958, 0, 0, 0, f(No, false, "䄯")},
-	{0x2f959, 0, 0, 0, f(No, false, "穀")},
-	{0x2f95a, 0, 0, 0, f(No, false, "穊")},
-	{0x2f95b, 0, 0, 0, f(No, false, "穏")},
-	{0x2f95c, 0, 0, 0, f(No, false, "𥥼")},
-	{0x2f95d, 0, 0, 0, f(No, false, "𥪧")},
-	{0x2f95f, 0, 0, 0, f(No, false, "竮")},
-	{0x2f960, 0, 0, 0, f(No, false, "䈂")},
-	{0x2f961, 0, 0, 0, f(No, false, "𥮫")},
-	{0x2f962, 0, 0, 0, f(No, false, "篆")},
-	{0x2f963, 0, 0, 0, f(No, false, "築")},
-	{0x2f964, 0, 0, 0, f(No, false, "䈧")},
-	{0x2f965, 0, 0, 0, f(No, false, "𥲀")},
-	{0x2f966, 0, 0, 0, f(No, false, "糒")},
-	{0x2f967, 0, 0, 0, f(No, false, "䊠")},
-	{0x2f968, 0, 0, 0, f(No, false, "糨")},
-	{0x2f969, 0, 0, 0, f(No, false, "糣")},
-	{0x2f96a, 0, 0, 0, f(No, false, "紀")},
-	{0x2f96b, 0, 0, 0, f(No, false, "𥾆")},
-	{0x2f96c, 0, 0, 0, f(No, false, "絣")},
-	{0x2f96d, 0, 0, 0, f(No, false, "䌁")},
-	{0x2f96e, 0, 0, 0, f(No, false, "緇")},
-	{0x2f96f, 0, 0, 0, f(No, false, "縂")},
-	{0x2f970, 0, 0, 0, f(No, false, "繅")},
-	{0x2f971, 0, 0, 0, f(No, false, "䌴")},
-	{0x2f972, 0, 0, 0, f(No, false, "𦈨")},
-	{0x2f973, 0, 0, 0, f(No, false, "𦉇")},
-	{0x2f974, 0, 0, 0, f(No, false, "䍙")},
-	{0x2f975, 0, 0, 0, f(No, false, "𦋙")},
-	{0x2f976, 0, 0, 0, f(No, false, "罺")},
-	{0x2f977, 0, 0, 0, f(No, false, "𦌾")},
-	{0x2f978, 0, 0, 0, f(No, false, "羕")},
-	{0x2f979, 0, 0, 0, f(No, false, "翺")},
-	{0x2f97a, 0, 0, 0, f(No, false, "者")},
-	{0x2f97b, 0, 0, 0, f(No, false, "𦓚")},
-	{0x2f97c, 0, 0, 0, f(No, false, "𦔣")},
-	{0x2f97d, 0, 0, 0, f(No, false, "聠")},
-	{0x2f97e, 0, 0, 0, f(No, false, "𦖨")},
-	{0x2f97f, 0, 0, 0, f(No, false, "聰")},
-	{0x2f980, 0, 0, 0, f(No, false, "𣍟")},
-	{0x2f981, 0, 0, 0, f(No, false, "䏕")},
-	{0x2f982, 0, 0, 0, f(No, false, "育")},
-	{0x2f983, 0, 0, 0, f(No, false, "脃")},
-	{0x2f984, 0, 0, 0, f(No, false, "䐋")},
-	{0x2f985, 0, 0, 0, f(No, false, "脾")},
-	{0x2f986, 0, 0, 0, f(No, false, "媵")},
-	{0x2f987, 0, 0, 0, f(No, false, "𦞧")},
-	{0x2f988, 0, 0, 0, f(No, false, "𦞵")},
-	{0x2f989, 0, 0, 0, f(No, false, "𣎓")},
-	{0x2f98a, 0, 0, 0, f(No, false, "𣎜")},
-	{0x2f98b, 0, 0, 0, f(No, false, "舁")},
-	{0x2f98c, 0, 0, 0, f(No, false, "舄")},
-	{0x2f98d, 0, 0, 0, f(No, false, "辞")},
-	{0x2f98e, 0, 0, 0, f(No, false, "䑫")},
-	{0x2f98f, 0, 0, 0, f(No, false, "芑")},
-	{0x2f990, 0, 0, 0, f(No, false, "芋")},
-	{0x2f991, 0, 0, 0, f(No, false, "芝")},
-	{0x2f992, 0, 0, 0, f(No, false, "劳")},
-	{0x2f993, 0, 0, 0, f(No, false, "花")},
-	{0x2f994, 0, 0, 0, f(No, false, "芳")},
-	{0x2f995, 0, 0, 0, f(No, false, "芽")},
-	{0x2f996, 0, 0, 0, f(No, false, "苦")},
-	{0x2f997, 0, 0, 0, f(No, false, "𦬼")},
-	{0x2f998, 0, 0, 0, f(No, false, "若")},
-	{0x2f999, 0, 0, 0, f(No, false, "茝")},
-	{0x2f99a, 0, 0, 0, f(No, false, "荣")},
-	{0x2f99b, 0, 0, 0, f(No, false, "莭")},
-	{0x2f99c, 0, 0, 0, f(No, false, "茣")},
-	{0x2f99d, 0, 0, 0, f(No, false, "莽")},
-	{0x2f99e, 0, 0, 0, f(No, false, "菧")},
-	{0x2f99f, 0, 0, 0, f(No, false, "著")},
-	{0x2f9a0, 0, 0, 0, f(No, false, "荓")},
-	{0x2f9a1, 0, 0, 0, f(No, false, "菊")},
-	{0x2f9a2, 0, 0, 0, f(No, false, "菌")},
-	{0x2f9a3, 0, 0, 0, f(No, false, "菜")},
-	{0x2f9a4, 0, 0, 0, f(No, false, "𦰶")},
-	{0x2f9a5, 0, 0, 0, f(No, false, "𦵫")},
-	{0x2f9a6, 0, 0, 0, f(No, false, "𦳕")},
-	{0x2f9a7, 0, 0, 0, f(No, false, "䔫")},
-	{0x2f9a8, 0, 0, 0, f(No, false, "蓱")},
-	{0x2f9a9, 0, 0, 0, f(No, false, "蓳")},
-	{0x2f9aa, 0, 0, 0, f(No, false, "蔖")},
-	{0x2f9ab, 0, 0, 0, f(No, false, "𧏊")},
-	{0x2f9ac, 0, 0, 0, f(No, false, "蕤")},
-	{0x2f9ad, 0, 0, 0, f(No, false, "𦼬")},
-	{0x2f9ae, 0, 0, 0, f(No, false, "䕝")},
-	{0x2f9af, 0, 0, 0, f(No, false, "䕡")},
-	{0x2f9b0, 0, 0, 0, f(No, false, "𦾱")},
-	{0x2f9b1, 0, 0, 0, f(No, false, "𧃒")},
-	{0x2f9b2, 0, 0, 0, f(No, false, "䕫")},
-	{0x2f9b3, 0, 0, 0, f(No, false, "虐")},
-	{0x2f9b4, 0, 0, 0, f(No, false, "虜")},
-	{0x2f9b5, 0, 0, 0, f(No, false, "虧")},
-	{0x2f9b6, 0, 0, 0, f(No, false, "虩")},
-	{0x2f9b7, 0, 0, 0, f(No, false, "蚩")},
-	{0x2f9b8, 0, 0, 0, f(No, false, "蚈")},
-	{0x2f9b9, 0, 0, 0, f(No, false, "蜎")},
-	{0x2f9ba, 0, 0, 0, f(No, false, "蛢")},
-	{0x2f9bb, 0, 0, 0, f(No, false, "蝹")},
-	{0x2f9bc, 0, 0, 0, f(No, false, "蜨")},
-	{0x2f9bd, 0, 0, 0, f(No, false, "蝫")},
-	{0x2f9be, 0, 0, 0, f(No, false, "螆")},
-	{0x2f9bf, 0, 0, 0, f(No, false, "䗗")},
-	{0x2f9c0, 0, 0, 0, f(No, false, "蟡")},
-	{0x2f9c1, 0, 0, 0, f(No, false, "蠁")},
-	{0x2f9c2, 0, 0, 0, f(No, false, "䗹")},
-	{0x2f9c3, 0, 0, 0, f(No, false, "衠")},
-	{0x2f9c4, 0, 0, 0, f(No, false, "衣")},
-	{0x2f9c5, 0, 0, 0, f(No, false, "𧙧")},
-	{0x2f9c6, 0, 0, 0, f(No, false, "裗")},
-	{0x2f9c7, 0, 0, 0, f(No, false, "裞")},
-	{0x2f9c8, 0, 0, 0, f(No, false, "䘵")},
-	{0x2f9c9, 0, 0, 0, f(No, false, "裺")},
-	{0x2f9ca, 0, 0, 0, f(No, false, "㒻")},
-	{0x2f9cb, 0, 0, 0, f(No, false, "𧢮")},
-	{0x2f9cc, 0, 0, 0, f(No, false, "𧥦")},
-	{0x2f9cd, 0, 0, 0, f(No, false, "䚾")},
-	{0x2f9ce, 0, 0, 0, f(No, false, "䛇")},
-	{0x2f9cf, 0, 0, 0, f(No, false, "誠")},
-	{0x2f9d0, 0, 0, 0, f(No, false, "諭")},
-	{0x2f9d1, 0, 0, 0, f(No, false, "變")},
-	{0x2f9d2, 0, 0, 0, f(No, false, "豕")},
-	{0x2f9d3, 0, 0, 0, f(No, false, "𧲨")},
-	{0x2f9d4, 0, 0, 0, f(No, false, "貫")},
-	{0x2f9d5, 0, 0, 0, f(No, false, "賁")},
-	{0x2f9d6, 0, 0, 0, f(No, false, "贛")},
-	{0x2f9d7, 0, 0, 0, f(No, false, "起")},
-	{0x2f9d8, 0, 0, 0, f(No, false, "𧼯")},
-	{0x2f9d9, 0, 0, 0, f(No, false, "𠠄")},
-	{0x2f9da, 0, 0, 0, f(No, false, "跋")},
-	{0x2f9db, 0, 0, 0, f(No, false, "趼")},
-	{0x2f9dc, 0, 0, 0, f(No, false, "跰")},
-	{0x2f9dd, 0, 0, 0, f(No, false, "𠣞")},
-	{0x2f9de, 0, 0, 0, f(No, false, "軔")},
-	{0x2f9df, 0, 0, 0, f(No, false, "輸")},
-	{0x2f9e0, 0, 0, 0, f(No, false, "𨗒")},
-	{0x2f9e1, 0, 0, 0, f(No, false, "𨗭")},
-	{0x2f9e2, 0, 0, 0, f(No, false, "邔")},
-	{0x2f9e3, 0, 0, 0, f(No, false, "郱")},
-	{0x2f9e4, 0, 0, 0, f(No, false, "鄑")},
-	{0x2f9e5, 0, 0, 0, f(No, false, "𨜮")},
-	{0x2f9e6, 0, 0, 0, f(No, false, "鄛")},
-	{0x2f9e7, 0, 0, 0, f(No, false, "鈸")},
-	{0x2f9e8, 0, 0, 0, f(No, false, "鋗")},
-	{0x2f9e9, 0, 0, 0, f(No, false, "鋘")},
-	{0x2f9ea, 0, 0, 0, f(No, false, "鉼")},
-	{0x2f9eb, 0, 0, 0, f(No, false, "鏹")},
-	{0x2f9ec, 0, 0, 0, f(No, false, "鐕")},
-	{0x2f9ed, 0, 0, 0, f(No, false, "𨯺")},
-	{0x2f9ee, 0, 0, 0, f(No, false, "開")},
-	{0x2f9ef, 0, 0, 0, f(No, false, "䦕")},
-	{0x2f9f0, 0, 0, 0, f(No, false, "閷")},
-	{0x2f9f1, 0, 0, 0, f(No, false, "𨵷")},
-	{0x2f9f2, 0, 0, 0, f(No, false, "䧦")},
-	{0x2f9f3, 0, 0, 0, f(No, false, "雃")},
-	{0x2f9f4, 0, 0, 0, f(No, false, "嶲")},
-	{0x2f9f5, 0, 0, 0, f(No, false, "霣")},
-	{0x2f9f6, 0, 0, 0, f(No, false, "𩅅")},
-	{0x2f9f7, 0, 0, 0, f(No, false, "𩈚")},
-	{0x2f9f8, 0, 0, 0, f(No, false, "䩮")},
-	{0x2f9f9, 0, 0, 0, f(No, false, "䩶")},
-	{0x2f9fa, 0, 0, 0, f(No, false, "韠")},
-	{0x2f9fb, 0, 0, 0, f(No, false, "𩐊")},
-	{0x2f9fc, 0, 0, 0, f(No, false, "䪲")},
-	{0x2f9fd, 0, 0, 0, f(No, false, "𩒖")},
-	{0x2f9fe, 0, 0, 0, f(No, false, "頋")},
-	{0x2fa00, 0, 0, 0, f(No, false, "頩")},
-	{0x2fa01, 0, 0, 0, f(No, false, "𩖶")},
-	{0x2fa02, 0, 0, 0, f(No, false, "飢")},
-	{0x2fa03, 0, 0, 0, f(No, false, "䬳")},
-	{0x2fa04, 0, 0, 0, f(No, false, "餩")},
-	{0x2fa05, 0, 0, 0, f(No, false, "馧")},
-	{0x2fa06, 0, 0, 0, f(No, false, "駂")},
-	{0x2fa07, 0, 0, 0, f(No, false, "駾")},
-	{0x2fa08, 0, 0, 0, f(No, false, "䯎")},
-	{0x2fa09, 0, 0, 0, f(No, false, "𩬰")},
-	{0x2fa0a, 0, 0, 0, f(No, false, "鬒")},
-	{0x2fa0b, 0, 0, 0, f(No, false, "鱀")},
-	{0x2fa0c, 0, 0, 0, f(No, false, "鳽")},
-	{0x2fa0d, 0, 0, 0, f(No, false, "䳎")},
-	{0x2fa0e, 0, 0, 0, f(No, false, "䳭")},
-	{0x2fa0f, 0, 0, 0, f(No, false, "鵧")},
-	{0x2fa10, 0, 0, 0, f(No, false, "𪃎")},
-	{0x2fa11, 0, 0, 0, f(No, false, "䳸")},
-	{0x2fa12, 0, 0, 0, f(No, false, "𪄅")},
-	{0x2fa13, 0, 0, 0, f(No, false, "𪈎")},
-	{0x2fa14, 0, 0, 0, f(No, false, "𪊑")},
-	{0x2fa15, 0, 0, 0, f(No, false, "麻")},
-	{0x2fa16, 0, 0, 0, f(No, false, "䵖")},
-	{0x2fa17, 0, 0, 0, f(No, false, "黹")},
-	{0x2fa18, 0, 0, 0, f(No, false, "黾")},
-	{0x2fa19, 0, 0, 0, f(No, false, "鼅")},
-	{0x2fa1a, 0, 0, 0, f(No, false, "鼏")},
-	{0x2fa1b, 0, 0, 0, f(No, false, "鼖")},
-	{0x2fa1c, 0, 0, 0, f(No, false, "鼻")},
-	{0x2fa1d, 0, 0, 0, f(No, false, "𪘀")},
-	{0x2fa1e, 0, 0, 0, f(Yes, false, "")},
-}
diff --git a/vendor/golang.org/x/text/unicode/norm/example_iter_test.go b/vendor/golang.org/x/text/unicode/norm/example_iter_test.go
deleted file mode 100644
index 82df89c7..00000000
--- a/vendor/golang.org/x/text/unicode/norm/example_iter_test.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package norm_test
-
-import (
-	"bytes"
-	"fmt"
-	"unicode/utf8"
-
-	"golang.org/x/text/unicode/norm"
-)
-
-// EqualSimple uses a norm.Iter to compare two non-normalized
-// strings for equivalence.
-func EqualSimple(a, b string) bool {
-	var ia, ib norm.Iter
-	ia.InitString(norm.NFKD, a)
-	ib.InitString(norm.NFKD, b)
-	for !ia.Done() && !ib.Done() {
-		if !bytes.Equal(ia.Next(), ib.Next()) {
-			return false
-		}
-	}
-	return ia.Done() && ib.Done()
-}
-
-// FindPrefix finds the longest common prefix of ASCII characters
-// of a and b.
-func FindPrefix(a, b string) int {
-	i := 0
-	for ; i < len(a) && i < len(b) && a[i] < utf8.RuneSelf && a[i] == b[i]; i++ {
-	}
-	return i
-}
-
-// EqualOpt is like EqualSimple, but optimizes the special
-// case for ASCII characters.
-func EqualOpt(a, b string) bool {
-	n := FindPrefix(a, b)
-	a, b = a[n:], b[n:]
-	var ia, ib norm.Iter
-	ia.InitString(norm.NFKD, a)
-	ib.InitString(norm.NFKD, b)
-	for !ia.Done() && !ib.Done() {
-		if !bytes.Equal(ia.Next(), ib.Next()) {
-			return false
-		}
-		if n := int64(FindPrefix(a[ia.Pos():], b[ib.Pos():])); n != 0 {
-			ia.Seek(n, 1)
-			ib.Seek(n, 1)
-		}
-	}
-	return ia.Done() && ib.Done()
-}
-
-var compareTests = []struct{ a, b string }{
-	{"aaa", "aaa"},
-	{"aaa", "aab"},
-	{"a\u0300a", "\u00E0a"},
-	{"a\u0300\u0320b", "a\u0320\u0300b"},
-	{"\u1E0A\u0323", "\x44\u0323\u0307"},
-	// A character that decomposes into multiple segments
-	// spans several iterations.
-	{"\u3304", "\u30A4\u30CB\u30F3\u30AF\u3099"},
-}
-
-func ExampleIter() {
-	for i, t := range compareTests {
-		r0 := EqualSimple(t.a, t.b)
-		r1 := EqualOpt(t.a, t.b)
-		fmt.Printf("%d: %v %v\n", i, r0, r1)
-	}
-	// Output:
-	// 0: true true
-	// 1: false false
-	// 2: true true
-	// 3: true true
-	// 4: true true
-	// 5: true true
-}
diff --git a/vendor/golang.org/x/text/unicode/norm/example_test.go b/vendor/golang.org/x/text/unicode/norm/example_test.go
deleted file mode 100644
index 8f3b1565..00000000
--- a/vendor/golang.org/x/text/unicode/norm/example_test.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package norm_test
-
-import (
-	"fmt"
-
-	"golang.org/x/text/unicode/norm"
-)
-
-func ExampleForm_NextBoundary() {
-	s := norm.NFD.String("Mêlée")
-
-	for i := 0; i < len(s); {
-		d := norm.NFC.NextBoundaryInString(s[i:], true)
-		fmt.Printf("%[1]s: %+[1]q\n", s[i:i+d])
-		i += d
-	}
-	// Output:
-	// M: "M"
-	// ê: "e\u0302"
-	// l: "l"
-	// é: "e\u0301"
-	// e: "e"
-}
diff --git a/vendor/golang.org/x/text/unicode/norm/forminfo_test.go b/vendor/golang.org/x/text/unicode/norm/forminfo_test.go
deleted file mode 100644
index e15ba9be..00000000
--- a/vendor/golang.org/x/text/unicode/norm/forminfo_test.go
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build test
-
-package norm
-
-import "testing"
-
-func TestProperties(t *testing.T) {
-	var d runeData
-	CK := [2]string{"C", "K"}
-	for k, r := 1, rune(0); r < 0x2ffff; r++ {
-		if k < len(testData) && r == testData[k].r {
-			d = testData[k]
-			k++
-		}
-		s := string(r)
-		for j, p := range []Properties{NFC.PropertiesString(s), NFKC.PropertiesString(s)} {
-			f := d.f[j]
-			if p.CCC() != d.ccc {
-				t.Errorf("%U: ccc(%s): was %d; want %d %X", r, CK[j], p.CCC(), d.ccc, p.index)
-			}
-			if p.isYesC() != (f.qc == Yes) {
-				t.Errorf("%U: YesC(%s): was %v; want %v", r, CK[j], p.isYesC(), f.qc == Yes)
-			}
-			if p.combinesBackward() != (f.qc == Maybe) {
-				t.Errorf("%U: combines backwards(%s): was %v; want %v", r, CK[j], p.combinesBackward(), f.qc == Maybe)
-			}
-			if p.nLeadingNonStarters() != d.nLead {
-				t.Errorf("%U: nLead(%s): was %d; want %d %#v %#v", r, CK[j], p.nLeadingNonStarters(), d.nLead, p, d)
-			}
-			if p.nTrailingNonStarters() != d.nTrail {
-				t.Errorf("%U: nTrail(%s): was %d; want %d %#v %#v", r, CK[j], p.nTrailingNonStarters(), d.nTrail, p, d)
-			}
-			if p.combinesForward() != f.combinesForward {
-				t.Errorf("%U: combines forward(%s): was %v; want %v %#v", r, CK[j], p.combinesForward(), f.combinesForward, p)
-			}
-			// Skip Hangul as it is algorithmically computed.
-			if r >= hangulBase && r < hangulEnd {
-				continue
-			}
-			if p.hasDecomposition() {
-				if has := f.decomposition != ""; !has {
-					t.Errorf("%U: hasDecomposition(%s): was %v; want %v", r, CK[j], p.hasDecomposition(), has)
-				}
-				if string(p.Decomposition()) != f.decomposition {
-					t.Errorf("%U: decomp(%s): was %+q; want %+q", r, CK[j], p.Decomposition(), f.decomposition)
-				}
-			}
-		}
-	}
-}
diff --git a/vendor/golang.org/x/text/unicode/norm/iter_test.go b/vendor/golang.org/x/text/unicode/norm/iter_test.go
deleted file mode 100644
index d95aa304..00000000
--- a/vendor/golang.org/x/text/unicode/norm/iter_test.go
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package norm
-
-import (
-	"strings"
-	"testing"
-)
-
-func doIterNorm(f Form, s string) []byte {
-	acc := []byte{}
-	i := Iter{}
-	i.InitString(f, s)
-	for !i.Done() {
-		acc = append(acc, i.Next()...)
-	}
-	return acc
-}
-
-func TestIterNext(t *testing.T) {
-	runNormTests(t, "IterNext", func(f Form, out []byte, s string) []byte {
-		return doIterNorm(f, string(append(out, s...)))
-	})
-}
-
-type SegmentTest struct {
-	in  string
-	out []string
-}
-
-var segmentTests = []SegmentTest{
-	{"\u1E0A\u0323a", []string{"\x44\u0323\u0307", "a", ""}},
-	{rep('a', segSize), append(strings.Split(rep('a', segSize), ""), "")},
-	{rep('a', segSize+2), append(strings.Split(rep('a', segSize+2), ""), "")},
-	{rep('a', segSize) + "\u0300aa",
-		append(strings.Split(rep('a', segSize-1), ""), "a\u0300", "a", "a", "")},
-
-	// U+0f73 is NOT treated as a starter as it is a modifier
-	{"a" + grave(29) + "\u0f73", []string{"a" + grave(29), cgj + "\u0f73"}},
-	{"a\u0f73", []string{"a\u0f73"}},
-
-	// U+ff9e is treated as a non-starter.
-	// TODO: should we? Note that this will only affect iteration, as whether
-	// or not we do so does not affect the normalization output and will either
-	// way result in consistent iteration output.
-	{"a" + grave(30) + "\uff9e", []string{"a" + grave(30), cgj + "\uff9e"}},
-	{"a\uff9e", []string{"a\uff9e"}},
-}
-
-var segmentTestsK = []SegmentTest{
-	{"\u3332", []string{"\u30D5", "\u30A1", "\u30E9", "\u30C3", "\u30C8\u3099", ""}},
-	// last segment of multi-segment decomposition needs normalization
-	{"\u3332\u093C", []string{"\u30D5", "\u30A1", "\u30E9", "\u30C3", "\u30C8\u093C\u3099", ""}},
-	{"\u320E", []string{"\x28", "\uAC00", "\x29"}},
-
-	// last segment should be copied to start of buffer.
-	{"\ufdfa", []string{"\u0635", "\u0644", "\u0649", " ", "\u0627", "\u0644", "\u0644", "\u0647", " ", "\u0639", "\u0644", "\u064a", "\u0647", " ", "\u0648", "\u0633", "\u0644", "\u0645", ""}},
-	{"\ufdfa" + grave(30), []string{"\u0635", "\u0644", "\u0649", " ", "\u0627", "\u0644", "\u0644", "\u0647", " ", "\u0639", "\u0644", "\u064a", "\u0647", " ", "\u0648", "\u0633", "\u0644", "\u0645" + grave(30), ""}},
-	{"\uFDFA" + grave(64), []string{"\u0635", "\u0644", "\u0649", " ", "\u0627", "\u0644", "\u0644", "\u0647", " ", "\u0639", "\u0644", "\u064a", "\u0647", " ", "\u0648", "\u0633", "\u0644", "\u0645" + grave(30), cgj + grave(30), cgj + grave(4), ""}},
-
-	// Hangul and Jamo are grouped together.
-	{"\uAC00", []string{"\u1100\u1161", ""}},
-	{"\uAC01", []string{"\u1100\u1161\u11A8", ""}},
-	{"\u1100\u1161", []string{"\u1100\u1161", ""}},
-}
-
-// Note that, by design, segmentation is equal for composing and decomposing forms.
-func TestIterSegmentation(t *testing.T) {
-	segmentTest(t, "SegmentTestD", NFD, segmentTests)
-	segmentTest(t, "SegmentTestC", NFC, segmentTests)
-	segmentTest(t, "SegmentTestKD", NFKD, segmentTestsK)
-	segmentTest(t, "SegmentTestKC", NFKC, segmentTestsK)
-}
-
-func segmentTest(t *testing.T, name string, f Form, tests []SegmentTest) {
-	iter := Iter{}
-	for i, tt := range tests {
-		iter.InitString(f, tt.in)
-		for j, seg := range tt.out {
-			if seg == "" {
-				if !iter.Done() {
-					res := string(iter.Next())
-					t.Errorf(`%s:%d:%d: expected Done()==true, found segment %+q`, name, i, j, res)
-				}
-				continue
-			}
-			if iter.Done() {
-				t.Errorf("%s:%d:%d: Done()==true, want false", name, i, j)
-			}
-			seg = f.String(seg)
-			if res := string(iter.Next()); res != seg {
-				t.Errorf(`%s:%d:%d" segment was %+q (%d); want %+q (%d)`, name, i, j, pc(res), len(res), pc(seg), len(seg))
-			}
-		}
-	}
-}
diff --git a/vendor/golang.org/x/text/unicode/norm/normalize_test.go b/vendor/golang.org/x/text/unicode/norm/normalize_test.go
deleted file mode 100644
index e3c0ac73..00000000
--- a/vendor/golang.org/x/text/unicode/norm/normalize_test.go
+++ /dev/null
@@ -1,1287 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package norm
-
-import (
-	"bytes"
-	"flag"
-	"fmt"
-	"io"
-	"log"
-	"strings"
-	"testing"
-	"unicode/utf8"
-
-	"golang.org/x/text/internal/testtext"
-	"golang.org/x/text/transform"
-)
-
-var (
-	testn = flag.Int("testn", -1, "specific test number to run or -1 for all")
-)
-
-// pc replaces any rune r that is repeated n times, for n > 1, with r{n}.
-func pc(s string) []byte {
-	b := bytes.NewBuffer(make([]byte, 0, len(s)))
-	for i := 0; i < len(s); {
-		r, sz := utf8.DecodeRuneInString(s[i:])
-		n := 0
-		if sz == 1 {
-			// Special-case one-byte case to handle repetition for invalid UTF-8.
-			for c := s[i]; i+n < len(s) && s[i+n] == c; n++ {
-			}
-		} else {
-			for _, r2 := range s[i:] {
-				if r2 != r {
-					break
-				}
-				n++
-			}
-		}
-		b.WriteString(s[i : i+sz])
-		if n > 1 {
-			fmt.Fprintf(b, "{%d}", n)
-		}
-		i += sz * n
-	}
-	return b.Bytes()
-}
-
-// pidx finds the index from which two strings start to differ, plus context.
-// It returns the index and ellipsis if the index is greater than 0.
-func pidx(a, b string) (i int, prefix string) {
-	for ; i < len(a) && i < len(b) && a[i] == b[i]; i++ {
-	}
-	if i < 8 {
-		return 0, ""
-	}
-	i -= 3 // ensure taking at least one full rune before the difference.
-	for k := i - 7; i > k && !utf8.RuneStart(a[i]); i-- {
-	}
-	return i, "..."
-}
-
-type PositionTest struct {
-	input  string
-	pos    int
-	buffer string // expected contents of reorderBuffer, if applicable
-}
-
-type positionFunc func(rb *reorderBuffer, s string) (int, []byte)
-
-func runPosTests(t *testing.T, name string, f Form, fn positionFunc, tests []PositionTest) {
-	rb := reorderBuffer{}
-	rb.init(f, nil)
-	for i, test := range tests {
-		rb.reset()
-		rb.src = inputString(test.input)
-		rb.nsrc = len(test.input)
-		pos, out := fn(&rb, test.input)
-		if pos != test.pos {
-			t.Errorf("%s:%d: position is %d; want %d", name, i, pos, test.pos)
-		}
-		if outs := string(out); outs != test.buffer {
-			k, pfx := pidx(outs, test.buffer)
-			t.Errorf("%s:%d: buffer \nwas  %s%+q; \nwant %s%+q", name, i, pfx, pc(outs[k:]), pfx, pc(test.buffer[k:]))
-		}
-	}
-}
-
-func grave(n int) string {
-	return rep(0x0300, n)
-}
-
-func rep(r rune, n int) string {
-	return strings.Repeat(string(r), n)
-}
-
-const segSize = maxByteBufferSize
-
-var cgj = GraphemeJoiner
-
-var decomposeSegmentTests = []PositionTest{
-	// illegal runes
-	{"\xC2", 0, ""},
-	{"\xC0", 1, "\xC0"},
-	{"\u00E0\x80", 2, "\u0061\u0300"},
-	// starter
-	{"a", 1, "a"},
-	{"ab", 1, "a"},
-	// starter + composing
-	{"a\u0300", 3, "a\u0300"},
-	{"a\u0300b", 3, "a\u0300"},
-	// with decomposition
-	{"\u00C0", 2, "A\u0300"},
-	{"\u00C0b", 2, "A\u0300"},
-	// long
-	{grave(31), 60, grave(30) + cgj},
-	{"a" + grave(31), 61, "a" + grave(30) + cgj},
-
-	// Stability tests: see http://www.unicode.org/review/pr-29.html.
-	// U+0300 COMBINING GRAVE ACCENT;Mn;230;NSM;;;;;N;NON-SPACING GRAVE;;;;
-	// U+0B47 ORIYA VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
-	// U+0B3E ORIYA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
-	// U+1100 HANGUL CHOSEONG KIYEOK;Lo;0;L;;;;;N;;;;;
-	// U+1161 HANGUL JUNGSEONG A;Lo;0;L;;;;;N;;;;;
-	{"\u0B47\u0300\u0B3E", 8, "\u0B47\u0300\u0B3E"},
-	{"\u1100\u0300\u1161", 8, "\u1100\u0300\u1161"},
-	{"\u0B47\u0B3E", 6, "\u0B47\u0B3E"},
-	{"\u1100\u1161", 6, "\u1100\u1161"},
-
-	// U+04DA MALAYALAM VOWEL SIGN O;Mc;0;L;0D46 0D3E;;;;N;;;;;
-	// Sequence of decomposing characters that are starters and modifiers.
-	{"\u0d4a" + strings.Repeat("\u0d3e", 31), 90, "\u0d46" + strings.Repeat("\u0d3e", 30) + cgj},
-
-	{grave(30), 60, grave(30)},
-	// U+FF9E is a starter, but decomposes to U+3099, which is not.
-	{grave(30) + "\uff9e", 60, grave(30) + cgj},
-	// ends with incomplete UTF-8 encoding
-	{"\xCC", 0, ""},
-	{"\u0300\xCC", 2, "\u0300"},
-}
-
-func decomposeSegmentF(rb *reorderBuffer, s string) (int, []byte) {
-	rb.initString(NFD, s)
-	rb.setFlusher(nil, appendFlush)
-	p := decomposeSegment(rb, 0, true)
-	return p, rb.out
-}
-
-func TestDecomposeSegment(t *testing.T) {
-	runPosTests(t, "TestDecomposeSegment", NFC, decomposeSegmentF, decomposeSegmentTests)
-}
-
-var firstBoundaryTests = []PositionTest{
-	// no boundary
-	{"", -1, ""},
-	{"\u0300", -1, ""},
-	{"\x80\x80", -1, ""},
-	// illegal runes
-	{"\xff", 0, ""},
-	{"\u0300\xff", 2, ""},
-	{"\u0300\xc0\x80\x80", 2, ""},
-	// boundaries
-	{"a", 0, ""},
-	{"\u0300a", 2, ""},
-	// Hangul
-	{"\u1103\u1161", 0, ""},
-	{"\u110B\u1173\u11B7", 0, ""},
-	{"\u1161\u110B\u1173\u11B7", 3, ""},
-	{"\u1173\u11B7\u1103\u1161", 6, ""},
-	// too many combining characters.
-	{grave(maxNonStarters - 1), -1, ""},
-	{grave(maxNonStarters), 60, ""},
-	{grave(maxNonStarters + 1), 60, ""},
-}
-
-func firstBoundaryF(rb *reorderBuffer, s string) (int, []byte) {
-	return rb.f.form.FirstBoundary([]byte(s)), nil
-}
-
-func firstBoundaryStringF(rb *reorderBuffer, s string) (int, []byte) {
-	return rb.f.form.FirstBoundaryInString(s), nil
-}
-
-func TestFirstBoundary(t *testing.T) {
-	runPosTests(t, "TestFirstBoundary", NFC, firstBoundaryF, firstBoundaryTests)
-	runPosTests(t, "TestFirstBoundaryInString", NFC, firstBoundaryStringF, firstBoundaryTests)
-}
-
-func TestNextBoundary(t *testing.T) {
-	testCases := []struct {
-		input string
-		atEOF bool
-		want  int
-	}{
-		// no boundary
-		{"", true, 0},
-		{"", false, -1},
-		{"\u0300", true, 2},
-		{"\u0300", false, -1},
-		{"\x80\x80", true, 1},
-		{"\x80\x80", false, 1},
-		// illegal runes
-		{"\xff", false, 1},
-		{"\u0300\xff", false, 2},
-		{"\u0300\xc0\x80\x80", false, 2},
-		{"\xc2\x80\x80", false, 2},
-		{"\xc2", false, -1},
-		{"\xc2", true, 1},
-		{"a\u0300\xc2", false, -1},
-		{"a\u0300\xc2", true, 3},
-		// boundaries
-		{"a", true, 1},
-		{"a", false, -1},
-		{"aa", false, 1},
-		{"\u0300", true, 2},
-		{"\u0300", false, -1},
-		{"\u0300a", false, 2},
-		// Hangul
-		{"\u1103\u1161", true, 6},
-		{"\u1103\u1161", false, -1},
-		{"\u110B\u1173\u11B7", false, -1},
-		{"\u110B\u1173\u11B7\u110B\u1173\u11B7", false, 9},
-		{"\u1161\u110B\u1173\u11B7", false, 3},
-		{"\u1173\u11B7\u1103\u1161", false, 6},
-		// too many combining characters.
-		{grave(maxNonStarters - 1), false, -1},
-		{grave(maxNonStarters), false, 60},
-		{grave(maxNonStarters + 1), false, 60},
-	}
-
-	for _, tc := range testCases {
-		if got := NFC.NextBoundary([]byte(tc.input), tc.atEOF); got != tc.want {
-			t.Errorf("NextBoundary(%+q, %v) = %d; want %d", tc.input, tc.atEOF, got, tc.want)
-		}
-		if got := NFC.NextBoundaryInString(tc.input, tc.atEOF); got != tc.want {
-			t.Errorf("NextBoundaryInString(%+q, %v) = %d; want %d", tc.input, tc.atEOF, got, tc.want)
-		}
-	}
-}
-
-var decomposeToLastTests = []PositionTest{
-	// ends with inert character
-	{"Hello!", 6, ""},
-	{"\u0632", 2, ""},
-	{"a\u0301\u0635", 5, ""},
-	// ends with non-inert starter
-	{"a", 0, "a"},
-	{"a\u0301a", 3, "a"},
-	{"a\u0301\u03B9", 3, "\u03B9"},
-	{"a\u0327", 0, "a\u0327"},
-	// illegal runes
-	{"\xFF", 1, ""},
-	{"aa\xFF", 3, ""},
-	{"\xC0\x80\x80", 3, ""},
-	{"\xCC\x80\x80", 3, ""},
-	// ends with incomplete UTF-8 encoding
-	{"a\xCC", 2, ""},
-	// ends with combining characters
-	{"\u0300\u0301", 0, "\u0300\u0301"},
-	{"a\u0300\u0301", 0, "a\u0300\u0301"},
-	{"a\u0301\u0308", 0, "a\u0301\u0308"},
-	{"a\u0308\u0301", 0, "a\u0308\u0301"},
-	{"aaaa\u0300\u0301", 3, "a\u0300\u0301"},
-	{"\u0300a\u0300\u0301", 2, "a\u0300\u0301"},
-	{"\u00C0", 0, "A\u0300"},
-	{"a\u00C0", 1, "A\u0300"},
-	// decomposing
-	{"a\u0300\u00E0", 3, "a\u0300"},
-	// multisegment decompositions (flushes leading segments)
-	{"a\u0300\uFDC0", 7, "\u064A"},
-	{"\uFDC0" + grave(29), 4, "\u064A" + grave(29)},
-	{"\uFDC0" + grave(30), 4, "\u064A" + grave(30)},
-	{"\uFDC0" + grave(31), 5, grave(30)},
-	{"\uFDFA" + grave(14), 31, "\u0645" + grave(14)},
-	// Overflow
-	{"\u00E0" + grave(29), 0, "a" + grave(30)},
-	{"\u00E0" + grave(30), 2, grave(30)},
-	// Hangul
-	{"a\u1103", 1, "\u1103"},
-	{"a\u110B", 1, "\u110B"},
-	{"a\u110B\u1173", 1, "\u110B\u1173"},
-	// See comment in composition.go:compBoundaryAfter.
-	{"a\u110B\u1173\u11B7", 1, "\u110B\u1173\u11B7"},
-	{"a\uC73C", 1, "\u110B\u1173"},
-	{"다음", 3, "\u110B\u1173\u11B7"},
-	{"다", 0, "\u1103\u1161"},
-	{"\u1103\u1161\u110B\u1173\u11B7", 6, "\u110B\u1173\u11B7"},
-	{"\u110B\u1173\u11B7\u1103\u1161", 9, "\u1103\u1161"},
-	{"다음음", 6, "\u110B\u1173\u11B7"},
-	{"음다다", 6, "\u1103\u1161"},
-	// maximized buffer
-	{"a" + grave(30), 0, "a" + grave(30)},
-	// Buffer overflow
-	{"a" + grave(31), 3, grave(30)},
-	// weird UTF-8
-	{"a\u0300\u11B7", 0, "a\u0300\u11B7"},
-}
-
-func decomposeToLast(rb *reorderBuffer, s string) (int, []byte) {
-	rb.setFlusher([]byte(s), appendFlush)
-	decomposeToLastBoundary(rb)
-	buf := rb.flush(nil)
-	return len(rb.out), buf
-}
-
-func TestDecomposeToLastBoundary(t *testing.T) {
-	runPosTests(t, "TestDecomposeToLastBoundary", NFKC, decomposeToLast, decomposeToLastTests)
-}
-
-var lastBoundaryTests = []PositionTest{
-	// ends with inert character
-	{"Hello!", 6, ""},
-	{"\u0632", 2, ""},
-	// ends with non-inert starter
-	{"a", 0, ""},
-	// illegal runes
-	{"\xff", 1, ""},
-	{"aa\xff", 3, ""},
-	{"a\xff\u0300", 1, ""}, // TODO: should probably be 2.
-	{"\xc0\x80\x80", 3, ""},
-	{"\xc0\x80\x80\u0300", 3, ""},
-	// ends with incomplete UTF-8 encoding
-	{"\xCC", -1, ""},
-	{"\xE0\x80", -1, ""},
-	{"\xF0\x80\x80", -1, ""},
-	{"a\xCC", 0, ""},
-	{"\x80\xCC", 1, ""},
-	{"\xCC\xCC", 1, ""},
-	// ends with combining characters
-	{"a\u0300\u0301", 0, ""},
-	{"aaaa\u0300\u0301", 3, ""},
-	{"\u0300a\u0300\u0301", 2, ""},
-	{"\u00C2", 0, ""},
-	{"a\u00C2", 1, ""},
-	// decomposition may recombine
-	{"\u0226", 0, ""},
-	// no boundary
-	{"", -1, ""},
-	{"\u0300\u0301", -1, ""},
-	{"\u0300", -1, ""},
-	{"\x80\x80", -1, ""},
-	{"\x80\x80\u0301", -1, ""},
-	// Hangul
-	{"다음", 3, ""},
-	{"다", 0, ""},
-	{"\u1103\u1161\u110B\u1173\u11B7", 6, ""},
-	{"\u110B\u1173\u11B7\u1103\u1161", 9, ""},
-	// too many combining characters.
-	{grave(maxNonStarters - 1), -1, ""},
-	// May still be preceded with a non-starter.
-	{grave(maxNonStarters), -1, ""},
-	// May still need to insert a cgj after the last combiner.
-	{grave(maxNonStarters + 1), 2, ""},
-	{grave(maxNonStarters + 2), 4, ""},
-
-	{"a" + grave(maxNonStarters-1), 0, ""},
-	{"a" + grave(maxNonStarters), 0, ""},
-	// May still need to insert a cgj after the last combiner.
-	{"a" + grave(maxNonStarters+1), 3, ""},
-	{"a" + grave(maxNonStarters+2), 5, ""},
-}
-
-func lastBoundaryF(rb *reorderBuffer, s string) (int, []byte) {
-	return rb.f.form.LastBoundary([]byte(s)), nil
-}
-
-func TestLastBoundary(t *testing.T) {
-	runPosTests(t, "TestLastBoundary", NFC, lastBoundaryF, lastBoundaryTests)
-}
-
-type spanTest struct {
-	input string
-	atEOF bool
-	n     int
-	err   error
-}
-
-var quickSpanTests = []spanTest{
-	{"", true, 0, nil},
-	// starters
-	{"a", true, 1, nil},
-	{"abc", true, 3, nil},
-	{"\u043Eb", true, 3, nil},
-	// incomplete last rune.
-	{"\xCC", true, 1, nil},
-	{"\xCC", false, 0, transform.ErrShortSrc},
-	{"a\xCC", true, 2, nil},
-	{"a\xCC", false, 0, transform.ErrShortSrc}, // TODO: could be 1 for NFD
-	// incorrectly ordered combining characters
-	{"\u0300\u0316", true, 0, transform.ErrEndOfSpan},
-	{"\u0300\u0316", false, 0, transform.ErrEndOfSpan},
-	{"\u0300\u0316cd", true, 0, transform.ErrEndOfSpan},
-	{"\u0300\u0316cd", false, 0, transform.ErrEndOfSpan},
-	// have a maximum number of combining characters.
-	{rep(0x035D, 30) + "\u035B", true, 0, transform.ErrEndOfSpan},
-	{"a" + rep(0x035D, 30) + "\u035B", true, 0, transform.ErrEndOfSpan},
-	{"Ɵ" + rep(0x035D, 30) + "\u035B", true, 0, transform.ErrEndOfSpan},
-	{"aa" + rep(0x035D, 30) + "\u035B", true, 1, transform.ErrEndOfSpan},
-	{rep(0x035D, 30) + cgj + "\u035B", true, 64, nil},
-	{"a" + rep(0x035D, 30) + cgj + "\u035B", true, 65, nil},
-	{"Ɵ" + rep(0x035D, 30) + cgj + "\u035B", true, 66, nil},
-	{"aa" + rep(0x035D, 30) + cgj + "\u035B", true, 66, nil},
-
-	{"a" + rep(0x035D, 30) + cgj + "\u035B", false, 61, transform.ErrShortSrc},
-	{"Ɵ" + rep(0x035D, 30) + cgj + "\u035B", false, 62, transform.ErrShortSrc},
-	{"aa" + rep(0x035D, 30) + cgj + "\u035B", false, 62, transform.ErrShortSrc},
-}
-
-var quickSpanNFDTests = []spanTest{
-	// needs decomposing
-	{"\u00C0", true, 0, transform.ErrEndOfSpan},
-	{"abc\u00C0", true, 3, transform.ErrEndOfSpan},
-	// correctly ordered combining characters
-	{"\u0300", true, 2, nil},
-	{"ab\u0300", true, 4, nil},
-	{"ab\u0300cd", true, 6, nil},
-	{"\u0300cd", true, 4, nil},
-	{"\u0316\u0300", true, 4, nil},
-	{"ab\u0316\u0300", true, 6, nil},
-	{"ab\u0316\u0300cd", true, 8, nil},
-	{"ab\u0316\u0300\u00C0", true, 6, transform.ErrEndOfSpan},
-	{"\u0316\u0300cd", true, 6, nil},
-	{"\u043E\u0308b", true, 5, nil},
-	// incorrectly ordered combining characters
-	{"ab\u0300\u0316", true, 1, transform.ErrEndOfSpan}, // TODO: we could skip 'b' as well.
-	{"ab\u0300\u0316cd", true, 1, transform.ErrEndOfSpan},
-	// Hangul
-	{"같은", true, 0, transform.ErrEndOfSpan},
-}
-
-var quickSpanNFCTests = []spanTest{
-	// okay composed
-	{"\u00C0", true, 2, nil},
-	{"abc\u00C0", true, 5, nil},
-	// correctly ordered combining characters
-	// TODO: b may combine with modifiers, which is why this fails. We could
-	// make a more precise test that that actually checks whether last
-	// characters combines. Probably not worth it.
-	{"ab\u0300", true, 1, transform.ErrEndOfSpan},
-	{"ab\u0300cd", true, 1, transform.ErrEndOfSpan},
-	{"ab\u0316\u0300", true, 1, transform.ErrEndOfSpan},
-	{"ab\u0316\u0300cd", true, 1, transform.ErrEndOfSpan},
-	{"\u00C0\u035D", true, 4, nil},
-	// we do not special case leading combining characters
-	{"\u0300cd", true, 0, transform.ErrEndOfSpan},
-	{"\u0300", true, 0, transform.ErrEndOfSpan},
-	{"\u0316\u0300", true, 0, transform.ErrEndOfSpan},
-	{"\u0316\u0300cd", true, 0, transform.ErrEndOfSpan},
-	// incorrectly ordered combining characters
-	{"ab\u0300\u0316", true, 1, transform.ErrEndOfSpan},
-	{"ab\u0300\u0316cd", true, 1, transform.ErrEndOfSpan},
-	// Hangul
-	{"같은", true, 6, nil},
-	{"같은", false, 3, transform.ErrShortSrc},
-	// We return the start of the violating segment in case of overflow.
-	{grave(30) + "\uff9e", true, 0, transform.ErrEndOfSpan},
-	{grave(30), true, 0, transform.ErrEndOfSpan},
-}
-
-func runSpanTests(t *testing.T, name string, f Form, testCases []spanTest) {
-	for i, tc := range testCases {
-		s := fmt.Sprintf("Bytes/%s/%d=%+q/atEOF=%v", name, i, pc(tc.input), tc.atEOF)
-		ok := testtext.Run(t, s, func(t *testing.T) {
-			n, err := f.Span([]byte(tc.input), tc.atEOF)
-			if n != tc.n || err != tc.err {
-				t.Errorf("\n got %d, %v;\nwant %d, %v", n, err, tc.n, tc.err)
-			}
-		})
-		if !ok {
-			continue // Don't do the String variant if the Bytes variant failed.
-		}
-		s = fmt.Sprintf("String/%s/%d=%+q/atEOF=%v", name, i, pc(tc.input), tc.atEOF)
-		testtext.Run(t, s, func(t *testing.T) {
-			n, err := f.SpanString(tc.input, tc.atEOF)
-			if n != tc.n || err != tc.err {
-				t.Errorf("\n got %d, %v;\nwant %d, %v", n, err, tc.n, tc.err)
-			}
-		})
-	}
-}
-
-func TestSpan(t *testing.T) {
-	runSpanTests(t, "NFD", NFD, quickSpanTests)
-	runSpanTests(t, "NFD", NFD, quickSpanNFDTests)
-	runSpanTests(t, "NFC", NFC, quickSpanTests)
-	runSpanTests(t, "NFC", NFC, quickSpanNFCTests)
-}
-
-var isNormalTests = []PositionTest{
-	{"", 1, ""},
-	// illegal runes
-	{"\xff", 1, ""},
-	// starters
-	{"a", 1, ""},
-	{"abc", 1, ""},
-	{"\u043Eb", 1, ""},
-	// incorrectly ordered combining characters
-	{"\u0300\u0316", 0, ""},
-	{"ab\u0300\u0316", 0, ""},
-	{"ab\u0300\u0316cd", 0, ""},
-	{"\u0300\u0316cd", 0, ""},
-}
-var isNormalNFDTests = []PositionTest{
-	// needs decomposing
-	{"\u00C0", 0, ""},
-	{"abc\u00C0", 0, ""},
-	// correctly ordered combining characters
-	{"\u0300", 1, ""},
-	{"ab\u0300", 1, ""},
-	{"ab\u0300cd", 1, ""},
-	{"\u0300cd", 1, ""},
-	{"\u0316\u0300", 1, ""},
-	{"ab\u0316\u0300", 1, ""},
-	{"ab\u0316\u0300cd", 1, ""},
-	{"\u0316\u0300cd", 1, ""},
-	{"\u043E\u0308b", 1, ""},
-	// Hangul
-	{"같은", 0, ""},
-}
-var isNormalNFCTests = []PositionTest{
-	// okay composed
-	{"\u00C0", 1, ""},
-	{"abc\u00C0", 1, ""},
-	// need reordering
-	{"a\u0300", 0, ""},
-	{"a\u0300cd", 0, ""},
-	{"a\u0316\u0300", 0, ""},
-	{"a\u0316\u0300cd", 0, ""},
-	// correctly ordered combining characters
-	{"ab\u0300", 1, ""},
-	{"ab\u0300cd", 1, ""},
-	{"ab\u0316\u0300", 1, ""},
-	{"ab\u0316\u0300cd", 1, ""},
-	{"\u00C0\u035D", 1, ""},
-	{"\u0300", 1, ""},
-	{"\u0316\u0300cd", 1, ""},
-	// Hangul
-	{"같은", 1, ""},
-}
-
-var isNormalNFKXTests = []PositionTest{
-	// Special case.
-	{"\u00BC", 0, ""},
-}
-
-func isNormalF(rb *reorderBuffer, s string) (int, []byte) {
-	if rb.f.form.IsNormal([]byte(s)) {
-		return 1, nil
-	}
-	return 0, nil
-}
-
-func isNormalStringF(rb *reorderBuffer, s string) (int, []byte) {
-	if rb.f.form.IsNormalString(s) {
-		return 1, nil
-	}
-	return 0, nil
-}
-
-func TestIsNormal(t *testing.T) {
-	runPosTests(t, "TestIsNormalNFD1", NFD, isNormalF, isNormalTests)
-	runPosTests(t, "TestIsNormalNFD2", NFD, isNormalF, isNormalNFDTests)
-	runPosTests(t, "TestIsNormalNFC1", NFC, isNormalF, isNormalTests)
-	runPosTests(t, "TestIsNormalNFC2", NFC, isNormalF, isNormalNFCTests)
-	runPosTests(t, "TestIsNormalNFKD1", NFKD, isNormalF, isNormalTests)
-	runPosTests(t, "TestIsNormalNFKD2", NFKD, isNormalF, isNormalNFDTests)
-	runPosTests(t, "TestIsNormalNFKD3", NFKD, isNormalF, isNormalNFKXTests)
-	runPosTests(t, "TestIsNormalNFKC1", NFKC, isNormalF, isNormalTests)
-	runPosTests(t, "TestIsNormalNFKC2", NFKC, isNormalF, isNormalNFCTests)
-	runPosTests(t, "TestIsNormalNFKC3", NFKC, isNormalF, isNormalNFKXTests)
-}
-
-func TestIsNormalString(t *testing.T) {
-	runPosTests(t, "TestIsNormalNFD1", NFD, isNormalStringF, isNormalTests)
-	runPosTests(t, "TestIsNormalNFD2", NFD, isNormalStringF, isNormalNFDTests)
-	runPosTests(t, "TestIsNormalNFC1", NFC, isNormalStringF, isNormalTests)
-	runPosTests(t, "TestIsNormalNFC2", NFC, isNormalStringF, isNormalNFCTests)
-}
-
-type AppendTest struct {
-	left  string
-	right string
-	out   string
-}
-
-type appendFunc func(f Form, out []byte, s string) []byte
-
-var fstr = []string{"NFC", "NFD", "NFKC", "NFKD"}
-
-func runNormTests(t *testing.T, name string, fn appendFunc) {
-	for f := NFC; f <= NFKD; f++ {
-		runAppendTests(t, name, f, fn, normTests[f])
-	}
-}
-
-func runAppendTests(t *testing.T, name string, f Form, fn appendFunc, tests []AppendTest) {
-	for i, test := range tests {
-		t.Run(fmt.Sprintf("%s/%d", fstr[f], i), func(t *testing.T) {
-			id := pc(test.left + test.right)
-			if *testn >= 0 && i != *testn {
-				return
-			}
-			t.Run("fn", func(t *testing.T) {
-				out := []byte(test.left)
-				have := string(fn(f, out, test.right))
-				if len(have) != len(test.out) {
-					t.Errorf("%+q: length is %d; want %d (%+q vs %+q)", id, len(have), len(test.out), pc(have), pc(test.out))
-				}
-				if have != test.out {
-					k, pf := pidx(have, test.out)
-					t.Errorf("%+q:\nwas  %s%+q; \nwant %s%+q", id, pf, pc(have[k:]), pf, pc(test.out[k:]))
-				}
-			})
-
-			// Bootstrap by normalizing input. Ensures that the various variants
-			// behave the same.
-			for g := NFC; g <= NFKD; g++ {
-				if f == g {
-					continue
-				}
-				t.Run(fstr[g], func(t *testing.T) {
-					want := g.String(test.left + test.right)
-					have := string(fn(g, g.AppendString(nil, test.left), test.right))
-					if len(have) != len(want) {
-						t.Errorf("%+q: length is %d; want %d (%+q vs %+q)", id, len(have), len(want), pc(have), pc(want))
-					}
-					if have != want {
-						k, pf := pidx(have, want)
-						t.Errorf("%+q:\nwas  %s%+q; \nwant %s%+q", id, pf, pc(have[k:]), pf, pc(want[k:]))
-					}
-				})
-			}
-		})
-	}
-}
-
-var normTests = [][]AppendTest{
-	appendTestsNFC,
-	appendTestsNFD,
-	appendTestsNFKC,
-	appendTestsNFKD,
-}
-
-var appendTestsNFC = []AppendTest{
-	{"", ascii, ascii},
-	{"", txt_all, txt_all},
-	{"\uff9e", grave(30), "\uff9e" + grave(29) + cgj + grave(1)},
-	{grave(30), "\uff9e", grave(30) + cgj + "\uff9e"},
-
-	// Tests designed for Iter.
-	{ // ordering of non-composing combining characters
-		"",
-		"\u0305\u0316",
-		"\u0316\u0305",
-	},
-	{ // segment overflow
-		"",
-		"a" + rep(0x0305, maxNonStarters+4) + "\u0316",
-		"a" + rep(0x0305, maxNonStarters) + cgj + "\u0316" + rep(0x305, 4),
-	},
-
-	{ // Combine across non-blocking non-starters.
-		// U+0327 COMBINING CEDILLA;Mn;202;NSM;;;;;N;NON-SPACING CEDILLA;;;;
-		// U+0325 COMBINING RING BELOW;Mn;220;NSM;;;;;N;NON-SPACING RING BELOW;;;;
-		"", "a\u0327\u0325", "\u1e01\u0327",
-	},
-
-	{ // Jamo V+T does not combine.
-		"",
-		"\u1161\u11a8",
-		"\u1161\u11a8",
-	},
-
-	// Stability tests: see http://www.unicode.org/review/pr-29.html.
-	{"", "\u0b47\u0300\u0b3e", "\u0b47\u0300\u0b3e"},
-	{"", "\u1100\u0300\u1161", "\u1100\u0300\u1161"},
-	{"", "\u0b47\u0b3e", "\u0b4b"},
-	{"", "\u1100\u1161", "\uac00"},
-
-	// U+04DA MALAYALAM VOWEL SIGN O;Mc;0;L;0D46 0D3E;;;;N;;;;;
-	{ // 0d4a starts a new segment.
-		"",
-		"\u0d4a" + strings.Repeat("\u0d3e", 15) + "\u0d4a" + strings.Repeat("\u0d3e", 15),
-		"\u0d4a" + strings.Repeat("\u0d3e", 15) + "\u0d4a" + strings.Repeat("\u0d3e", 15),
-	},
-
-	{ // Split combining characters.
-		// TODO: don't insert CGJ before starters.
-		"",
-		"\u0d46" + strings.Repeat("\u0d3e", 31),
-		"\u0d4a" + strings.Repeat("\u0d3e", 29) + cgj + "\u0d3e",
-	},
-
-	{ // Split combining characters.
-		"",
-		"\u0d4a" + strings.Repeat("\u0d3e", 30),
-		"\u0d4a" + strings.Repeat("\u0d3e", 29) + cgj + "\u0d3e",
-	},
-
-	{ //  https://golang.org/issues/20079
-		"",
-		"\xeb\u0344",
-		"\xeb\u0308\u0301",
-	},
-
-	{ //  https://golang.org/issues/20079
-		"",
-		"\uac00" + strings.Repeat("\u0300", 30),
-		"\uac00" + strings.Repeat("\u0300", 29) + "\u034f\u0300",
-	},
-
-	{ //  https://golang.org/issues/20079
-		"",
-		"\xeb" + strings.Repeat("\u0300", 31),
-		"\xeb" + strings.Repeat("\u0300", 30) + "\u034f\u0300",
-	},
-}
-
-var appendTestsNFD = []AppendTest{
-	// TODO: Move some of the tests here.
-}
-
-var appendTestsNFKC = []AppendTest{
-	// empty buffers
-	{"", "", ""},
-	{"a", "", "a"},
-	{"", "a", "a"},
-	{"", "\u0041\u0307\u0304", "\u01E0"},
-	// segment split across buffers
-	{"", "a\u0300b", "\u00E0b"},
-	{"a", "\u0300b", "\u00E0b"},
-	{"a", "\u0300\u0316", "\u00E0\u0316"},
-	{"a", "\u0316\u0300", "\u00E0\u0316"},
-	{"a", "\u0300a\u0300", "\u00E0\u00E0"},
-	{"a", "\u0300a\u0300a\u0300", "\u00E0\u00E0\u00E0"},
-	{"a", "\u0300aaa\u0300aaa\u0300", "\u00E0aa\u00E0aa\u00E0"},
-	{"a\u0300", "\u0327", "\u00E0\u0327"},
-	{"a\u0327", "\u0300", "\u00E0\u0327"},
-	{"a\u0316", "\u0300", "\u00E0\u0316"},
-	{"\u0041\u0307", "\u0304", "\u01E0"},
-	// Hangul
-	{"", "\u110B\u1173", "\uC73C"},
-	{"", "\u1103\u1161", "\uB2E4"},
-	{"", "\u110B\u1173\u11B7", "\uC74C"},
-	{"", "\u320E", "\x28\uAC00\x29"},
-	{"", "\x28\u1100\u1161\x29", "\x28\uAC00\x29"},
-	{"\u1103", "\u1161", "\uB2E4"},
-	{"\u110B", "\u1173\u11B7", "\uC74C"},
-	{"\u110B\u1173", "\u11B7", "\uC74C"},
-	{"\uC73C", "\u11B7", "\uC74C"},
-	// UTF-8 encoding split across buffers
-	{"a\xCC", "\x80", "\u00E0"},
-	{"a\xCC", "\x80b", "\u00E0b"},
-	{"a\xCC", "\x80a\u0300", "\u00E0\u00E0"},
-	{"a\xCC", "\x80\x80", "\u00E0\x80"},
-	{"a\xCC", "\x80\xCC", "\u00E0\xCC"},
-	{"a\u0316\xCC", "\x80a\u0316\u0300", "\u00E0\u0316\u00E0\u0316"},
-	// ending in incomplete UTF-8 encoding
-	{"", "\xCC", "\xCC"},
-	{"a", "\xCC", "a\xCC"},
-	{"a", "b\xCC", "ab\xCC"},
-	{"\u0226", "\xCC", "\u0226\xCC"},
-	// illegal runes
-	{"", "\x80", "\x80"},
-	{"", "\x80\x80\x80", "\x80\x80\x80"},
-	{"", "\xCC\x80\x80\x80", "\xCC\x80\x80\x80"},
-	{"", "a\x80", "a\x80"},
-	{"", "a\x80\x80\x80", "a\x80\x80\x80"},
-	{"", "a\x80\x80\x80\x80\x80\x80", "a\x80\x80\x80\x80\x80\x80"},
-	{"a", "\x80\x80\x80", "a\x80\x80\x80"},
-	// overflow
-	{"", strings.Repeat("\x80", 33), strings.Repeat("\x80", 33)},
-	{strings.Repeat("\x80", 33), "", strings.Repeat("\x80", 33)},
-	{strings.Repeat("\x80", 33), strings.Repeat("\x80", 33), strings.Repeat("\x80", 66)},
-	// overflow of combining characters
-	{"", grave(34), grave(30) + cgj + grave(4)},
-	{"", grave(36), grave(30) + cgj + grave(6)},
-	{grave(29), grave(5), grave(30) + cgj + grave(4)},
-	{grave(30), grave(4), grave(30) + cgj + grave(4)},
-	{grave(30), grave(3), grave(30) + cgj + grave(3)},
-	{grave(30) + "\xCC", "\x80", grave(30) + cgj + grave(1)},
-	{"", "\uFDFA" + grave(14), "\u0635\u0644\u0649 \u0627\u0644\u0644\u0647 \u0639\u0644\u064a\u0647 \u0648\u0633\u0644\u0645" + grave(14)},
-	{"", "\uFDFA" + grave(28) + "\u0316", "\u0635\u0644\u0649 \u0627\u0644\u0644\u0647 \u0639\u0644\u064a\u0647 \u0648\u0633\u0644\u0645\u0316" + grave(28)},
-	// - First rune has a trailing non-starter.
-	{"\u00d5", grave(30), "\u00d5" + grave(29) + cgj + grave(1)},
-	// - U+FF9E decomposes into a non-starter in compatibility mode. A CGJ must be
-	//   inserted even when FF9E starts a new segment.
-	{"\uff9e", grave(30), "\u3099" + grave(29) + cgj + grave(1)},
-	{grave(30), "\uff9e", grave(30) + cgj + "\u3099"},
-	// - Many non-starter decompositions in a row causing overflow.
-	{"", rep(0x340, 31), rep(0x300, 30) + cgj + "\u0300"},
-	{"", rep(0xFF9E, 31), rep(0x3099, 30) + cgj + "\u3099"},
-
-	{"", "\u0644\u0625" + rep(0x300, 31), "\u0644\u0625" + rep(0x300, 29) + cgj + "\u0300\u0300"},
-	{"", "\ufef9" + rep(0x300, 31), "\u0644\u0625" + rep(0x300, 29) + cgj + rep(0x0300, 2)},
-	{"", "\ufef9" + rep(0x300, 31), "\u0644\u0625" + rep(0x300, 29) + cgj + rep(0x0300, 2)},
-
-	// U+0F81 TIBETAN VOWEL SIGN REVERSED II splits into two modifiers.
-	{"", "\u0f7f" + rep(0xf71, 29) + "\u0f81", "\u0f7f" + rep(0xf71, 29) + cgj + "\u0f71\u0f80"},
-	{"", "\u0f7f" + rep(0xf71, 28) + "\u0f81", "\u0f7f" + rep(0xf71, 29) + "\u0f80"},
-	{"", "\u0f7f" + rep(0xf81, 16), "\u0f7f" + rep(0xf71, 15) + rep(0xf80, 15) + cgj + "\u0f71\u0f80"},
-
-	// weird UTF-8
-	{"\u00E0\xE1", "\x86", "\u00E0\xE1\x86"},
-	{"a\u0300\u11B7", "\u0300", "\u00E0\u11B7\u0300"},
-	{"a\u0300\u11B7\u0300", "\u0300", "\u00E0\u11B7\u0300\u0300"},
-	{"\u0300", "\xF8\x80\x80\x80\x80\u0300", "\u0300\xF8\x80\x80\x80\x80\u0300"},
-	{"\u0300", "\xFC\x80\x80\x80\x80\x80\u0300", "\u0300\xFC\x80\x80\x80\x80\x80\u0300"},
-	{"\xF8\x80\x80\x80\x80\u0300", "\u0300", "\xF8\x80\x80\x80\x80\u0300\u0300"},
-	{"\xFC\x80\x80\x80\x80\x80\u0300", "\u0300", "\xFC\x80\x80\x80\x80\x80\u0300\u0300"},
-	{"\xF8\x80\x80\x80", "\x80\u0300\u0300", "\xF8\x80\x80\x80\x80\u0300\u0300"},
-
-	{"", strings.Repeat("a\u0316\u0300", 6), strings.Repeat("\u00E0\u0316", 6)},
-	// large input.
-	{"", strings.Repeat("a\u0300\u0316", 31), strings.Repeat("\u00E0\u0316", 31)},
-	{"", strings.Repeat("a\u0300\u0316", 4000), strings.Repeat("\u00E0\u0316", 4000)},
-	{"", strings.Repeat("\x80\x80", 4000), strings.Repeat("\x80\x80", 4000)},
-	{"", "\u0041\u0307\u0304", "\u01E0"},
-}
-
-var appendTestsNFKD = []AppendTest{
-	{"", "a" + grave(64), "a" + grave(30) + cgj + grave(30) + cgj + grave(4)},
-
-	{ // segment overflow on unchanged character
-		"",
-		"a" + grave(64) + "\u0316",
-		"a" + grave(30) + cgj + grave(30) + cgj + "\u0316" + grave(4),
-	},
-	{ // segment overflow on unchanged character + start value
-		"",
-		"a" + grave(98) + "\u0316",
-		"a" + grave(30) + cgj + grave(30) + cgj + grave(30) + cgj + "\u0316" + grave(8),
-	},
-	{ // segment overflow on decomposition. (U+0340 decomposes to U+0300.)
-		"",
-		"a" + grave(59) + "\u0340",
-		"a" + grave(30) + cgj + grave(30),
-	},
-	{ // segment overflow on non-starter decomposition
-		"",
-		"a" + grave(33) + "\u0340" + grave(30) + "\u0320",
-		"a" + grave(30) + cgj + grave(30) + cgj + "\u0320" + grave(4),
-	},
-	{ // start value after ASCII overflow
-		"",
-		rep('a', segSize) + grave(32) + "\u0320",
-		rep('a', segSize) + grave(30) + cgj + "\u0320" + grave(2),
-	},
-	{ // Jamo overflow
-		"",
-		"\u1100\u1161" + grave(30) + "\u0320" + grave(2),
-		"\u1100\u1161" + grave(29) + cgj + "\u0320" + grave(3),
-	},
-	{ // Hangul
-		"",
-		"\uac00",
-		"\u1100\u1161",
-	},
-	{ // Hangul overflow
-		"",
-		"\uac00" + grave(32) + "\u0320",
-		"\u1100\u1161" + grave(29) + cgj + "\u0320" + grave(3),
-	},
-	{ // Hangul overflow in Hangul mode.
-		"",
-		"\uac00\uac00" + grave(32) + "\u0320",
-		"\u1100\u1161\u1100\u1161" + grave(29) + cgj + "\u0320" + grave(3),
-	},
-	{ // Hangul overflow in Hangul mode.
-		"",
-		strings.Repeat("\uac00", 3) + grave(32) + "\u0320",
-		strings.Repeat("\u1100\u1161", 3) + grave(29) + cgj + "\u0320" + grave(3),
-	},
-	{ // start value after cc=0
-		"",
-		"您您" + grave(34) + "\u0320",
-		"您您" + grave(30) + cgj + "\u0320" + grave(4),
-	},
-	{ // start value after normalization
-		"",
-		"\u0300\u0320a" + grave(34) + "\u0320",
-		"\u0320\u0300a" + grave(30) + cgj + "\u0320" + grave(4),
-	},
-	{
-		// U+0F81 TIBETAN VOWEL SIGN REVERSED II splits into two modifiers.
-		"",
-		"a\u0f7f" + rep(0xf71, 29) + "\u0f81",
-		"a\u0f7f" + rep(0xf71, 29) + cgj + "\u0f71\u0f80",
-	},
-}
-
-func TestAppend(t *testing.T) {
-	runNormTests(t, "Append", func(f Form, out []byte, s string) []byte {
-		return f.Append(out, []byte(s)...)
-	})
-}
-
-func TestAppendString(t *testing.T) {
-	runNormTests(t, "AppendString", func(f Form, out []byte, s string) []byte {
-		return f.AppendString(out, s)
-	})
-}
-
-func TestBytes(t *testing.T) {
-	runNormTests(t, "Bytes", func(f Form, out []byte, s string) []byte {
-		buf := []byte{}
-		buf = append(buf, out...)
-		buf = append(buf, s...)
-		return f.Bytes(buf)
-	})
-}
-
-func TestString(t *testing.T) {
-	runNormTests(t, "String", func(f Form, out []byte, s string) []byte {
-		outs := string(out) + s
-		return []byte(f.String(outs))
-	})
-}
-
-func TestLinking(t *testing.T) {
-	const prog = `
-	package main
-	import "fmt"
-	import "golang.org/x/text/unicode/norm"
-	func main() { fmt.Println(norm.%s) }
-	`
-	baseline, errB := testtext.CodeSize(fmt.Sprintf(prog, "MaxSegmentSize"))
-	withTables, errT := testtext.CodeSize(fmt.Sprintf(prog, `NFC.String("")`))
-	if errB != nil || errT != nil {
-		t.Skipf("code size failed: %v and %v", errB, errT)
-	}
-	// Tables are at least 50K
-	if d := withTables - baseline; d < 50*1024 {
-		t.Errorf("tables appear not to be dropped: %d - %d = %d",
-			withTables, baseline, d)
-	}
-}
-
-func appendBench(f Form, in []byte) func() {
-	buf := make([]byte, 0, 4*len(in))
-	return func() {
-		f.Append(buf, in...)
-	}
-}
-
-func bytesBench(f Form, in []byte) func() {
-	return func() {
-		f.Bytes(in)
-	}
-}
-
-func iterBench(f Form, in []byte) func() {
-	iter := Iter{}
-	return func() {
-		iter.Init(f, in)
-		for !iter.Done() {
-			iter.Next()
-		}
-	}
-}
-
-func transformBench(f Form, in []byte) func() {
-	buf := make([]byte, 4*len(in))
-	return func() {
-		if _, n, err := f.Transform(buf, in, true); err != nil || len(in) != n {
-			log.Panic(n, len(in), err)
-		}
-	}
-}
-
-func readerBench(f Form, in []byte) func() {
-	buf := make([]byte, 4*len(in))
-	return func() {
-		r := f.Reader(bytes.NewReader(in))
-		var err error
-		for err == nil {
-			_, err = r.Read(buf)
-		}
-		if err != io.EOF {
-			panic("")
-		}
-	}
-}
-
-func writerBench(f Form, in []byte) func() {
-	buf := make([]byte, 0, 4*len(in))
-	return func() {
-		r := f.Writer(bytes.NewBuffer(buf))
-		if _, err := r.Write(in); err != nil {
-			panic("")
-		}
-	}
-}
-
-func appendBenchmarks(bm []func(), f Form, in []byte) []func() {
-	bm = append(bm, appendBench(f, in))
-	bm = append(bm, iterBench(f, in))
-	bm = append(bm, transformBench(f, in))
-	bm = append(bm, readerBench(f, in))
-	bm = append(bm, writerBench(f, in))
-	return bm
-}
-
-func doFormBenchmark(b *testing.B, inf, f Form, s string) {
-	b.StopTimer()
-	in := inf.Bytes([]byte(s))
-	bm := appendBenchmarks(nil, f, in)
-	b.SetBytes(int64(len(in) * len(bm)))
-	b.StartTimer()
-	for i := 0; i < b.N; i++ {
-		for _, fn := range bm {
-			fn()
-		}
-	}
-}
-
-func doSingle(b *testing.B, f func(Form, []byte) func(), s []byte) {
-	b.StopTimer()
-	fn := f(NFC, s)
-	b.SetBytes(int64(len(s)))
-	b.StartTimer()
-	for i := 0; i < b.N; i++ {
-		fn()
-	}
-}
-
-var (
-	smallNoChange = []byte("nörmalization")
-	smallChange   = []byte("No\u0308rmalization")
-	ascii         = strings.Repeat("There is nothing to change here! ", 500)
-)
-
-func lowerBench(f Form, in []byte) func() {
-	// Use package strings instead of bytes as it doesn't allocate memory
-	// if there aren't any changes.
-	s := string(in)
-	return func() {
-		strings.ToLower(s)
-	}
-}
-
-func BenchmarkLowerCaseNoChange(b *testing.B) {
-	doSingle(b, lowerBench, smallNoChange)
-}
-func BenchmarkLowerCaseChange(b *testing.B) {
-	doSingle(b, lowerBench, smallChange)
-}
-
-func quickSpanBench(f Form, in []byte) func() {
-	return func() {
-		f.QuickSpan(in)
-	}
-}
-
-func BenchmarkQuickSpanChangeNFC(b *testing.B) {
-	doSingle(b, quickSpanBench, smallNoChange)
-}
-
-func BenchmarkBytesNoChangeNFC(b *testing.B) {
-	doSingle(b, bytesBench, smallNoChange)
-}
-func BenchmarkBytesChangeNFC(b *testing.B) {
-	doSingle(b, bytesBench, smallChange)
-}
-
-func BenchmarkAppendNoChangeNFC(b *testing.B) {
-	doSingle(b, appendBench, smallNoChange)
-}
-func BenchmarkAppendChangeNFC(b *testing.B) {
-	doSingle(b, appendBench, smallChange)
-}
-func BenchmarkAppendLargeNFC(b *testing.B) {
-	doSingle(b, appendBench, txt_all_bytes)
-}
-
-func BenchmarkIterNoChangeNFC(b *testing.B) {
-	doSingle(b, iterBench, smallNoChange)
-}
-func BenchmarkIterChangeNFC(b *testing.B) {
-	doSingle(b, iterBench, smallChange)
-}
-func BenchmarkIterLargeNFC(b *testing.B) {
-	doSingle(b, iterBench, txt_all_bytes)
-}
-
-func BenchmarkTransformNoChangeNFC(b *testing.B) {
-	doSingle(b, transformBench, smallNoChange)
-}
-func BenchmarkTransformChangeNFC(b *testing.B) {
-	doSingle(b, transformBench, smallChange)
-}
-func BenchmarkTransformLargeNFC(b *testing.B) {
-	doSingle(b, transformBench, txt_all_bytes)
-}
-
-func BenchmarkNormalizeAsciiNFC(b *testing.B) {
-	doFormBenchmark(b, NFC, NFC, ascii)
-}
-func BenchmarkNormalizeAsciiNFD(b *testing.B) {
-	doFormBenchmark(b, NFC, NFD, ascii)
-}
-func BenchmarkNormalizeAsciiNFKC(b *testing.B) {
-	doFormBenchmark(b, NFC, NFKC, ascii)
-}
-func BenchmarkNormalizeAsciiNFKD(b *testing.B) {
-	doFormBenchmark(b, NFC, NFKD, ascii)
-}
-
-func BenchmarkNormalizeNFC2NFC(b *testing.B) {
-	doFormBenchmark(b, NFC, NFC, txt_all)
-}
-func BenchmarkNormalizeNFC2NFD(b *testing.B) {
-	doFormBenchmark(b, NFC, NFD, txt_all)
-}
-func BenchmarkNormalizeNFD2NFC(b *testing.B) {
-	doFormBenchmark(b, NFD, NFC, txt_all)
-}
-func BenchmarkNormalizeNFD2NFD(b *testing.B) {
-	doFormBenchmark(b, NFD, NFD, txt_all)
-}
-
-// Hangul is often special-cased, so we test it separately.
-func BenchmarkNormalizeHangulNFC2NFC(b *testing.B) {
-	doFormBenchmark(b, NFC, NFC, txt_kr)
-}
-func BenchmarkNormalizeHangulNFC2NFD(b *testing.B) {
-	doFormBenchmark(b, NFC, NFD, txt_kr)
-}
-func BenchmarkNormalizeHangulNFD2NFC(b *testing.B) {
-	doFormBenchmark(b, NFD, NFC, txt_kr)
-}
-func BenchmarkNormalizeHangulNFD2NFD(b *testing.B) {
-	doFormBenchmark(b, NFD, NFD, txt_kr)
-}
-
-var forms = []Form{NFC, NFD, NFKC, NFKD}
-
-func doTextBenchmark(b *testing.B, s string) {
-	b.StopTimer()
-	in := []byte(s)
-	bm := []func(){}
-	for _, f := range forms {
-		bm = appendBenchmarks(bm, f, in)
-	}
-	b.SetBytes(int64(len(s) * len(bm)))
-	b.StartTimer()
-	for i := 0; i < b.N; i++ {
-		for _, f := range bm {
-			f()
-		}
-	}
-}
-
-func BenchmarkCanonicalOrdering(b *testing.B) {
-	doTextBenchmark(b, txt_canon)
-}
-func BenchmarkExtendedLatin(b *testing.B) {
-	doTextBenchmark(b, txt_vn)
-}
-func BenchmarkMiscTwoByteUtf8(b *testing.B) {
-	doTextBenchmark(b, twoByteUtf8)
-}
-func BenchmarkMiscThreeByteUtf8(b *testing.B) {
-	doTextBenchmark(b, threeByteUtf8)
-}
-func BenchmarkHangul(b *testing.B) {
-	doTextBenchmark(b, txt_kr)
-}
-func BenchmarkJapanese(b *testing.B) {
-	doTextBenchmark(b, txt_jp)
-}
-func BenchmarkChinese(b *testing.B) {
-	doTextBenchmark(b, txt_cn)
-}
-func BenchmarkOverflow(b *testing.B) {
-	doTextBenchmark(b, overflow)
-}
-
-var overflow = string(bytes.Repeat([]byte("\u035D"), 4096)) + "\u035B"
-
-// Tests sampled from the Canonical ordering tests (Part 2) of
-// http://unicode.org/Public/UNIDATA/NormalizationTest.txt
-const txt_canon = `\u0061\u0315\u0300\u05AE\u0300\u0062 \u0061\u0300\u0315\u0300\u05AE\u0062
-\u0061\u0302\u0315\u0300\u05AE\u0062 \u0061\u0307\u0315\u0300\u05AE\u0062
-\u0061\u0315\u0300\u05AE\u030A\u0062 \u0061\u059A\u0316\u302A\u031C\u0062
-\u0061\u032E\u059A\u0316\u302A\u0062 \u0061\u0338\u093C\u0334\u0062 
-\u0061\u059A\u0316\u302A\u0339       \u0061\u0341\u0315\u0300\u05AE\u0062
-\u0061\u0348\u059A\u0316\u302A\u0062 \u0061\u0361\u0345\u035D\u035C\u0062
-\u0061\u0366\u0315\u0300\u05AE\u0062 \u0061\u0315\u0300\u05AE\u0486\u0062
-\u0061\u05A4\u059A\u0316\u302A\u0062 \u0061\u0315\u0300\u05AE\u0613\u0062
-\u0061\u0315\u0300\u05AE\u0615\u0062 \u0061\u0617\u0315\u0300\u05AE\u0062
-\u0061\u0619\u0618\u064D\u064E\u0062 \u0061\u0315\u0300\u05AE\u0654\u0062
-\u0061\u0315\u0300\u05AE\u06DC\u0062 \u0061\u0733\u0315\u0300\u05AE\u0062
-\u0061\u0744\u059A\u0316\u302A\u0062 \u0061\u0315\u0300\u05AE\u0745\u0062
-\u0061\u09CD\u05B0\u094D\u3099\u0062 \u0061\u0E38\u0E48\u0E38\u0C56\u0062
-\u0061\u0EB8\u0E48\u0E38\u0E49\u0062 \u0061\u0F72\u0F71\u0EC8\u0F71\u0062
-\u0061\u1039\u05B0\u094D\u3099\u0062 \u0061\u05B0\u094D\u3099\u1A60\u0062
-\u0061\u3099\u093C\u0334\u1BE6\u0062 \u0061\u3099\u093C\u0334\u1C37\u0062
-\u0061\u1CD9\u059A\u0316\u302A\u0062 \u0061\u2DED\u0315\u0300\u05AE\u0062
-\u0061\u2DEF\u0315\u0300\u05AE\u0062 \u0061\u302D\u302E\u059A\u0316\u0062`
-
-// Taken from http://creativecommons.org/licenses/by-sa/3.0/vn/
-const txt_vn = `Với các điều kiện sau: Ghi nhận công của tác giả. 
-Nếu bạn sử dụng, chuyển đổi, hoặc xây dựng dự án từ 
-nội dung được chia sẻ này, bạn phải áp dụng giấy phép này hoặc 
-một giấy phép khác có các điều khoản tương tự như giấy phép này
-cho dự án của bạn. Hiểu rằng: Miễn — Bất kỳ các điều kiện nào
-trên đây cũng có thể được miễn bỏ nếu bạn được sự cho phép của
-người sở hữu bản quyền. Phạm vi công chúng — Khi tác phẩm hoặc
-bất kỳ chương nào của tác phẩm đã trong vùng dành cho công
-chúng theo quy định của pháp luật thì tình trạng của nó không 
-bị ảnh hưởng bởi giấy phép trong bất kỳ trường hợp nào.`
-
-// Taken from http://creativecommons.org/licenses/by-sa/1.0/deed.ru
-const txt_ru = `При обязательном соблюдении следующих условий:
-Attribution — Вы должны атрибутировать произведение (указывать
-автора и источник) в порядке, предусмотренном автором или
-лицензиаром (но только так, чтобы никоим образом не подразумевалось,
-что они поддерживают вас или использование вами данного произведения).
-Υπό τις ακόλουθες προϋποθέσεις:`
-
-// Taken from http://creativecommons.org/licenses/by-sa/3.0/gr/
-const txt_gr = `Αναφορά Δημιουργού — Θα πρέπει να κάνετε την αναφορά στο έργο με τον
-τρόπο που έχει οριστεί από το δημιουργό ή το χορηγούντο την άδεια
-(χωρίς όμως να εννοείται με οποιονδήποτε τρόπο ότι εγκρίνουν εσάς ή
-τη χρήση του έργου από εσάς). Παρόμοια Διανομή — Εάν αλλοιώσετε,
-τροποποιήσετε ή δημιουργήσετε περαιτέρω βασισμένοι στο έργο θα
-μπορείτε να διανέμετε το έργο που θα προκύψει μόνο με την ίδια ή
-παρόμοια άδεια.`
-
-// Taken from http://creativecommons.org/licenses/by-sa/3.0/deed.ar
-const txt_ar = `بموجب الشروط التالية نسب المصنف — يجب عليك أن
-تنسب العمل بالطريقة التي تحددها المؤلف أو المرخص (ولكن ليس بأي حال من
-الأحوال أن توحي وتقترح بتحول أو استخدامك للعمل).
-المشاركة على قدم المساواة — إذا كنت يعدل ، والتغيير ، أو الاستفادة
-من هذا العمل ، قد ينتج عن توزيع العمل إلا في ظل تشابه او تطابق فى واحد
-لهذا الترخيص.`
-
-// Taken from http://creativecommons.org/licenses/by-sa/1.0/il/
-const txt_il = `בכפוף לתנאים הבאים: ייחוס — עליך לייחס את היצירה (לתת קרדיט) באופן
-המצויין על-ידי היוצר או מעניק הרישיון (אך לא בשום אופן המרמז על כך
-שהם תומכים בך או בשימוש שלך ביצירה). שיתוף זהה — אם תחליט/י לשנות,
-לעבד או ליצור יצירה נגזרת בהסתמך על יצירה זו, תוכל/י להפיץ את יצירתך
-החדשה רק תחת אותו הרישיון או רישיון דומה לרישיון זה.`
-
-const twoByteUtf8 = txt_ru + txt_gr + txt_ar + txt_il
-
-// Taken from http://creativecommons.org/licenses/by-sa/2.0/kr/
-const txt_kr = `다음과 같은 조건을 따라야 합니다: 저작자표시
-(Attribution) — 저작자나 이용허락자가 정한 방법으로 저작물의
-원저작자를 표시하여야 합니다(그러나 원저작자가 이용자나 이용자의
-이용을 보증하거나 추천한다는 의미로 표시해서는 안됩니다). 
-동일조건변경허락 — 이 저작물을 이용하여 만든 이차적 저작물에는 본
-라이선스와 동일한 라이선스를 적용해야 합니다.`
-
-// Taken from http://creativecommons.org/licenses/by-sa/3.0/th/
-const txt_th = `ภายใต้เงื่อนไข ดังต่อไปนี้ : แสดงที่มา — คุณต้องแสดงที่
-มาของงานดังกล่าว ตามรูปแบบที่ผู้สร้างสรรค์หรือผู้อนุญาตกำหนด (แต่
-ไม่ใช่ในลักษณะที่ว่า พวกเขาสนับสนุนคุณหรือสนับสนุนการที่
-คุณนำงานไปใช้) อนุญาตแบบเดียวกัน — หากคุณดัดแปลง เปลี่ยนรูป หรื
-อต่อเติมงานนี้ คุณต้องใช้สัญญาอนุญาตแบบเดียวกันหรือแบบที่เหมื
-อนกับสัญญาอนุญาตที่ใช้กับงานนี้เท่านั้น`
-
-const threeByteUtf8 = txt_th
-
-// Taken from http://creativecommons.org/licenses/by-sa/2.0/jp/
-const txt_jp = `あなたの従うべき条件は以下の通りです。
-表示 — あなたは原著作者のクレジットを表示しなければなりません。
-継承 — もしあなたがこの作品を改変、変形または加工した場合、
-あなたはその結果生じた作品をこの作品と同一の許諾条件の下でのみ
-頒布することができます。`
-
-// http://creativecommons.org/licenses/by-sa/2.5/cn/
-const txt_cn = `您可以自由： 复制、发行、展览、表演、放映、
-广播或通过信息网络传播本作品 创作演绎作品
-对本作品进行商业性使用 惟须遵守下列条件：
-署名 — 您必须按照作者或者许可人指定的方式对作品进行署名。
-相同方式共享 — 如果您改变、转换本作品或者以本作品为基础进行创作，
-您只能采用与本协议相同的许可协议发布基于本作品的演绎作品。`
-
-const txt_cjk = txt_cn + txt_jp + txt_kr
-const txt_all = txt_vn + twoByteUtf8 + threeByteUtf8 + txt_cjk
-
-var txt_all_bytes = []byte(txt_all)
diff --git a/vendor/golang.org/x/text/unicode/norm/readwriter_test.go b/vendor/golang.org/x/text/unicode/norm/readwriter_test.go
deleted file mode 100644
index b7756ba2..00000000
--- a/vendor/golang.org/x/text/unicode/norm/readwriter_test.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package norm
-
-import (
-	"bytes"
-	"fmt"
-	"testing"
-)
-
-var bufSizes = []int{1, 2, 3, 4, 5, 6, 7, 8, 100, 101, 102, 103, 4000, 4001, 4002, 4003}
-
-func readFunc(size int) appendFunc {
-	return func(f Form, out []byte, s string) []byte {
-		out = append(out, s...)
-		r := f.Reader(bytes.NewBuffer(out))
-		buf := make([]byte, size)
-		result := []byte{}
-		for n, err := 0, error(nil); err == nil; {
-			n, err = r.Read(buf)
-			result = append(result, buf[:n]...)
-		}
-		return result
-	}
-}
-
-func TestReader(t *testing.T) {
-	for _, s := range bufSizes {
-		name := fmt.Sprintf("TestReader%d", s)
-		runNormTests(t, name, readFunc(s))
-	}
-}
-
-func writeFunc(size int) appendFunc {
-	return func(f Form, out []byte, s string) []byte {
-		in := append(out, s...)
-		result := new(bytes.Buffer)
-		w := f.Writer(result)
-		buf := make([]byte, size)
-		for n := 0; len(in) > 0; in = in[n:] {
-			n = copy(buf, in)
-			_, _ = w.Write(buf[:n])
-		}
-		w.Close()
-		return result.Bytes()
-	}
-}
-
-func TestWriter(t *testing.T) {
-	for _, s := range bufSizes {
-		name := fmt.Sprintf("TestWriter%d", s)
-		runNormTests(t, name, writeFunc(s))
-	}
-}
diff --git a/vendor/golang.org/x/text/unicode/norm/transform_test.go b/vendor/golang.org/x/text/unicode/norm/transform_test.go
deleted file mode 100644
index d596ff3d..00000000
--- a/vendor/golang.org/x/text/unicode/norm/transform_test.go
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package norm
-
-import (
-	"fmt"
-	"testing"
-
-	"golang.org/x/text/transform"
-)
-
-func TestTransform(t *testing.T) {
-	tests := []struct {
-		f       Form
-		in, out string
-		eof     bool
-		dstSize int
-		err     error
-	}{
-		{NFC, "ab", "ab", true, 2, nil},
-		{NFC, "qx", "qx", true, 2, nil},
-		{NFD, "qx", "qx", true, 2, nil},
-		{NFC, "", "", true, 1, nil},
-		{NFD, "", "", true, 1, nil},
-		{NFC, "", "", false, 1, nil},
-		{NFD, "", "", false, 1, nil},
-
-		// Normalized segment does not fit in destination.
-		{NFD, "ö", "", true, 1, transform.ErrShortDst},
-		{NFD, "ö", "", true, 2, transform.ErrShortDst},
-
-		// As an artifact of the algorithm, only full segments are written.
-		// This is not strictly required, and some bytes could be written.
-		// In practice, for Transform to not block, the destination buffer
-		// should be at least MaxSegmentSize to work anyway and these edge
-		// conditions will be relatively rare.
-		{NFC, "ab", "", true, 1, transform.ErrShortDst},
-		// This is even true for inert runes.
-		{NFC, "qx", "", true, 1, transform.ErrShortDst},
-		{NFC, "a\u0300abc", "\u00e0a", true, 4, transform.ErrShortDst},
-
-		// We cannot write a segment if successive runes could still change the result.
-		{NFD, "ö", "", false, 3, transform.ErrShortSrc},
-		{NFC, "a\u0300", "", false, 4, transform.ErrShortSrc},
-		{NFD, "a\u0300", "", false, 4, transform.ErrShortSrc},
-		{NFC, "ö", "", false, 3, transform.ErrShortSrc},
-
-		{NFC, "a\u0300", "", true, 1, transform.ErrShortDst},
-		// Theoretically could fit, but won't due to simplified checks.
-		{NFC, "a\u0300", "", true, 2, transform.ErrShortDst},
-		{NFC, "a\u0300", "", true, 3, transform.ErrShortDst},
-		{NFC, "a\u0300", "\u00e0", true, 4, nil},
-
-		{NFD, "öa\u0300", "o\u0308", false, 8, transform.ErrShortSrc},
-		{NFD, "öa\u0300ö", "o\u0308a\u0300", true, 8, transform.ErrShortDst},
-		{NFD, "öa\u0300ö", "o\u0308a\u0300", false, 12, transform.ErrShortSrc},
-
-		// Illegal input is copied verbatim.
-		{NFD, "\xbd\xb2=\xbc ", "\xbd\xb2=\xbc ", true, 8, nil},
-	}
-	b := make([]byte, 100)
-	for i, tt := range tests {
-		nDst, _, err := tt.f.Transform(b[:tt.dstSize], []byte(tt.in), tt.eof)
-		out := string(b[:nDst])
-		if out != tt.out || err != tt.err {
-			t.Errorf("%d: was %+q (%v); want %+q (%v)", i, out, err, tt.out, tt.err)
-		}
-		if want := tt.f.String(tt.in)[:nDst]; want != out {
-			t.Errorf("%d: incorrect normalization: was %+q; want %+q", i, out, want)
-		}
-	}
-}
-
-var transBufSizes = []int{
-	MaxTransformChunkSize,
-	3 * MaxTransformChunkSize / 2,
-	2 * MaxTransformChunkSize,
-	3 * MaxTransformChunkSize,
-	100 * MaxTransformChunkSize,
-}
-
-func doTransNorm(f Form, buf []byte, b []byte) []byte {
-	acc := []byte{}
-	for p := 0; p < len(b); {
-		nd, ns, _ := f.Transform(buf[:], b[p:], true)
-		p += ns
-		acc = append(acc, buf[:nd]...)
-	}
-	return acc
-}
-
-func TestTransformNorm(t *testing.T) {
-	for _, sz := range transBufSizes {
-		buf := make([]byte, sz)
-		runNormTests(t, fmt.Sprintf("Transform:%d", sz), func(f Form, out []byte, s string) []byte {
-			return doTransNorm(f, buf, append(out, s...))
-		})
-	}
-}
diff --git a/vendor/golang.org/x/text/unicode/norm/ucd_test.go b/vendor/golang.org/x/text/unicode/norm/ucd_test.go
deleted file mode 100644
index 29205a6a..00000000
--- a/vendor/golang.org/x/text/unicode/norm/ucd_test.go
+++ /dev/null
@@ -1,275 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package norm
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"regexp"
-	"runtime"
-	"strconv"
-	"strings"
-	"sync"
-	"testing"
-	"time"
-	"unicode/utf8"
-
-	"golang.org/x/text/internal/gen"
-	"golang.org/x/text/internal/testtext"
-)
-
-var once sync.Once
-
-func skipShort(t *testing.T) {
-	testtext.SkipIfNotLong(t)
-
-	once.Do(func() { loadTestData(t) })
-}
-
-// This regression test runs the test set in NormalizationTest.txt
-// (taken from http://www.unicode.org/Public/<unicode.Version>/ucd/).
-//
-// NormalizationTest.txt has form:
-// @Part0 # Specific cases
-// #
-// 1E0A;1E0A;0044 0307;1E0A;0044 0307; # (Ḋ; Ḋ; D◌̇; Ḋ; D◌̇; ) LATIN CAPITAL LETTER D WITH DOT ABOVE
-// 1E0C;1E0C;0044 0323;1E0C;0044 0323; # (Ḍ; Ḍ; D◌̣; Ḍ; D◌̣; ) LATIN CAPITAL LETTER D WITH DOT BELOW
-//
-// Each test has 5 columns (c1, c2, c3, c4, c5), where
-// (c1, c2, c3, c4, c5) == (c1, NFC(c1), NFD(c1), NFKC(c1), NFKD(c1))
-//
-// CONFORMANCE:
-// 1. The following invariants must be true for all conformant implementations
-//
-//    NFC
-//      c2 ==  NFC(c1) ==  NFC(c2) ==  NFC(c3)
-//      c4 ==  NFC(c4) ==  NFC(c5)
-//
-//    NFD
-//      c3 ==  NFD(c1) ==  NFD(c2) ==  NFD(c3)
-//      c5 ==  NFD(c4) ==  NFD(c5)
-//
-//    NFKC
-//      c4 == NFKC(c1) == NFKC(c2) == NFKC(c3) == NFKC(c4) == NFKC(c5)
-//
-//    NFKD
-//      c5 == NFKD(c1) == NFKD(c2) == NFKD(c3) == NFKD(c4) == NFKD(c5)
-//
-// 2. For every code point X assigned in this version of Unicode that is not
-//    specifically listed in Part 1, the following invariants must be true
-//    for all conformant implementations:
-//
-//      X == NFC(X) == NFD(X) == NFKC(X) == NFKD(X)
-//
-
-// Column types.
-const (
-	cRaw = iota
-	cNFC
-	cNFD
-	cNFKC
-	cNFKD
-	cMaxColumns
-)
-
-// Holds data from NormalizationTest.txt
-var part []Part
-
-type Part struct {
-	name   string
-	number int
-	tests  []Test
-}
-
-type Test struct {
-	name   string
-	partnr int
-	number int
-	r      rune                // used for character by character test
-	cols   [cMaxColumns]string // Each has 5 entries, see below.
-}
-
-func (t Test) Name() string {
-	if t.number < 0 {
-		return part[t.partnr].name
-	}
-	return fmt.Sprintf("%s:%d", part[t.partnr].name, t.number)
-}
-
-var partRe = regexp.MustCompile(`@Part(\d) # (.*)$`)
-var testRe = regexp.MustCompile(`^` + strings.Repeat(`([\dA-F ]+);`, 5) + ` # (.*)$`)
-
-var counter int
-
-// Load the data form NormalizationTest.txt
-func loadTestData(t *testing.T) {
-	f := gen.OpenUCDFile("NormalizationTest.txt")
-	defer f.Close()
-	scanner := bufio.NewScanner(f)
-	for scanner.Scan() {
-		line := scanner.Text()
-		if len(line) == 0 || line[0] == '#' {
-			continue
-		}
-		m := partRe.FindStringSubmatch(line)
-		if m != nil {
-			if len(m) < 3 {
-				t.Fatal("Failed to parse Part: ", line)
-			}
-			i, err := strconv.Atoi(m[1])
-			if err != nil {
-				t.Fatal(err)
-			}
-			name := m[2]
-			part = append(part, Part{name: name[:len(name)-1], number: i})
-			continue
-		}
-		m = testRe.FindStringSubmatch(line)
-		if m == nil || len(m) < 7 {
-			t.Fatalf(`Failed to parse: "%s" result: %#v`, line, m)
-		}
-		test := Test{name: m[6], partnr: len(part) - 1, number: counter}
-		counter++
-		for j := 1; j < len(m)-1; j++ {
-			for _, split := range strings.Split(m[j], " ") {
-				r, err := strconv.ParseUint(split, 16, 64)
-				if err != nil {
-					t.Fatal(err)
-				}
-				if test.r == 0 {
-					// save for CharacterByCharacterTests
-					test.r = rune(r)
-				}
-				var buf [utf8.UTFMax]byte
-				sz := utf8.EncodeRune(buf[:], rune(r))
-				test.cols[j-1] += string(buf[:sz])
-			}
-		}
-		part := &part[len(part)-1]
-		part.tests = append(part.tests, test)
-	}
-	if scanner.Err() != nil {
-		t.Fatal(scanner.Err())
-	}
-}
-
-func cmpResult(t *testing.T, tc *Test, name string, f Form, gold, test, result string) {
-	if gold != result {
-		t.Errorf("%s:%s: %s(%+q)=%+q; want %+q: %s",
-			tc.Name(), name, fstr[f], test, result, gold, tc.name)
-	}
-}
-
-func cmpIsNormal(t *testing.T, tc *Test, name string, f Form, test string, result, want bool) {
-	if result != want {
-		t.Errorf("%s:%s: %s(%+q)=%v; want %v", tc.Name(), name, fstr[f], test, result, want)
-	}
-}
-
-func doTest(t *testing.T, tc *Test, f Form, gold, test string) {
-	testb := []byte(test)
-	result := f.Bytes(testb)
-	cmpResult(t, tc, "Bytes", f, gold, test, string(result))
-
-	sresult := f.String(test)
-	cmpResult(t, tc, "String", f, gold, test, sresult)
-
-	acc := []byte{}
-	i := Iter{}
-	i.InitString(f, test)
-	for !i.Done() {
-		acc = append(acc, i.Next()...)
-	}
-	cmpResult(t, tc, "Iter.Next", f, gold, test, string(acc))
-
-	buf := make([]byte, 128)
-	acc = nil
-	for p := 0; p < len(testb); {
-		nDst, nSrc, _ := f.Transform(buf, testb[p:], true)
-		acc = append(acc, buf[:nDst]...)
-		p += nSrc
-	}
-	cmpResult(t, tc, "Transform", f, gold, test, string(acc))
-
-	for i := range test {
-		out := f.Append(f.Bytes([]byte(test[:i])), []byte(test[i:])...)
-		cmpResult(t, tc, fmt.Sprintf(":Append:%d", i), f, gold, test, string(out))
-	}
-	cmpIsNormal(t, tc, "IsNormal", f, test, f.IsNormal([]byte(test)), test == gold)
-	cmpIsNormal(t, tc, "IsNormalString", f, test, f.IsNormalString(test), test == gold)
-}
-
-func doConformanceTests(t *testing.T, tc *Test, partn int) {
-	for i := 0; i <= 2; i++ {
-		doTest(t, tc, NFC, tc.cols[1], tc.cols[i])
-		doTest(t, tc, NFD, tc.cols[2], tc.cols[i])
-		doTest(t, tc, NFKC, tc.cols[3], tc.cols[i])
-		doTest(t, tc, NFKD, tc.cols[4], tc.cols[i])
-	}
-	for i := 3; i <= 4; i++ {
-		doTest(t, tc, NFC, tc.cols[3], tc.cols[i])
-		doTest(t, tc, NFD, tc.cols[4], tc.cols[i])
-		doTest(t, tc, NFKC, tc.cols[3], tc.cols[i])
-		doTest(t, tc, NFKD, tc.cols[4], tc.cols[i])
-	}
-}
-
-func TestCharacterByCharacter(t *testing.T) {
-	skipShort(t)
-	tests := part[1].tests
-	var last rune = 0
-	for i := 0; i <= len(tests); i++ { // last one is special case
-		var r rune
-		if i == len(tests) {
-			r = 0x2FA1E // Don't have to go to 0x10FFFF
-		} else {
-			r = tests[i].r
-		}
-		for last++; last < r; last++ {
-			// Check all characters that were not explicitly listed in the test.
-			tc := &Test{partnr: 1, number: -1}
-			char := string(last)
-			doTest(t, tc, NFC, char, char)
-			doTest(t, tc, NFD, char, char)
-			doTest(t, tc, NFKC, char, char)
-			doTest(t, tc, NFKD, char, char)
-		}
-		if i < len(tests) {
-			doConformanceTests(t, &tests[i], 1)
-		}
-	}
-}
-
-func TestStandardTests(t *testing.T) {
-	skipShort(t)
-	for _, j := range []int{0, 2, 3} {
-		for _, test := range part[j].tests {
-			doConformanceTests(t, &test, j)
-		}
-	}
-}
-
-// TestPerformance verifies that normalization is O(n). If any of the
-// code does not properly check for maxCombiningChars, normalization
-// may exhibit O(n**2) behavior.
-func TestPerformance(t *testing.T) {
-	skipShort(t)
-	runtime.GOMAXPROCS(2)
-	success := make(chan bool, 1)
-	go func() {
-		buf := bytes.Repeat([]byte("\u035D"), 1024*1024)
-		buf = append(buf, "\u035B"...)
-		NFC.Append(nil, buf...)
-		success <- true
-	}()
-	timeout := time.After(1 * time.Second)
-	select {
-	case <-success:
-		// test completed before the timeout
-	case <-timeout:
-		t.Errorf(`unexpectedly long time to complete PerformanceTest`)
-	}
-}
diff --git a/vendor/golang.org/x/text/unicode/rangetable/merge_test.go b/vendor/golang.org/x/text/unicode/rangetable/merge_test.go
deleted file mode 100644
index 93ed0fca..00000000
--- a/vendor/golang.org/x/text/unicode/rangetable/merge_test.go
+++ /dev/null
@@ -1,184 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package rangetable
-
-import (
-	"testing"
-	"unicode"
-)
-
-var (
-	maxRuneTable = &unicode.RangeTable{
-		R32: []unicode.Range32{
-			{unicode.MaxRune, unicode.MaxRune, 1},
-		},
-	}
-
-	overlap1 = &unicode.RangeTable{
-		R16: []unicode.Range16{
-			{0x100, 0xfffc, 4},
-		},
-		R32: []unicode.Range32{
-			{0x100000, 0x10fffc, 4},
-		},
-	}
-
-	overlap2 = &unicode.RangeTable{
-		R16: []unicode.Range16{
-			{0x101, 0xfffd, 4},
-		},
-		R32: []unicode.Range32{
-			{0x100001, 0x10fffd, 3},
-		},
-	}
-
-	// The following table should be compacted into two entries for R16 and R32.
-	optimize = &unicode.RangeTable{
-		R16: []unicode.Range16{
-			{0x1, 0x1, 1},
-			{0x2, 0x2, 1},
-			{0x3, 0x3, 1},
-			{0x5, 0x5, 1},
-			{0x7, 0x7, 1},
-			{0x9, 0x9, 1},
-			{0xb, 0xf, 2},
-		},
-		R32: []unicode.Range32{
-			{0x10001, 0x10001, 1},
-			{0x10002, 0x10002, 1},
-			{0x10003, 0x10003, 1},
-			{0x10005, 0x10005, 1},
-			{0x10007, 0x10007, 1},
-			{0x10009, 0x10009, 1},
-			{0x1000b, 0x1000f, 2},
-		},
-	}
-)
-
-func TestMerge(t *testing.T) {
-	for i, tt := range [][]*unicode.RangeTable{
-		{unicode.Cc, unicode.Cf},
-		{unicode.L, unicode.Ll},
-		{unicode.L, unicode.Ll, unicode.Lu},
-		{unicode.Ll, unicode.Lu},
-		{unicode.M},
-		unicode.GraphicRanges,
-		cased,
-
-		// Merge R16 only and R32 only and vice versa.
-		{unicode.Khmer, unicode.Khudawadi},
-		{unicode.Imperial_Aramaic, unicode.Radical},
-
-		// Merge with empty.
-		{&unicode.RangeTable{}},
-		{&unicode.RangeTable{}, &unicode.RangeTable{}},
-		{&unicode.RangeTable{}, &unicode.RangeTable{}, &unicode.RangeTable{}},
-		{&unicode.RangeTable{}, unicode.Hiragana},
-		{unicode.Inherited, &unicode.RangeTable{}},
-		{&unicode.RangeTable{}, unicode.Hanunoo, &unicode.RangeTable{}},
-
-		// Hypothetical tables.
-		{maxRuneTable},
-		{overlap1, overlap2},
-
-		// Optimization
-		{optimize},
-	} {
-		rt := Merge(tt...)
-		for r := rune(0); r <= unicode.MaxRune; r++ {
-			if got, want := unicode.Is(rt, r), unicode.In(r, tt...); got != want {
-				t.Fatalf("%d:%U: got %v; want %v", i, r, got, want)
-			}
-		}
-		// Test optimization and correctness for R16.
-		for k := 0; k < len(rt.R16)-1; k++ {
-			if lo, hi := rt.R16[k].Lo, rt.R16[k].Hi; lo > hi {
-				t.Errorf("%d: Lo (%x) > Hi (%x)", i, lo, hi)
-			}
-			if hi, lo := rt.R16[k].Hi, rt.R16[k+1].Lo; hi >= lo {
-				t.Errorf("%d: Hi (%x) >= next Lo (%x)", i, hi, lo)
-			}
-			if rt.R16[k].Hi+rt.R16[k].Stride == rt.R16[k+1].Lo {
-				t.Errorf("%d: missed optimization for R16 at %d between %X and %x",
-					i, k, rt.R16[k], rt.R16[k+1])
-			}
-		}
-		// Test optimization and correctness for R32.
-		for k := 0; k < len(rt.R32)-1; k++ {
-			if lo, hi := rt.R32[k].Lo, rt.R32[k].Hi; lo > hi {
-				t.Errorf("%d: Lo (%x) > Hi (%x)", i, lo, hi)
-			}
-			if hi, lo := rt.R32[k].Hi, rt.R32[k+1].Lo; hi >= lo {
-				t.Errorf("%d: Hi (%x) >= next Lo (%x)", i, hi, lo)
-			}
-			if rt.R32[k].Hi+rt.R32[k].Stride == rt.R32[k+1].Lo {
-				t.Errorf("%d: missed optimization for R32 at %d between %X and %X",
-					i, k, rt.R32[k], rt.R32[k+1])
-			}
-		}
-	}
-}
-
-const runes = "Hello World in 2015!,\U0010fffd"
-
-func BenchmarkNotMerged(t *testing.B) {
-	for i := 0; i < t.N; i++ {
-		for _, r := range runes {
-			unicode.In(r, unicode.GraphicRanges...)
-		}
-	}
-}
-
-func BenchmarkMerged(t *testing.B) {
-	rt := Merge(unicode.GraphicRanges...)
-
-	for i := 0; i < t.N; i++ {
-		for _, r := range runes {
-			unicode.Is(rt, r)
-		}
-	}
-}
-
-var cased = []*unicode.RangeTable{
-	unicode.Lower,
-	unicode.Upper,
-	unicode.Title,
-	unicode.Other_Lowercase,
-	unicode.Other_Uppercase,
-}
-
-func BenchmarkNotMergedCased(t *testing.B) {
-	for i := 0; i < t.N; i++ {
-		for _, r := range runes {
-			unicode.In(r, cased...)
-		}
-	}
-}
-
-func BenchmarkMergedCased(t *testing.B) {
-	// This reduces len(R16) from 243 to 82 and len(R32) from 65 to 35 for
-	// Unicode 7.0.0.
-	rt := Merge(cased...)
-
-	for i := 0; i < t.N; i++ {
-		for _, r := range runes {
-			unicode.Is(rt, r)
-		}
-	}
-}
-
-func BenchmarkInit(t *testing.B) {
-	for i := 0; i < t.N; i++ {
-		Merge(cased...)
-		Merge(unicode.GraphicRanges...)
-	}
-}
-
-func BenchmarkInit2(t *testing.B) {
-	// Hypothetical near-worst-case performance.
-	for i := 0; i < t.N; i++ {
-		Merge(overlap1, overlap2)
-	}
-}
diff --git a/vendor/golang.org/x/text/unicode/rangetable/rangetable_test.go b/vendor/golang.org/x/text/unicode/rangetable/rangetable_test.go
deleted file mode 100644
index 5a355aa3..00000000
--- a/vendor/golang.org/x/text/unicode/rangetable/rangetable_test.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package rangetable
-
-import (
-	"reflect"
-	"testing"
-	"unicode"
-)
-
-var (
-	empty = &unicode.RangeTable{}
-	many  = &unicode.RangeTable{
-		R16:         []unicode.Range16{{0, 0xffff, 5}},
-		R32:         []unicode.Range32{{0x10004, 0x10009, 5}},
-		LatinOffset: 0,
-	}
-)
-
-func TestVisit(t *testing.T) {
-	Visit(empty, func(got rune) {
-		t.Error("call from empty RangeTable")
-	})
-
-	var want rune
-	Visit(many, func(got rune) {
-		if got != want {
-			t.Errorf("got %U; want %U", got, want)
-		}
-		want += 5
-	})
-	if want -= 5; want != 0x10009 {
-		t.Errorf("last run was %U; want U+10009", want)
-	}
-}
-
-func TestNew(t *testing.T) {
-	for i, rt := range []*unicode.RangeTable{
-		empty,
-		unicode.Co,
-		unicode.Letter,
-		unicode.ASCII_Hex_Digit,
-		many,
-		maxRuneTable,
-	} {
-		var got, want []rune
-		Visit(rt, func(r rune) {
-			want = append(want, r)
-		})
-		Visit(New(want...), func(r rune) {
-			got = append(got, r)
-		})
-		if !reflect.DeepEqual(got, want) {
-			t.Errorf("%d:\ngot  %v;\nwant %v", i, got, want)
-		}
-	}
-}
diff --git a/vendor/gopkg.in/natefinch/lumberjack.v2/example_test.go b/vendor/gopkg.in/natefinch/lumberjack.v2/example_test.go
deleted file mode 100644
index bf689fd9..00000000
--- a/vendor/gopkg.in/natefinch/lumberjack.v2/example_test.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package lumberjack_test
-
-import (
-	"log"
-
-	"gopkg.in/natefinch/lumberjack.v2"
-)
-
-// To use lumberjack with the standard library's log package, just pass it into
-// the SetOutput function when your application starts.
-func Example() {
-	log.SetOutput(&lumberjack.Logger{
-		Filename:   "/var/log/myapp/foo.log",
-		MaxSize:    500, // megabytes
-		MaxBackups: 3,
-		MaxAge:     28, // days
-	})
-}
diff --git a/vendor/gopkg.in/natefinch/lumberjack.v2/linux_test.go b/vendor/gopkg.in/natefinch/lumberjack.v2/linux_test.go
deleted file mode 100644
index 2bd16849..00000000
--- a/vendor/gopkg.in/natefinch/lumberjack.v2/linux_test.go
+++ /dev/null
@@ -1,205 +0,0 @@
-// +build linux
-
-package lumberjack
-
-import (
-	"os"
-	"syscall"
-	"testing"
-	"time"
-)
-
-func TestMaintainMode(t *testing.T) {
-	currentTime = fakeTime
-	dir := makeTempDir("TestMaintainMode", t)
-	defer os.RemoveAll(dir)
-
-	filename := logFile(dir)
-
-	mode := os.FileMode(0600)
-	f, err := os.OpenFile(filename, os.O_CREATE|os.O_RDWR, mode)
-	isNil(err, t)
-	f.Close()
-
-	l := &Logger{
-		Filename:   filename,
-		MaxBackups: 1,
-		MaxSize:    100, // megabytes
-	}
-	defer l.Close()
-	b := []byte("boo!")
-	n, err := l.Write(b)
-	isNil(err, t)
-	equals(len(b), n, t)
-
-	newFakeTime()
-
-	err = l.Rotate()
-	isNil(err, t)
-
-	filename2 := backupFile(dir)
-	info, err := os.Stat(filename)
-	isNil(err, t)
-	info2, err := os.Stat(filename2)
-	isNil(err, t)
-	equals(mode, info.Mode(), t)
-	equals(mode, info2.Mode(), t)
-}
-
-func TestMaintainOwner(t *testing.T) {
-	fakeFS := newFakeFS()
-	os_Chown = fakeFS.Chown
-	os_Stat = fakeFS.Stat
-	defer func() {
-		os_Chown = os.Chown
-		os_Stat = os.Stat
-	}()
-	currentTime = fakeTime
-	dir := makeTempDir("TestMaintainOwner", t)
-	defer os.RemoveAll(dir)
-
-	filename := logFile(dir)
-
-	f, err := os.OpenFile(filename, os.O_CREATE|os.O_RDWR, 0644)
-	isNil(err, t)
-	f.Close()
-
-	l := &Logger{
-		Filename:   filename,
-		MaxBackups: 1,
-		MaxSize:    100, // megabytes
-	}
-	defer l.Close()
-	b := []byte("boo!")
-	n, err := l.Write(b)
-	isNil(err, t)
-	equals(len(b), n, t)
-
-	newFakeTime()
-
-	err = l.Rotate()
-	isNil(err, t)
-
-	equals(555, fakeFS.files[filename].uid, t)
-	equals(666, fakeFS.files[filename].gid, t)
-}
-
-func TestCompressMaintainMode(t *testing.T) {
-	currentTime = fakeTime
-
-	dir := makeTempDir("TestCompressMaintainMode", t)
-	defer os.RemoveAll(dir)
-
-	filename := logFile(dir)
-
-	mode := os.FileMode(0600)
-	f, err := os.OpenFile(filename, os.O_CREATE|os.O_RDWR, mode)
-	isNil(err, t)
-	f.Close()
-
-	l := &Logger{
-		Compress: true,
-		Filename:   filename,
-		MaxBackups: 1,
-		MaxSize:    100, // megabytes
-	}
-	defer l.Close()
-	b := []byte("boo!")
-	n, err := l.Write(b)
-	isNil(err, t)
-	equals(len(b), n, t)
-
-	newFakeTime()
-
-	err = l.Rotate()
-	isNil(err, t)
-
-	// we need to wait a little bit since the files get compressed on a different
-	// goroutine.
-	<-time.After(10 * time.Millisecond)
-
-	// a compressed version of the log file should now exist with the correct
-	// mode.
-	filename2 := backupFile(dir)
-	info, err := os.Stat(filename)
-	isNil(err, t)
-	info2, err := os.Stat(filename2+compressSuffix)
-	isNil(err, t)
-	equals(mode, info.Mode(), t)
-	equals(mode, info2.Mode(), t)
-}
-
-func TestCompressMaintainOwner(t *testing.T) {
-	fakeFS := newFakeFS()
-	os_Chown = fakeFS.Chown
-	os_Stat = fakeFS.Stat
-	defer func() {
-		os_Chown = os.Chown
-		os_Stat = os.Stat
-	}()
-	currentTime = fakeTime
-	dir := makeTempDir("TestCompressMaintainOwner", t)
-	defer os.RemoveAll(dir)
-
-	filename := logFile(dir)
-
-	f, err := os.OpenFile(filename, os.O_CREATE|os.O_RDWR, 0644)
-	isNil(err, t)
-	f.Close()
-
-	l := &Logger{
-		Compress:   true,
-		Filename:   filename,
-		MaxBackups: 1,
-		MaxSize:    100, // megabytes
-	}
-	defer l.Close()
-	b := []byte("boo!")
-	n, err := l.Write(b)
-	isNil(err, t)
-	equals(len(b), n, t)
-
-	newFakeTime()
-
-	err = l.Rotate()
-	isNil(err, t)
-
-	// we need to wait a little bit since the files get compressed on a different
-	// goroutine.
-	<-time.After(10 * time.Millisecond)
-
-	// a compressed version of the log file should now exist with the correct
-	// owner.
-	filename2 := backupFile(dir)
-	equals(555, fakeFS.files[filename2+compressSuffix].uid, t)
-	equals(666, fakeFS.files[filename2+compressSuffix].gid, t)
-}
-
-type fakeFile struct {
-	uid int
-	gid int
-}
-
-type fakeFS struct {
-	files map[string]fakeFile
-}
-
-func newFakeFS() *fakeFS {
-	return &fakeFS{files: make(map[string]fakeFile)}
-}
-
-func (fs *fakeFS) Chown(name string, uid, gid int) error {
-	fs.files[name] = fakeFile{uid: uid, gid: gid}
-	return nil
-}
-
-func (fs *fakeFS) Stat(name string) (os.FileInfo, error) {
-	info, err := os.Stat(name)
-	if err != nil {
-		return nil, err
-	}
-	stat := info.Sys().(*syscall.Stat_t)
-	stat.Uid = 555
-	stat.Gid = 666
-	return info, nil
-}
diff --git a/vendor/gopkg.in/natefinch/lumberjack.v2/lumberjack_test.go b/vendor/gopkg.in/natefinch/lumberjack.v2/lumberjack_test.go
deleted file mode 100644
index 58e165f0..00000000
--- a/vendor/gopkg.in/natefinch/lumberjack.v2/lumberjack_test.go
+++ /dev/null
@@ -1,816 +0,0 @@
-package lumberjack
-
-import (
-	"bytes"
-	"compress/gzip"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-
-	"github.com/BurntSushi/toml"
-	"gopkg.in/yaml.v2"
-)
-
-// !!!NOTE!!!
-//
-// Running these tests in parallel will almost certainly cause sporadic (or even
-// regular) failures, because they're all messing with the same global variable
-// that controls the logic's mocked time.Now.  So... don't do that.
-
-// Since all the tests uses the time to determine filenames etc, we need to
-// control the wall clock as much as possible, which means having a wall clock
-// that doesn't change unless we want it to.
-var fakeCurrentTime = time.Now()
-
-func fakeTime() time.Time {
-	return fakeCurrentTime
-}
-
-func TestNewFile(t *testing.T) {
-	currentTime = fakeTime
-
-	dir := makeTempDir("TestNewFile", t)
-	defer os.RemoveAll(dir)
-	l := &Logger{
-		Filename: logFile(dir),
-	}
-	defer l.Close()
-	b := []byte("boo!")
-	n, err := l.Write(b)
-	isNil(err, t)
-	equals(len(b), n, t)
-	existsWithContent(logFile(dir), b, t)
-	fileCount(dir, 1, t)
-}
-
-func TestOpenExisting(t *testing.T) {
-	currentTime = fakeTime
-	dir := makeTempDir("TestOpenExisting", t)
-	defer os.RemoveAll(dir)
-
-	filename := logFile(dir)
-	data := []byte("foo!")
-	err := ioutil.WriteFile(filename, data, 0644)
-	isNil(err, t)
-	existsWithContent(filename, data, t)
-
-	l := &Logger{
-		Filename: filename,
-	}
-	defer l.Close()
-	b := []byte("boo!")
-	n, err := l.Write(b)
-	isNil(err, t)
-	equals(len(b), n, t)
-
-	// make sure the file got appended
-	existsWithContent(filename, append(data, b...), t)
-
-	// make sure no other files were created
-	fileCount(dir, 1, t)
-}
-
-func TestWriteTooLong(t *testing.T) {
-	currentTime = fakeTime
-	megabyte = 1
-	dir := makeTempDir("TestWriteTooLong", t)
-	defer os.RemoveAll(dir)
-	l := &Logger{
-		Filename: logFile(dir),
-		MaxSize:  5,
-	}
-	defer l.Close()
-	b := []byte("booooooooooooooo!")
-	n, err := l.Write(b)
-	notNil(err, t)
-	equals(0, n, t)
-	equals(err.Error(),
-		fmt.Sprintf("write length %d exceeds maximum file size %d", len(b), l.MaxSize), t)
-	_, err = os.Stat(logFile(dir))
-	assert(os.IsNotExist(err), t, "File exists, but should not have been created")
-}
-
-func TestMakeLogDir(t *testing.T) {
-	currentTime = fakeTime
-	dir := time.Now().Format("TestMakeLogDir" + backupTimeFormat)
-	dir = filepath.Join(os.TempDir(), dir)
-	defer os.RemoveAll(dir)
-	filename := logFile(dir)
-	l := &Logger{
-		Filename: filename,
-	}
-	defer l.Close()
-	b := []byte("boo!")
-	n, err := l.Write(b)
-	isNil(err, t)
-	equals(len(b), n, t)
-	existsWithContent(logFile(dir), b, t)
-	fileCount(dir, 1, t)
-}
-
-func TestDefaultFilename(t *testing.T) {
-	currentTime = fakeTime
-	dir := os.TempDir()
-	filename := filepath.Join(dir, filepath.Base(os.Args[0])+"-lumberjack.log")
-	defer os.Remove(filename)
-	l := &Logger{}
-	defer l.Close()
-	b := []byte("boo!")
-	n, err := l.Write(b)
-
-	isNil(err, t)
-	equals(len(b), n, t)
-	existsWithContent(filename, b, t)
-}
-
-func TestAutoRotate(t *testing.T) {
-	currentTime = fakeTime
-	megabyte = 1
-
-	dir := makeTempDir("TestAutoRotate", t)
-	defer os.RemoveAll(dir)
-
-	filename := logFile(dir)
-	l := &Logger{
-		Filename: filename,
-		MaxSize:  10,
-	}
-	defer l.Close()
-	b := []byte("boo!")
-	n, err := l.Write(b)
-	isNil(err, t)
-	equals(len(b), n, t)
-
-	existsWithContent(filename, b, t)
-	fileCount(dir, 1, t)
-
-	newFakeTime()
-
-	b2 := []byte("foooooo!")
-	n, err = l.Write(b2)
-	isNil(err, t)
-	equals(len(b2), n, t)
-
-	// the old logfile should be moved aside and the main logfile should have
-	// only the last write in it.
-	existsWithContent(filename, b2, t)
-
-	// the backup file will use the current fake time and have the old contents.
-	existsWithContent(backupFile(dir), b, t)
-
-	fileCount(dir, 2, t)
-}
-
-func TestFirstWriteRotate(t *testing.T) {
-	currentTime = fakeTime
-	megabyte = 1
-	dir := makeTempDir("TestFirstWriteRotate", t)
-	defer os.RemoveAll(dir)
-
-	filename := logFile(dir)
-	l := &Logger{
-		Filename: filename,
-		MaxSize:  10,
-	}
-	defer l.Close()
-
-	start := []byte("boooooo!")
-	err := ioutil.WriteFile(filename, start, 0600)
-	isNil(err, t)
-
-	newFakeTime()
-
-	// this would make us rotate
-	b := []byte("fooo!")
-	n, err := l.Write(b)
-	isNil(err, t)
-	equals(len(b), n, t)
-
-	existsWithContent(filename, b, t)
-	existsWithContent(backupFile(dir), start, t)
-
-	fileCount(dir, 2, t)
-}
-
-func TestMaxBackups(t *testing.T) {
-	currentTime = fakeTime
-	megabyte = 1
-	dir := makeTempDir("TestMaxBackups", t)
-	defer os.RemoveAll(dir)
-
-	filename := logFile(dir)
-	l := &Logger{
-		Filename:   filename,
-		MaxSize:    10,
-		MaxBackups: 1,
-	}
-	defer l.Close()
-	b := []byte("boo!")
-	n, err := l.Write(b)
-	isNil(err, t)
-	equals(len(b), n, t)
-
-	existsWithContent(filename, b, t)
-	fileCount(dir, 1, t)
-
-	newFakeTime()
-
-	// this will put us over the max
-	b2 := []byte("foooooo!")
-	n, err = l.Write(b2)
-	isNil(err, t)
-	equals(len(b2), n, t)
-
-	// this will use the new fake time
-	secondFilename := backupFile(dir)
-	existsWithContent(secondFilename, b, t)
-
-	// make sure the old file still exists with the same content.
-	existsWithContent(filename, b2, t)
-
-	fileCount(dir, 2, t)
-
-	newFakeTime()
-
-	// this will make us rotate again
-	b3 := []byte("baaaaaar!")
-	n, err = l.Write(b3)
-	isNil(err, t)
-	equals(len(b3), n, t)
-
-	// this will use the new fake time
-	thirdFilename := backupFile(dir)
-	existsWithContent(thirdFilename, b2, t)
-
-	existsWithContent(filename, b3, t)
-
-	// we need to wait a little bit since the files get deleted on a different
-	// goroutine.
-	<-time.After(time.Millisecond * 10)
-
-	// should only have two files in the dir still
-	fileCount(dir, 2, t)
-
-	// second file name should still exist
-	existsWithContent(thirdFilename, b2, t)
-
-	// should have deleted the first backup
-	notExist(secondFilename, t)
-
-	// now test that we don't delete directories or non-logfile files
-
-	newFakeTime()
-
-	// create a file that is close to but different from the logfile name.
-	// It shouldn't get caught by our deletion filters.
-	notlogfile := logFile(dir) + ".foo"
-	err = ioutil.WriteFile(notlogfile, []byte("data"), 0644)
-	isNil(err, t)
-
-	// Make a directory that exactly matches our log file filters... it still
-	// shouldn't get caught by the deletion filter since it's a directory.
-	notlogfiledir := backupFile(dir)
-	err = os.Mkdir(notlogfiledir, 0700)
-	isNil(err, t)
-
-	newFakeTime()
-
-	// this will use the new fake time
-	fourthFilename := backupFile(dir)
-
-	// Create a log file that is/was being compressed - this should
-	// not be counted since both the compressed and the uncompressed
-	// log files still exist.
-	compLogFile := fourthFilename+compressSuffix
-	err = ioutil.WriteFile(compLogFile, []byte("compress"), 0644)
-	isNil(err, t)
-
-	// this will make us rotate again
-	b4 := []byte("baaaaaaz!")
-	n, err = l.Write(b4)
-	isNil(err, t)
-	equals(len(b4), n, t)
-
-	existsWithContent(fourthFilename, b3, t)
-	existsWithContent(fourthFilename+compressSuffix, []byte("compress"), t)
-
-	// we need to wait a little bit since the files get deleted on a different
-	// goroutine.
-	<-time.After(time.Millisecond * 10)
-
-	// We should have four things in the directory now - the 2 log files, the
-	// not log file, and the directory
-	fileCount(dir, 5, t)
-
-	// third file name should still exist
-	existsWithContent(filename, b4, t)
-
-	existsWithContent(fourthFilename, b3, t)
-
-	// should have deleted the first filename
-	notExist(thirdFilename, t)
-
-	// the not-a-logfile should still exist
-	exists(notlogfile, t)
-
-	// the directory
-	exists(notlogfiledir, t)
-}
-
-func TestCleanupExistingBackups(t *testing.T) {
-	// test that if we start with more backup files than we're supposed to have
-	// in total, that extra ones get cleaned up when we rotate.
-
-	currentTime = fakeTime
-	megabyte = 1
-
-	dir := makeTempDir("TestCleanupExistingBackups", t)
-	defer os.RemoveAll(dir)
-
-	// make 3 backup files
-
-	data := []byte("data")
-	backup := backupFile(dir)
-	err := ioutil.WriteFile(backup, data, 0644)
-	isNil(err, t)
-
-	newFakeTime()
-
-	backup = backupFile(dir)
-	err = ioutil.WriteFile(backup+compressSuffix, data, 0644)
-	isNil(err, t)
-
-	newFakeTime()
-
-	backup = backupFile(dir)
-	err = ioutil.WriteFile(backup, data, 0644)
-	isNil(err, t)
-
-	// now create a primary log file with some data
-	filename := logFile(dir)
-	err = ioutil.WriteFile(filename, data, 0644)
-	isNil(err, t)
-
-	l := &Logger{
-		Filename:   filename,
-		MaxSize:    10,
-		MaxBackups: 1,
-	}
-	defer l.Close()
-
-	newFakeTime()
-
-	b2 := []byte("foooooo!")
-	n, err := l.Write(b2)
-	isNil(err, t)
-	equals(len(b2), n, t)
-
-	// we need to wait a little bit since the files get deleted on a different
-	// goroutine.
-	<-time.After(time.Millisecond * 10)
-
-	// now we should only have 2 files left - the primary and one backup
-	fileCount(dir, 2, t)
-}
-
-func TestMaxAge(t *testing.T) {
-	currentTime = fakeTime
-	megabyte = 1
-
-	dir := makeTempDir("TestMaxAge", t)
-	defer os.RemoveAll(dir)
-
-	filename := logFile(dir)
-	l := &Logger{
-		Filename: filename,
-		MaxSize:  10,
-		MaxAge:   1,
-	}
-	defer l.Close()
-	b := []byte("boo!")
-	n, err := l.Write(b)
-	isNil(err, t)
-	equals(len(b), n, t)
-
-	existsWithContent(filename, b, t)
-	fileCount(dir, 1, t)
-
-	// two days later
-	newFakeTime()
-
-	b2 := []byte("foooooo!")
-	n, err = l.Write(b2)
-	isNil(err, t)
-	equals(len(b2), n, t)
-	existsWithContent(backupFile(dir), b, t)
-
-	// we need to wait a little bit since the files get deleted on a different
-	// goroutine.
-	<-time.After(10 * time.Millisecond)
-
-	// We should still have 2 log files, since the most recent backup was just
-	// created.
-	fileCount(dir, 2, t)
-
-	existsWithContent(filename, b2, t)
-
-	// we should have deleted the old file due to being too old
-	existsWithContent(backupFile(dir), b, t)
-
-	// two days later
-	newFakeTime()
-
-	b3 := []byte("baaaaar!")
-	n, err = l.Write(b3)
-	isNil(err, t)
-	equals(len(b3), n, t)
-	existsWithContent(backupFile(dir), b2, t)
-
-	// we need to wait a little bit since the files get deleted on a different
-	// goroutine.
-	<-time.After(10 * time.Millisecond)
-
-	// We should have 2 log files - the main log file, and the most recent
-	// backup.  The earlier backup is past the cutoff and should be gone.
-	fileCount(dir, 2, t)
-
-	existsWithContent(filename, b3, t)
-
-	// we should have deleted the old file due to being too old
-	existsWithContent(backupFile(dir), b2, t)
-}
-
-func TestOldLogFiles(t *testing.T) {
-	currentTime = fakeTime
-	megabyte = 1
-
-	dir := makeTempDir("TestOldLogFiles", t)
-	defer os.RemoveAll(dir)
-
-	filename := logFile(dir)
-	data := []byte("data")
-	err := ioutil.WriteFile(filename, data, 07)
-	isNil(err, t)
-
-	// This gives us a time with the same precision as the time we get from the
-	// timestamp in the name.
-	t1, err := time.Parse(backupTimeFormat, fakeTime().UTC().Format(backupTimeFormat))
-	isNil(err, t)
-
-	backup := backupFile(dir)
-	err = ioutil.WriteFile(backup, data, 07)
-	isNil(err, t)
-
-	newFakeTime()
-
-	t2, err := time.Parse(backupTimeFormat, fakeTime().UTC().Format(backupTimeFormat))
-	isNil(err, t)
-
-	backup2 := backupFile(dir)
-	err = ioutil.WriteFile(backup2, data, 07)
-	isNil(err, t)
-
-	l := &Logger{Filename: filename}
-	files, err := l.oldLogFiles()
-	isNil(err, t)
-	equals(2, len(files), t)
-
-	// should be sorted by newest file first, which would be t2
-	equals(t2, files[0].timestamp, t)
-	equals(t1, files[1].timestamp, t)
-}
-
-func TestTimeFromName(t *testing.T) {
-	l := &Logger{Filename: "/var/log/myfoo/foo.log"}
-	prefix, ext := l.prefixAndExt()
-
-	tests := []struct {
-		filename string
-		want     time.Time
-		wantErr  bool
-	}{
-		{"foo-2014-05-04T14-44-33.555.log", time.Date(2014, 5, 4, 14, 44, 33, 555000000, time.UTC), false},
-		{"foo-2014-05-04T14-44-33.555", time.Time{}, true},
-		{"2014-05-04T14-44-33.555.log", time.Time{}, true},
-		{"foo.log", time.Time{}, true},
-	}
-
-	for _, test := range tests {
-		got, err := l.timeFromName(test.filename, prefix, ext)
-		equals(got, test.want, t)
-		equals(err != nil, test.wantErr, t)
-	}
-}
-
-func TestLocalTime(t *testing.T) {
-	currentTime = fakeTime
-	megabyte = 1
-
-	dir := makeTempDir("TestLocalTime", t)
-	defer os.RemoveAll(dir)
-
-	l := &Logger{
-		Filename:  logFile(dir),
-		MaxSize:   10,
-		LocalTime: true,
-	}
-	defer l.Close()
-	b := []byte("boo!")
-	n, err := l.Write(b)
-	isNil(err, t)
-	equals(len(b), n, t)
-
-	b2 := []byte("fooooooo!")
-	n2, err := l.Write(b2)
-	isNil(err, t)
-	equals(len(b2), n2, t)
-
-	existsWithContent(logFile(dir), b2, t)
-	existsWithContent(backupFileLocal(dir), b, t)
-}
-
-func TestRotate(t *testing.T) {
-	currentTime = fakeTime
-	dir := makeTempDir("TestRotate", t)
-	defer os.RemoveAll(dir)
-
-	filename := logFile(dir)
-
-	l := &Logger{
-		Filename:   filename,
-		MaxBackups: 1,
-		MaxSize:    100, // megabytes
-	}
-	defer l.Close()
-	b := []byte("boo!")
-	n, err := l.Write(b)
-	isNil(err, t)
-	equals(len(b), n, t)
-
-	existsWithContent(filename, b, t)
-	fileCount(dir, 1, t)
-
-	newFakeTime()
-
-	err = l.Rotate()
-	isNil(err, t)
-
-	// we need to wait a little bit since the files get deleted on a different
-	// goroutine.
-	<-time.After(10 * time.Millisecond)
-
-	filename2 := backupFile(dir)
-	existsWithContent(filename2, b, t)
-	existsWithContent(filename, []byte{}, t)
-	fileCount(dir, 2, t)
-	newFakeTime()
-
-	err = l.Rotate()
-	isNil(err, t)
-
-	// we need to wait a little bit since the files get deleted on a different
-	// goroutine.
-	<-time.After(10 * time.Millisecond)
-
-	filename3 := backupFile(dir)
-	existsWithContent(filename3, []byte{}, t)
-	existsWithContent(filename, []byte{}, t)
-	fileCount(dir, 2, t)
-
-	b2 := []byte("foooooo!")
-	n, err = l.Write(b2)
-	isNil(err, t)
-	equals(len(b2), n, t)
-
-	// this will use the new fake time
-	existsWithContent(filename, b2, t)
-}
-
-func TestCompressOnRotate(t *testing.T) {
-	currentTime = fakeTime
-	megabyte = 1
-
-	dir := makeTempDir("TestCompressOnRotate", t)
-	defer os.RemoveAll(dir)
-
-	filename := logFile(dir)
-	l := &Logger{
-		Compress: true,
-		Filename: filename,
-		MaxSize:  10,
-	}
-	defer l.Close()
-	b := []byte("boo!")
-	n, err := l.Write(b)
-	isNil(err, t)
-	equals(len(b), n, t)
-
-	existsWithContent(filename, b, t)
-	fileCount(dir, 1, t)
-
-	newFakeTime()
-
-	err = l.Rotate()
-	isNil(err, t)
-
-	// the old logfile should be moved aside and the main logfile should have
-	// nothing in it.
-	existsWithContent(filename, []byte{}, t)
-
-	// we need to wait a little bit since the files get compressed on a different
-	// goroutine.
-	<-time.After(10 * time.Millisecond)
-
-	// a compressed version of the log file should now exist and the original
-	// should have been removed.
-	bc := new(bytes.Buffer)
-	gz := gzip.NewWriter(bc)
-	_, err = gz.Write(b)
-	isNil(err, t)
-	err = gz.Close()
-	isNil(err, t)
-	existsWithContent(backupFile(dir)+compressSuffix, bc.Bytes(), t)
-	notExist(backupFile(dir), t)
-
-	fileCount(dir, 2, t)
-}
-
-func TestCompressOnResume(t *testing.T) {
-	currentTime = fakeTime
-	megabyte = 1
-
-	dir := makeTempDir("TestCompressOnResume", t)
-	defer os.RemoveAll(dir)
-
-	filename := logFile(dir)
-	l := &Logger{
-		Compress: true,
-		Filename: filename,
-		MaxSize:  10,
-	}
-	defer l.Close()
-
-	// Create a backup file and empty "compressed" file.
-	filename2 := backupFile(dir)
-	b := []byte("foo!")
-	err := ioutil.WriteFile(filename2, b, 0644)
-	isNil(err, t)
-	err = ioutil.WriteFile(filename2+compressSuffix, []byte{}, 0644)
-	isNil(err, t)
-
-	newFakeTime()
-
-	b2 := []byte("boo!")
-	n, err := l.Write(b2)
-	isNil(err, t)
-	equals(len(b2), n, t)
-	existsWithContent(filename, b2, t)
-
-	// we need to wait a little bit since the files get compressed on a different
-	// goroutine.
-	<-time.After(10 * time.Millisecond)
-
-	// The write should have started the compression - a compressed version of
-	// the log file should now exist and the original should have been removed.
-	bc := new(bytes.Buffer)
-	gz := gzip.NewWriter(bc)
-	_, err = gz.Write(b)
-	isNil(err, t)
-	err = gz.Close()
-	isNil(err, t)
-	existsWithContent(filename2+compressSuffix, bc.Bytes(), t)
-	notExist(filename2, t)
-
-	fileCount(dir, 2, t)
-}
-
-func TestJson(t *testing.T) {
-	data := []byte(`
-{
-	"filename": "foo",
-	"maxsize": 5,
-	"maxage": 10,
-	"maxbackups": 3,
-	"localtime": true,
-	"compress": true
-}`[1:])
-
-	l := Logger{}
-	err := json.Unmarshal(data, &l)
-	isNil(err, t)
-	equals("foo", l.Filename, t)
-	equals(5, l.MaxSize, t)
-	equals(10, l.MaxAge, t)
-	equals(3, l.MaxBackups, t)
-	equals(true, l.LocalTime, t)
-	equals(true, l.Compress, t)
-}
-
-func TestYaml(t *testing.T) {
-	data := []byte(`
-filename: foo
-maxsize: 5
-maxage: 10
-maxbackups: 3
-localtime: true
-compress: true`[1:])
-
-	l := Logger{}
-	err := yaml.Unmarshal(data, &l)
-	isNil(err, t)
-	equals("foo", l.Filename, t)
-	equals(5, l.MaxSize, t)
-	equals(10, l.MaxAge, t)
-	equals(3, l.MaxBackups, t)
-	equals(true, l.LocalTime, t)
-	equals(true, l.Compress, t)
-}
-
-func TestToml(t *testing.T) {
-	data := `
-filename = "foo"
-maxsize = 5
-maxage = 10
-maxbackups = 3
-localtime = true
-compress = true`[1:]
-
-	l := Logger{}
-	md, err := toml.Decode(data, &l)
-	isNil(err, t)
-	equals("foo", l.Filename, t)
-	equals(5, l.MaxSize, t)
-	equals(10, l.MaxAge, t)
-	equals(3, l.MaxBackups, t)
-	equals(true, l.LocalTime, t)
-	equals(true, l.Compress, t)
-	equals(0, len(md.Undecoded()), t)
-}
-
-// makeTempDir creates a file with a semi-unique name in the OS temp directory.
-// It should be based on the name of the test, to keep parallel tests from
-// colliding, and must be cleaned up after the test is finished.
-func makeTempDir(name string, t testing.TB) string {
-	dir := time.Now().Format(name + backupTimeFormat)
-	dir = filepath.Join(os.TempDir(), dir)
-	isNilUp(os.Mkdir(dir, 0700), t, 1)
-	return dir
-}
-
-// existsWithContent checks that the given file exists and has the correct content.
-func existsWithContent(path string, content []byte, t testing.TB) {
-	info, err := os.Stat(path)
-	isNilUp(err, t, 1)
-	equalsUp(int64(len(content)), info.Size(), t, 1)
-
-	b, err := ioutil.ReadFile(path)
-	isNilUp(err, t, 1)
-	equalsUp(content, b, t, 1)
-}
-
-// logFile returns the log file name in the given directory for the current fake
-// time.
-func logFile(dir string) string {
-	return filepath.Join(dir, "foobar.log")
-}
-
-func backupFile(dir string) string {
-	return filepath.Join(dir, "foobar-"+fakeTime().UTC().Format(backupTimeFormat)+".log")
-}
-
-func backupFileLocal(dir string) string {
-	return filepath.Join(dir, "foobar-"+fakeTime().Format(backupTimeFormat)+".log")
-}
-
-// logFileLocal returns the log file name in the given directory for the current
-// fake time using the local timezone.
-func logFileLocal(dir string) string {
-	return filepath.Join(dir, fakeTime().Format(backupTimeFormat))
-}
-
-// fileCount checks that the number of files in the directory is exp.
-func fileCount(dir string, exp int, t testing.TB) {
-	files, err := ioutil.ReadDir(dir)
-	isNilUp(err, t, 1)
-	// Make sure no other files were created.
-	equalsUp(exp, len(files), t, 1)
-}
-
-// newFakeTime sets the fake "current time" to two days later.
-func newFakeTime() {
-	fakeCurrentTime = fakeCurrentTime.Add(time.Hour * 24 * 2)
-}
-
-func notExist(path string, t testing.TB) {
-	_, err := os.Stat(path)
-	assertUp(os.IsNotExist(err), t, 1, "expected to get os.IsNotExist, but instead got %v", err)
-}
-
-func exists(path string, t testing.TB) {
-	_, err := os.Stat(path)
-	assertUp(err == nil, t, 1, "expected file to exist, but got error from os.Stat: %v", err)
-}
diff --git a/vendor/gopkg.in/natefinch/lumberjack.v2/rotate_test.go b/vendor/gopkg.in/natefinch/lumberjack.v2/rotate_test.go
deleted file mode 100644
index 4bd4325d..00000000
--- a/vendor/gopkg.in/natefinch/lumberjack.v2/rotate_test.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// +build linux
-
-package lumberjack_test
-
-import (
-	"log"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"gopkg.in/natefinch/lumberjack.v2"
-)
-
-// Example of how to rotate in response to SIGHUP.
-func ExampleLogger_Rotate() {
-	l := &lumberjack.Logger{}
-	log.SetOutput(l)
-	c := make(chan os.Signal, 1)
-	signal.Notify(c, syscall.SIGHUP)
-
-	go func() {
-		for {
-			<-c
-			l.Rotate()
-		}
-	}()
-}
diff --git a/vendor/gopkg.in/natefinch/lumberjack.v2/testing_test.go b/vendor/gopkg.in/natefinch/lumberjack.v2/testing_test.go
deleted file mode 100644
index 8e89c083..00000000
--- a/vendor/gopkg.in/natefinch/lumberjack.v2/testing_test.go
+++ /dev/null
@@ -1,91 +0,0 @@
-package lumberjack
-
-import (
-	"fmt"
-	"path/filepath"
-	"reflect"
-	"runtime"
-	"testing"
-)
-
-// assert will log the given message if condition is false.
-func assert(condition bool, t testing.TB, msg string, v ...interface{}) {
-	assertUp(condition, t, 1, msg, v...)
-}
-
-// assertUp is like assert, but used inside helper functions, to ensure that
-// the file and line number reported by failures corresponds to one or more
-// levels up the stack.
-func assertUp(condition bool, t testing.TB, caller int, msg string, v ...interface{}) {
-	if !condition {
-		_, file, line, _ := runtime.Caller(caller + 1)
-		v = append([]interface{}{filepath.Base(file), line}, v...)
-		fmt.Printf("%s:%d: "+msg+"\n", v...)
-		t.FailNow()
-	}
-}
-
-// equals tests that the two values are equal according to reflect.DeepEqual.
-func equals(exp, act interface{}, t testing.TB) {
-	equalsUp(exp, act, t, 1)
-}
-
-// equalsUp is like equals, but used inside helper functions, to ensure that the
-// file and line number reported by failures corresponds to one or more levels
-// up the stack.
-func equalsUp(exp, act interface{}, t testing.TB, caller int) {
-	if !reflect.DeepEqual(exp, act) {
-		_, file, line, _ := runtime.Caller(caller + 1)
-		fmt.Printf("%s:%d: exp: %v (%T), got: %v (%T)\n",
-			filepath.Base(file), line, exp, exp, act, act)
-		t.FailNow()
-	}
-}
-
-// isNil reports a failure if the given value is not nil.  Note that values
-// which cannot be nil will always fail this check.
-func isNil(obtained interface{}, t testing.TB) {
-	isNilUp(obtained, t, 1)
-}
-
-// isNilUp is like isNil, but used inside helper functions, to ensure that the
-// file and line number reported by failures corresponds to one or more levels
-// up the stack.
-func isNilUp(obtained interface{}, t testing.TB, caller int) {
-	if !_isNil(obtained) {
-		_, file, line, _ := runtime.Caller(caller + 1)
-		fmt.Printf("%s:%d: expected nil, got: %v\n", filepath.Base(file), line, obtained)
-		t.FailNow()
-	}
-}
-
-// notNil reports a failure if the given value is nil.
-func notNil(obtained interface{}, t testing.TB) {
-	notNilUp(obtained, t, 1)
-}
-
-// notNilUp is like notNil, but used inside helper functions, to ensure that the
-// file and line number reported by failures corresponds to one or more levels
-// up the stack.
-func notNilUp(obtained interface{}, t testing.TB, caller int) {
-	if _isNil(obtained) {
-		_, file, line, _ := runtime.Caller(caller + 1)
-		fmt.Printf("%s:%d: expected non-nil, got: %v\n", filepath.Base(file), line, obtained)
-		t.FailNow()
-	}
-}
-
-// _isNil is a helper function for isNil and notNil, and should not be used
-// directly.
-func _isNil(obtained interface{}) bool {
-	if obtained == nil {
-		return true
-	}
-
-	switch v := reflect.ValueOf(obtained); v.Kind() {
-	case reflect.Chan, reflect.Func, reflect.Interface, reflect.Map, reflect.Ptr, reflect.Slice:
-		return v.IsNil()
-	}
-
-	return false
-}